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

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.4",
+	"generatedAt": "2026-05-09T14:28:30.285Z",
 	"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

@@ -12552,6 +12552,100 @@ async function migrateRegistryV2ToV3(v2Registry) {
     appliedManifestVersion: undefined
   };
 }
+function getStringField(item, field) {
+  const record = item;
+  if (!(field in record) || record[field] === undefined) {
+    return;
+  }
+  const value = record[field];
+  if (typeof value !== "string") {
+    throw new Error("portable-registry.json has unsupported schema/version");
+  }
+  return value;
+}
+function getOwnedSections(item) {
+  const record = item;
+  if (!("ownedSections" in record) || record.ownedSections === undefined) {
+    return;
+  }
+  const value = record.ownedSections;
+  if (!Array.isArray(value) || !value.every((section) => typeof section === "string")) {
+    throw new Error("portable-registry.json has unsupported schema/version");
+  }
+  return value;
+}
+function getInstallSource(item) {
+  const installSource = getStringField(item, "installSource");
+  if (installSource === undefined) {
+    return "kit";
+  }
+  if (installSource !== "kit" && installSource !== "manual") {
+    throw new Error("portable-registry.json has unsupported schema/version");
+  }
+  return installSource;
+}
+async function repairStaleRegistryV3(registry) {
+  const installations = [];
+  for (const item of registry.installations) {
+    let targetChecksum = normalizeChecksum(getStringField(item, "targetChecksum")) || UNKNOWN_CHECKSUM;
+    if (targetChecksum === UNKNOWN_CHECKSUM && existsSync2(item.path)) {
+      try {
+        targetChecksum = await computeFileChecksum(item.path);
+      } catch {
+        targetChecksum = UNKNOWN_CHECKSUM;
+      }
+    }
+    installations.push({
+      ...item,
+      sourceChecksum: normalizeChecksum(getStringField(item, "sourceChecksum")) || UNKNOWN_CHECKSUM,
+      targetChecksum,
+      installSource: getInstallSource(item),
+      ownedSections: getOwnedSections(item)
+    });
+  }
+  return normalizePortableRegistryChecksums({
+    ...registry,
+    version: "3.0",
+    installations,
+    lastReconciled: registry.lastReconciled,
+    appliedManifestVersion: registry.appliedManifestVersion
+  });
+}
+async function persistCurrentStaleRegistryV3Repair(preparedRepair) {
+  return withRegistryLock(async () => {
+    let content;
+    try {
+      content = await readFile2(REGISTRY_PATH, "utf-8");
+    } catch (error) {
+      if (isErrnoCode(error, "ENOENT")) {
+        return readPortableRegistryInternal({ persistStaleV3Repair: false });
+      }
+      throw error;
+    }
+    let data;
+    try {
+      data = JSON.parse(content);
+    } catch (error) {
+      throw new Error(`portable-registry.json is not valid JSON: ${error instanceof Error ? error.message : "Unknown parse error"}`);
+    }
+    const v3Result = PortableRegistrySchemaV3.safeParse(data);
+    if (v3Result.success) {
+      return normalizePortableRegistryChecksums(v3Result.data);
+    }
+    const repairableV3Result = RepairablePortableRegistrySchemaV3.safeParse(data);
+    if (!repairableV3Result.success) {
+      return readPortableRegistryInternal({ persistStaleV3Repair: false });
+    }
+    const repairedRegistry = preparedRepair && preparedRepair.sourceContent === content ? preparedRepair.repairedRegistry : await repairStaleRegistryV3(repairableV3Result.data);
+    if (await isMigrationLocked()) {
+      logger.verbose("Migration in progress by another process, using repaired v3 view");
+      return repairedRegistry;
+    }
+    logger.verbose("Repairing stale portable registry v3.0 fields");
+    await writePortableRegistry(repairedRegistry);
+    return repairedRegistry;
+  });
+}
 async function isMigrationLocked() {
   try {
     const lockContent = await readFile2(MIGRATION_LOCK_PATH, "utf-8");
@@ -12589,6 +12683,9 @@ async function removeMigrationLock() {
   } catch {}
 }
 async function readPortableRegistry() {
+  return readPortableRegistryInternal({ persistStaleV3Repair: true });
+}
+async function readPortableRegistryInternal(options2) {
   try {
     const content = await readFile2(REGISTRY_PATH, "utf-8");
     let data;
@@ -12601,6 +12698,21 @@ async function readPortableRegistry() {
     if (v3Result.success) {
       return normalizePortableRegistryChecksums(v3Result.data);
     }
+    const repairableV3Result = RepairablePortableRegistrySchemaV3.safeParse(data);
+    if (repairableV3Result.success) {
+      const repairedRegistry = await repairStaleRegistryV3(repairableV3Result.data);
+      if (!options2.persistStaleV3Repair) {
+        return repairedRegistry;
+      }
+      if (await isMigrationLocked()) {
+        logger.verbose("Migration in progress by another process, using repaired v3 view");
+        return repairedRegistry;
+      }
+      return persistCurrentStaleRegistryV3Repair({
+        sourceContent: content,
+        repairedRegistry
+      });
+    }
     const v2Result = PortableRegistrySchema.safeParse(data);
     if (!v2Result.success) {
       throw new Error("portable-registry.json has unsupported schema/version");
@@ -12640,6 +12752,9 @@ async function readPortableRegistry() {
   }
   return { version: "3.0", installations: [] };
 }
+async function readPortableRegistryWithinRegistryLock() {
+  return readPortableRegistryInternal({ persistStaleV3Repair: false });
+}
 async function writePortableRegistry(registry) {
   const dir = dirname(REGISTRY_PATH);
   if (!existsSync2(dir)) {
@@ -12682,7 +12797,7 @@ async function withRegistryLock(operation) {
 }
 async function addPortableInstallation(item, type, provider, global2, path, sourcePath, options2) {
   await withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     registry.installations = registry.installations.filter((i) => !(i.item === item && i.type === type && i.provider === provider && i.global === global2));
     registry.installations.push({
       item,
@@ -12703,7 +12818,7 @@ async function addPortableInstallation(item, type, provider, global2, path, sour
 }
 async function removePortableInstallation(item, type, provider, global2) {
   return withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     const index = registry.installations.findIndex((i) => i.item === item && i.type === type && i.provider === provider && i.global === global2);
     if (index === -1)
       return null;
@@ -12727,14 +12842,14 @@ function findPortableInstallations(registry, item, type, provider, global2) {
 }
 async function updateAppliedManifestVersion(version) {
   await withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     registry.appliedManifestVersion = version;
     await writePortableRegistry(registry);
   });
 }
 async function removeInstallationsByFilter(predicate) {
   return withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     const removed = [];
     registry.installations = registry.installations.filter((entry) => {
       if (predicate(entry)) {
@@ -12751,7 +12866,7 @@ async function removeInstallationsByFilter(predicate) {
 }
 async function syncPortableRegistry() {
   return withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     const removed = [];
     registry.installations = registry.installations.filter((i) => {
       if (!existsSync2(i.path)) {
@@ -12766,7 +12881,7 @@ async function syncPortableRegistry() {
     return { removed };
   });
 }
-var import_proper_lockfile, home2, REGISTRY_PATH, REGISTRY_LOCK_PATH, LEGACY_REGISTRY_PATH, MIGRATION_LOCK_PATH, PortableInstallationSchema, PortableRegistrySchema, PortableInstallationSchemaV3, PortableRegistrySchemaV3, LegacyInstallationSchema, LegacyRegistrySchema;
+var import_proper_lockfile, home2, REGISTRY_PATH, REGISTRY_LOCK_PATH, LEGACY_REGISTRY_PATH, MIGRATION_LOCK_PATH, PortableInstallationSchema, PortableRegistrySchema, PortableInstallationSchemaV3, PortableRegistrySchemaV3, RepairablePortableRegistrySchemaV3, LegacyInstallationSchema, LegacyRegistrySchema;
 var init_portable_registry = __esm(() => {
   init_zod();
   init_logger();
@@ -12811,6 +12926,12 @@ var init_portable_registry = __esm(() => {
     lastReconciled: exports_external.string().optional(),
     appliedManifestVersion: exports_external.string().optional()
   });
+  RepairablePortableRegistrySchemaV3 = exports_external.object({
+    version: exports_external.literal("3.0"),
+    installations: exports_external.array(PortableInstallationSchema),
+    lastReconciled: exports_external.string().optional(),
+    appliedManifestVersion: exports_external.string().optional()
+  }).passthrough();
   LegacyInstallationSchema = exports_external.object({
     skill: exports_external.string(),
     agent: exports_external.string(),
@@ -62359,7 +62480,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.0.0-dev.2",
+    version: "4.0.0-dev.4",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -78178,6 +78299,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 +105317,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 +105547,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 +111425,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 +111738,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 +111846,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 +111856,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 +111900,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 +111910,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.4",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {