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

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.3.1-dev.1",
-	"generatedAt": "2026-05-14T14:42:20.256Z",
+	"version": "4.3.1-dev.2",
+	"generatedAt": "2026-05-19T18:58:29.031Z",
 	"commands": {
 		"agents": {
 			"name": "agents",
@@ -1635,6 +1635,12 @@
 								}
 							]
 						}
+					],
+					"sections": [
+						{
+							"title": "Agent Editing Reminder",
+							"content": "After creating a plan, Claude Code agents should read `plan.md` and every generated `phase-*.md` before editing. The files already exist; Write/Edit without Read can be rejected after wasting tokens."
+						}
 					]
 				},
 				{

package/dist/index.js

@@ -12564,6 +12564,16 @@ import { existsSync as existsSync2 } from "node:fs";
 import { mkdir, readFile as readFile2, rename, unlink, writeFile } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
 import { dirname, join as join2, resolve } from "node:path";
+function getPortableRegistryPaths() {
+  const home2 = homedir3();
+  const claudekitDir = join2(home2, ".claudekit");
+  return {
+    registryPath: join2(claudekitDir, "portable-registry.json"),
+    registryLockPath: join2(claudekitDir, "portable-registry.lock"),
+    legacyRegistryPath: join2(claudekitDir, "skill-registry.json"),
+    migrationLockPath: join2(claudekitDir, ".migration.lock")
+  };
+}
 function isErrnoCode(error, code) {
   return typeof error === "object" && error !== null && "code" in error && error.code === code;
 }
@@ -12597,8 +12607,9 @@ function getCliVersion() {
   }
 }
 async function migrateLegacyRegistry() {
+  const { legacyRegistryPath } = getPortableRegistryPaths();
   try {
-    const content = await readFile2(LEGACY_REGISTRY_PATH, "utf-8");
+    const content = await readFile2(legacyRegistryPath, "utf-8");
     const data = JSON.parse(content);
     const legacy = LegacyRegistrySchema.parse(data);
     const installations = legacy.installations.map((i) => ({
@@ -12707,9 +12718,10 @@ async function repairStaleRegistryV3(registry) {
 }
 async function persistCurrentStaleRegistryV3Repair(preparedRepair) {
   return withRegistryLock(async () => {
+    const { registryPath } = getPortableRegistryPaths();
     let content;
     try {
-      content = await readFile2(REGISTRY_PATH, "utf-8");
+      content = await readFile2(registryPath, "utf-8");
     } catch (error) {
       if (isErrnoCode(error, "ENOENT")) {
         return readPortableRegistryInternal({ persistStaleV3Repair: false });
@@ -12741,8 +12753,9 @@ async function persistCurrentStaleRegistryV3Repair(preparedRepair) {
   });
 }
 async function isMigrationLocked() {
+  const { migrationLockPath } = getPortableRegistryPaths();
   try {
-    const lockContent = await readFile2(MIGRATION_LOCK_PATH, "utf-8");
+    const lockContent = await readFile2(migrationLockPath, "utf-8");
     const lockTime = Number.parseInt(lockContent, 10);
     if (Number.isNaN(lockTime)) {
       logger.verbose("Migration lock timestamp is invalid, treating lock as active");
@@ -12754,7 +12767,7 @@ async function isMigrationLocked() {
       return true;
     }
     logger.verbose("Removing stale migration lock");
-    await unlink(MIGRATION_LOCK_PATH);
+    await unlink(migrationLockPath);
     return false;
   } catch (error) {
     if (isErrnoCode(error, "ENOENT")) {
@@ -12765,23 +12778,26 @@ async function isMigrationLocked() {
   }
 }
 async function createMigrationLock() {
-  const lockDir = dirname(MIGRATION_LOCK_PATH);
+  const { migrationLockPath } = getPortableRegistryPaths();
+  const lockDir = dirname(migrationLockPath);
   if (!existsSync2(lockDir)) {
     await mkdir(lockDir, { recursive: true });
   }
-  await writeFile(MIGRATION_LOCK_PATH, Date.now().toString(), "utf-8");
+  await writeFile(migrationLockPath, Date.now().toString(), "utf-8");
 }
 async function removeMigrationLock() {
+  const { migrationLockPath } = getPortableRegistryPaths();
   try {
-    await unlink(MIGRATION_LOCK_PATH);
+    await unlink(migrationLockPath);
   } catch {}
 }
 async function readPortableRegistry() {
   return readPortableRegistryInternal({ persistStaleV3Repair: true });
 }
 async function readPortableRegistryInternal(options2) {
+  const { registryPath } = getPortableRegistryPaths();
   try {
-    const content = await readFile2(REGISTRY_PATH, "utf-8");
+    const content = await readFile2(registryPath, "utf-8");
     let data;
     try {
       data = JSON.parse(content);
@@ -12850,15 +12866,16 @@ async function readPortableRegistryWithinRegistryLock() {
   return readPortableRegistryInternal({ persistStaleV3Repair: false });
 }
 async function writePortableRegistry(registry) {
-  const dir = dirname(REGISTRY_PATH);
+  const { registryPath } = getPortableRegistryPaths();
+  const dir = dirname(registryPath);
   if (!existsSync2(dir)) {
     await mkdir(dir, { recursive: true });
   }
   const normalizedRegistry = normalizePortableRegistryChecksums(registry);
-  const tempPath = `${REGISTRY_PATH}.tmp-${process.pid}-${Date.now()}`;
+  const tempPath = `${registryPath}.tmp-${process.pid}-${Date.now()}`;
   try {
     await writeFile(tempPath, JSON.stringify(normalizedRegistry, null, 2), "utf-8");
-    await rename(tempPath, REGISTRY_PATH);
+    await rename(tempPath, registryPath);
   } catch (error) {
     try {
       await unlink(tempPath);
@@ -12867,14 +12884,15 @@ async function writePortableRegistry(registry) {
   }
 }
 async function withRegistryLock(operation) {
-  const lockDir = dirname(REGISTRY_LOCK_PATH);
+  const { registryLockPath } = getPortableRegistryPaths();
+  const lockDir = dirname(registryLockPath);
   if (!existsSync2(lockDir)) {
     await mkdir(lockDir, { recursive: true });
   }
-  if (!existsSync2(REGISTRY_LOCK_PATH)) {
-    await writeFile(REGISTRY_LOCK_PATH, "", "utf-8");
+  if (!existsSync2(registryLockPath)) {
+    await writeFile(registryLockPath, "", "utf-8");
   }
-  const release = await import_proper_lockfile.default.lock(REGISTRY_LOCK_PATH, {
+  const release = await import_proper_lockfile.default.lock(registryLockPath, {
     realpath: false,
     retries: {
       retries: 5,
@@ -12975,17 +12993,12 @@ 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, RepairablePortableRegistrySchemaV3, LegacyInstallationSchema, LegacyRegistrySchema;
+var import_proper_lockfile, PortableInstallationSchema, PortableRegistrySchema, PortableInstallationSchemaV3, PortableRegistrySchemaV3, RepairablePortableRegistrySchemaV3, LegacyInstallationSchema, LegacyRegistrySchema;
 var init_portable_registry = __esm(() => {
   init_zod();
   init_logger();
   init_checksum_utils();
   import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
-  home2 = homedir3();
-  REGISTRY_PATH = join2(home2, ".claudekit", "portable-registry.json");
-  REGISTRY_LOCK_PATH = join2(home2, ".claudekit", "portable-registry.lock");
-  LEGACY_REGISTRY_PATH = join2(home2, ".claudekit", "skill-registry.json");
-  MIGRATION_LOCK_PATH = join2(home2, ".claudekit", ".migration.lock");
   PortableInstallationSchema = exports_external.object({
     item: exports_external.string(),
     type: exports_external.enum(["agent", "command", "skill", "config", "rules", "hooks"]),
@@ -13046,6 +13059,12 @@ import { existsSync as existsSync3 } from "node:fs";
 import { mkdir as mkdir2, readFile as readFile3, realpath, unlink as unlink2, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
 import { basename, dirname as dirname2, isAbsolute, join as join3, relative, resolve as resolve2 } from "node:path";
+function resolveCodexTomlRegistryDeps(deps) {
+  return {
+    ...defaultCodexTomlRegistryDeps,
+    ...deps
+  };
+}
 async function ensureDir(filePath) {
   const dir = dirname2(filePath);
   if (!existsSync3(dir)) {
@@ -13299,12 +13318,13 @@ async function restoreFileSnapshots(snapshots) {
     await restoreFileSnapshot(snapshots[index]);
   }
 }
-async function rollbackRegistryEntries(entries, portableType, provider, global2) {
+async function rollbackRegistryEntries(entries, portableType, provider, global2, registryDeps) {
   for (let index = entries.length - 1;index >= 0; index -= 1) {
-    await removePortableInstallation(entries[index].itemName, portableType, provider, global2);
+    await registryDeps.removePortableInstallation(entries[index].itemName, portableType, provider, global2);
   }
 }
-async function installCodexToml(items, provider, portableType, options2) {
+async function installCodexToml(items, provider, portableType, options2, deps) {
+  const registryDeps = resolveCodexTomlRegistryDeps(deps);
   const config = providers[provider];
   const pathConfig = config.agents;
   if (!pathConfig) {
@@ -13487,7 +13507,7 @@ async function installCodexToml(items, provider, portableType, options2) {
         }
         await writeFile2(configTomlPath, mergeResult.content, "utf-8");
         for (const install of pendingInstalls) {
-          await addPortableInstallation(install.itemName, portableType, provider, options2.global, install.agentTomlPath, install.sourcePath, {
+          await registryDeps.addPortableInstallation(install.itemName, portableType, provider, options2.global, install.agentTomlPath, install.sourcePath, {
             sourceChecksum: install.sourceChecksum,
             targetChecksum: install.targetChecksum,
             ownedSections: [install.slug],
@@ -13506,7 +13526,7 @@ async function installCodexToml(items, provider, portableType, options2) {
         let message = error instanceof Error ? error.message : "Unknown error";
         if (addedRegistryEntries.length > 0) {
           try {
-            await rollbackRegistryEntries(addedRegistryEntries, portableType, provider, options2.global);
+            await rollbackRegistryEntries(addedRegistryEntries, portableType, provider, options2.global, registryDeps);
           } catch (rollbackRegistryError) {
             const rollbackMessage = rollbackRegistryError instanceof Error ? rollbackRegistryError.message : "Unknown registry rollback error";
             message = `${message}; registry rollback failed: ${rollbackMessage}`;
@@ -13632,7 +13652,7 @@ async function cleanupStaleCodexConfigEntries(options2) {
     return [];
   }
 }
-var import_proper_lockfile2, SENTINEL_START = "# --- ck-managed-agents-start ---", SENTINEL_END = "# --- ck-managed-agents-end ---", MAX_WINDOWS_PATH_LENGTH = 240;
+var import_proper_lockfile2, SENTINEL_START = "# --- ck-managed-agents-start ---", SENTINEL_END = "# --- ck-managed-agents-end ---", MAX_WINDOWS_PATH_LENGTH = 240, defaultCodexTomlRegistryDeps;
 var init_codex_toml_installer = __esm(() => {
   init_logger();
   init_checksum_utils();
@@ -13641,6 +13661,10 @@ var init_codex_toml_installer = __esm(() => {
   init_portable_registry();
   init_provider_registry();
   import_proper_lockfile2 = __toESM(require_proper_lockfile(), 1);
+  defaultCodexTomlRegistryDeps = {
+    addPortableInstallation,
+    removePortableInstallation
+  };
 });
 
 // src/commands/portable/merge-single-sections.ts
@@ -13888,6 +13912,12 @@ function validateStrategyTargetPath(targetPath, options2) {
   }
   return null;
 }
+function resolvePortableInstallerRegistryDeps(deps) {
+  return {
+    ...defaultPortableInstallerRegistryDeps,
+    ...deps
+  };
+}
 function resolvePerFileOutputFilename(filename, pathConfig) {
   if (pathConfig.nestedCommands !== false || !filename.includes("/")) {
     return filename;
@@ -14049,7 +14079,7 @@ function buildPerFileCollisionSkips(items, provider, configDisplayName, basePath
   }
   return skipped;
 }
-async function installPerFileItems(items, provider, portableType, pathConfig, options2) {
+async function installPerFileItems(items, provider, portableType, pathConfig, options2, registryDeps) {
   const config = providers[provider];
   const results = [];
   let aggregateChars = 0;
@@ -14101,7 +14131,7 @@ async function installPerFileItems(items, provider, portableType, pathConfig, op
         continue;
       }
     }
-    const result = await installPerFile(item, provider, portableType, options2);
+    const result = await installPerFile(item, provider, portableType, options2, registryDeps);
     if (totalCharLimit && result.success && !result.skipped) {
       aggregateChars += itemSize;
     }
@@ -14189,7 +14219,7 @@ function parseYamlModesFile(content) {
   }
   return modes;
 }
-async function installPerFile(item, provider, portableType, options2) {
+async function installPerFile(item, provider, portableType, options2, registryDeps) {
   const config = providers[provider];
   const typeKey = getProviderPathKeyForPortableType(portableType);
   const pathConfig = config[typeKey];
@@ -14274,7 +14304,7 @@ async function installPerFile(item, provider, portableType, options2) {
     await writeFile3(targetPath, result.content, "utf-8");
     const sourceChecksum = computeContentChecksum(result.content);
     const targetChecksum = sourceChecksum;
-    await addPortableInstallation(item.name, portableType, provider, options2.global, targetPath, item.sourcePath, {
+    await registryDeps.addPortableInstallation(item.name, portableType, provider, options2.global, targetPath, item.sourcePath, {
       sourceChecksum,
       targetChecksum,
       installSource: "kit"
@@ -14307,7 +14337,7 @@ async function installPerFile(item, provider, portableType, options2) {
     };
   }
 }
-async function installMergeSingle(items, provider, portableType, options2) {
+async function installMergeSingle(items, provider, portableType, options2, registryDeps) {
   const config = providers[provider];
   const typeKey = getProviderPathKeyForPortableType(portableType);
   const pathConfig = config[typeKey];
@@ -14479,7 +14509,7 @@ ${sections.join(`
           const sectionContent = newOwnedSections.get(sectionKey) || "";
           const sourceChecksum = newSourceChecksums.get(sectionKey) ?? computeContentChecksum(item.body);
           const targetChecksum = computeContentChecksum(sectionContent);
-          await addPortableInstallation(item.name, portableType, provider, options2.global, targetPath, item.sourcePath, {
+          await registryDeps.addPortableInstallation(item.name, portableType, provider, options2.global, targetPath, item.sourcePath, {
             sourceChecksum,
             targetChecksum,
             ownedSections: [sectionKey],
@@ -14522,7 +14552,7 @@ ${sections.join(`
     };
   }
 }
-async function installYamlMerge(items, provider, portableType, options2) {
+async function installYamlMerge(items, provider, portableType, options2, registryDeps) {
   const config = providers[provider];
   const typeKey = getProviderPathKeyForPortableType(portableType);
   const pathConfig = config[typeKey];
@@ -14628,7 +14658,7 @@ async function installYamlMerge(items, provider, portableType, options2) {
     for (const item of items) {
       const result = convertItem(item, pathConfig.format, provider, { global: options2.global });
       const sourceChecksum = computeContentChecksum(result.content);
-      await addPortableInstallation(item.name, portableType, provider, options2.global, targetPath, item.sourcePath, {
+      await registryDeps.addPortableInstallation(item.name, portableType, provider, options2.global, targetPath, item.sourcePath, {
         sourceChecksum,
         targetChecksum,
         ownedSections,
@@ -14660,7 +14690,7 @@ async function installYamlMerge(items, provider, portableType, options2) {
     };
   }
 }
-async function installJsonMerge(items, provider, portableType, options2) {
+async function installJsonMerge(items, provider, portableType, options2, registryDeps) {
   const config = providers[provider];
   const typeKey = getProviderPathKeyForPortableType(portableType);
   const pathConfig = config[typeKey];
@@ -14838,7 +14868,7 @@ ${item.body}
     for (const item of items) {
       const result = convertItem(item, pathConfig.format, provider, { global: options2.global });
       const sourceChecksum = computeContentChecksum(result.content);
-      await addPortableInstallation(item.name, portableType, provider, options2.global, modesPath, item.sourcePath, {
+      await registryDeps.addPortableInstallation(item.name, portableType, provider, options2.global, modesPath, item.sourcePath, {
         sourceChecksum,
         targetChecksum,
         ownedSections,
@@ -14870,7 +14900,8 @@ ${item.body}
     };
   }
 }
-async function installPortableItem(items, provider, portableType, options2) {
+async function installPortableItem(items, provider, portableType, options2, deps) {
+  const registryDeps = resolvePortableInstallerRegistryDeps(deps);
   const config = providers[provider];
   const typeKey = getProviderPathKeyForPortableType(portableType);
   const pathConfig = config[typeKey];
@@ -14885,17 +14916,17 @@ async function installPortableItem(items, provider, portableType, options2) {
   }
   switch (pathConfig.writeStrategy) {
     case "merge-single":
-      return installMergeSingle(items, provider, portableType, options2);
+      return installMergeSingle(items, provider, portableType, options2, registryDeps);
     case "yaml-merge":
-      return installYamlMerge(items, provider, portableType, options2);
+      return installYamlMerge(items, provider, portableType, options2, registryDeps);
     case "json-merge":
-      return installJsonMerge(items, provider, portableType, options2);
+      return installJsonMerge(items, provider, portableType, options2, registryDeps);
     case "codex-toml":
-      return installCodexToml(items, provider, portableType, options2);
+      return installCodexToml(items, provider, portableType, options2, registryDeps);
     case "single-file":
-      return installPerFile(items[0], provider, portableType, options2);
+      return installPerFile(items[0], provider, portableType, options2, registryDeps);
     case "codex-hooks":
-      return installPerFile(items[0], provider, portableType, options2);
+      return installPerFile(items[0], provider, portableType, options2, registryDeps);
     case "per-file": {
       const results = [];
       let aggregateChars = 0;
@@ -14943,7 +14974,7 @@ async function installPortableItem(items, provider, portableType, options2) {
             continue;
           }
         }
-        const result = await installPerFile(item, provider, portableType, options2);
+        const result = await installPerFile(item, provider, portableType, options2, registryDeps);
         if (totalCharLimit && result.success && !result.skipped) {
           aggregateChars += itemSize;
         }
@@ -14979,7 +15010,8 @@ async function installPortableItem(items, provider, portableType, options2) {
     }
   }
 }
-async function installPortableItems(items, targetProviders, portableType, options2) {
+async function installPortableItems(items, targetProviders, portableType, options2, deps) {
+  const registryDeps = resolvePortableInstallerRegistryDeps(deps);
   const uniqueProviders = Array.from(new Set(targetProviders));
   const results = [];
   for (const provider of uniqueProviders) {
@@ -14988,14 +15020,14 @@ async function installPortableItems(items, targetProviders, portableType, option
     const pathConfig = config[typeKey];
     const providerOptions = { ...options2 };
     if (pathConfig?.writeStrategy === "per-file") {
-      results.push(...await installPerFileItems(items, provider, portableType, pathConfig, providerOptions));
+      results.push(...await installPerFileItems(items, provider, portableType, pathConfig, providerOptions, registryDeps));
       continue;
     }
-    results.push(await installPortableItem(items, provider, portableType, providerOptions));
+    results.push(await installPortableItem(items, provider, portableType, providerOptions, registryDeps));
   }
   return results;
 }
-var import_proper_lockfile3, ClineCustomModeSchema, ClineCustomModesFileSchema;
+var import_proper_lockfile3, ClineCustomModeSchema, ClineCustomModesFileSchema, defaultPortableInstallerRegistryDeps;
 var init_portable_installer = __esm(() => {
   init_zod();
   init_checksum_utils();
@@ -15018,6 +15050,9 @@ var init_portable_installer = __esm(() => {
   ClineCustomModesFileSchema = exports_external.object({
     customModes: exports_external.array(ClineCustomModeSchema).optional()
   });
+  defaultPortableInstallerRegistryDeps = {
+    addPortableInstallation
+  };
 });
 
 // src/commands/portable/types.ts
@@ -49406,7 +49441,7 @@ function resolveAgentDirs() {
       dirs.push({ path: candidate, label: rel });
     }
   }
-  const globalPath = join28(home3, ".claude", "agents");
+  const globalPath = join28(home2, ".claude", "agents");
   dirs.push({ path: globalPath, label: "~/.claude/agents" });
   const seen = new Set;
   return dirs.filter(({ path: path3 }) => {
@@ -49495,11 +49530,11 @@ function registerAgentsBrowserRoutes(app) {
     res.status(404).json({ error: "Agent not found" });
   });
 }
-var home3;
+var home2;
 var init_agents_routes = __esm(() => {
   init_frontmatter_parser();
   init_kit_layout();
-  home3 = homedir15();
+  home2 = homedir15();
 });
 
 // src/schemas/ck-config.schema.json
@@ -51551,10 +51586,10 @@ function mergeServers(lists) {
 function isSafeProjectPath(projectPath) {
   if (projectPath.includes(".."))
     return false;
-  const home4 = homedir23();
+  const home3 = homedir23();
   try {
     const resolved = resolve14(projectPath);
-    if (!resolved.startsWith(home4))
+    if (!resolved.startsWith(home3))
       return false;
     return existsSync21(resolved);
   } catch {
@@ -51918,9 +51953,9 @@ async function copyHooksCompanionDirs(sourceDir, targetDir) {
 function resolveSourceOrigin(sourcePath) {
   if (!sourcePath)
     return "global";
-  const home4 = homedir24();
+  const home3 = homedir24();
   const cwd2 = process.cwd();
-  if (cwd2 === home4)
+  if (cwd2 === home3)
     return "global";
   const cwdPrefix = cwd2.endsWith(sep6) ? cwd2 : `${cwd2}${sep6}`;
   if (sourcePath === cwd2 || sourcePath.startsWith(cwdPrefix))
@@ -54450,12 +54485,12 @@ function scrubHookEntry(entry, event, capabilities, pathRewrite) {
 }
 function rewriteCommandPath(command, pathRewrite) {
   if (pathRewrite.commandSubstitutions && pathRewrite.commandSubstitutions.size > 0) {
-    const home4 = homedir26();
+    const home3 = homedir26();
     for (const [originalAbsPath, wrapperAbsPath] of pathRewrite.commandSubstitutions) {
       const candidates = new Set([
         originalAbsPath,
-        originalAbsPath.replace(home4, "$HOME"),
-        originalAbsPath.replace(home4, "~")
+        originalAbsPath.replace(home3, "$HOME"),
+        originalAbsPath.replace(home3, "~")
       ]);
       for (const candidate of candidates) {
         if (command.includes(candidate)) {
@@ -55432,14 +55467,15 @@ var init_portable_manifest = __esm(() => {
 function shouldBackfillRegistry(action) {
   return action.action === "skip" && action.backfillRegistry === true && typeof action.targetPath === "string" && action.targetPath.length > 0 && typeof action.sourceChecksum === "string" && !isUnknownChecksum(action.sourceChecksum) && typeof action.currentTargetChecksum === "string" && !isUnknownChecksum(action.currentTargetChecksum);
 }
-async function backfillRegistryChecksums(actions, registry) {
+async function backfillRegistryChecksums(actions, registry, deps) {
+  const addInstallation = deps?.addPortableInstallation ?? addPortableInstallation;
   for (const action of actions) {
     if (!shouldBackfillRegistry(action))
       continue;
     const registryEntry = registry.installations.find((entry) => entry.item === action.item && entry.type === action.type && entry.provider === action.provider && entry.global === action.global);
     if (!registryEntry)
       continue;
-    await addPortableInstallation(action.item, action.type, action.provider, action.global, action.targetPath, registryEntry.sourcePath, {
+    await addInstallation(action.item, action.type, action.provider, action.global, action.targetPath, registryEntry.sourcePath, {
       sourceChecksum: action.sourceChecksum,
       targetChecksum: action.currentTargetChecksum,
       ownedSections: registryEntry.ownedSections,
@@ -56728,6 +56764,12 @@ import { existsSync as existsSync30 } from "node:fs";
 import { readFile as readFile26, rm as rm8 } from "node:fs/promises";
 import { homedir as homedir29 } from "node:os";
 import { basename as basename17, join as join46, resolve as resolve23 } from "node:path";
+function resolveRegistryDeps(deps) {
+  return {
+    ...defaultRegistryDeps,
+    ...deps?.registry
+  };
+}
 function isDisallowedControlCode(codePoint) {
   return codePoint >= 0 && codePoint <= 8 || codePoint >= 11 && codePoint <= 31 || codePoint >= 127 && codePoint <= 159;
 }
@@ -56962,7 +57004,7 @@ async function executePlanDeleteAction(action, options2) {
     if (!shouldPreserveTarget && action.targetPath && existsSync30(action.targetPath)) {
       await rm8(action.targetPath, { recursive: true, force: true });
     }
-    await removePortableInstallation(action.item, action.type, action.provider, action.global, action.targetPath ? { path: action.targetPath } : undefined);
+    await (options2?.removePortableInstallation ?? removePortableInstallation)(action.item, action.type, action.provider, action.global, action.targetPath ? { path: action.targetPath } : undefined);
     return {
       provider: action.provider,
       providerDisplayName: providers[action.provider]?.displayName || action.provider,
@@ -57333,7 +57375,8 @@ function getCapabilities(provider) {
     hooks: config.hooks !== null
   };
 }
-function registerMigrationRoutes(app) {
+function registerMigrationRoutes(app, deps) {
+  const registryDeps = resolveRegistryDeps(deps);
   app.get("/api/migrate/providers", async (_req, res) => {
     try {
       const detected = new Set(await detectInstalledProviders());
@@ -57367,12 +57410,12 @@ function registerMigrationRoutes(app) {
       };
       const discovered = await discoverMigrationItems(includeAll);
       const cwd2 = process.cwd();
-      const home4 = homedir29();
+      const home3 = homedir29();
       res.status(200).json({
         cwd: cwd2,
         targetPaths: {
           project: join46(cwd2, ".claude"),
-          global: join46(home4, ".claude")
+          global: join46(home3, ".claude")
         },
         sourcePaths: discovered.sourcePaths,
         sourceOrigins: {
@@ -57541,7 +57584,7 @@ function registerMigrationRoutes(app) {
           warnReadFailure("hook", hook.name, error);
         }
       }
-      const registry = await readPortableRegistry();
+      const registry = await registryDeps.readPortableRegistry();
       const targetStates = await buildTargetStates(registry.installations, {
         onReadFailure: (entryPath, error) => warnReadFailure("registry-target", entryPath, error)
       });
@@ -57650,7 +57693,7 @@ function registerMigrationRoutes(app) {
       }
       const configSource = sourceParsed.value;
       const discovered = await discoverMigrationItems(include, configSource);
-      const registry = await readPortableRegistry();
+      const registry = await registryDeps.readPortableRegistry();
       const candidates = [];
       if (include.agents) {
         addCandidates(discovered.agents.map((a3) => ({
@@ -57903,15 +57946,18 @@ function registerMigrationRoutes(app) {
         const writtenPaths = new Set(allResults.filter((r2) => r2.success && !r2.skipped && r2.path.length > 0).map((r2) => resolve23(r2.path)));
         for (const deleteAction of deleteActions) {
           const deleteResult = await executePlanDeleteAction(deleteAction, {
-            preservePaths: writtenPaths
+            preservePaths: writtenPaths,
+            removePortableInstallation: registryDeps.removePortableInstallation
           });
           deleteResult.portableType = deleteAction.type;
           deleteResult.itemName = deleteAction.item;
           allResults.push(deleteResult);
         }
         try {
-          const registry = await readPortableRegistry();
-          await backfillRegistryChecksums(plan.actions, registry);
+          const registry = await registryDeps.readPortableRegistry();
+          await backfillRegistryChecksums(plan.actions, registry, {
+            addPortableInstallation: registryDeps.addPortableInstallation
+          });
         } catch {}
         for (const provider of allPlanProviders) {
           if (providers[provider]?.agents?.writeStrategy !== "codex-toml")
@@ -57928,7 +57974,7 @@ function registerMigrationRoutes(app) {
             });
             if (staleSlugs.length > 0) {
               const staleSlugSet = new Set(staleSlugs.map((s) => `${s}.toml`));
-              await removeInstallationsByFilter((i) => i.type === "agent" && i.provider === provider && i.global === scope && staleSlugSet.has(basename17(i.path)));
+              await registryDeps.removeInstallationsByFilter((i) => i.type === "agent" && i.provider === provider && i.global === scope && staleSlugSet.has(basename17(i.path)));
             }
           }
         }
@@ -57939,7 +57985,7 @@ function registerMigrationRoutes(app) {
           const kitRoot = (agentSrc ? resolve23(agentSrc, "..") : null) ?? (cmdSrc ? resolve23(cmdSrc, "..") : null) ?? (skillSrc ? resolve23(skillSrc, "..") : null) ?? null;
           const manifest = kitRoot ? await loadPortableManifest(kitRoot) : null;
           if (manifest?.cliVersion) {
-            await updateAppliedManifestVersion(manifest.cliVersion);
+            await registryDeps.updateAppliedManifestVersion(manifest.cliVersion);
           }
         } catch {}
         const responseResults2 = [...allResults, ...hookRegistrationResults2];
@@ -58141,7 +58187,7 @@ function registerMigrationRoutes(app) {
     }
   });
 }
-var MIGRATION_TYPES, MAX_PROVIDER_COUNT = 20, MAX_PLAN_ACTIONS = 5000, ALLOWED_CONFIG_SOURCE_KEYS, CONFLICT_RESOLUTION_SCHEMA, RECONCILE_ACTION_SCHEMA, RECONCILE_BANNER_SCHEMA, RECONCILE_PLAN_SCHEMA, PLAN_EXECUTE_PAYLOAD_SCHEMA, PLURAL_TO_SINGULAR, shellHookWarningShown = false;
+var defaultRegistryDeps, MIGRATION_TYPES, MAX_PROVIDER_COUNT = 20, MAX_PLAN_ACTIONS = 5000, ALLOWED_CONFIG_SOURCE_KEYS, CONFLICT_RESOLUTION_SCHEMA, RECONCILE_ACTION_SCHEMA, RECONCILE_BANNER_SCHEMA, RECONCILE_PLAN_SCHEMA, PLAN_EXECUTE_PAYLOAD_SCHEMA, PLURAL_TO_SINGULAR, shellHookWarningShown = false;
 var init_migration_routes = __esm(() => {
   init_agents_discovery();
   init_commands_discovery();
@@ -58163,6 +58209,13 @@ var init_migration_routes = __esm(() => {
   init_logger();
   init_zod();
   init_migration_result_utils();
+  defaultRegistryDeps = {
+    addPortableInstallation,
+    readPortableRegistry,
+    removeInstallationsByFilter,
+    removePortableInstallation,
+    updateAppliedManifestVersion
+  };
   MIGRATION_TYPES = [
     "agents",
     "commands",
@@ -60998,8 +61051,8 @@ function toDateStr(d3) {
   return `${y3}-${m2}-${day}`;
 }
 async function scanActivityMetrics(periodDays) {
-  const home4 = homedir33();
-  const projectsDir2 = join56(home4, ".claude", "projects");
+  const home3 = homedir33();
+  const projectsDir2 = join56(home3, ".claude", "projects");
   const cutoff = new Date;
   cutoff.setDate(cutoff.getDate() - periodDays);
   const dailyMap = new Map;
@@ -61069,29 +61122,29 @@ async function scanActivityMetrics(periodDays) {
   return { totalSessions, projects: projectActivities, dailyCounts };
 }
 async function resolveSessionDir(projectId) {
-  const home4 = homedir33();
+  const home3 = homedir33();
   if (projectId.startsWith("discovered-")) {
     try {
       const encodedPathB64 = projectId.slice("discovered-".length);
       const projectPath = Buffer.from(encodedPathB64, "base64url").toString("utf-8");
       const claudeEncoded = encodePath(projectPath);
-      return join56(home4, ".claude", "projects", claudeEncoded);
+      return join56(home3, ".claude", "projects", claudeEncoded);
     } catch {
       return null;
     }
   }
   if (projectId === "current") {
     const cwdEncoded = encodePath(process.cwd());
-    return join56(home4, ".claude", "projects", cwdEncoded);
+    return join56(home3, ".claude", "projects", cwdEncoded);
   }
   if (projectId === "global") {
-    const globalEncoded = encodePath(join56(home4, ".claude"));
-    return join56(home4, ".claude", "projects", globalEncoded);
+    const globalEncoded = encodePath(join56(home3, ".claude"));
+    return join56(home3, ".claude", "projects", globalEncoded);
   }
   const registered = await ProjectsRegistryManager.getProject(projectId);
   if (registered) {
     const claudeEncoded = encodePath(registered.path);
-    return join56(home4, ".claude", "projects", claudeEncoded);
+    return join56(home3, ".claude", "projects", claudeEncoded);
   }
   return null;
 }
@@ -61243,8 +61296,8 @@ async function parseSessionDetail(filePath, limit, offset) {
 }
 function registerSessionRoutes(app) {
   app.get("/api/sessions", async (_req, res) => {
-    const home4 = homedir33();
-    const projectsDir2 = join56(home4, ".claude", "projects");
+    const home3 = homedir33();
+    const projectsDir2 = join56(home3, ".claude", "projects");
     if (!existsSync38(projectsDir2)) {
       res.json({ projects: [] });
       return;
@@ -61927,10 +61980,10 @@ function hasOpenCodeInstallSignal2() {
     join59(process.cwd(), "opencode.jsonc"),
     join59(process.cwd(), ".opencode/agents"),
     join59(process.cwd(), ".opencode/commands"),
-    join59(home4, ".config/opencode/AGENTS.md"),
-    join59(home4, ".config/opencode/agents"),
-    join59(home4, ".config/opencode/commands"),
-    join59(home4, ".opencode", "bin", OPENCODE_BINARY_NAME2)
+    join59(home3, ".config/opencode/AGENTS.md"),
+    join59(home3, ".config/opencode/agents"),
+    join59(home3, ".config/opencode/commands"),
+    join59(home3, ".opencode", "bin", OPENCODE_BINARY_NAME2)
   ]);
 }
 async function detectInstalledAgents() {
@@ -61954,108 +62007,108 @@ function isSkillInstalled(skillName, agent, options2) {
   const installPath = getInstallPath(skillName, agent, options2);
   return existsSync39(installPath);
 }
-var home4, OPENCODE_BINARY_NAME2, agents;
+var home3, OPENCODE_BINARY_NAME2, agents;
 var init_agents = __esm(() => {
-  home4 = homedir37();
+  home3 = homedir37();
   OPENCODE_BINARY_NAME2 = platform5() === "win32" ? "opencode.exe" : "opencode";
   agents = {
     "claude-code": {
       name: "claude-code",
       displayName: "Claude Code",
       projectPath: ".claude/skills",
-      globalPath: join59(home4, ".claude/skills"),
-      detect: async () => existsSync39(join59(home4, ".claude"))
+      globalPath: join59(home3, ".claude/skills"),
+      detect: async () => existsSync39(join59(home3, ".claude"))
     },
     cursor: {
       name: "cursor",
       displayName: "Cursor",
       projectPath: ".cursor/skills",
-      globalPath: join59(home4, ".cursor/skills"),
-      detect: async () => existsSync39(join59(home4, ".cursor"))
+      globalPath: join59(home3, ".cursor/skills"),
+      detect: async () => existsSync39(join59(home3, ".cursor"))
     },
     codex: {
       name: "codex",
       displayName: "Codex",
       projectPath: ".codex/skills",
-      globalPath: join59(home4, ".codex/skills"),
-      detect: async () => existsSync39(join59(home4, ".codex"))
+      globalPath: join59(home3, ".codex/skills"),
+      detect: async () => existsSync39(join59(home3, ".codex"))
     },
     opencode: {
       name: "opencode",
       displayName: "OpenCode",
       projectPath: ".claude/skills",
-      globalPath: join59(home4, ".claude/skills"),
+      globalPath: join59(home3, ".claude/skills"),
       detect: async () => hasOpenCodeInstallSignal2()
     },
     goose: {
       name: "goose",
       displayName: "Goose",
       projectPath: ".goose/skills",
-      globalPath: join59(home4, ".config/goose/skills"),
-      detect: async () => existsSync39(join59(home4, ".config/goose"))
+      globalPath: join59(home3, ".config/goose/skills"),
+      detect: async () => existsSync39(join59(home3, ".config/goose"))
     },
     "gemini-cli": {
       name: "gemini-cli",
       displayName: "Gemini CLI",
       projectPath: ".agents/skills",
-      globalPath: join59(home4, ".agents/skills"),
-      detect: async () => existsSync39(join59(home4, ".gemini"))
+      globalPath: join59(home3, ".agents/skills"),
+      detect: async () => existsSync39(join59(home3, ".gemini"))
     },
     antigravity: {
       name: "antigravity",
       displayName: "Antigravity",
       projectPath: ".agent/skills",
-      globalPath: join59(home4, ".gemini/antigravity/skills"),
-      detect: async () => existsSync39(join59(process.cwd(), ".agent")) || existsSync39(join59(home4, ".gemini/antigravity"))
+      globalPath: join59(home3, ".gemini/antigravity/skills"),
+      detect: async () => existsSync39(join59(process.cwd(), ".agent")) || existsSync39(join59(home3, ".gemini/antigravity"))
     },
     "github-copilot": {
       name: "github-copilot",
       displayName: "GitHub Copilot",
       projectPath: ".github/skills",
-      globalPath: join59(home4, ".copilot/skills"),
-      detect: async () => existsSync39(join59(home4, ".copilot"))
+      globalPath: join59(home3, ".copilot/skills"),
+      detect: async () => existsSync39(join59(home3, ".copilot"))
     },
     amp: {
       name: "amp",
       displayName: "Amp",
       projectPath: ".agents/skills",
-      globalPath: join59(home4, ".config/agents/skills"),
-      detect: async () => existsSync39(join59(home4, ".config/amp"))
+      globalPath: join59(home3, ".config/agents/skills"),
+      detect: async () => existsSync39(join59(home3, ".config/amp"))
     },
     kilo: {
       name: "kilo",
       displayName: "Kilo Code",
       projectPath: ".kilocode/skills",
-      globalPath: join59(home4, ".kilocode/skills"),
-      detect: async () => existsSync39(join59(home4, ".kilocode"))
+      globalPath: join59(home3, ".kilocode/skills"),
+      detect: async () => existsSync39(join59(home3, ".kilocode"))
     },
     roo: {
       name: "roo",
       displayName: "Roo Code",
       projectPath: ".roo/skills",
-      globalPath: join59(home4, ".roo/skills"),
-      detect: async () => existsSync39(join59(home4, ".roo"))
+      globalPath: join59(home3, ".roo/skills"),
+      detect: async () => existsSync39(join59(home3, ".roo"))
     },
     windsurf: {
       name: "windsurf",
       displayName: "Windsurf",
       projectPath: ".windsurf/skills",
-      globalPath: join59(home4, ".codeium/windsurf/skills"),
-      detect: async () => existsSync39(join59(home4, ".codeium/windsurf"))
+      globalPath: join59(home3, ".codeium/windsurf/skills"),
+      detect: async () => existsSync39(join59(home3, ".codeium/windsurf"))
     },
     cline: {
       name: "cline",
       displayName: "Cline",
       projectPath: ".cline/skills",
-      globalPath: join59(home4, ".cline/skills"),
-      detect: async () => existsSync39(join59(home4, ".cline"))
+      globalPath: join59(home3, ".cline/skills"),
+      detect: async () => existsSync39(join59(home3, ".cline"))
     },
     openhands: {
       name: "openhands",
       displayName: "OpenHands",
       projectPath: ".openhands/skills",
-      globalPath: join59(home4, ".openhands/skills"),
-      detect: async () => existsSync39(join59(home4, ".openhands"))
+      globalPath: join59(home3, ".openhands/skills"),
+      detect: async () => existsSync39(join59(home3, ".openhands"))
     }
   };
 });
@@ -62096,15 +62149,15 @@ function migrateRegistryPaths(registry) {
 }
 async function readRegistry2() {
   try {
-    if (!existsSync40(REGISTRY_PATH2)) {
+    if (!existsSync40(REGISTRY_PATH)) {
       return { version: "1.0", installations: [] };
     }
-    const content = await readFile31(REGISTRY_PATH2, "utf-8");
+    const content = await readFile31(REGISTRY_PATH, "utf-8");
     const data = JSON.parse(content);
     const registry = SkillRegistrySchema.parse(data);
     if (migrateRegistryPaths(registry)) {
       try {
-        await writeFile15(REGISTRY_PATH2, JSON.stringify(registry, null, 2), "utf-8");
+        await writeFile15(REGISTRY_PATH, JSON.stringify(registry, null, 2), "utf-8");
       } catch {}
     }
     return registry;
@@ -62116,11 +62169,11 @@ async function readRegistry2() {
   }
 }
 async function writeRegistry2(registry) {
-  const dir = dirname25(REGISTRY_PATH2);
+  const dir = dirname25(REGISTRY_PATH);
   if (!existsSync40(dir)) {
     await mkdir15(dir, { recursive: true });
   }
-  await writeFile15(REGISTRY_PATH2, JSON.stringify(registry, null, 2), "utf-8");
+  await writeFile15(REGISTRY_PATH, JSON.stringify(registry, null, 2), "utf-8");
 }
 async function addInstallation(skill, agent, global3, path6, sourcePath) {
   const registry = await readRegistry2();
@@ -62172,11 +62225,11 @@ async function syncRegistry() {
   }
   return { removed };
 }
-var home5, REGISTRY_PATH2, SkillInstallationSchema, SkillRegistrySchema, REGISTRY_PATH_MIGRATIONS;
+var home4, REGISTRY_PATH, SkillInstallationSchema, SkillRegistrySchema, REGISTRY_PATH_MIGRATIONS;
 var init_skills_registry = __esm(() => {
   init_zod();
-  home5 = homedir38();
-  REGISTRY_PATH2 = join60(home5, ".claudekit", "skill-registry.json");
+  home4 = homedir38();
+  REGISTRY_PATH = join60(home4, ".claudekit", "skill-registry.json");
   SkillInstallationSchema = exports_external.object({
     skill: exports_external.string(),
     agent: exports_external.string(),
@@ -63287,7 +63340,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.3.1-dev.1",
+    version: "4.3.1-dev.2",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -65804,12 +65857,12 @@ function extractHookReferencePaths(cmd) {
 }
 function resolveHookScriptPath(scriptPath, projectDir) {
   let resolved = scriptPath.replace(/\\/g, "/");
-  const home6 = homedir40();
-  resolved = resolved.replace(/^\$\{?HOME\}?/, home6);
+  const home5 = homedir40();
+  resolved = resolved.replace(/^\$\{?HOME\}?/, home5);
   resolved = resolved.replace(/^\$\{?CLAUDE_PROJECT_DIR\}?/, projectDir);
-  resolved = resolved.replace(/^%USERPROFILE%/, home6);
+  resolved = resolved.replace(/^%USERPROFILE%/, home5);
   resolved = resolved.replace(/^%CLAUDE_PROJECT_DIR%/, projectDir);
-  resolved = resolved.replace(/^~\//, `${home6}/`);
+  resolved = resolved.replace(/^~\//, `${home5}/`);
   if (resolved.startsWith(".claude/") || resolved === ".claude") {
     resolved = join67(projectDir, resolved);
   }
@@ -80168,6 +80221,12 @@ var init_plan_command_help = __esm(() => {
             title: "Scope Options",
             options: [{ flags: "-g, --global", description: "Create plan in global plans scope" }]
           }
+        ],
+        sections: [
+          {
+            title: "Agent Editing Reminder",
+            content: "After creating a plan, Claude Code agents should read `plan.md` and every generated `phase-*.md` before editing. The files already exist; Write/Edit without Read can be rejected after wasting tokens."
+          }
         ]
       },
       {
@@ -84596,6 +84655,16 @@ init_provider_registry();
 import { existsSync as existsSync9 } from "node:fs";
 import { lstat as lstat3, rm as rm2 } from "node:fs/promises";
 import { basename as basename5, dirname as dirname6, join as join17, relative as relative4, resolve as resolve8, sep as sep4 } from "node:path";
+var defaultCommandRegistryDeps = {
+  readPortableRegistry,
+  removePortableInstallation
+};
+function resolveCommandRegistryDeps(deps) {
+  return {
+    ...defaultCommandRegistryDeps,
+    ...deps
+  };
+}
 function isPathWithinBase(targetPath, basePath) {
   const resolvedTarget = resolve8(targetPath);
   const resolvedBase = resolve8(basePath);
@@ -84727,8 +84796,9 @@ async function removeCommandTarget(targetPath, provider, basePath) {
   }
   await rm2(targetPath, { recursive: true, force: true });
 }
-async function uninstallCommandFromProvider(commandName, provider, global3) {
-  const registry = await readPortableRegistry();
+async function uninstallCommandFromProvider(commandName, provider, global3, deps) {
+  const registryDeps = resolveCommandRegistryDeps(deps);
+  const registry = await registryDeps.readPortableRegistry();
   const installations = findPortableInstallations(registry, commandName, "command", provider, global3);
   if (installations.length === 0) {
     return {
@@ -84749,7 +84819,7 @@ async function uninstallCommandFromProvider(commandName, provider, global3) {
     if (fileExists) {
       await removeCommandTarget(installation.path, provider, basePath);
     }
-    await removePortableInstallation(commandName, "command", provider, global3);
+    await registryDeps.removePortableInstallation(commandName, "command", provider, global3);
     return {
       item: commandName,
       provider,
@@ -84771,7 +84841,8 @@ async function uninstallCommandFromProvider(commandName, provider, global3) {
     };
   }
 }
-async function forceUninstallCommandFromProvider(commandName, provider, global3) {
+async function forceUninstallCommandFromProvider(commandName, provider, global3, deps) {
+  const registryDeps = resolveCommandRegistryDeps(deps);
   const config = providers[provider];
   const pathConfig = config.commands;
   if (!pathConfig) {
@@ -84841,7 +84912,7 @@ async function forceUninstallCommandFromProvider(commandName, provider, global3)
   }
   try {
     await removeCommandTarget(targetPath, provider, basePath);
-    await removePortableInstallation(commandName, "command", provider, global3);
+    await registryDeps.removePortableInstallation(commandName, "command", provider, global3);
     return {
       item: commandName,
       provider,
@@ -84862,8 +84933,9 @@ async function forceUninstallCommandFromProvider(commandName, provider, global3)
     };
   }
 }
-async function getInstalledCommands(provider, global3) {
-  const registry = await readPortableRegistry();
+async function getInstalledCommands(provider, global3, deps) {
+  const registryDeps = resolveCommandRegistryDeps(deps);
+  const registry = await registryDeps.readPortableRegistry();
   return registry.installations.filter((i) => {
     if (i.type !== "command")
       return false;
@@ -84876,9 +84948,20 @@ async function getInstalledCommands(provider, global3) {
 }
 
 // src/commands/commands/commands-command.ts
-async function listCommands(showInstalled) {
+var defaultCommandsRegistryDeps = {
+  readPortableRegistry,
+  removePortableInstallation,
+  syncPortableRegistry
+};
+function resolveCommandsRegistryDeps(options2) {
+  return {
+    ...defaultCommandsRegistryDeps,
+    ...options2?.registry
+  };
+}
+async function listCommands(showInstalled, registryDeps) {
   if (showInstalled) {
-    const installations = await getInstalledCommands();
+    const installations = await getInstalledCommands(undefined, undefined, registryDeps);
     if (installations.length === 0) {
       f2.warn("No commands installed via ck commands.");
       return;
@@ -84930,9 +85013,9 @@ async function listCommands(showInstalled) {
   console.log(import_picocolors13.default.dim(`  Source: ${sourcePath}`));
   console.log();
 }
-async function handleUninstall2(options2) {
+async function handleUninstall2(options2, registryDeps) {
   if (!options2.name) {
-    const installations = await getInstalledCommands();
+    const installations = await getInstalledCommands(undefined, undefined, registryDeps);
     if (installations.length === 0) {
       f2.warn("No commands installed via ck commands.");
       return;
@@ -84964,7 +85047,7 @@ async function handleUninstall2(options2) {
     const spinner2 = de();
     spinner2.start("Uninstalling...");
     for (const inst of toUninstall) {
-      await uninstallCommandFromProvider(inst.item, inst.provider, inst.global);
+      await uninstallCommandFromProvider(inst.item, inst.provider, inst.global, registryDeps);
     }
     spinner2.stop("Uninstall complete");
     f2.success(`Removed ${toUninstall.length} command(s)`);
@@ -84990,7 +85073,7 @@ async function handleUninstall2(options2) {
     const spinner2 = de();
     spinner2.start("Force uninstalling...");
     const targets = options2.agent;
-    const results = await Promise.all(targets.map((provider) => forceUninstallCommandFromProvider(trimmedName, provider, options2.global ?? false)));
+    const results = await Promise.all(targets.map((provider) => forceUninstallCommandFromProvider(trimmedName, provider, options2.global ?? false, registryDeps)));
     const successCount2 = results.filter((result) => result.success).length;
     spinner2.stop("Force uninstall complete");
     for (const result of results) {
@@ -85005,7 +85088,7 @@ async function handleUninstall2(options2) {
     }
     return true;
   };
-  const registry = await readPortableRegistry();
+  const registry = await registryDeps.readPortableRegistry();
   const matches = registry.installations.filter((i) => i.type === "command" && i.item.toLowerCase() === trimmedName.toLowerCase());
   if (matches.length === 0) {
     if (options2.force) {
@@ -85048,7 +85131,7 @@ async function handleUninstall2(options2) {
   spinner.start("Uninstalling...");
   let successCount = 0;
   for (const inst of toRemove) {
-    const result = await uninstallCommandFromProvider(inst.item, inst.provider, inst.global);
+    const result = await uninstallCommandFromProvider(inst.item, inst.provider, inst.global, registryDeps);
     if (result.success)
       successCount++;
   }
@@ -85059,11 +85142,12 @@ async function commandsCommand(options2) {
   console.log();
   oe(import_picocolors13.default.bgCyan(import_picocolors13.default.black(" ck commands ")));
   try {
+    const registryDeps = resolveCommandsRegistryDeps(options2);
     const validOptions = PortableCommandOptionsSchema.parse(options2);
     if (validOptions.sync) {
       const spinner2 = de();
       spinner2.start("Syncing registry...");
-      const { removed } = await syncPortableRegistry();
+      const { removed } = await registryDeps.syncPortableRegistry();
       spinner2.stop("Sync complete");
       if (removed.length > 0) {
         const cmdRemoved = removed.filter((r2) => r2.type === "command");
@@ -85075,12 +85159,12 @@ async function commandsCommand(options2) {
       return;
     }
     if (validOptions.uninstall) {
-      await handleUninstall2(validOptions);
+      await handleUninstall2(validOptions, registryDeps);
       $e(import_picocolors13.default.green("Done!"));
       return;
     }
     if (validOptions.list) {
-      await listCommands(validOptions.installed ?? false);
+      await listCommands(validOptions.installed ?? false, registryDeps);
       $e(import_picocolors13.default.dim("Use --name <command> to install a specific command"));
       return;
     }
@@ -87266,16 +87350,16 @@ async function checkPathRefsValid(projectDir) {
       };
     }
     const baseDir = dirname28(claudeMdPath);
-    const home6 = homedir42();
+    const home5 = homedir42();
     const broken = [];
     for (const ref of refs) {
       let refPath;
       if (ref.startsWith("$HOME") || ref.startsWith("${HOME}") || ref.startsWith("%USERPROFILE%")) {
-        refPath = normalize6(ref.replace(/^\$\{?HOME\}?/, home6).replace("%USERPROFILE%", home6));
+        refPath = normalize6(ref.replace(/^\$\{?HOME\}?/, home5).replace("%USERPROFILE%", home5));
       } else if (ref.startsWith("$CLAUDE_PROJECT_DIR") || ref.startsWith("${CLAUDE_PROJECT_DIR}") || ref.startsWith("%CLAUDE_PROJECT_DIR%")) {
         refPath = normalize6(ref.replace(/^\$\{?CLAUDE_PROJECT_DIR\}?/, projectDir).replace("%CLAUDE_PROJECT_DIR%", projectDir));
       } else if (ref.startsWith("~")) {
-        refPath = normalize6(ref.replace(/^~/, home6));
+        refPath = normalize6(ref.replace(/^~/, home5));
       } else if (ref.startsWith("/")) {
         refPath = normalize6(ref);
       } else if (/^[A-Za-z]:/.test(ref)) {
@@ -87284,7 +87368,7 @@ async function checkPathRefsValid(projectDir) {
         refPath = resolve35(baseDir, ref);
       }
       const normalizedPath = normalize6(refPath);
-      const isWithinHome = normalizedPath.startsWith(home6);
+      const isWithinHome = normalizedPath.startsWith(home5);
       const isWithinBase2 = normalizedPath.startsWith(normalize6(baseDir));
       const isAbsoluteAllowed = ref.startsWith("/") || /^[A-Za-z]:/.test(ref);
       if (!isWithinHome && !isWithinBase2 && !isAbsoluteAllowed) {
@@ -89271,8 +89355,8 @@ class ReportGenerator {
     };
   }
   scrubPath(path7) {
-    const home6 = process.env.HOME || process.env.USERPROFILE || "";
-    return home6 ? path7.replace(home6, "~") : path7;
+    const home5 = process.env.HOME || process.env.USERPROFILE || "";
+    return home5 ? path7.replace(home5, "~") : path7;
   }
   getStatusIcon(status) {
     switch (status) {
@@ -89386,8 +89470,8 @@ class DoctorUIRenderer {
     }
   }
   shortenPath(path7) {
-    const home6 = process.env.HOME || process.env.USERPROFILE || "";
-    let shortened = home6 ? path7.replace(home6, "~") : path7;
+    const home5 = process.env.HOME || process.env.USERPROFILE || "";
+    let shortened = home5 ? path7.replace(home5, "~") : path7;
     const maxLen = 50;
     if (shortened.length > maxLen) {
       const start = shortened.slice(0, 20);
@@ -108253,11 +108337,11 @@ function wrapText(value, width) {
 }
 function formatDisplayPath(value) {
   const normalized = value.replace(/\\/g, "/");
-  const home6 = homedir48().replace(/\\/g, "/");
-  if (normalized === home6)
+  const home5 = homedir48().replace(/\\/g, "/");
+  if (normalized === home5)
     return "~";
-  if (normalized.startsWith(`${home6}/`)) {
-    return normalized.replace(home6, "~");
+  if (normalized.startsWith(`${home5}/`)) {
+    return normalized.replace(home5, "~");
   }
   return normalized;
 }
@@ -108712,8 +108796,8 @@ function pickGenericModel(models) {
   return sorted[0] ?? null;
 }
 async function resolveOpenCodeDefaultModel(opts = {}) {
-  const home6 = opts.homeDir ?? homedir50();
-  const authedProviders = await readAuthedProviders(home6);
+  const home5 = opts.homeDir ?? homedir50();
+  const authedProviders = await readAuthedProviders(home5);
   if (authedProviders.length === 0) {
     return { ok: false, reason: "no-auth", authedProviders: [] };
   }
@@ -111315,6 +111399,17 @@ init_plans_registry();
 init_output_manager();
 var import_picocolors33 = __toESM(require_picocolors(), 1);
 import { basename as basename31, dirname as dirname45, relative as relative32, resolve as resolve53 } from "node:path";
+function quoteReadTarget(filePath) {
+  return `"${filePath.replace(/\\/g, "/").replace(/"/g, "\\\"")}"`;
+}
+function buildPlanCreateReadReminder(planFile, phaseFiles, cwd2 = process.cwd()) {
+  const files = [planFile, ...phaseFiles].map((file) => quoteReadTarget(relative32(cwd2, file)));
+  return [
+    "  [i] Claude Code agents: read plan.md and every phase-*.md before editing.",
+    "      These files already exist; Write/Edit without Read may be rejected after wasting tokens.",
+    `      cat ${files.join(" ")}`
+  ];
+}
 async function handleCreate(target, options2) {
   if (!options2.title) {
     output.error("[X] --title is required for create");
@@ -111392,6 +111487,9 @@ async function handleCreate(target, options2) {
   for (const f3 of result.phaseFiles) {
     console.log(`    [ ] ${basename31(f3)}`);
   }
+  for (const line of buildPlanCreateReadReminder(result.planFile, result.phaseFiles)) {
+    console.log(line);
+  }
   console.log();
 }
 async function handleCheck(target, options2) {

package/package.json

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