claudekit-cli 4.0.0-dev.2 → 4.0.0-dev.3

package/README.md

@@ -324,6 +324,7 @@ Remove ClaudeKit installations from your system:
 ck uninstall              # Interactive mode - prompts for scope and confirmation
 ck uninstall --local      # Uninstall only local installation (current project)
 ck uninstall --global     # Uninstall only global installation (~/.claude/)
+ck uninstall -g --kit marketing  # Remove only global Marketing kit
 ck uninstall -l -y        # Local only, skip confirmation
 ck uninstall -g -y        # Global only, skip confirmation
 ck uninstall --yes        # Non-interactive - skip confirmation (for scripts)
@@ -334,7 +335,11 @@ ck uninstall --yes        # Non-interactive - skip confirmation (for scripts)
   - **Local only**: Remove from current project (`.claude/`)
   - **Global only**: Remove from user directory (`~/.claude/`)
   - **Both**: Remove all ClaudeKit installations
+- When multiple kits are installed in the selected scope, interactive uninstall prompts for:
+  - **Marketing kit only** or **Engineer kit only**: Remove one kit and preserve the other
+  - **All ClaudeKit kits**: Remove the full selected installation scope
 - Use `--local` or `--global` flags to skip the prompt
+- Use `--kit engineer` or `--kit marketing` to skip the kit prompt
 
 **What it does:**
 - Detects local `.claude` directory in current project

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.0.0-dev.2",
-	"generatedAt": "2026-05-07T18:05:52.152Z",
+	"version": "4.0.0-dev.3",
+	"generatedAt": "2026-05-09T03:16:37.030Z",
 	"commands": {
 		"agents": {
 			"name": "agents",
@@ -1922,6 +1922,10 @@
 			"description": "Remove ClaudeKit installations (ownership-aware)",
 			"usage": "ck uninstall [options]",
 			"examples": [
+				{
+					"command": "ck uninstall --global --kit marketing",
+					"description": "Remove only the global Marketing kit and preserve Engineer"
+				},
 				{
 					"command": "ck uninstall --local --yes",
 					"description": "Remove local installation without confirmation"

package/dist/index.js

@@ -62359,7 +62359,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.0.0-dev.2",
+    version: "4.0.0-dev.3",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -78178,6 +78178,10 @@ var init_uninstall_command_help = __esm(() => {
     description: "Remove ClaudeKit installations (ownership-aware)",
     usage: "ck uninstall [options]",
     examples: [
+      {
+        command: "ck uninstall --global --kit marketing",
+        description: "Remove only the global Marketing kit and preserve Engineer"
+      },
       {
         command: "ck uninstall --local --yes",
         description: "Remove local installation without confirmation"
@@ -105192,6 +105196,21 @@ function isSyncContext(ctx) {
 }
 
 // src/commands/init/phases/selection-handler.ts
+function buildKitScopedUninstallCommands(kits, resolvedDir, isGlobal) {
+  const scopeFlag = isGlobal || PathResolver.isLocalSameAsGlobal(resolvedDir) ? "--global" : "--local";
+  return kits.map((kit) => `ck uninstall ${scopeFlag} --kit ${kit}`);
+}
+function buildRerunInitCommand(kitType, resolvedDir, isGlobal) {
+  const args = ["ck init"];
+  const targetsGlobal = isGlobal || PathResolver.isLocalSameAsGlobal(resolvedDir);
+  if (targetsGlobal) {
+    args.push("--global");
+  } else {
+    args.push(`--dir ${JSON.stringify(resolvedDir)}`);
+  }
+  args.push(`--kit ${kitType}`);
+  return args.join(" ");
+}
 async function handleSelection(ctx) {
   if (ctx.cancelled)
     return ctx;
@@ -105407,6 +105426,11 @@ async function handleSelection(ctx) {
             try {
               const confirmAdd = await ctx.prompts.confirm(`${existingKitsDisplay} already installed. Add ${kit.name} alongside?`);
               if (!confirmAdd) {
+                logger.info("To remove one installed kit first, run:");
+                for (const command of buildKitScopedUninstallCommands(otherKits, resolvedDir, ctx.options.global)) {
+                  logger.info(`  ${command}`);
+                }
+                logger.info(`Then rerun: ${buildRerunInitCommand(kitType, resolvedDir, ctx.options.global)}`);
                 logger.warning("Multi-kit installation cancelled by user");
                 return { ...ctx, cancelled: true };
               }
@@ -111280,6 +111304,9 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     remainingKits: []
   };
   const metadata = await ManifestWriter.readManifest(installation.path);
+  if (kit && (!metadata || !getInstalledKits(metadata).includes(kit))) {
+    return result;
+  }
   const uninstallManifest = await ManifestWriter.getUninstallManifest(installation.path, kit);
   result.remainingKits = uninstallManifest.remainingKits;
   if (uninstallManifest.isMultiKit && kit && metadata?.kits?.[kit]) {
@@ -111590,6 +111617,56 @@ async function promptScope(installations) {
   }
   return selected;
 }
+async function getInstallationKits(installation) {
+  const metadata = await ManifestWriter.readManifest(installation.path);
+  return metadata ? getInstalledKits(metadata) : [];
+}
+async function getInstalledKitSet(installations) {
+  const installedKitSet = new Set;
+  for (const installation of installations) {
+    for (const kit of await getInstallationKits(installation)) {
+      installedKitSet.add(kit);
+    }
+  }
+  return installedKitSet;
+}
+async function filterInstallationsByKit(installations, kit) {
+  const filtered = [];
+  for (const installation of installations) {
+    const installedKits = await getInstallationKits(installation);
+    if (installedKits.includes(kit)) {
+      filtered.push(installation);
+    }
+  }
+  return filtered;
+}
+async function promptKitSelection(installedKitSet) {
+  if (installedKitSet.size < 2) {
+    return "all";
+  }
+  const kitOrder = ["marketing", "engineer"];
+  const kitOptions = kitOrder.filter((kit) => installedKitSet.has(kit)).map((kit) => ({
+    value: kit,
+    label: `${kit[0].toUpperCase()}${kit.slice(1)} kit only`,
+    hint: "Preserve other installed kit(s) and customizations"
+  }));
+  const options2 = [
+    ...kitOptions,
+    {
+      value: "all",
+      label: "All ClaudeKit kits",
+      hint: "Remove the full selected installation scope"
+    }
+  ];
+  const selected = await ie({
+    message: "Multiple kits are installed. What do you want to uninstall?",
+    options: options2
+  });
+  if (lD(selected)) {
+    return null;
+  }
+  return selected;
+}
 async function confirmUninstall(scope, kitLabel = "") {
   const scopeText = scope === "all" ? "all ClaudeKit installations" : scope === "local" ? "local ClaudeKit installation" : "global ClaudeKit installation";
   const confirmed = await se({
@@ -111648,7 +111725,7 @@ async function uninstallCommand(options2) {
         }
         scope = promptedScope;
       }
-      const installations = allInstallations.filter((i) => {
+      let installations = allInstallations.filter((i) => {
         if (scope === "all")
           return true;
         return i.type === scope;
@@ -111658,16 +111735,41 @@ async function uninstallCommand(options2) {
         logger.info(`No ${scopeLabel} ClaudeKit installation found.`);
         return;
       }
+      let kitToRemove = validOptions.kit;
+      if (!kitToRemove) {
+        const installedKitSet = await getInstalledKitSet(installations);
+        if (validOptions.yes) {
+          if (installedKitSet.size > 1) {
+            logger.info("Removing all installed kits (--yes flag bypasses kit prompt; use --kit to scope).");
+          }
+        } else {
+          const selectedKit = await promptKitSelection(installedKitSet);
+          if (!selectedKit) {
+            logger.info("Uninstall cancelled.");
+            return;
+          }
+          if (selectedKit !== "all") {
+            kitToRemove = selectedKit;
+          }
+        }
+      }
+      if (kitToRemove) {
+        installations = await filterInstallationsByKit(installations, kitToRemove);
+        if (installations.length === 0) {
+          logger.info(`Kit "${kitToRemove}" is not installed in selected scope.`);
+          return;
+        }
+      }
       displayInstallations(installations, scope);
-      if (validOptions.kit) {
-        log.info(import_picocolors39.default.cyan(`Kit-scoped uninstall: ${validOptions.kit} kit only`));
+      if (kitToRemove) {
+        log.info(import_picocolors39.default.cyan(`Kit-scoped uninstall: ${kitToRemove} kit only`));
       }
       if (validOptions.dryRun) {
         log.info(import_picocolors39.default.yellow("DRY RUN MODE - No files will be deleted"));
         await removeInstallations(installations, {
           dryRun: true,
           forceOverwrite: validOptions.forceOverwrite,
-          kit: validOptions.kit
+          kit: kitToRemove
         });
         prompts.outro("Dry-run complete. No changes were made.");
         return;
@@ -111677,7 +111779,7 @@ async function uninstallCommand(options2) {
 ${import_picocolors39.default.yellow("User modifications will be permanently deleted!")}`);
       }
       if (!validOptions.yes) {
-        const kitLabel = validOptions.kit ? ` (${validOptions.kit} kit only)` : "";
+        const kitLabel = kitToRemove ? ` (${kitToRemove} kit only)` : "";
         const confirmed = await confirmUninstall(scope, kitLabel);
         if (!confirmed) {
           logger.info("Uninstall cancelled.");
@@ -111687,10 +111789,10 @@ ${import_picocolors39.default.yellow("User modifications will be permanently del
       const results = await removeInstallations(installations, {
         dryRun: false,
         forceOverwrite: validOptions.forceOverwrite,
-        kit: validOptions.kit
+        kit: kitToRemove
       });
       const hasProtectedFiles = results.some((result) => result.protectedTrackedPaths.length > 0);
-      const kitMsg = validOptions.kit ? ` (${validOptions.kit} kit)` : "";
+      const kitMsg = kitToRemove ? ` (${kitToRemove} kit)` : "";
       if (hasProtectedFiles) {
         prompts.outro(`ClaudeKit${kitMsg} uninstall completed with preserved customizations. Use --force-overwrite for full removal.`);
         return;

package/package.json

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