claudekit-cli 4.5.0-dev.8 → 4.5.0-dev.9

package/dist/index.js

@@ -15619,12 +15619,16 @@ function detectLegacyState(claudeDir) {
   const metadata = readJsonSafe(join6(claudeDir, "metadata.json"));
   if (!isRecord(metadata))
     return { installed: false, version: null };
+  const hasLegacyPayload = hasTrackedPluginSuppliedLegacyFiles(claudeDir);
   if (isRecord(metadata.kits) && isRecord(metadata.kits[ENGINEER_KIT_KEY])) {
     const kit = metadata.kits[ENGINEER_KIT_KEY];
-    return { installed: true, version: typeof kit.version === "string" ? kit.version : null };
+    return {
+      installed: hasLegacyPayload,
+      version: hasLegacyPayload && typeof kit.version === "string" ? kit.version : null
+    };
   }
   const hasFiles = Array.isArray(metadata.files) && metadata.files.length > 0 || Array.isArray(metadata.installedFiles) && metadata.installedFiles.length > 0;
-  if (typeof metadata.version === "string" && hasFiles) {
+  if (typeof metadata.version === "string" && hasFiles && hasLegacyPayload) {
     return { installed: true, version: metadata.version };
   }
   return { installed: false, version: null };
@@ -15980,11 +15984,12 @@ var init_github = __esm(() => {
 });
 
 // src/types/metadata.ts
-var TrackedFileSchema, InstalledSettingsSchema, KitMetadataSchema, MultiKitMetadataSchema, LegacyMetadataSchema, MetadataSchema, DownloadMethodSchema, ConfigSchema;
+var InstallModePreferenceSchema, TrackedFileSchema, InstalledSettingsSchema, KitMetadataSchema, MultiKitMetadataSchema, LegacyMetadataSchema, MetadataSchema, DownloadMethodSchema, ConfigSchema;
 var init_metadata = __esm(() => {
   init_zod();
   init_commands();
   init_kit();
+  InstallModePreferenceSchema = exports_external.enum(["auto", "plugin", "legacy"]);
   TrackedFileSchema = exports_external.object({
     path: exports_external.string(),
     checksum: exports_external.string().regex(/^[a-f0-9]{64}$/, "Invalid SHA-256 checksum"),
@@ -16005,6 +16010,7 @@ var init_metadata = __esm(() => {
     installedAt: exports_external.string(),
     files: exports_external.array(TrackedFileSchema).optional(),
     ignoredSkills: exports_external.array(exports_external.string()).optional(),
+    installModePreference: InstallModePreferenceSchema.optional(),
     lastUpdateCheck: exports_external.string().optional(),
     dismissedVersion: exports_external.string().optional(),
     installedSettings: InstalledSettingsSchema.optional()
@@ -16688,6 +16694,7 @@ __export(exports_types, {
   KitLayoutSchema: () => KitLayoutSchema,
   KitConfigSchema: () => KitConfigSchema,
   InstalledSettingsSchema: () => InstalledSettingsSchema,
+  InstallModePreferenceSchema: () => InstallModePreferenceSchema,
   GitHubReleaseSchema: () => GitHubReleaseSchema,
   GitHubReleaseAssetSchema: () => GitHubReleaseAssetSchema,
   GitHubError: () => GitHubError,
@@ -64573,7 +64580,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.5.0-dev.8",
+    version: "4.5.0-dev.9",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -66815,36 +66822,148 @@ class CodexPluginInstaller {
     return this.run(["plugin", "list"], this.opts(15000));
   }
   async verifyInstalled() {
-    const r2 = await this.listJson();
-    if (!r2.ok) {
-      const text = await this.listText();
-      return text.ok && parseTextPluginList(text.stdout + text.stderr);
-    }
-    try {
-      const parsed = JSON.parse(r2.stdout);
-      return (parsed.installed ?? []).some((plugin) => plugin.pluginId === `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}` && plugin.installed === true && plugin.enabled === true);
-    } catch {
-      const text = await this.listText();
-      return text.ok && parseTextPluginList(text.stdout + text.stderr);
-    }
+    const state = await detectCodexPluginListState(this);
+    return state.status === "installed-current" || state.status === "installed-stale-version" || state.status === "installed-stale-source";
   }
 }
+function createState(status, entry, options2 = {}, error) {
+  const pluginId = `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`;
+  return {
+    status,
+    pluginId,
+    enabled: entry?.enabled ?? false,
+    installed: entry?.installed ?? false,
+    installedVersion: entry?.version ?? null,
+    expectedVersion: options2.expectedVersion ?? null,
+    marketplace: entry?.marketplace ?? null,
+    expectedMarketplace: options2.expectedMarketplace ?? CK_MARKETPLACE_NAME,
+    source: entry?.source ?? null,
+    expectedSource: options2.expectedSource ?? null,
+    shouldRefresh: status === "missing" || status === "disabled" || status === "installed-stale-version" || status === "installed-stale-source",
+    ...error ? { error } : {}
+  };
+}
+function classifyCodexPluginEntry(entry, options2 = {}) {
+  if (!entry)
+    return createState("missing", null, options2);
+  if (!entry.enabled || !entry.installed)
+    return createState("disabled", entry, options2);
+  const expectedMarketplace = options2.expectedMarketplace ?? CK_MARKETPLACE_NAME;
+  if (entry.marketplace && entry.marketplace !== expectedMarketplace) {
+    return createState("installed-stale-source", entry, options2);
+  }
+  if (options2.expectedSource && entry.source && entry.source !== options2.expectedSource) {
+    return createState("installed-stale-source", entry, options2);
+  }
+  if (options2.expectedVersion && entry.version && !versionsMatch(entry.version, options2.expectedVersion)) {
+    return createState("installed-stale-version", entry, options2);
+  }
+  return createState("installed-current", entry, options2);
+}
 function parseTextPluginList(output2) {
   const pluginId = `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const row = new RegExp(`^\\s*${pluginId}\\s+.*\\binstalled\\b.*\\benabled\\b`, "im");
-  return row.test(output2);
+  const row = new RegExp(`^\\s*(${pluginId})\\s+(.*)$`, "im").exec(output2);
+  if (!row)
+    return null;
+  const details = row[2] ?? "";
+  const versionMatch = details.match(/\b(v?\d+\.\d+\.\d+(?:[-+][^\s]+)?)\b/);
+  return {
+    pluginId: `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`,
+    installed: /\binstalled\b/i.test(details),
+    enabled: /\benabled\b/i.test(details) && !/\bdisabled\b/i.test(details),
+    version: versionMatch?.[1] ?? null,
+    marketplace: CK_MARKETPLACE_NAME,
+    source: null
+  };
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stringField(source, keys) {
+  for (const key of keys) {
+    const value = source[key];
+    if (typeof value === "string" && value.trim() !== "")
+      return value;
+  }
+  return null;
+}
+function sourceField(source, keys) {
+  for (const key of keys) {
+    const value = source[key];
+    if (typeof value === "string" && value.trim() !== "")
+      return value;
+    if (isRecord3(value)) {
+      const nested = stringField(value, ["path", "sourcePath", "url"]);
+      if (nested)
+        return nested;
+    }
+  }
+  return null;
+}
+function booleanField(source, key, defaultValue) {
+  const value = source[key];
+  return typeof value === "boolean" ? value : defaultValue;
+}
+function parseJsonPluginList(output2) {
+  let parsed;
+  try {
+    parsed = JSON.parse(output2);
+  } catch {
+    return null;
+  }
+  const rawEntries = Array.isArray(parsed) ? parsed : isRecord3(parsed) ? parsed.installed ?? parsed.plugins ?? parsed.entries : null;
+  if (!Array.isArray(rawEntries))
+    return null;
+  return rawEntries.flatMap((entry) => {
+    if (!isRecord3(entry))
+      return [];
+    const pluginId = stringField(entry, ["pluginId", "id"]) ?? (stringField(entry, ["name"]) === CK_PLUGIN_NAME ? `${CK_PLUGIN_NAME}@${stringField(entry, ["marketplace", "marketplaceName"]) ?? CK_MARKETPLACE_NAME}` : null);
+    if (pluginId !== `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`)
+      return [];
+    return [
+      {
+        pluginId,
+        installed: booleanField(entry, "installed", true),
+        enabled: booleanField(entry, "enabled", false),
+        version: stringField(entry, ["version", "pluginVersion", "manifestVersion"]),
+        marketplace: stringField(entry, ["marketplace", "marketplaceName"]),
+        source: sourceField(entry, ["source", "path", "sourcePath"])
+      }
+    ];
+  });
+}
+async function detectCodexPluginState(installer = new CodexPluginInstaller, options2 = {}) {
+  if (!await installer.isCodexAvailable()) {
+    return createState("codex-unavailable", null, options2);
+  }
+  if (!await installer.isPluginSupported()) {
+    return createState("plugins-unsupported", null, options2);
+  }
+  return detectCodexPluginListState(installer, options2);
+}
+async function detectCodexPluginListState(installer, options2 = {}) {
+  const json = await installer.listJson();
+  if (json.ok) {
+    const entries = parseJsonPluginList(json.stdout);
+    if (entries)
+      return classifyCodexPluginEntry(entries[0] ?? null, options2);
+  }
+  const text = await installer.listText();
+  if (text.ok)
+    return classifyCodexPluginEntry(parseTextPluginList(text.stdout + text.stderr), options2);
+  return createState("unknown", null, options2, json.stderr || text.stderr || "codex plugin list failed");
 }
 async function installCodexPlugin(opts) {
   const installer = opts.installer ?? new CodexPluginInstaller(undefined, opts.codexHome);
   if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
     return { action: "skipped-codex-unsupported", pluginVerified: false };
   }
-  const added = await installer.marketplaceAdd(opts.pluginSourceDir);
+  const added = await addOrReplaceMarketplace(installer, opts.pluginSourceDir);
   if (!added.ok) {
     return {
       action: "install-failed",
       pluginVerified: false,
-      error: `codex marketplace add failed: ${added.stderr.trim()}`
+      error: added.error
     };
   }
   const installed = await installer.add();
@@ -66865,6 +66984,26 @@ async function installCodexPlugin(opts) {
   }
   return { action: "installed", pluginVerified: true };
 }
+async function addOrReplaceMarketplace(installer, pluginSourceDir) {
+  const added = await installer.marketplaceAdd(pluginSourceDir);
+  if (added.ok)
+    return { ok: true };
+  const error = added.stderr.trim();
+  if (!isReplaceableMarketplaceAddFailure(error)) {
+    return { ok: false, error: `codex marketplace add failed: ${error}` };
+  }
+  await installer.marketplaceRemove(CK_MARKETPLACE_NAME);
+  const readded = await installer.marketplaceAdd(pluginSourceDir);
+  if (readded.ok)
+    return { ok: true };
+  return {
+    ok: false,
+    error: `codex marketplace refresh failed: ${readded.stderr.trim() || error}`
+  };
+}
+function isReplaceableMarketplaceAddFailure(error) {
+  return /\balready\b/i.test(error) && /\bmarketplace\b/i.test(error);
+}
 async function removeCodexPlugin(opts = {}) {
   const installer = opts.installer ?? new CodexPluginInstaller(undefined, opts.codexHome);
   if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
@@ -66872,16 +67011,16 @@ async function removeCodexPlugin(opts = {}) {
   }
   const removed = await installer.remove();
   const marketplaceRemoved = await installer.marketplaceRemove();
+  const state = await detectCodexPluginListState(installer);
   return {
     removed: removed.ok,
-    marketplaceRemoved: marketplaceRemoved.ok
+    marketplaceRemoved: marketplaceRemoved.ok,
+    pluginStillInstalled: state.installed,
+    ...state.installed ? { error: `codex plugin still installed after removal (${state.status})` } : {}
   };
 }
-async function shouldRefreshCodexPlugin(installer = new CodexPluginInstaller) {
-  if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
-    return false;
-  }
-  return !await installer.verifyInstalled();
+async function shouldRefreshCodexPlugin(installer = new CodexPluginInstaller, options2 = {}) {
+  return (await detectCodexPluginState(installer, options2)).shouldRefresh;
 }
 var execFileAsync6, DEFAULT_TIMEOUT_MS2 = 120000, defaultCodexRunner = async (args, opts) => {
   const env2 = { ...process.env };
@@ -66916,13 +67055,41 @@ var execFileAsync6, DEFAULT_TIMEOUT_MS2 = 120000, defaultCodexRunner = async (ar
 };
 var init_codex_plugin_installer = __esm(() => {
   init_install_mode_detector();
+  init_version_utils();
   execFileAsync6 = promisify9(execFile8);
 });
 
-// src/domains/migration/metadata-migration.ts
+// src/domains/installation/plugin/install-mode-preference.ts
+import { readFileSync as readFileSync16 } from "node:fs";
 import { join as join66 } from "node:path";
+function normalizeInstallModePreference(value) {
+  if (value === "auto" || value === "plugin" || value === "legacy")
+    return value;
+  return null;
+}
+function readInstallModePreferenceFromMetadata(metadata, kit = "engineer") {
+  return normalizeInstallModePreference(metadata?.kits?.[kit]?.installModePreference);
+}
+function resolveInstallModePreferenceForUpdate(metadata, kit) {
+  if (kit !== "engineer")
+    return;
+  return readInstallModePreferenceFromMetadata(metadata, kit) ?? DEFAULT_INSTALL_MODE_PREFERENCE;
+}
+function readInstallModePreferenceFromClaudeDir(claudeDir3, kit = "engineer") {
+  try {
+    const parsed = JSON.parse(readFileSync16(join66(claudeDir3, "metadata.json"), "utf-8"));
+    return readInstallModePreferenceFromMetadata(parsed, kit);
+  } catch {
+    return null;
+  }
+}
+var DEFAULT_INSTALL_MODE_PREFERENCE = "auto";
+var init_install_mode_preference = () => {};
+
+// src/domains/migration/metadata-migration.ts
+import { join as join67 } from "node:path";
 async function detectMetadataFormat(claudeDir3) {
-  const metadataPath = join66(claudeDir3, "metadata.json");
+  const metadataPath = join67(claudeDir3, "metadata.json");
   if (!await import_fs_extra6.pathExists(metadataPath)) {
     return { format: "none", metadata: null, detectedKit: null };
   }
@@ -66974,7 +67141,7 @@ async function migrateToMultiKit(claudeDir3) {
       toFormat: "multi-kit"
     };
   }
-  const metadataPath = join66(claudeDir3, "metadata.json");
+  const metadataPath = join67(claudeDir3, "metadata.json");
   const legacy = detection.metadata;
   if (!legacy) {
     return {
@@ -67086,7 +67253,7 @@ var init_metadata_migration = __esm(() => {
 });
 
 // src/services/file-operations/claudekit-scanner.ts
-import { join as join67 } from "node:path";
+import { join as join68 } from "node:path";
 async function scanClaudeKitDirectory(directoryPath) {
   const counts = {
     agents: 0,
@@ -67100,33 +67267,33 @@ async function scanClaudeKitDirectory(directoryPath) {
     }
     const items = await import_fs_extra7.readdir(directoryPath);
     if (items.includes("agents")) {
-      const agentsPath = join67(directoryPath, "agents");
+      const agentsPath = join68(directoryPath, "agents");
       const agentFiles = await import_fs_extra7.readdir(agentsPath);
       counts.agents = agentFiles.filter((file) => file.endsWith(".md")).length;
     }
     if (items.includes("commands")) {
-      const commandsPath = join67(directoryPath, "commands");
+      const commandsPath = join68(directoryPath, "commands");
       const commandFiles = await import_fs_extra7.readdir(commandsPath);
       counts.commands = commandFiles.filter((file) => file.endsWith(".md")).length;
     }
     if (items.includes("rules")) {
-      const rulesPath = join67(directoryPath, "rules");
+      const rulesPath = join68(directoryPath, "rules");
       const ruleFiles = await import_fs_extra7.readdir(rulesPath);
       counts.rules = ruleFiles.filter((file) => file.endsWith(".md")).length;
     } else if (items.includes("workflows")) {
-      const workflowsPath = join67(directoryPath, "workflows");
+      const workflowsPath = join68(directoryPath, "workflows");
       const workflowFiles = await import_fs_extra7.readdir(workflowsPath);
       counts.rules = workflowFiles.filter((file) => file.endsWith(".md")).length;
     }
     if (items.includes("skills")) {
-      const skillsPath = join67(directoryPath, "skills");
+      const skillsPath = join68(directoryPath, "skills");
       const skillItems = await import_fs_extra7.readdir(skillsPath);
       let skillCount = 0;
       for (const item of skillItems) {
         if (SKIP_DIRS_CLAUDE_INTERNAL.includes(item)) {
           continue;
         }
-        const itemPath = join67(skillsPath, item);
+        const itemPath = join68(skillsPath, item);
         const stat13 = await import_fs_extra7.readdir(itemPath).catch(() => null);
         if (stat13?.includes("SKILL.md")) {
           skillCount++;
@@ -67168,14 +67335,14 @@ async function getClaudeKitSetup(projectDir = process.cwd()) {
   const globalDir = getGlobalInstallDir();
   if (await import_fs_extra7.pathExists(globalDir)) {
     setup.global.path = globalDir;
-    setup.global.metadata = await readClaudeKitMetadata(join67(globalDir, "metadata.json"));
+    setup.global.metadata = await readClaudeKitMetadata(join68(globalDir, "metadata.json"));
     setup.global.components = await scanClaudeKitDirectory(globalDir);
   }
-  const projectClaudeDir = join67(projectDir, ".claude");
+  const projectClaudeDir = join68(projectDir, ".claude");
   const isLocalSameAsGlobal = projectClaudeDir === globalDir;
   if (!isLocalSameAsGlobal && await import_fs_extra7.pathExists(projectClaudeDir)) {
     setup.project.path = projectClaudeDir;
-    setup.project.metadata = await readClaudeKitMetadata(join67(projectClaudeDir, "metadata.json"));
+    setup.project.metadata = await readClaudeKitMetadata(join68(projectClaudeDir, "metadata.json"));
     setup.project.components = await scanClaudeKitDirectory(projectClaudeDir);
   }
   return setup;
@@ -67945,7 +68112,7 @@ var init_error_handler2 = __esm(() => {
 // src/domains/versioning/release-cache.ts
 import { existsSync as existsSync47 } from "node:fs";
 import { mkdir as mkdir18, readFile as readFile37, unlink as unlink8, writeFile as writeFile20 } from "node:fs/promises";
-import { join as join68 } from "node:path";
+import { join as join69 } from "node:path";
 var ReleaseCacheEntrySchema, ReleaseCache;
 var init_release_cache = __esm(() => {
   init_logger();
@@ -67960,7 +68127,7 @@ var init_release_cache = __esm(() => {
     static CACHE_TTL_SECONDS = Number(process.env.CK_CACHE_TTL) || 3600;
     cacheDir;
     constructor() {
-      this.cacheDir = join68(PathResolver.getCacheDir(false), ReleaseCache.CACHE_DIR);
+      this.cacheDir = join69(PathResolver.getCacheDir(false), ReleaseCache.CACHE_DIR);
     }
     async get(key) {
       const cacheFile = this.getCachePath(key);
@@ -68018,7 +68185,7 @@ var init_release_cache = __esm(() => {
           const files = await readdir19(this.cacheDir);
           for (const file of files) {
             if (file.endsWith(".json")) {
-              await unlink8(join68(this.cacheDir, file));
+              await unlink8(join69(this.cacheDir, file));
             }
           }
           logger.debug("All release cache cleared");
@@ -68029,7 +68196,7 @@ var init_release_cache = __esm(() => {
     }
     getCachePath(key) {
       const safeKey = key.replace(/[^a-zA-Z0-9_-]/g, "_");
-      return join68(this.cacheDir, `${safeKey}.json`);
+      return join69(this.cacheDir, `${safeKey}.json`);
     }
     isExpired(timestamp) {
       const now = Date.now();
@@ -68687,7 +68854,7 @@ import { exec as exec2, spawn as spawn2 } from "node:child_process";
 import { existsSync as existsSync48 } from "node:fs";
 import { readdir as readdir19 } from "node:fs/promises";
 import { builtinModules } from "node:module";
-import { dirname as dirname30, join as join69 } from "node:path";
+import { dirname as dirname30, join as join70 } from "node:path";
 import { promisify as promisify10 } from "node:util";
 function selectKitForUpdate(params) {
   const { hasLocal, hasGlobal, localKits, globalKits } = params;
@@ -68719,7 +68886,7 @@ function selectKitForUpdate(params) {
   };
 }
 async function readMetadataFile(claudeDir3) {
-  const metadataPath = join69(claudeDir3, "metadata.json");
+  const metadataPath = join70(claudeDir3, "metadata.json");
   try {
     if (!await import_fs_extra8.pathExists(metadataPath))
       return null;
@@ -68769,7 +68936,7 @@ function collectSettingsHookRegistrations(settings, options2 = {}) {
   return registrations;
 }
 async function readManagedHookNames(claudeDir3) {
-  const manifestPath = join69(claudeDir3, "hooks", MANAGED_HOOKS_MANIFEST);
+  const manifestPath = join70(claudeDir3, "hooks", MANAGED_HOOKS_MANIFEST);
   if (!existsSync48(manifestPath))
     return [];
   try {
@@ -68783,7 +68950,7 @@ async function readManagedHookNames(claudeDir3) {
   }
 }
 async function readDisabledHookNames(claudeDir3) {
-  const configPath = join69(claudeDir3, ".ck.json");
+  const configPath = join70(claudeDir3, ".ck.json");
   if (!existsSync48(configPath))
     return new Set;
   try {
@@ -68795,7 +68962,7 @@ async function readDisabledHookNames(claudeDir3) {
   }
 }
 async function countMissingCkHookRegistrations(claudeDir3, kit, options2 = {}) {
-  const settingsPath = join69(claudeDir3, "settings.json");
+  const settingsPath = join70(claudeDir3, "settings.json");
   if (!existsSync48(settingsPath))
     return 0;
   const managedHooks = await readManagedHookNames(claudeDir3);
@@ -68804,19 +68971,19 @@ async function countMissingCkHookRegistrations(claudeDir3, kit, options2 = {}) {
   const settings = parseJsonContent(await import_fs_extra8.readFile(settingsPath, "utf-8"));
   const liveHookRegistrations = collectSettingsHookRegistrations(settings, options2);
   const disabledHooks = await readDisabledHookNames(claudeDir3);
-  const hooksDir = join69(claudeDir3, "hooks");
+  const hooksDir = join70(claudeDir3, "hooks");
   let missing = 0;
   for (const name of managedHooks) {
     if (disabledHooks.has(name))
       continue;
-    if (!existsSync48(join69(hooksDir, `${name}.cjs`)))
+    if (!existsSync48(join70(hooksDir, `${name}.cjs`)))
       continue;
     if (!liveHookRegistrations.get(name)?.hasCorrectScope)
       missing++;
   }
   return missing;
 }
-function buildInitCommand(isGlobal, kit, beta, yes, restoreCkHooks) {
+function buildInitCommand(isGlobal, kit, beta, yes, restoreCkHooks, installMode) {
   const parts = ["ck init"];
   if (isGlobal)
     parts.push("-g");
@@ -68826,6 +68993,8 @@ function buildInitCommand(isGlobal, kit, beta, yes, restoreCkHooks) {
     parts.push("--yes");
   if (restoreCkHooks)
     parts.push("--restore-ck-hooks");
+  if (installMode && isGlobal && kit === "engineer")
+    parts.push(`--install-mode ${installMode}`);
   parts.push("--install-skills");
   if (beta)
     parts.push("--beta");
@@ -68862,7 +69031,7 @@ async function fetchLatestReleaseTag(kit, beta) {
   }
 }
 async function findMissingHookDependencies(claudeDir3) {
-  const hooksDir = join69(claudeDir3, "hooks");
+  const hooksDir = join70(claudeDir3, "hooks");
   if (!existsSync48(hooksDir))
     return [];
   const files = await readdir19(hooksDir);
@@ -68873,14 +69042,14 @@ async function findMissingHookDependencies(claudeDir3) {
     ...builtinModules.map((name) => `node:${name}`)
   ]);
   for (const file of cjsFiles) {
-    const content = await import_fs_extra8.readFile(join69(hooksDir, file), "utf8");
+    const content = await import_fs_extra8.readFile(join70(hooksDir, file), "utf8");
     const requireRegex = /require\(['"]([^'"]+)['"]\)/g;
     for (let match = requireRegex.exec(content);match; match = requireRegex.exec(content)) {
       const depPath = match[1];
       if (!depPath || nodeBuiltins.has(depPath) || !depPath.startsWith("."))
         continue;
-      const resolvedPath = join69(hooksDir, depPath);
-      const exists = existsSync48(resolvedPath) || HOOK_DEPENDENCY_EXTENSIONS.some((ext) => existsSync48(resolvedPath + ext)) || existsSync48(join69(resolvedPath, "index.js")) || existsSync48(join69(resolvedPath, "index.cjs")) || existsSync48(join69(resolvedPath, "index.mjs"));
+      const resolvedPath = join70(hooksDir, depPath);
+      const exists = existsSync48(resolvedPath) || HOOK_DEPENDENCY_EXTENSIONS.some((ext) => existsSync48(resolvedPath + ext)) || existsSync48(join70(resolvedPath, "index.js")) || existsSync48(join70(resolvedPath, "index.cjs")) || existsSync48(join70(resolvedPath, "index.mjs"));
       if (!exists)
         missing.push(`${file}: ${depPath}`);
     }
@@ -68897,7 +69066,7 @@ async function promptKitUpdate(beta, yes, deps) {
     const findMissingHookDepsFn = deps?.findMissingHookDependenciesFn ?? findMissingHookDependencies;
     const detectInstallModeFn = deps?.detectInstallModeFn ?? detectInstallMode;
     const hasTrackedPluginSuppliedLegacyFilesFn = deps?.hasTrackedPluginSuppliedLegacyFilesFn ?? hasTrackedPluginSuppliedLegacyFiles;
-    const shouldRefreshCodexPluginFn = deps?.shouldRefreshCodexPluginFn ?? shouldRefreshCodexPlugin;
+    const shouldRefreshCodexPluginFn = deps?.shouldRefreshCodexPluginFn ?? ((options2) => shouldRefreshCodexPlugin(undefined, options2));
     const setup = await getSetupFn();
     const hasLocal = !!setup.project.metadata;
     const hasGlobal = !!setup.global.metadata;
@@ -68940,6 +69109,8 @@ async function promptKitUpdate(beta, yes, deps) {
         };
       }
     }
+    let kitVersion = selection.kit ? selection.isGlobal ? globalMetadata?.kits?.[selection.kit]?.version : localMetadata?.kits?.[selection.kit]?.version : undefined;
+    let installModePreference = selection.isGlobal ? resolveInstallModePreferenceForUpdate(globalMetadata, selection.kit) : undefined;
     const selectedClaudeDir = selection.isGlobal ? setup.global.path : setup.project.path;
     if (selectedClaudeDir) {
       try {
@@ -68963,13 +69134,20 @@ async function promptKitUpdate(beta, yes, deps) {
       try {
         if (selection.isGlobal && selection.kit === "engineer") {
           const installMode = detectInstallModeFn(selectedClaudeDir);
-          const needsPluginMigration = installMode.mode === "legacy" || installMode.mode === "mixed" && hasTrackedPluginSuppliedLegacyFilesFn(selectedClaudeDir);
-          if (needsPluginMigration) {
-            logger.warning(`Detected ${installMode.mode} global Engineer install; migrating to plugin format`);
-            forceKitReinstall = true;
+          if (installModePreference === "legacy") {
+            if (installMode.plugin.installed || installMode.plugin.staleCache) {
+              logger.warning("Detected plugin state for legacy global Engineer preference; reinstalling legacy mode");
+              forceKitReinstall = true;
+            }
+          } else {
+            const needsPluginMigration = installMode.mode === "legacy" || installMode.mode === "mixed" && hasTrackedPluginSuppliedLegacyFilesFn(selectedClaudeDir);
+            if (needsPluginMigration) {
+              logger.warning(`Detected ${installMode.mode} global Engineer install; migrating to plugin format`);
+              forceKitReinstall = true;
+            }
           }
-          if (await shouldRefreshCodexPluginFn()) {
-            logger.warning("Detected missing Codex ClaudeKit plugin; reinstalling global Engineer content");
+          if (installModePreference !== "legacy" && await shouldRefreshCodexPluginFn({ expectedVersion: kitVersion })) {
+            logger.warning("Detected Codex ClaudeKit plugin state requiring refresh; reinstalling global Engineer content");
             forceKitReinstall = true;
           }
         }
@@ -68977,7 +69155,6 @@ async function promptKitUpdate(beta, yes, deps) {
         logger.verbose(`Plugin install-mode self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
       }
     }
-    let kitVersion = selection.kit ? selection.isGlobal ? globalMetadata?.kits?.[selection.kit]?.version : localMetadata?.kits?.[selection.kit]?.version : undefined;
     const isBetaInstalled = isBetaVersion(kitVersion);
     const promptMessage = selection.promptMessage;
     if (selection.kit && kitVersion) {
@@ -69022,6 +69199,7 @@ async function promptKitUpdate(beta, yes, deps) {
               promptMessage: `Update local project ClaudeKit content${localKits[0] || selection.kit ? ` (${localKits[0] || selection.kit})` : ""}?`
             };
             kitVersion = selection.kit ? localMetadata?.kits?.[selection.kit]?.version : undefined;
+            installModePreference = undefined;
           }
         }
       } catch (error) {
@@ -69051,7 +69229,7 @@ async function promptKitUpdate(beta, yes, deps) {
     }
     const useBeta = beta || isBetaInstalled;
     if (yes) {
-      const initCmd = buildInitCommand(selection.isGlobal, selection.kit, useBeta, true, forceKitReinstall);
+      const initCmd = buildInitCommand(selection.isGlobal, selection.kit, useBeta, true, forceKitReinstall, installModePreference);
       logger.info(`Running: ${initCmd}`);
       const s = (deps?.spinnerFn ?? de)();
       s.start("Updating ClaudeKit content...");
@@ -69073,6 +69251,9 @@ async function promptKitUpdate(beta, yes, deps) {
       } catch (error) {
         s.stop("Kit update finished");
         const errorMsg = error instanceof Error ? error.message : "unknown";
+        if (installModePreference === "plugin") {
+          throw new StrictPluginUpdateError(`Strict plugin kit update failed: ${errorMsg}`);
+        }
         if (errorMsg.includes("exit code") && !errorMsg.includes("exit code 0")) {
           logger.warning("Kit content update may have encountered issues");
           logger.verbose(`Error: ${errorMsg}`);
@@ -69084,8 +69265,12 @@ async function promptKitUpdate(beta, yes, deps) {
       const args = ["init"];
       if (selection.isGlobal)
         args.push("-g");
+      if (selection.kit)
+        args.push("--kit", selection.kit);
       if (forceKitReinstall)
         args.push("--restore-ck-hooks");
+      if (installModePreference)
+        args.push("--install-mode", installModePreference);
       args.push("--install-skills");
       if (useBeta)
         args.push("--beta");
@@ -69102,10 +69287,15 @@ async function promptKitUpdate(beta, yes, deps) {
       }));
       const exitCode = await spawnFn(args);
       if (exitCode !== 0) {
+        if (installModePreference === "plugin") {
+          throw new StrictPluginUpdateError(`Strict plugin kit update failed with exit code ${exitCode}`);
+        }
         logger.warning("Kit content update may have encountered issues");
       }
     }
   } catch (error) {
+    if (error instanceof StrictPluginUpdateError)
+      throw error;
     logger.verbose(`Failed to prompt for kit update: ${error instanceof Error ? error.message : "unknown error"}`);
   }
 }
@@ -69258,12 +69448,13 @@ async function promptMigrateUpdate(deps) {
     logger.verbose(`Migrate step skipped: ${error instanceof Error ? error.message : "unknown"}`);
   }
 }
-var import_fs_extra8, execAsync2, SAFE_PROVIDER_NAME, HOOK_DEPENDENCY_EXTENSIONS, MANAGED_HOOKS_MANIFEST = "managed-hooks.json";
+var import_fs_extra8, execAsync2, SAFE_PROVIDER_NAME, HOOK_DEPENDENCY_EXTENSIONS, MANAGED_HOOKS_MANIFEST = "managed-hooks.json", StrictPluginUpdateError;
 var init_post_update_handler = __esm(() => {
   init_ck_config_manager();
   init_hook_health_checker();
   init_codex_plugin_installer();
   init_install_mode_detector();
+  init_install_mode_preference();
   init_metadata_migration();
   init_version_utils();
   init_claudekit_scanner();
@@ -69276,6 +69467,12 @@ var init_post_update_handler = __esm(() => {
   execAsync2 = promisify10(exec2);
   SAFE_PROVIDER_NAME = /^[a-z0-9-]+$/;
   HOOK_DEPENDENCY_EXTENSIONS = [".js", ".cjs", ".mjs", ".json"];
+  StrictPluginUpdateError = class StrictPluginUpdateError extends Error {
+    constructor(message) {
+      super(message);
+      this.name = "StrictPluginUpdateError";
+    }
+  };
 });
 
 // src/commands/update-cli.ts
@@ -69409,7 +69606,7 @@ var init_update_cli = __esm(() => {
 
 // src/domains/sync/config-version-checker.ts
 import { mkdir as mkdir19, readFile as readFile39, unlink as unlink9, writeFile as writeFile21 } from "node:fs/promises";
-import { join as join70 } from "node:path";
+import { join as join71 } from "node:path";
 function parseCacheTtl() {
   const envValue = process.env.CK_SYNC_CACHE_TTL;
   if (!envValue) {
@@ -69435,11 +69632,11 @@ function parseCacheTtl() {
 class ConfigVersionChecker {
   static getLegacyCacheFilePath(kitType, global3) {
     const cacheDir = PathResolver.getCacheDir(global3);
-    return join70(cacheDir, `${kitType}-${CACHE_FILENAME}`);
+    return join71(cacheDir, `${kitType}-${CACHE_FILENAME}`);
   }
   static getCacheFilePath(kitType, global3, channel) {
     const cacheDir = PathResolver.getCacheDir(global3);
-    return join70(cacheDir, `${kitType}-${channel}-${CACHE_FILENAME}`);
+    return join71(cacheDir, `${kitType}-${channel}-${CACHE_FILENAME}`);
   }
   static resolveChannel(currentVersion, override) {
     if (override) {
@@ -69675,7 +69872,7 @@ import { execFile as execFile9 } from "node:child_process";
 import { existsSync as existsSync49 } from "node:fs";
 import { readFile as readFile40 } from "node:fs/promises";
 import { cpus, homedir as homedir42, totalmem } from "node:os";
-import { join as join71 } from "node:path";
+import { join as join72 } from "node:path";
 function runCommand(cmd, args, fallback2) {
   return new Promise((resolve36) => {
     execFile9(cmd, args, { timeout: 5000 }, (err, stdout) => {
@@ -69961,7 +70158,7 @@ async function getPackageJson() {
 }
 async function getKitMetadata2(kitName) {
   try {
-    const metadataPath = join71(PathResolver.getGlobalKitDir(), "metadata.json");
+    const metadataPath = join72(PathResolver.getGlobalKitDir(), "metadata.json");
     if (!existsSync49(metadataPath))
       return null;
     const content = await readFile40(metadataPath, "utf-8");
@@ -70119,7 +70316,7 @@ var init_routes = __esm(() => {
 
 // src/domains/web-server/static-server.ts
 import { existsSync as existsSync50 } from "node:fs";
-import { basename as basename24, dirname as dirname31, join as join72, resolve as resolve36 } from "node:path";
+import { basename as basename24, dirname as dirname31, join as join73, resolve as resolve36 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function addRuntimeUiCandidate(candidates, runtimePath) {
   if (!runtimePath) {
@@ -70131,22 +70328,22 @@ function addRuntimeUiCandidate(candidates, runtimePath) {
   }
   const entryDir = dirname31(resolve36(runtimePath));
   if (basename24(entryDir) === "dist") {
-    candidates.add(join72(entryDir, "ui"));
+    candidates.add(join73(entryDir, "ui"));
   }
-  candidates.add(join72(entryDir, "..", "dist", "ui"));
+  candidates.add(join73(entryDir, "..", "dist", "ui"));
 }
 function resolveUiDistPath() {
   const candidates = new Set;
   addRuntimeUiCandidate(candidates, process.argv[1]);
-  candidates.add(join72(__dirname3, "ui"));
-  candidates.add(join72(process.cwd(), "dist", "ui"));
-  candidates.add(join72(process.cwd(), "src", "ui", "dist"));
+  candidates.add(join73(__dirname3, "ui"));
+  candidates.add(join73(process.cwd(), "dist", "ui"));
+  candidates.add(join73(process.cwd(), "src", "ui", "dist"));
   for (const path7 of candidates) {
-    if (existsSync50(join72(path7, "index.html"))) {
+    if (existsSync50(join73(path7, "index.html"))) {
       return path7;
     }
   }
-  return Array.from(candidates)[0] ?? join72(process.cwd(), "dist", "ui");
+  return Array.from(candidates)[0] ?? join73(process.cwd(), "dist", "ui");
 }
 function serveStatic(app) {
   const uiDistPath = resolveUiDistPath();
@@ -70182,7 +70379,7 @@ function serveStatic(app) {
     if (req.path.startsWith("/assets/") || req.path.match(/\.(js|css|ico|png|jpg|svg|woff2?)$/)) {
       return next();
     }
-    res.sendFile(join72(uiDistPath, "index.html"), { dotfiles: "allow" });
+    res.sendFile(join73(uiDistPath, "index.html"), { dotfiles: "allow" });
   });
   logger.debug(`Serving static files from ${uiDistPath}`);
 }
@@ -74988,7 +75185,7 @@ var init_process_executor = __esm(() => {
 });
 
 // src/services/package-installer/agy-installer.ts
-import { join as join90 } from "node:path";
+import { join as join92 } from "node:path";
 async function isAgyInstalled() {
   try {
     await execAsync7("agy --version", { timeout: 1e4 });
@@ -75000,7 +75197,7 @@ async function isAgyInstalled() {
 async function installAgyUnix() {
   const { unlink: unlink13 } = await import("node:fs/promises");
   const { tmpdir: tmpdir4 } = await import("node:os");
-  const tempScriptPath = join90(tmpdir4(), "agy-install.sh");
+  const tempScriptPath = join92(tmpdir4(), "agy-install.sh");
   try {
     logger.info("Downloading Antigravity CLI installation script...");
     await execFileAsync7("curl", ["-fsSL", AGY_INSTALL_SH_URL, "-o", tempScriptPath], {
@@ -75072,7 +75269,7 @@ var init_agy_installer = __esm(() => {
 });
 
 // src/services/package-installer/opencode-installer.ts
-import { join as join91 } from "node:path";
+import { join as join93 } from "node:path";
 async function isOpenCodeInstalled() {
   try {
     await execAsync7("opencode --version", { timeout: 5000 });
@@ -75095,7 +75292,7 @@ async function installOpenCode() {
     logger.info(`Installing ${displayName}...`);
     const { unlink: unlink13 } = await import("node:fs/promises");
     const { tmpdir: tmpdir4 } = await import("node:os");
-    const tempScriptPath = join91(tmpdir4(), "opencode-install.sh");
+    const tempScriptPath = join93(tmpdir4(), "opencode-install.sh");
     try {
       logger.info("Downloading OpenCode installation script...");
       await execFileAsync7("curl", ["-fsSL", "https://opencode.ai/install", "-o", tempScriptPath], {
@@ -75330,8 +75527,8 @@ var init_npm_package_manager = __esm(() => {
 });
 
 // src/services/package-installer/install-error-handler.ts
-import { existsSync as existsSync62, readFileSync as readFileSync20, unlinkSync as unlinkSync3 } from "node:fs";
-import { join as join92 } from "node:path";
+import { existsSync as existsSync62, readFileSync as readFileSync22, unlinkSync as unlinkSync3 } from "node:fs";
+import { join as join94 } from "node:path";
 function parseNameReason(str2) {
   const colonIndex = str2.indexOf(":");
   if (colonIndex === -1) {
@@ -75394,14 +75591,14 @@ function getSystemPackageCommands(summary, systemFailures) {
   return summary.remediation.sudo_packages ? [summary.remediation.sudo_packages] : [];
 }
 function displayInstallErrors(skillsDir2) {
-  const summaryPath = join92(skillsDir2, ".install-error-summary.json");
+  const summaryPath = join94(skillsDir2, ".install-error-summary.json");
   if (!existsSync62(summaryPath)) {
     logger.error("Skills installation failed. Run with --verbose for details.");
     return;
   }
   let summary;
   try {
-    summary = JSON.parse(readFileSync20(summaryPath, "utf-8"));
+    summary = JSON.parse(readFileSync22(summaryPath, "utf-8"));
   } catch (parseError) {
     logger.error("Failed to parse error summary. File may be corrupted.");
     logger.debug(`Parse error: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
@@ -75493,7 +75690,7 @@ async function checkNeedsSudoPackages() {
   }
 }
 function hasInstallState(skillsDir2) {
-  const stateFilePath = join92(skillsDir2, ".install-state.json");
+  const stateFilePath = join94(skillsDir2, ".install-state.json");
   return existsSync62(stateFilePath);
 }
 var WHICH_COMMAND_TIMEOUT_MS = 5000, WINDOWS_SYSTEM_PACKAGES, SYSTEM_TOOL_KEYS, WINDOWS_RSVG_COMMANDS;
@@ -75511,7 +75708,7 @@ var init_install_error_handler = __esm(() => {
 });
 
 // src/services/package-installer/skills-installer.ts
-import { join as join93 } from "node:path";
+import { join as join95 } from "node:path";
 async function installSkillsDependencies(skillsDir2, options2 = {}) {
   const { skipConfirm = false, withSudo = false } = options2;
   const displayName = "Skills Dependencies";
@@ -75537,7 +75734,7 @@ async function installSkillsDependencies(skillsDir2, options2 = {}) {
     const clack = await Promise.resolve().then(() => (init_dist2(), exports_dist));
     const platform10 = process.platform;
     const scriptName = platform10 === "win32" ? "install.ps1" : "install.sh";
-    const scriptPath = join93(skillsDir2, scriptName);
+    const scriptPath = join95(skillsDir2, scriptName);
     try {
       validateScriptPath(skillsDir2, scriptPath);
     } catch (error) {
@@ -75553,7 +75750,7 @@ async function installSkillsDependencies(skillsDir2, options2 = {}) {
       logger.warning(`Skills installation script not found: ${scriptPath}`);
       logger.info("");
       logger.info("\uD83D\uDCD6 Manual Installation Instructions:");
-      logger.info(`  See: ${join93(skillsDir2, "INSTALLATION.md")}`);
+      logger.info(`  See: ${join95(skillsDir2, "INSTALLATION.md")}`);
       logger.info("");
       logger.info("Quick start:");
       logger.info("  cd .claude/skills/ai-multimodal/scripts");
@@ -75600,7 +75797,7 @@ async function installSkillsDependencies(skillsDir2, options2 = {}) {
       logger.info(`  ${platform10 === "win32" ? `powershell -File "${scriptPath}"` : `bash ${scriptPath}`}`);
       logger.info("");
       logger.info("Or see complete guide:");
-      logger.info(`  ${join93(skillsDir2, "INSTALLATION.md")}`);
+      logger.info(`  ${join95(skillsDir2, "INSTALLATION.md")}`);
       return {
         success: false,
         package: displayName,
@@ -75721,7 +75918,7 @@ async function installSkillsDependencies(skillsDir2, options2 = {}) {
     logger.info("\uD83D\uDCD6 Manual Installation Instructions:");
     logger.info("");
     logger.info("See complete guide:");
-    logger.info(`  cat ${join93(skillsDir2, "INSTALLATION.md")}`);
+    logger.info(`  cat ${join95(skillsDir2, "INSTALLATION.md")}`);
     logger.info("");
     logger.info("Quick start:");
     logger.info("  cd .claude/skills/ai-multimodal/scripts");
@@ -75767,7 +75964,7 @@ var init_skills_installer2 = __esm(() => {
 // src/services/package-installer/agy-mcp/config-manager.ts
 import { existsSync as existsSync63 } from "node:fs";
 import { mkdir as mkdir23, readFile as readFile49, writeFile as writeFile25 } from "node:fs/promises";
-import { dirname as dirname34, join as join94 } from "node:path";
+import { dirname as dirname34, join as join96 } from "node:path";
 async function readJsonFile(filePath) {
   try {
     const content = await readFile49(filePath, "utf-8");
@@ -75779,7 +75976,7 @@ async function readJsonFile(filePath) {
   }
 }
 async function addAgyToGitignore(projectDir) {
-  const gitignorePath = join94(projectDir, ".gitignore");
+  const gitignorePath = join96(projectDir, ".gitignore");
   try {
     let content = "";
     if (existsSync63(gitignorePath)) {
@@ -75879,12 +76076,12 @@ var init_config_manager2 = __esm(() => {
 // src/services/package-installer/agy-mcp/validation.ts
 import { existsSync as existsSync64, lstatSync, readlinkSync } from "node:fs";
 import { homedir as homedir45 } from "node:os";
-import { join as join95 } from "node:path";
+import { join as join97 } from "node:path";
 function getGlobalMcpConfigPath() {
-  return join95(homedir45(), ".claude", ".mcp.json");
+  return join97(homedir45(), ".claude", ".mcp.json");
 }
 function getLocalMcpConfigPath(projectDir) {
-  return join95(projectDir, ".mcp.json");
+  return join97(projectDir, ".mcp.json");
 }
 function findMcpConfigPath(projectDir) {
   const localPath = getLocalMcpConfigPath(projectDir);
@@ -75902,9 +76099,9 @@ function findMcpConfigPath(projectDir) {
 }
 function getAgyMcpConfigPath(projectDir, isGlobal) {
   if (isGlobal) {
-    return join95(homedir45(), ".gemini", "config", "mcp_config.json");
+    return join97(homedir45(), ".gemini", "config", "mcp_config.json");
   }
-  return join95(projectDir, ".agents", "mcp_config.json");
+  return join97(projectDir, ".agents", "mcp_config.json");
 }
 function checkExistingAgyConfig(projectDir, isGlobal = false) {
   const agyConfigPath = getAgyMcpConfigPath(projectDir, isGlobal);
@@ -75934,7 +76131,7 @@ var init_validation = __esm(() => {
 // src/services/package-installer/agy-mcp/linker-core.ts
 import { existsSync as existsSync65 } from "node:fs";
 import { mkdir as mkdir24, symlink as symlink3 } from "node:fs/promises";
-import { dirname as dirname35, join as join96 } from "node:path";
+import { dirname as dirname35, join as join98 } from "node:path";
 async function createSymlink(targetPath, linkPath, projectDir, isGlobal) {
   const linkDir = dirname35(linkPath);
   if (!existsSync65(linkDir)) {
@@ -75945,7 +76142,7 @@ async function createSymlink(targetPath, linkPath, projectDir, isGlobal) {
   if (isGlobal) {
     symlinkTarget = getGlobalMcpConfigPath();
   } else {
-    const localMcpPath = join96(projectDir, ".mcp.json");
+    const localMcpPath = join98(projectDir, ".mcp.json");
     const isLocalConfig = targetPath === localMcpPath;
     symlinkTarget = isLocalConfig ? "../.mcp.json" : targetPath;
   }
@@ -78363,9 +78560,9 @@ __export(exports_worktree_manager, {
 });
 import { existsSync as existsSync77 } from "node:fs";
 import { readFile as readFile70, writeFile as writeFile41 } from "node:fs/promises";
-import { join as join160 } from "node:path";
+import { join as join162 } from "node:path";
 async function createWorktree(projectDir, issueNumber, baseBranch) {
-  const worktreePath = join160(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join162(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
   const branchName = `ck-watch/issue-${issueNumber}`;
   await spawnAndCollect("git", ["fetch", "origin", baseBranch], projectDir).catch(() => {
     logger.warning(`[worktree] Could not fetch origin/${baseBranch}, using local`);
@@ -78383,7 +78580,7 @@ async function createWorktree(projectDir, issueNumber, baseBranch) {
   return worktreePath;
 }
 async function removeWorktree(projectDir, issueNumber) {
-  const worktreePath = join160(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join162(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
   const branchName = `ck-watch/issue-${issueNumber}`;
   try {
     await spawnAndCollect("git", ["worktree", "remove", worktreePath, "--force"], projectDir);
@@ -78397,7 +78594,7 @@ async function listActiveWorktrees(projectDir) {
   try {
     const output2 = await spawnAndCollect("git", ["worktree", "list", "--porcelain"], projectDir);
     const issueNumbers = [];
-    const worktreePrefix = join160(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
+    const worktreePrefix = join162(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
     for (const line of output2.split(`
 `)) {
       if (line.startsWith("worktree ")) {
@@ -78425,7 +78622,7 @@ async function cleanupAllWorktrees(projectDir) {
   await spawnAndCollect("git", ["worktree", "prune"], projectDir).catch(() => {});
 }
 async function ensureGitignore(projectDir) {
-  const gitignorePath = join160(projectDir, ".gitignore");
+  const gitignorePath = join162(projectDir, ".gitignore");
   try {
     const content = existsSync77(gitignorePath) ? await readFile70(gitignorePath, "utf-8") : "";
     if (!content.includes(".worktrees")) {
@@ -78529,16 +78726,16 @@ var init_content_validator = __esm(() => {
 
 // src/commands/content/phases/context-cache-manager.ts
 import { createHash as createHash11 } from "node:crypto";
-import { existsSync as existsSync83, mkdirSync as mkdirSync7, readFileSync as readFileSync23, readdirSync as readdirSync15, statSync as statSync15 } from "node:fs";
+import { existsSync as existsSync83, mkdirSync as mkdirSync7, readFileSync as readFileSync25, readdirSync as readdirSync15, statSync as statSync15 } from "node:fs";
 import { rename as rename16, writeFile as writeFile43 } from "node:fs/promises";
 import { homedir as homedir54 } from "node:os";
-import { basename as basename34, join as join167 } from "node:path";
+import { basename as basename34, join as join169 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
   if (!existsSync83(cachePath))
     return null;
   try {
-    const raw2 = readFileSync23(cachePath, "utf-8");
+    const raw2 = readFileSync25(cachePath, "utf-8");
     const cache5 = JSON.parse(raw2);
     const age = Date.now() - new Date(cache5.createdAt).getTime();
     if (age >= CACHE_TTL_MS5)
@@ -78575,25 +78772,25 @@ function computeSourceHash(repoPath) {
 }
 function getDocSourcePaths(repoPath) {
   const paths = [];
-  const docsDir = join167(repoPath, "docs");
+  const docsDir = join169(repoPath, "docs");
   if (existsSync83(docsDir)) {
     try {
       const files = readdirSync15(docsDir);
       for (const f3 of files) {
         if (f3.endsWith(".md"))
-          paths.push(join167(docsDir, f3));
+          paths.push(join169(docsDir, f3));
       }
     } catch {}
   }
-  const readme = join167(repoPath, "README.md");
+  const readme = join169(repoPath, "README.md");
   if (existsSync83(readme))
     paths.push(readme);
-  const stylesDir = join167(repoPath, "assets", "writing-styles");
+  const stylesDir = join169(repoPath, "assets", "writing-styles");
   if (existsSync83(stylesDir)) {
     try {
       const files = readdirSync15(stylesDir);
       for (const f3 of files) {
-        paths.push(join167(stylesDir, f3));
+        paths.push(join169(stylesDir, f3));
       }
     } catch {}
   }
@@ -78602,11 +78799,11 @@ function getDocSourcePaths(repoPath) {
 function getCacheFilePath(repoPath) {
   const repoName = basename34(repoPath).replace(/[^a-zA-Z0-9_-]/g, "_");
   const pathHash = createHash11("sha256").update(repoPath).digest("hex").slice(0, 8);
-  return join167(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
+  return join169(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
 }
 var CACHE_DIR, CACHE_TTL_MS5;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join167(homedir54(), ".claudekit", "cache");
+  CACHE_DIR = join169(homedir54(), ".claudekit", "cache");
   CACHE_TTL_MS5 = 24 * 60 * 60 * 1000;
 });
 
@@ -78786,8 +78983,8 @@ function extractContentFromResponse(response) {
 
 // src/commands/content/phases/docs-summarizer.ts
 import { execSync as execSync7 } from "node:child_process";
-import { existsSync as existsSync84, readFileSync as readFileSync24, readdirSync as readdirSync16 } from "node:fs";
-import { join as join168 } from "node:path";
+import { existsSync as existsSync84, readFileSync as readFileSync26, readdirSync as readdirSync16 } from "node:fs";
+import { join as join170 } from "node:path";
 async function summarizeProjectDocs(repoPath, contentLogger) {
   const rawContent = collectRawDocs(repoPath);
   if (rawContent.total.length < 200) {
@@ -78835,18 +79032,18 @@ function collectRawDocs(repoPath) {
       return "";
     if (totalChars >= MAX_RAW_CONTENT_CHARS)
       return "";
-    const content = readFileSync24(filePath, "utf-8");
+    const content = readFileSync26(filePath, "utf-8");
     const capped = content.slice(0, Math.min(maxChars, MAX_RAW_CONTENT_CHARS - totalChars));
     totalChars += capped.length;
     return capped;
   };
   const docsContent = [];
-  const docsDir = join168(repoPath, "docs");
+  const docsDir = join170(repoPath, "docs");
   if (existsSync84(docsDir)) {
     try {
       const files = readdirSync16(docsDir).filter((f3) => f3.endsWith(".md")).sort();
       for (const f3 of files) {
-        const content = readCapped(join168(docsDir, f3), 5000);
+        const content = readCapped(join170(docsDir, f3), 5000);
         if (content) {
           docsContent.push(`### ${f3}
 ${content}`);
@@ -78860,21 +79057,21 @@ ${content}`);
   let brand = "";
   const brandCandidates = ["docs/brand-guidelines.md", "docs/design-guidelines.md"];
   for (const p of brandCandidates) {
-    brand = readCapped(join168(repoPath, p), 3000);
+    brand = readCapped(join170(repoPath, p), 3000);
     if (brand)
       break;
   }
   let styles3 = "";
-  const stylesDir = join168(repoPath, "assets", "writing-styles");
+  const stylesDir = join170(repoPath, "assets", "writing-styles");
   if (existsSync84(stylesDir)) {
     try {
       const files = readdirSync16(stylesDir).slice(0, 3);
-      styles3 = files.map((f3) => readCapped(join168(stylesDir, f3), 1000)).filter(Boolean).join(`
+      styles3 = files.map((f3) => readCapped(join170(stylesDir, f3), 1000)).filter(Boolean).join(`
 
 `);
     } catch {}
   }
-  const readme = readCapped(join168(repoPath, "README.md"), 3000);
+  const readme = readCapped(join170(repoPath, "README.md"), 3000);
   const total = [docs, brand, styles3, readme].join(`
 `);
   return { docs, brand, styles: styles3, readme, total };
@@ -79061,9 +79258,9 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 import { execSync as execSync8 } from "node:child_process";
 import { existsSync as existsSync85, mkdirSync as mkdirSync8, readdirSync as readdirSync17 } from "node:fs";
 import { homedir as homedir55 } from "node:os";
-import { join as join169 } from "node:path";
+import { join as join171 } from "node:path";
 async function generatePhoto(_content, context, config, platform18, contentId, contentLogger) {
-  const mediaDir = join169(config.contentDir.replace(/^~/, homedir55()), "media", String(contentId));
+  const mediaDir = join171(config.contentDir.replace(/^~/, homedir55()), "media", String(contentId));
   if (!existsSync85(mediaDir)) {
     mkdirSync8(mediaDir, { recursive: true });
   }
@@ -79088,7 +79285,7 @@ async function generatePhoto(_content, context, config, platform18, contentId, c
     const imageFile = files.find((f3) => /\.(png|jpg|jpeg|webp)$/i.test(f3));
     if (imageFile) {
       const ext2 = imageFile.split(".").pop() ?? "png";
-      return { path: join169(mediaDir, imageFile), ...dimensions, format: ext2 };
+      return { path: join171(mediaDir, imageFile), ...dimensions, format: ext2 };
     }
     contentLogger.warn(`Photo generation produced no image for content ${contentId}`);
     return null;
@@ -79178,7 +79375,7 @@ var init_content_creator = __esm(() => {
 // src/commands/content/phases/content-logger.ts
 import { createWriteStream as createWriteStream4, existsSync as existsSync86, mkdirSync as mkdirSync9, statSync as statSync16 } from "node:fs";
 import { homedir as homedir56 } from "node:os";
-import { join as join170 } from "node:path";
+import { join as join172 } from "node:path";
 
 class ContentLogger {
   stream = null;
@@ -79186,7 +79383,7 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join170(homedir56(), ".claudekit", "logs");
+    this.logDir = join172(homedir56(), ".claudekit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
@@ -79218,7 +79415,7 @@ class ContentLogger {
     }
   }
   getLogPath() {
-    return join170(this.logDir, `content-${this.getDateStr()}.log`);
+    return join172(this.logDir, `content-${this.getDateStr()}.log`);
   }
   write(level, message) {
     this.rotateIfNeeded();
@@ -79235,18 +79432,18 @@ class ContentLogger {
     if (dateStr !== this.currentDate) {
       this.close();
       this.currentDate = dateStr;
-      const logPath = join170(this.logDir, `content-${dateStr}.log`);
+      const logPath = join172(this.logDir, `content-${dateStr}.log`);
       this.stream = createWriteStream4(logPath, { flags: "a", mode: 384 });
       return;
     }
     if (this.maxBytes > 0 && this.stream) {
-      const logPath = join170(this.logDir, `content-${this.currentDate}.log`);
+      const logPath = join172(this.logDir, `content-${this.currentDate}.log`);
       try {
         const stat26 = statSync16(logPath);
         if (stat26.size >= this.maxBytes) {
           this.close();
           const suffix = Date.now();
-          const rotatedPath = join170(this.logDir, `content-${this.currentDate}-${suffix}.log`);
+          const rotatedPath = join172(this.logDir, `content-${this.currentDate}-${suffix}.log`);
           import("node:fs/promises").then(({ rename: rename17 }) => rename17(logPath, rotatedPath).catch(() => {}));
           this.stream = createWriteStream4(logPath, { flags: "w", mode: 384 });
         }
@@ -79516,8 +79713,8 @@ function isNoiseCommit(title, author) {
 
 // src/commands/content/phases/change-detector.ts
 import { execSync as execSync10, spawnSync as spawnSync9 } from "node:child_process";
-import { existsSync as existsSync88, readFileSync as readFileSync25, readdirSync as readdirSync18, statSync as statSync17 } from "node:fs";
-import { join as join171 } from "node:path";
+import { existsSync as existsSync88, readFileSync as readFileSync27, readdirSync as readdirSync18, statSync as statSync17 } from "node:fs";
+import { join as join173 } from "node:path";
 function detectCommits(repo, since) {
   try {
     const fetchUrl = sshToHttps(repo.remoteUrl);
@@ -79626,7 +79823,7 @@ function detectTags(repo, since) {
   }
 }
 function detectCompletedPlans(repo, since) {
-  const plansDir = join171(repo.path, "plans");
+  const plansDir = join173(repo.path, "plans");
   if (!existsSync88(plansDir))
     return [];
   const sinceMs = new Date(since).getTime();
@@ -79636,14 +79833,14 @@ function detectCompletedPlans(repo, since) {
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
-      const planFile = join171(plansDir, entry.name, "plan.md");
+      const planFile = join173(plansDir, entry.name, "plan.md");
       if (!existsSync88(planFile))
         continue;
       try {
         const stat26 = statSync17(planFile);
         if (stat26.mtimeMs < sinceMs)
           continue;
-        const content = readFileSync25(planFile, "utf-8");
+        const content = readFileSync27(planFile, "utf-8");
         const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         if (!frontmatterMatch)
           continue;
@@ -79714,7 +79911,7 @@ function classifyCommit(event) {
 // src/commands/content/phases/repo-discoverer.ts
 import { execSync as execSync11 } from "node:child_process";
 import { readdirSync as readdirSync19 } from "node:fs";
-import { join as join172 } from "node:path";
+import { join as join174 } from "node:path";
 function discoverRepos2(cwd2) {
   const repos = [];
   if (isGitRepoRoot(cwd2)) {
@@ -79727,7 +79924,7 @@ function discoverRepos2(cwd2) {
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith("."))
         continue;
-      const dirPath = join172(cwd2, entry.name);
+      const dirPath = join174(cwd2, entry.name);
       if (isGitRepoRoot(dirPath)) {
         const info = getRepoInfo(dirPath);
         if (info)
@@ -80395,9 +80592,9 @@ var init_types6 = __esm(() => {
 
 // src/commands/content/phases/state-manager.ts
 import { readFile as readFile72, rename as rename17, writeFile as writeFile44 } from "node:fs/promises";
-import { join as join173 } from "node:path";
+import { join as join175 } from "node:path";
 async function loadContentConfig(projectDir) {
-  const configPath = join173(projectDir, CK_CONFIG_FILE2);
+  const configPath = join175(projectDir, CK_CONFIG_FILE2);
   try {
     const raw2 = await readFile72(configPath, "utf-8");
     const json = JSON.parse(raw2);
@@ -80407,13 +80604,13 @@ async function loadContentConfig(projectDir) {
   }
 }
 async function saveContentConfig(projectDir, config) {
-  const configPath = join173(projectDir, CK_CONFIG_FILE2);
+  const configPath = join175(projectDir, CK_CONFIG_FILE2);
   const json = await readJsonSafe5(configPath);
   json.content = { ...json.content, ...config };
   await atomicWrite3(configPath, json);
 }
 async function loadContentState(projectDir) {
-  const configPath = join173(projectDir, CK_CONFIG_FILE2);
+  const configPath = join175(projectDir, CK_CONFIG_FILE2);
   try {
     const raw2 = await readFile72(configPath, "utf-8");
     const json = JSON.parse(raw2);
@@ -80424,7 +80621,7 @@ async function loadContentState(projectDir) {
   }
 }
 async function saveContentState(projectDir, state) {
-  const configPath = join173(projectDir, CK_CONFIG_FILE2);
+  const configPath = join175(projectDir, CK_CONFIG_FILE2);
   const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
   for (const key of Object.keys(state.dailyPostCounts)) {
     const dateStr = key.slice(-10);
@@ -80706,7 +80903,7 @@ var init_platform_setup_x = __esm(() => {
 
 // src/commands/content/phases/setup-wizard.ts
 import { existsSync as existsSync89 } from "node:fs";
-import { join as join174 } from "node:path";
+import { join as join176 } from "node:path";
 async function runSetupWizard2(cwd2, contentLogger) {
   console.log();
   oe(import_picocolors43.default.bgCyan(import_picocolors43.default.white(" CK Content — Multi-Channel Content Engine ")));
@@ -80774,8 +80971,8 @@ async function showRepoSummary(cwd2) {
 function detectBrandAssets(cwd2, contentLogger) {
   const repos = discoverRepos2(cwd2);
   for (const repo of repos) {
-    const hasGuidelines = existsSync89(join174(repo.path, "docs", "brand-guidelines.md"));
-    const hasStyles = existsSync89(join174(repo.path, "assets", "writing-styles"));
+    const hasGuidelines = existsSync89(join176(repo.path, "docs", "brand-guidelines.md"));
+    const hasStyles = existsSync89(join176(repo.path, "assets", "writing-styles"));
     if (!hasGuidelines) {
       f2.warning(`${repo.name}: No docs/brand-guidelines.md — content will use generic tone.`);
       contentLogger.warn(`${repo.name}: missing docs/brand-guidelines.md`);
@@ -80915,15 +81112,15 @@ __export(exports_content_subcommands, {
   logsContent: () => logsContent,
   approveContentCmd: () => approveContentCmd
 });
-import { existsSync as existsSync91, readFileSync as readFileSync26, unlinkSync as unlinkSync6 } from "node:fs";
+import { existsSync as existsSync91, readFileSync as readFileSync28, unlinkSync as unlinkSync6 } from "node:fs";
 import { homedir as homedir58 } from "node:os";
-import { join as join175 } from "node:path";
+import { join as join177 } from "node:path";
 function isDaemonRunning() {
-  const lockFile = join175(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join177(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync91(lockFile))
     return { running: false, pid: null };
   try {
-    const pidStr = readFileSync26(lockFile, "utf-8").trim();
+    const pidStr = readFileSync28(lockFile, "utf-8").trim();
     const pid = Number.parseInt(pidStr, 10);
     if (Number.isNaN(pid)) {
       unlinkSync6(lockFile);
@@ -80951,13 +81148,13 @@ async function startContent(options2) {
   await contentCommand(options2);
 }
 async function stopContent() {
-  const lockFile = join175(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join177(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync91(lockFile)) {
     logger.info("Content daemon is not running.");
     return;
   }
   try {
-    const pidStr = readFileSync26(lockFile, "utf-8").trim();
+    const pidStr = readFileSync28(lockFile, "utf-8").trim();
     const pid = Number.parseInt(pidStr, 10);
     if (!Number.isNaN(pid)) {
       process.kill(pid, "SIGTERM");
@@ -80990,9 +81187,9 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join175(homedir58(), ".claudekit", "logs");
+  const logDir = join177(homedir58(), ".claudekit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
-  const logPath = join175(logDir, `content-${dateStr}.log`);
+  const logPath = join177(logDir, `content-${dateStr}.log`);
   if (!existsSync91(logPath)) {
     logger.info("No content logs found for today.");
     return;
@@ -81005,7 +81202,7 @@ async function logsContent(options2) {
       process.exit(0);
     });
   } else {
-    const content = readFileSync26(logPath, "utf-8");
+    const content = readFileSync28(logPath, "utf-8");
     console.log(content);
   }
 }
@@ -81024,13 +81221,13 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join175(homedir58(), ".claudekit", "locks");
+  LOCK_DIR = join177(homedir58(), ".claudekit", "locks");
 });
 
 // src/commands/content/content-command.ts
 import { existsSync as existsSync92, mkdirSync as mkdirSync11, unlinkSync as unlinkSync7, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir59 } from "node:os";
-import { join as join176 } from "node:path";
+import { join as join178 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
   const contentLogger = new ContentLogger;
@@ -81208,8 +81405,8 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join176(homedir59(), ".claudekit", "locks");
-  LOCK_FILE = join176(LOCK_DIR2, "ck-content.lock");
+  LOCK_DIR2 = join178(homedir59(), ".claudekit", "locks");
+  LOCK_FILE = join178(LOCK_DIR2, "ck-content.lock");
 });
 
 // src/commands/content/index.ts
@@ -88384,7 +88581,7 @@ import { promisify as promisify14 } from "node:util";
 // src/domains/github/gh-cli-utils.ts
 init_environment();
 init_logger();
-import { readFileSync as readFileSync16 } from "node:fs";
+import { readFileSync as readFileSync17 } from "node:fs";
 var MIN_GH_CLI_VERSION = "2.20.0";
 var GH_COMMAND_TIMEOUT_MS = 1e4;
 function compareVersions6(a3, b3) {
@@ -88405,7 +88602,7 @@ function isWSL2() {
   if (process.platform !== "linux")
     return false;
   try {
-    const release = readFileSync16("/proc/version", "utf-8").toLowerCase();
+    const release = readFileSync17("/proc/version", "utf-8").toLowerCase();
     return release.includes("microsoft") || release.includes("wsl");
   } catch (error) {
     logger.debug(`WSL detection skipped: ${error instanceof Error ? error.message : "unknown error"}`);
@@ -89169,14 +89366,14 @@ async function checkCliInstallMethod() {
 }
 // src/domains/health-checks/checkers/claude-md-checker.ts
 import { existsSync as existsSync52, statSync as statSync11 } from "node:fs";
-import { join as join73 } from "node:path";
+import { join as join74 } from "node:path";
 function checkClaudeMd(setup, projectDir) {
   const results = [];
   if (setup.global.path) {
-    const globalClaudeMd = join73(setup.global.path, "CLAUDE.md");
+    const globalClaudeMd = join74(setup.global.path, "CLAUDE.md");
     results.push(checkClaudeMdFile(globalClaudeMd, "Global CLAUDE.md", "ck-global-claude-md"));
   }
-  const projectClaudeMd = join73(projectDir, ".claude", "CLAUDE.md");
+  const projectClaudeMd = join74(projectDir, ".claude", "CLAUDE.md");
   results.push(checkClaudeMdFile(projectClaudeMd, "Project CLAUDE.md", "ck-project-claude-md"));
   return results;
 }
@@ -89234,10 +89431,10 @@ function checkClaudeMdFile(path7, name, id) {
   }
 }
 // src/domains/health-checks/checkers/active-plan-checker.ts
-import { existsSync as existsSync53, readFileSync as readFileSync18 } from "node:fs";
-import { join as join74 } from "node:path";
+import { existsSync as existsSync53, readFileSync as readFileSync19 } from "node:fs";
+import { join as join75 } from "node:path";
 function checkActivePlan(projectDir) {
-  const activePlanPath = join74(projectDir, ".claude", "active-plan");
+  const activePlanPath = join75(projectDir, ".claude", "active-plan");
   if (!existsSync53(activePlanPath)) {
     return {
       id: "ck-active-plan",
@@ -89250,8 +89447,8 @@ function checkActivePlan(projectDir) {
     };
   }
   try {
-    const targetPath = readFileSync18(activePlanPath, "utf-8").trim();
-    const fullPath = join74(projectDir, targetPath);
+    const targetPath = readFileSync19(activePlanPath, "utf-8").trim();
+    const fullPath = join75(projectDir, targetPath);
     if (!existsSync53(fullPath)) {
       return {
         id: "ck-active-plan",
@@ -89289,13 +89486,13 @@ function checkActivePlan(projectDir) {
 }
 // src/domains/health-checks/checkers/skills-checker.ts
 import { existsSync as existsSync54 } from "node:fs";
-import { join as join75 } from "node:path";
+import { join as join76 } from "node:path";
 function checkSkillsScripts(setup) {
   const results = [];
   const platform8 = process.platform;
   const scriptName = platform8 === "win32" ? "install.ps1" : "install.sh";
   if (setup.global.path) {
-    const globalScriptPath = join75(setup.global.path, "skills", scriptName);
+    const globalScriptPath = join76(setup.global.path, "skills", scriptName);
     const hasGlobalScript = existsSync54(globalScriptPath);
     results.push({
       id: "ck-global-skills-script",
@@ -89310,7 +89507,7 @@ function checkSkillsScripts(setup) {
     });
   }
   if (setup.project.metadata) {
-    const projectScriptPath = join75(setup.project.path, "skills", scriptName);
+    const projectScriptPath = join76(setup.project.path, "skills", scriptName);
     const hasProjectScript = existsSync54(projectScriptPath);
     results.push({
       id: "ck-project-skills-script",
@@ -89347,13 +89544,13 @@ function checkComponentCounts(setup) {
 }
 // src/domains/health-checks/checkers/skill-budget-checker.ts
 init_path_resolver();
-import { join as join77, resolve as resolve37 } from "node:path";
+import { join as join78, resolve as resolve37 } from "node:path";
 
 // src/domains/health-checks/checkers/skill-budget-scanner.ts
 var import_gray_matter11 = __toESM(require_gray_matter(), 1);
 import { existsSync as existsSync55 } from "node:fs";
 import { readFile as readFile41, readdir as readdir20 } from "node:fs/promises";
-import { basename as basename25, join as join76, relative as relative17 } from "node:path";
+import { basename as basename25, join as join77, relative as relative17 } from "node:path";
 var SKIP_DIRS5 = new Set([".git", ".venv", "__pycache__", "node_modules", "scripts", "common"]);
 async function scanSkills2(skillsDir2) {
   if (!existsSync55(skillsDir2))
@@ -89361,7 +89558,7 @@ async function scanSkills2(skillsDir2) {
   const skillDirs = await findSkillDirs(skillsDir2);
   const skills = [];
   for (const dir of skillDirs) {
-    const file = join76(dir, "SKILL.md");
+    const file = join77(dir, "SKILL.md");
     try {
       const content = await readFile41(file, "utf8");
       const { data } = import_gray_matter11.default(content, { engines: { javascript: { parse: () => ({}) } } });
@@ -89387,8 +89584,8 @@ async function findSkillDirs(dir) {
   }
   const results = [];
   for (const entry of entries) {
-    const child = join76(dir, entry.name);
-    if (existsSync55(join76(child, "SKILL.md"))) {
+    const child = join77(dir, entry.name);
+    if (existsSync55(join77(child, "SKILL.md"))) {
       results.push(child);
       continue;
     }
@@ -89470,12 +89667,12 @@ async function checkSkillBudget(setup, projectDir) {
   const globalClaudeDir = resolve37(PathResolver.getGlobalKitDir());
   const projectScopeAliasesGlobal = projectClaudeDir === globalClaudeDir;
   const [projectSkills, globalSkills] = await Promise.all([
-    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join77(projectClaudeDir, "skills")),
-    scanSkills2(join77(globalClaudeDir, "skills"))
+    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join78(projectClaudeDir, "skills")),
+    scanSkills2(join78(globalClaudeDir, "skills"))
   ]);
   if (!isEngineerLikeProject(setup, [...projectSkills, ...globalSkills]))
     return [];
-  const settingsPath = join77(projectClaudeDir, "settings.json");
+  const settingsPath = join78(projectClaudeDir, "settings.json");
   const settings = await readProjectSettings(settingsPath);
   const activeSkills = [...projectSkills, ...globalSkills];
   const listingSkills = uniqueSkills(activeSkills);
@@ -89633,7 +89830,7 @@ init_logger();
 init_path_resolver();
 init_shared2();
 import { constants as constants2, access as access3, unlink as unlink10, writeFile as writeFile22 } from "node:fs/promises";
-import { join as join78 } from "node:path";
+import { join as join79 } from "node:path";
 async function checkGlobalDirReadable() {
   const globalDir = PathResolver.getGlobalKitDir();
   if (shouldSkipExpensiveOperations2()) {
@@ -89690,7 +89887,7 @@ async function checkGlobalDirWritable() {
   }
   const timestamp = Date.now();
   const random = Math.random().toString(36).substring(2);
-  const testFile = join78(globalDir, `.ck-write-test-${timestamp}-${random}`);
+  const testFile = join79(globalDir, `.ck-write-test-${timestamp}-${random}`);
   try {
     await writeFile22(testFile, "test", { encoding: "utf-8", flag: "wx" });
   } catch (error) {
@@ -89726,7 +89923,7 @@ async function checkGlobalDirWritable() {
 init_path_resolver();
 import { existsSync as existsSync57 } from "node:fs";
 import { readdir as readdir21 } from "node:fs/promises";
-import { join as join79 } from "node:path";
+import { join as join80 } from "node:path";
 
 // src/domains/health-checks/utils/path-normalizer.ts
 import { normalize as normalize5 } from "node:path";
@@ -89739,8 +89936,8 @@ function normalizePath2(filePath) {
 // src/domains/health-checks/checkers/hooks-checker.ts
 init_shared2();
 async function checkHooksExist(projectDir) {
-  const globalHooksDir = join79(PathResolver.getGlobalKitDir(), "hooks");
-  const projectHooksDir = join79(projectDir, ".claude", "hooks");
+  const globalHooksDir = join80(PathResolver.getGlobalKitDir(), "hooks");
+  const projectHooksDir = join80(projectDir, ".claude", "hooks");
   const globalExists = existsSync57(globalHooksDir);
   const projectExists = existsSync57(projectHooksDir);
   let hookCount = 0;
@@ -89749,7 +89946,7 @@ async function checkHooksExist(projectDir) {
     const files = await readdir21(globalHooksDir, { withFileTypes: false });
     const hooks = files.filter((f3) => HOOK_EXTENSIONS2.some((ext) => f3.endsWith(ext)));
     hooks.forEach((hook) => {
-      const fullPath = join79(globalHooksDir, hook);
+      const fullPath = join80(globalHooksDir, hook);
       checkedFiles.add(normalizePath2(fullPath));
     });
   }
@@ -89759,7 +89956,7 @@ async function checkHooksExist(projectDir) {
     const files = await readdir21(projectHooksDir, { withFileTypes: false });
     const hooks = files.filter((f3) => HOOK_EXTENSIONS2.some((ext) => f3.endsWith(ext)));
     hooks.forEach((hook) => {
-      const fullPath = join79(projectHooksDir, hook);
+      const fullPath = join80(projectHooksDir, hook);
       checkedFiles.add(normalizePath2(fullPath));
     });
   }
@@ -89791,10 +89988,10 @@ init_logger();
 init_path_resolver();
 import { existsSync as existsSync58 } from "node:fs";
 import { readFile as readFile43 } from "node:fs/promises";
-import { join as join80 } from "node:path";
+import { join as join81 } from "node:path";
 async function checkSettingsValid(projectDir) {
-  const globalSettings = join80(PathResolver.getGlobalKitDir(), "settings.json");
-  const projectSettings = join80(projectDir, ".claude", "settings.json");
+  const globalSettings = join81(PathResolver.getGlobalKitDir(), "settings.json");
+  const projectSettings = join81(projectDir, ".claude", "settings.json");
   const settingsPath = existsSync58(globalSettings) ? globalSettings : existsSync58(projectSettings) ? projectSettings : null;
   if (!settingsPath) {
     return {
@@ -89867,10 +90064,10 @@ init_path_resolver();
 import { existsSync as existsSync59 } from "node:fs";
 import { readFile as readFile44 } from "node:fs/promises";
 import { homedir as homedir43 } from "node:os";
-import { dirname as dirname32, join as join81, normalize as normalize6, resolve as resolve38 } from "node:path";
+import { dirname as dirname32, join as join82, normalize as normalize6, resolve as resolve38 } from "node:path";
 async function checkPathRefsValid(projectDir) {
-  const globalClaudeMd = join81(PathResolver.getGlobalKitDir(), "CLAUDE.md");
-  const projectClaudeMd = join81(projectDir, ".claude", "CLAUDE.md");
+  const globalClaudeMd = join82(PathResolver.getGlobalKitDir(), "CLAUDE.md");
+  const projectClaudeMd = join82(projectDir, ".claude", "CLAUDE.md");
   const claudeMdPath = existsSync59(globalClaudeMd) ? globalClaudeMd : existsSync59(projectClaudeMd) ? projectClaudeMd : null;
   if (!claudeMdPath) {
     return {
@@ -89965,7 +90162,7 @@ async function checkPathRefsValid(projectDir) {
 // src/domains/health-checks/checkers/config-completeness-checker.ts
 import { existsSync as existsSync60 } from "node:fs";
 import { readdir as readdir22 } from "node:fs/promises";
-import { join as join82 } from "node:path";
+import { join as join83 } from "node:path";
 async function checkProjectConfigCompleteness(setup, projectDir) {
   const baseResult = {
     id: "ck-project-config-complete",
@@ -89999,15 +90196,15 @@ async function checkProjectConfigCompleteness(setup, projectDir) {
       suggestion: "Run 'ck init' (choose global or project scope when prompted)"
     };
   }
-  const projectClaudeDir = join82(projectDir, ".claude");
+  const projectClaudeDir = join83(projectDir, ".claude");
   const requiredDirs = ["agents", "commands", "skills"];
   const missingDirs = [];
   for (const dir of requiredDirs) {
-    if (!existsSync60(join82(projectClaudeDir, dir))) {
+    if (!existsSync60(join83(projectClaudeDir, dir))) {
       missingDirs.push(dir);
     }
   }
-  const hasRulesOrWorkflows = existsSync60(join82(projectClaudeDir, "rules")) || existsSync60(join82(projectClaudeDir, "workflows"));
+  const hasRulesOrWorkflows = existsSync60(join83(projectClaudeDir, "rules")) || existsSync60(join83(projectClaudeDir, "workflows"));
   if (!hasRulesOrWorkflows) {
     missingDirs.push("rules");
   }
@@ -90040,7 +90237,7 @@ async function checkProjectConfigCompleteness(setup, projectDir) {
   };
 }
 // src/domains/health-checks/checkers/env-keys-checker.ts
-import { join as join84 } from "node:path";
+import { join as join85 } from "node:path";
 
 // src/domains/installation/setup-wizard.ts
 init_config_generator();
@@ -90049,7 +90246,7 @@ init_logger();
 init_path_resolver();
 init_dist2();
 var import_fs_extra9 = __toESM(require_lib(), 1);
-import { join as join83 } from "node:path";
+import { join as join84 } from "node:path";
 var IMAGE_PROVIDER_ENV_KEYS = [
   "GEMINI_API_KEY",
   "OPENROUTER_API_KEY",
@@ -90222,7 +90419,7 @@ function normalizeParsedEnvValue(key, value) {
   return trimmed;
 }
 async function checkGlobalConfig() {
-  const globalEnvPath = join83(PathResolver.getGlobalKitDir(), ".env");
+  const globalEnvPath = join84(PathResolver.getGlobalKitDir(), ".env");
   if (!await import_fs_extra9.pathExists(globalEnvPath))
     return false;
   const env2 = await parseEnvFile(globalEnvPath);
@@ -90238,7 +90435,7 @@ async function runSetupWizard(options2) {
   let globalEnv = {};
   const hasGlobalConfig = !isGlobal && await checkGlobalConfig();
   if (!isGlobal) {
-    const globalEnvPath = join83(PathResolver.getGlobalKitDir(), ".env");
+    const globalEnvPath = join84(PathResolver.getGlobalKitDir(), ".env");
     if (await import_fs_extra9.pathExists(globalEnvPath)) {
       globalEnv = await parseEnvFile(globalEnvPath);
     }
@@ -90338,7 +90535,7 @@ async function runSetupWizard(options2) {
     f2.info(`Set IMAGE_GEN_PROVIDER=${selectedProvider}`);
   }
   await generateEnvFile(targetDir, values);
-  f2.success(`Configuration saved to ${join83(targetDir, ".env")}`);
+  f2.success(`Configuration saved to ${join84(targetDir, ".env")}`);
   return true;
 }
 async function promptForAdditionalGeminiKeys(primaryKey) {
@@ -90433,7 +90630,7 @@ function formatConfiguredProviderMessage(providers2) {
 async function checkEnvKeys(setup) {
   const results = [];
   if (setup.global.path) {
-    const globalEnvPath = join84(setup.global.path, ".env");
+    const globalEnvPath = join85(setup.global.path, ".env");
     const globalCheck = await checkRequiredKeysExist(globalEnvPath);
     if (!globalCheck.allPresent) {
       const missingKeys = globalCheck.missing.map((m2) => m2.label).join(", ");
@@ -90462,7 +90659,7 @@ async function checkEnvKeys(setup) {
     }
   }
   if (setup.project.metadata) {
-    const projectEnvPath = join84(setup.project.path, ".env");
+    const projectEnvPath = join85(setup.project.path, ".env");
     const projectCheck = await checkRequiredKeysExist(projectEnvPath);
     if (!projectCheck.allPresent) {
       const missingKeys = projectCheck.missing.map((m2) => m2.label).join(", ");
@@ -90566,28 +90763,40 @@ class ClaudekitChecker {
   }
 }
 // src/domains/health-checks/plugin-install-mode-checker.ts
+init_codex_plugin_installer();
 init_install_mode_detector();
+init_install_mode_preference();
+init_path_resolver();
+import { readFileSync as readFileSync20 } from "node:fs";
+import { join as join86 } from "node:path";
 
 class PluginInstallModeChecker {
   claudeDir;
+  deps;
   group = "claudekit";
-  constructor(claudeDir3) {
+  constructor(claudeDir3, deps = {}) {
     this.claudeDir = claudeDir3;
+    this.deps = deps;
   }
   async run() {
     const r2 = detectInstallMode(this.claudeDir);
+    const readPreference = this.deps.readInstallModePreference ?? readInstallModePreferenceFromClaudeDir;
+    const preference = readPreference(r2.claudeDir) ?? DEFAULT_INSTALL_MODE_PREFERENCE;
+    const codexState = await this.readCodexState(expectedCodexPluginOptions(r2.claudeDir));
     const detail = [];
+    detail.push(`preference: ${preference}`);
     if (r2.plugin.installed) {
       const bits = [r2.plugin.enabled ? "enabled" : "disabled"];
       if (r2.plugin.version)
         bits.push(r2.plugin.version);
       if (r2.plugin.marketplace)
         bits.push(`via ${r2.plugin.marketplace}`);
-      detail.push(`plugin: ${bits.join(", ")}`);
+      detail.push(`Claude plugin: ${bits.join(", ")}`);
     }
     if (r2.legacy.installed) {
       detail.push(`legacy copy${r2.legacy.version ? ` (${r2.legacy.version})` : ""}`);
     }
+    detail.push(formatCodexDetail(codexState));
     const suffix = detail.length > 0 ? ` — ${detail.join("; ")}` : "";
     let status = "pass";
     let message = `Install mode: ${r2.mode}${suffix}`;
@@ -90597,9 +90806,18 @@ class PluginInstallModeChecker {
     } else if (r2.mode === "plugin" && !r2.plugin.enabled) {
       status = "warn";
       message = `Install mode: plugin, but the plugin is disabled. Run \`claude plugin enable ck\`.${suffix}`;
+    } else if (preference === "legacy" && (r2.plugin.installed || r2.plugin.staleCache || codexState.installed)) {
+      status = "warn";
+      message = `Install mode: ${r2.mode}, but preference is legacy. Run \`ck init -g --kit engineer --install-mode legacy\`.${suffix}`;
+    } else if (preference === "plugin" && (r2.mode === "legacy" || r2.mode === "fresh" || !r2.plugin.enabled)) {
+      status = "warn";
+      message = `Install mode: ${r2.mode}, but preference is plugin. Run \`ck init -g --kit engineer --install-mode plugin\`.${suffix}`;
+    } else if (codexState.shouldRefresh && preference !== "legacy") {
+      status = "warn";
+      message = `Install mode: ${r2.mode}; Codex plugin requires refresh. Run \`ck update\`.${suffix}`;
     } else if (r2.mode === "fresh") {
       status = "info";
-      message = "Install mode: fresh (ClaudeKit Engineer not installed). Run `ck init` to install.";
+      message = `Install mode: fresh (ClaudeKit Engineer not installed). Run \`ck init\` to install.${suffix}`;
     }
     return [
       {
@@ -90612,6 +90830,62 @@ class PluginInstallModeChecker {
       }
     ];
   }
+  async readCodexState(options2) {
+    try {
+      if (this.deps.detectCodexPluginState)
+        return await this.deps.detectCodexPluginState(options2);
+      return await detectCodexPluginState(undefined, options2);
+    } catch (error) {
+      return {
+        status: "unknown",
+        pluginId: "ck@claudekit",
+        enabled: false,
+        installed: false,
+        installedVersion: null,
+        expectedVersion: options2.expectedVersion ?? null,
+        marketplace: null,
+        expectedMarketplace: options2.expectedMarketplace ?? "claudekit",
+        source: null,
+        expectedSource: options2.expectedSource ?? null,
+        shouldRefresh: false,
+        error: error instanceof Error ? error.message : "unknown"
+      };
+    }
+  }
+}
+function formatCodexDetail(state) {
+  const bits = [state.status];
+  if (state.installedVersion)
+    bits.push(state.installedVersion);
+  if (state.marketplace)
+    bits.push(`via ${state.marketplace}`);
+  if (state.source)
+    bits.push(`source ${state.source}`);
+  if (state.error)
+    bits.push(state.error);
+  return `Codex plugin: ${bits.join(", ")}`;
+}
+function expectedCodexPluginOptions(claudeDir3) {
+  return {
+    expectedVersion: readEngineerKitVersion(claudeDir3),
+    expectedMarketplace: "claudekit",
+    expectedSource: join86(PathResolver.getCacheDir(true), "ck-plugin-source")
+  };
+}
+function readEngineerKitVersion(claudeDir3) {
+  try {
+    const parsed = JSON.parse(readFileSync20(join86(claudeDir3, "metadata.json"), "utf-8"));
+    if (!isRecord4(parsed) || !isRecord4(parsed.kits) || !isRecord4(parsed.kits.engineer)) {
+      return null;
+    }
+    const version = parsed.kits.engineer.version;
+    return typeof version === "string" && version.trim() !== "" ? version : null;
+  } catch {
+    return null;
+  }
+}
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 // src/domains/health-checks/auth-checker.ts
 init_github_auth();
@@ -90962,7 +91236,7 @@ init_environment();
 init_path_resolver();
 import { constants as constants3, access as access4, mkdir as mkdir21, readFile as readFile46, unlink as unlink11, writeFile as writeFile23 } from "node:fs/promises";
 import { arch as arch2, homedir as homedir44, platform as platform8 } from "node:os";
-import { join as join86, normalize as normalize7 } from "node:path";
+import { join as join88, normalize as normalize7 } from "node:path";
 function shouldSkipExpensiveOperations4() {
   return shouldSkipExpensiveOperations();
 }
@@ -91053,7 +91327,7 @@ async function checkGlobalDirAccess() {
       autoFixable: false
     };
   }
-  const testFile = join86(globalDir, ".ck-doctor-access-test");
+  const testFile = join88(globalDir, ".ck-doctor-access-test");
   try {
     await mkdir21(globalDir, { recursive: true });
     await writeFile23(testFile, "test", "utf-8");
@@ -91131,7 +91405,7 @@ async function checkWSLBoundary() {
 // src/domains/health-checks/platform/windows-checker.ts
 init_path_resolver();
 import { mkdir as mkdir22, symlink as symlink2, unlink as unlink12, writeFile as writeFile24 } from "node:fs/promises";
-import { join as join87 } from "node:path";
+import { join as join89 } from "node:path";
 async function checkLongPathSupport() {
   if (shouldSkipExpensiveOperations4()) {
     return {
@@ -91183,8 +91457,8 @@ async function checkSymlinkSupport() {
     };
   }
   const testDir = PathResolver.getGlobalKitDir();
-  const target = join87(testDir, ".ck-symlink-test-target");
-  const link = join87(testDir, ".ck-symlink-test-link");
+  const target = join89(testDir, ".ck-symlink-test-target");
+  const link = join89(testDir, ".ck-symlink-test-link");
   try {
     await mkdir22(testDir, { recursive: true });
     await writeFile24(target, "test", "utf-8");
@@ -91801,9 +92075,9 @@ class AutoHealer {
 }
 // src/domains/health-checks/report-generator.ts
 import { execSync as execSync4, spawnSync as spawnSync6 } from "node:child_process";
-import { readFileSync as readFileSync19, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6 } from "node:fs";
+import { readFileSync as readFileSync21, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
-import { dirname as dirname33, join as join88 } from "node:path";
+import { dirname as dirname33, join as join90 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 init_environment();
 init_logger();
@@ -91811,8 +92085,8 @@ init_dist2();
 function getCliVersion4() {
   try {
     const __dirname4 = dirname33(fileURLToPath4(import.meta.url));
-    const pkgPath = join88(__dirname4, "../../../package.json");
-    const pkg = JSON.parse(readFileSync19(pkgPath, "utf-8"));
+    const pkgPath = join90(__dirname4, "../../../package.json");
+    const pkg = JSON.parse(readFileSync21(pkgPath, "utf-8"));
     return pkg.version || "unknown";
   } catch (err) {
     logger.debug(`Failed to read CLI version: ${err}`);
@@ -91950,7 +92224,7 @@ class ReportGenerator {
         return null;
       }
     }
-    const tmpFile = join88(tmpdir3(), `ck-report-${Date.now()}.txt`);
+    const tmpFile = join90(tmpdir3(), `ck-report-${Date.now()}.txt`);
     writeFileSync6(tmpFile, report);
     try {
       const result = spawnSync6("gh", ["gist", "create", tmpFile, "--desc", "ClaudeKit Diagnostic Report"], {
@@ -92292,7 +92566,7 @@ init_config_version_checker();
 
 // src/domains/sync/sync-engine.ts
 import { lstat as lstat6, readFile as readFile48, readlink as readlink2, realpath as realpath8, stat as stat14 } from "node:fs/promises";
-import { isAbsolute as isAbsolute12, join as join89, normalize as normalize8, relative as relative19 } from "node:path";
+import { isAbsolute as isAbsolute12, join as join91, normalize as normalize8, relative as relative19 } from "node:path";
 
 // src/services/file-operations/ownership-checker.ts
 init_metadata_migration();
@@ -93507,7 +93781,7 @@ async function validateSymlinkChain(path8, basePath, maxDepth = MAX_SYMLINK_DEPT
       if (!stats.isSymbolicLink())
         break;
       const target = await readlink2(current);
-      const resolvedTarget = isAbsolute12(target) ? target : join89(current, "..", target);
+      const resolvedTarget = isAbsolute12(target) ? target : join91(current, "..", target);
       const normalizedTarget = normalize8(resolvedTarget);
       const rel = relative19(basePath, normalizedTarget);
       if (rel.startsWith("..") || isAbsolute12(rel)) {
@@ -93543,7 +93817,7 @@ async function validateSyncPath(basePath, filePath) {
   if (normalized.startsWith("..") || normalized.includes("/../")) {
     throw new Error(`Path traversal not allowed: ${filePath}`);
   }
-  const fullPath = join89(basePath, normalized);
+  const fullPath = join91(basePath, normalized);
   const rel = relative19(basePath, fullPath);
   if (rel.startsWith("..") || isAbsolute12(rel)) {
     throw new Error(`Path escapes base directory: ${filePath}`);
@@ -93558,7 +93832,7 @@ async function validateSyncPath(basePath, filePath) {
     }
   } catch (error) {
     if (error.code === "ENOENT") {
-      const parentPath = join89(fullPath, "..");
+      const parentPath = join91(fullPath, "..");
       try {
         const resolvedBase = await realpath8(basePath);
         const resolvedParent = await realpath8(parentPath);
@@ -94467,7 +94741,7 @@ async function getLatestVersion(kit, includePrereleases = false) {
 init_logger();
 init_path_resolver();
 init_safe_prompts();
-import { join as join97 } from "node:path";
+import { join as join99 } from "node:path";
 async function promptUpdateMode() {
   const updateEverything = await se({
     message: "Do you want to update everything?"
@@ -94509,7 +94783,7 @@ async function promptDirectorySelection(global3 = false) {
   return selectedCategories;
 }
 async function promptFreshConfirmation(targetPath, analysis) {
-  const backupRoot = join97(PathResolver.getConfigDir(false), "backups");
+  const backupRoot = join99(PathResolver.getConfigDir(false), "backups");
   logger.warning("[!] Fresh installation will remove ClaudeKit files:");
   logger.info(`Path: ${targetPath}`);
   logger.info(`Recovery backup: ${backupRoot}`);
@@ -94786,7 +95060,7 @@ init_logger();
 init_logger();
 init_path_resolver();
 var import_fs_extra10 = __toESM(require_lib(), 1);
-import { join as join98 } from "node:path";
+import { join as join100 } from "node:path";
 async function handleConflicts(ctx) {
   if (ctx.cancelled)
     return ctx;
@@ -94795,7 +95069,7 @@ async function handleConflicts(ctx) {
   if (PathResolver.isLocalSameAsGlobal()) {
     return ctx;
   }
-  const localSettingsPath = join98(process.cwd(), ".claude", "settings.json");
+  const localSettingsPath = join100(process.cwd(), ".claude", "settings.json");
   if (!await import_fs_extra10.pathExists(localSettingsPath)) {
     return ctx;
   }
@@ -94810,7 +95084,7 @@ async function handleConflicts(ctx) {
     return { ...ctx, cancelled: true };
   }
   if (choice === "remove") {
-    const localClaudeDir = join98(process.cwd(), ".claude");
+    const localClaudeDir = join100(process.cwd(), ".claude");
     try {
       await import_fs_extra10.remove(localClaudeDir);
       logger.success("Removed local .claude/ directory");
@@ -94907,7 +95181,7 @@ init_logger();
 init_safe_spinner();
 import { mkdir as mkdir30, stat as stat17 } from "node:fs/promises";
 import { tmpdir as tmpdir4 } from "node:os";
-import { join as join105 } from "node:path";
+import { join as join107 } from "node:path";
 
 // src/shared/temp-cleanup.ts
 init_logger();
@@ -94926,7 +95200,7 @@ init_logger();
 init_output_manager();
 import { createWriteStream as createWriteStream2, rmSync } from "node:fs";
 import { mkdir as mkdir25 } from "node:fs/promises";
-import { join as join99 } from "node:path";
+import { join as join101 } from "node:path";
 
 // src/shared/progress-bar.ts
 init_output_manager();
@@ -95136,7 +95410,7 @@ var MAX_DOWNLOAD_SIZE = 500 * 1024 * 1024;
 class FileDownloader {
   async downloadAsset(asset, destDir) {
     try {
-      const destPath = join99(destDir, asset.name);
+      const destPath = join101(destDir, asset.name);
       await mkdir25(destDir, { recursive: true });
       output.info(`Downloading ${asset.name} (${formatBytes2(asset.size)})...`);
       logger.verbose("Download details", {
@@ -95221,7 +95495,7 @@ class FileDownloader {
   }
   async downloadFile(params) {
     const { url, name, size, destDir, token } = params;
-    const destPath = join99(destDir, name);
+    const destPath = join101(destDir, name);
     await mkdir25(destDir, { recursive: true });
     output.info(`Downloading ${name}${size ? ` (${formatBytes2(size)})` : ""}...`);
     const headers = {};
@@ -95307,7 +95581,7 @@ init_logger();
 init_types3();
 import { constants as constants4 } from "node:fs";
 import { access as access5, readdir as readdir23 } from "node:fs/promises";
-import { join as join100 } from "node:path";
+import { join as join102 } from "node:path";
 async function pathExists11(path8) {
   try {
     await access5(path8, constants4.F_OK);
@@ -95326,7 +95600,7 @@ async function validateExtraction(extractDir) {
     const criticalPaths = [".claude"];
     const missingPaths = [];
     for (const path8 of criticalPaths) {
-      if (await pathExists11(join100(extractDir, path8))) {
+      if (await pathExists11(join102(extractDir, path8))) {
         logger.debug(`Found: ${path8}`);
         continue;
       }
@@ -95336,7 +95610,7 @@ async function validateExtraction(extractDir) {
     const guidancePaths = ["CLAUDE.md", ".claude/CLAUDE.md", ".claude/rules/CLAUDE.md"];
     let guidancePath = null;
     for (const path8 of guidancePaths) {
-      if (await pathExists11(join100(extractDir, path8))) {
+      if (await pathExists11(join102(extractDir, path8))) {
         guidancePath = path8;
         break;
       }
@@ -95361,7 +95635,7 @@ async function validateExtraction(extractDir) {
 // src/domains/installation/extraction/tar-extractor.ts
 init_logger();
 import { copyFile as copyFile4, mkdir as mkdir28, readdir as readdir25, rm as rm11, stat as stat15 } from "node:fs/promises";
-import { join as join103 } from "node:path";
+import { join as join105 } from "node:path";
 
 // node_modules/@isaacs/fs-minipass/dist/esm/index.js
 import EE from "events";
@@ -101123,7 +101397,7 @@ var mkdirSync4 = (dir, opt) => {
 };
 
 // node_modules/tar/dist/esm/path-reservations.js
-import { join as join101 } from "node:path";
+import { join as join103 } from "node:path";
 
 // node_modules/tar/dist/esm/normalize-unicode.js
 var normalizeCache = Object.create(null);
@@ -101156,7 +101430,7 @@ var getDirs = (path13) => {
   const dirs = path13.split("/").slice(0, -1).reduce((set, path14) => {
     const s = set[set.length - 1];
     if (s !== undefined) {
-      path14 = join101(s, path14);
+      path14 = join103(s, path14);
     }
     set.push(path14 || "/");
     return set;
@@ -101170,7 +101444,7 @@ class PathReservations {
   #running = new Set;
   reserve(paths, fn) {
     paths = isWindows4 ? ["win32 parallelization disabled"] : paths.map((p) => {
-      return stripTrailingSlashes(join101(normalizeUnicode(p))).toLowerCase();
+      return stripTrailingSlashes(join103(normalizeUnicode(p))).toLowerCase();
     });
     const dirs = new Set(paths.map((path13) => getDirs(path13)).reduce((a3, b3) => a3.concat(b3)));
     this.#reservations.set(fn, { dirs, paths });
@@ -102230,7 +102504,7 @@ function decodeFilePath(path15) {
 init_logger();
 init_types3();
 import { copyFile as copyFile3, lstat as lstat7, mkdir as mkdir27, readdir as readdir24 } from "node:fs/promises";
-import { join as join102, relative as relative21 } from "node:path";
+import { join as join104, relative as relative21 } from "node:path";
 async function withRetry(fn, retries = 3) {
   for (let i = 0;i < retries; i++) {
     try {
@@ -102252,8 +102526,8 @@ async function moveDirectoryContents(sourceDir, destDir, shouldExclude, sizeTrac
   await mkdir27(destDir, { recursive: true });
   const entries = await readdir24(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join102(sourceDir, entry);
-    const destPath = join102(destDir, entry);
+    const sourcePath = join104(sourceDir, entry);
+    const destPath = join104(destDir, entry);
     const relativePath = relative21(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -102280,8 +102554,8 @@ async function copyDirectory(sourceDir, destDir, shouldExclude, sizeTracker) {
   await mkdir27(destDir, { recursive: true });
   const entries = await readdir24(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join102(sourceDir, entry);
-    const destPath = join102(destDir, entry);
+    const sourcePath = join104(sourceDir, entry);
+    const destPath = join104(destDir, entry);
     const relativePath = relative21(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -102329,7 +102603,7 @@ class TarExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join103(tempExtractDir, rootEntry);
+        const rootPath = join105(tempExtractDir, rootEntry);
         const rootStat = await stat15(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir25(rootPath, { encoding: "utf8" });
@@ -102345,7 +102619,7 @@ class TarExtractor {
           }
         } else {
           await mkdir28(destDir, { recursive: true });
-          await copyFile4(rootPath, join103(destDir, rootEntry));
+          await copyFile4(rootPath, join105(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -102367,7 +102641,7 @@ init_logger();
 var import_extract_zip = __toESM(require_extract_zip(), 1);
 import { execFile as execFile11 } from "node:child_process";
 import { copyFile as copyFile5, mkdir as mkdir29, readdir as readdir26, rm as rm12, stat as stat16 } from "node:fs/promises";
-import { join as join104 } from "node:path";
+import { join as join106 } from "node:path";
 import { promisify as promisify16 } from "node:util";
 
 // src/domains/installation/extraction/native-zip-commands.ts
@@ -102459,7 +102733,7 @@ class ZipExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join104(tempExtractDir, rootEntry);
+        const rootPath = join106(tempExtractDir, rootEntry);
         const rootStat = await stat16(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir26(rootPath, { encoding: "utf8" });
@@ -102475,7 +102749,7 @@ class ZipExtractor {
           }
         } else {
           await mkdir29(destDir, { recursive: true });
-          await copyFile5(rootPath, join104(destDir, rootEntry));
+          await copyFile5(rootPath, join106(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -102576,7 +102850,7 @@ class DownloadManager {
   async createTempDir() {
     const timestamp = Date.now();
     const counter = DownloadManager.tempDirCounter++;
-    const primaryTempDir = join105(tmpdir4(), `claudekit-${timestamp}-${counter}`);
+    const primaryTempDir = join107(tmpdir4(), `claudekit-${timestamp}-${counter}`);
     try {
       await mkdir30(primaryTempDir, { recursive: true });
       logger.debug(`Created temp directory: ${primaryTempDir}`);
@@ -102593,7 +102867,7 @@ Solutions:
   2. Set HOME environment variable
   3. Try running from a different directory`);
       }
-      const fallbackTempDir = join105(homeDir, ".claudekit", "tmp", `claudekit-${timestamp}-${counter}`);
+      const fallbackTempDir = join107(homeDir, ".claudekit", "tmp", `claudekit-${timestamp}-${counter}`);
       try {
         await mkdir30(fallbackTempDir, { recursive: true });
         logger.debug(`Created temp directory (fallback): ${fallbackTempDir}`);
@@ -103053,20 +103327,20 @@ async function handleDownload(ctx) {
   };
 }
 // src/commands/init/phases/merge-handler.ts
-import { join as join123 } from "node:path";
+import { join as join125 } from "node:path";
 
 // src/domains/installation/deletion-handler.ts
 import { existsSync as existsSync66, lstatSync as lstatSync3, readdirSync as readdirSync10, rmSync as rmSync2, rmdirSync, unlinkSync as unlinkSync4 } from "node:fs";
-import { dirname as dirname38, join as join108, relative as relative22, resolve as resolve43, sep as sep12 } from "node:path";
+import { dirname as dirname38, join as join110, relative as relative22, resolve as resolve43, sep as sep12 } from "node:path";
 
 // src/services/file-operations/manifest/manifest-reader.ts
 init_metadata_migration();
 init_logger();
 init_types3();
 var import_fs_extra11 = __toESM(require_lib(), 1);
-import { join as join107 } from "node:path";
+import { join as join109 } from "node:path";
 async function readManifest(claudeDir3) {
-  const metadataPath = join107(claudeDir3, "metadata.json");
+  const metadataPath = join109(claudeDir3, "metadata.json");
   if (!await import_fs_extra11.pathExists(metadataPath)) {
     return null;
   }
@@ -103252,7 +103526,7 @@ function collectFilesRecursively(dir, baseDir) {
   try {
     const entries = readdirSync10(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join108(dir, entry.name);
+      const fullPath = join110(dir, entry.name);
       const relativePath = relative22(baseDir, fullPath);
       if (entry.isDirectory()) {
         results.push(...collectFilesRecursively(fullPath, baseDir));
@@ -103320,7 +103594,7 @@ function deletePath(fullPath, claudeDir3) {
   }
 }
 async function updateMetadataAfterDeletion(claudeDir3, deletedPaths) {
-  const metadataPath = join108(claudeDir3, "metadata.json");
+  const metadataPath = join110(claudeDir3, "metadata.json");
   if (!await import_fs_extra12.pathExists(metadataPath)) {
     return;
   }
@@ -103375,7 +103649,7 @@ async function handleDeletions(sourceMetadata, claudeDir3, kitType) {
   const userMetadata = await readManifest(claudeDir3);
   const result = { deletedPaths: [], preservedPaths: [], errors: [] };
   for (const path16 of deletions) {
-    const fullPath = join108(claudeDir3, path16);
+    const fullPath = join110(claudeDir3, path16);
     const normalizedPath = resolve43(fullPath);
     const normalizedClaudeDir = resolve43(claudeDir3);
     if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep12}`)) {
@@ -103415,7 +103689,7 @@ init_logger();
 init_types3();
 var import_fs_extra16 = __toESM(require_lib(), 1);
 var import_ignore3 = __toESM(require_ignore(), 1);
-import { dirname as dirname42, join as join113, relative as relative25 } from "node:path";
+import { dirname as dirname42, join as join115, relative as relative25 } from "node:path";
 
 // src/domains/installation/selective-merger.ts
 import { stat as stat18 } from "node:fs/promises";
@@ -103591,7 +103865,7 @@ class SelectiveMerger {
 
 // src/domains/installation/merger/deleted-skill-preservation.ts
 init_metadata_migration();
-import { dirname as dirname39, join as join109, relative as relative23 } from "node:path";
+import { dirname as dirname39, join as join111, relative as relative23 } from "node:path";
 var import_fs_extra13 = __toESM(require_lib(), 1);
 async function findIgnoredSkillDirectories({
   files,
@@ -103619,7 +103893,7 @@ async function findIgnoredSkillDirectories({
     return root ? [root] : [];
   }));
   for (const [metadataRoot, sourceRoot] of sourceSkillRoots) {
-    const destSkillRoot = join109(destDir, ...sourceRoot.split("/"));
+    const destSkillRoot = join111(destDir, ...sourceRoot.split("/"));
     const skillExists = await import_fs_extra13.pathExists(destSkillRoot);
     if (existingIgnoredRoots.has(metadataRoot) || !skillExists && previouslyTrackedRoots.has(metadataRoot)) {
       ignoredSkillDirectories.add(metadataRoot);
@@ -103669,7 +103943,7 @@ init_logger();
 var import_fs_extra14 = __toESM(require_lib(), 1);
 var import_ignore2 = __toESM(require_ignore(), 1);
 import { relative as relative24 } from "node:path";
-import { join as join110 } from "node:path";
+import { join as join112 } from "node:path";
 
 // node_modules/@isaacs/balanced-match/dist/esm/index.js
 var balanced = (a3, b3, str2) => {
@@ -105125,7 +105399,7 @@ class FileScanner {
     const files = [];
     const entries = await import_fs_extra14.readdir(dir, { encoding: "utf8" });
     for (const entry of entries) {
-      const fullPath = join110(dir, entry);
+      const fullPath = join112(dir, entry);
       const relativePath = relative24(baseDir, fullPath);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
       const stats = await import_fs_extra14.lstat(fullPath);
@@ -105161,13 +105435,13 @@ class FileScanner {
 // src/domains/installation/merger/settings-processor.ts
 import { execSync as execSync5 } from "node:child_process";
 import { homedir as homedir46 } from "node:os";
-import { dirname as dirname41, join as join112 } from "node:path";
+import { dirname as dirname41, join as join114 } from "node:path";
 
 // src/domains/config/installed-settings-tracker.ts
 init_shared();
 import { existsSync as existsSync67 } from "node:fs";
 import { mkdir as mkdir31, readFile as readFile52, writeFile as writeFile27 } from "node:fs/promises";
-import { dirname as dirname40, join as join111 } from "node:path";
+import { dirname as dirname40, join as join113 } from "node:path";
 var CK_JSON_FILE = ".ck.json";
 
 class InstalledSettingsTracker {
@@ -105181,9 +105455,9 @@ class InstalledSettingsTracker {
   }
   getCkJsonPath() {
     if (this.isGlobal) {
-      return join111(this.projectDir, CK_JSON_FILE);
+      return join113(this.projectDir, CK_JSON_FILE);
     }
-    return join111(this.projectDir, ".claude", CK_JSON_FILE);
+    return join113(this.projectDir, ".claude", CK_JSON_FILE);
   }
   async loadInstalledSettings() {
     const ckJsonPath = this.getCkJsonPath();
@@ -105451,10 +105725,10 @@ class SettingsProcessor {
     };
     try {
       if (this.isGlobal) {
-        await addFromConfig(join112(this.projectDir, ".ck.json"));
+        await addFromConfig(join114(this.projectDir, ".ck.json"));
       } else {
-        await addFromConfig(join112(PathResolver.getGlobalKitDir(), ".ck.json"));
-        await addFromConfig(join112(this.projectDir, ".claude", ".ck.json"));
+        await addFromConfig(join114(PathResolver.getGlobalKitDir(), ".ck.json"));
+        await addFromConfig(join114(this.projectDir, ".claude", ".ck.json"));
       }
     } catch (error) {
       logger.debug(`Failed to load .ck.json hook preferences: ${error instanceof Error ? error.message : "unknown"}`);
@@ -105841,7 +106115,7 @@ class SettingsProcessor {
       return false;
     }
     const configuredGlobalDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
-    const defaultGlobalDir = join112(homedir46(), ".claude").replace(/\\/g, "/");
+    const defaultGlobalDir = join114(homedir46(), ".claude").replace(/\\/g, "/");
     return configuredGlobalDir !== defaultGlobalDir;
   }
   getClaudeCommandRoot() {
@@ -105861,7 +106135,7 @@ class SettingsProcessor {
     return true;
   }
   async repairSiblingSettingsLocal(destFile) {
-    const settingsLocalPath = join112(dirname41(destFile), "settings.local.json");
+    const settingsLocalPath = join114(dirname41(destFile), "settings.local.json");
     if (settingsLocalPath === destFile || !await import_fs_extra15.pathExists(settingsLocalPath)) {
       return;
     }
@@ -105958,7 +106232,7 @@ class SettingsProcessor {
     }
   }
   async dynamicTeamHookHandlerExists(destFile, handler) {
-    return import_fs_extra15.pathExists(join112(dirname41(destFile), "hooks", handler));
+    return import_fs_extra15.pathExists(join114(dirname41(destFile), "hooks", handler));
   }
   removeDynamicTeamHookRegistrations(settings) {
     let removed = 0;
@@ -106099,7 +106373,7 @@ class CopyExecutor {
     for (const file of files) {
       const relativePath = relative25(sourceDir, file);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
-      const destPath = join113(destDir, relativePath);
+      const destPath = join115(destDir, relativePath);
       if (await import_fs_extra16.pathExists(destPath)) {
         if (this.fileScanner.shouldNeverCopy(normalizedRelativePath)) {
           logger.debug(`Security-sensitive file exists but won't be overwritten: ${normalizedRelativePath}`);
@@ -106123,7 +106397,7 @@ class CopyExecutor {
     for (const file of files) {
       const relativePath = relative25(sourceDir, file);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
-      const destPath = join113(destDir, relativePath);
+      const destPath = join115(destDir, relativePath);
       if (this.fileScanner.shouldNeverCopy(normalizedRelativePath)) {
         logger.debug(`Skipping security-sensitive file: ${normalizedRelativePath}`);
         skippedCount++;
@@ -106335,15 +106609,15 @@ class FileMerger {
 
 // src/domains/migration/legacy-migration.ts
 import { readdir as readdir28, stat as stat19 } from "node:fs/promises";
-import { join as join117, relative as relative26 } from "node:path";
+import { join as join119, relative as relative26 } from "node:path";
 // src/services/file-operations/manifest/manifest-tracker.ts
-import { join as join116 } from "node:path";
+import { join as join118 } from "node:path";
 
 // src/domains/migration/release-manifest.ts
 init_logger();
 init_zod();
 var import_fs_extra17 = __toESM(require_lib(), 1);
-import { join as join114 } from "node:path";
+import { join as join116 } from "node:path";
 var ReleaseManifestFileSchema = exports_external.object({
   path: exports_external.string(),
   checksum: exports_external.string().regex(/^[a-f0-9]{64}$/),
@@ -106358,7 +106632,7 @@ var ReleaseManifestSchema = exports_external.object({
 
 class ReleaseManifestLoader {
   static async load(extractDir) {
-    const manifestPath = join114(extractDir, "release-manifest.json");
+    const manifestPath = join116(extractDir, "release-manifest.json");
     try {
       const content = await import_fs_extra17.readFile(manifestPath, "utf-8");
       const parsed = JSON.parse(content);
@@ -106381,12 +106655,12 @@ init_p_limit();
 
 // src/services/file-operations/manifest/manifest-updater.ts
 init_metadata_migration();
-import { join as join115 } from "node:path";
+import { join as join117 } from "node:path";
 init_logger();
 init_types3();
 var import_fs_extra18 = __toESM(require_lib(), 1);
-async function writeManifest(claudeDir3, kitName, version, scope, kitType, trackedFiles, userConfigFiles, ignoredSkills = []) {
-  const metadataPath = join115(claudeDir3, "metadata.json");
+async function writeManifest(claudeDir3, kitName, version, scope, kitType, trackedFiles, userConfigFiles, ignoredSkills = [], installModePreference) {
+  const metadataPath = join117(claudeDir3, "metadata.json");
   const kit = kitType || (/\bmarketing\b/i.test(kitName) ? "marketing" : "engineer");
   await import_fs_extra18.ensureFile(metadataPath);
   let release = null;
@@ -106411,6 +106685,7 @@ async function writeManifest(claudeDir3, kitName, version, scope, kitType, track
     const existingKits = existingMetadata.kits || {};
     const normalizedTrackedPaths = trackedFiles.map((file) => normalizeMetadataPath(file.path));
     const existingIgnoredSkills = existingKits[kit]?.ignoredSkills ?? [];
+    const existingInstallModePreference = existingKits[kit]?.installModePreference;
     const mergedIgnoredSkills = uniqueNormalizedSkillRoots([
       ...existingIgnoredSkills,
       ...ignoredSkills
@@ -106420,7 +106695,8 @@ async function writeManifest(claudeDir3, kitName, version, scope, kitType, track
       version,
       installedAt,
       files: trackedFiles.length > 0 ? trackedFiles : undefined,
-      ignoredSkills: mergedIgnoredSkills.length > 0 ? mergedIgnoredSkills : undefined
+      ignoredSkills: mergedIgnoredSkills.length > 0 ? mergedIgnoredSkills : undefined,
+      installModePreference: installModePreference ?? existingInstallModePreference
     };
     const otherKitsExist = Object.keys(existingKits).some((k2) => k2 !== kit);
     const metadata = {
@@ -106458,7 +106734,7 @@ function uniqueNormalizedSkillRoots(paths) {
   }))).sort();
 }
 async function removeKitFromManifest(claudeDir3, kit, options2) {
-  const metadataPath = join115(claudeDir3, "metadata.json");
+  const metadataPath = join117(claudeDir3, "metadata.json");
   if (!await import_fs_extra18.pathExists(metadataPath))
     return false;
   let release = null;
@@ -106490,7 +106766,7 @@ async function removeKitFromManifest(claudeDir3, kit, options2) {
   }
 }
 async function retainTrackedFilesInManifest(claudeDir3, retainedPaths, options2) {
-  const metadataPath = join115(claudeDir3, "metadata.json");
+  const metadataPath = join117(claudeDir3, "metadata.json");
   if (!await import_fs_extra18.pathExists(metadataPath))
     return false;
   const normalizedPaths = new Set(retainedPaths.map((path17) => path17.replace(/\\/g, "/")));
@@ -106671,7 +106947,7 @@ function buildFileTrackingList(options2) {
     if (!isGlobal && !installedPath.startsWith(".claude/"))
       continue;
     const relativePath = isGlobal ? installedPath : installedPath.replace(/^\.claude\//, "");
-    const filePath = join116(claudeDir3, relativePath);
+    const filePath = join118(claudeDir3, relativePath);
     const manifestEntry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
     const ownership = manifestEntry ? "ck" : "user";
     filesToTrack.push({
@@ -106695,7 +106971,7 @@ async function trackFilesWithProgress(filesToTrack, manifestOptions) {
     }
   });
   trackingSpinner.succeed(`Tracked ${trackResult.success} files`);
-  await writeManifest(manifestOptions.claudeDir, manifestOptions.kitName, manifestOptions.releaseTag, manifestOptions.mode, manifestOptions.kitType, tracker.getTrackedFiles(), tracker.getUserConfigFiles(), manifestOptions.ignoredSkills);
+  await writeManifest(manifestOptions.claudeDir, manifestOptions.kitName, manifestOptions.releaseTag, manifestOptions.mode, manifestOptions.kitType, tracker.getTrackedFiles(), tracker.getUserConfigFiles(), manifestOptions.ignoredSkills, manifestOptions.installModePreference);
   return trackResult;
 }
 // src/services/file-operations/manifest-writer.ts
@@ -106725,8 +107001,8 @@ class ManifestWriter {
   getTrackedFiles() {
     return this.tracker.getTrackedFiles();
   }
-  async writeManifest(claudeDir3, kitName, version, scope, kitType, ignoredSkills) {
-    return writeManifest(claudeDir3, kitName, version, scope, kitType, this.getTrackedFiles(), this.getUserConfigFiles(), ignoredSkills);
+  async writeManifest(claudeDir3, kitName, version, scope, kitType, ignoredSkills, installModePreference) {
+    return writeManifest(claudeDir3, kitName, version, scope, kitType, this.getTrackedFiles(), this.getUserConfigFiles(), ignoredSkills, installModePreference);
   }
   static async readManifest(claudeDir3) {
     return readManifest(claudeDir3);
@@ -106782,7 +107058,7 @@ class LegacyMigration {
         continue;
       if (SKIP_DIRS_ALL.includes(entry))
         continue;
-      const fullPath = join117(dir, entry);
+      const fullPath = join119(dir, entry);
       let stats;
       try {
         stats = await stat19(fullPath);
@@ -106892,7 +107168,7 @@ User-created files (sample):`);
     ];
     if (filesToChecksum.length > 0) {
       const checksumResults = await mapWithLimit(filesToChecksum, async ({ relativePath, ownership }) => {
-        const fullPath = join117(claudeDir3, relativePath);
+        const fullPath = join119(claudeDir3, relativePath);
         const checksum = await OwnershipChecker.calculateChecksum(fullPath);
         return { relativePath, checksum, ownership };
       }, getOptimalConcurrency());
@@ -106913,7 +107189,7 @@ User-created files (sample):`);
       installedAt: new Date().toISOString(),
       files: trackedFiles
     };
-    const metadataPath = join117(claudeDir3, "metadata.json");
+    const metadataPath = join119(claudeDir3, "metadata.json");
     await import_fs_extra19.writeFile(metadataPath, JSON.stringify(updatedMetadata, null, 2));
     logger.success(`Migration complete: tracked ${trackedFiles.length} files`);
     return true;
@@ -107019,7 +107295,7 @@ function buildConflictSummary(fileConflicts, hookConflicts, mcpConflicts) {
 init_logger();
 init_skip_directories();
 var import_fs_extra20 = __toESM(require_lib(), 1);
-import { join as join118, relative as relative27, resolve as resolve44 } from "node:path";
+import { join as join120, relative as relative27, resolve as resolve44 } from "node:path";
 
 class FileScanner2 {
   static async getFiles(dirPath, relativeTo) {
@@ -107035,7 +107311,7 @@ class FileScanner2 {
           logger.debug(`Skipping directory: ${entry}`);
           continue;
         }
-        const fullPath = join118(dirPath, entry);
+        const fullPath = join120(dirPath, entry);
         if (!FileScanner2.isSafePath(basePath, fullPath)) {
           logger.warning(`Skipping potentially unsafe path: ${entry}`);
           continue;
@@ -107070,8 +107346,8 @@ class FileScanner2 {
     return files;
   }
   static async findCustomFiles(destDir, sourceDir, subPath) {
-    const destSubDir = join118(destDir, subPath);
-    const sourceSubDir = join118(sourceDir, subPath);
+    const destSubDir = join120(destDir, subPath);
+    const sourceSubDir = join120(sourceDir, subPath);
     logger.debug(`findCustomFiles - destDir: ${destDir}`);
     logger.debug(`findCustomFiles - sourceDir: ${sourceDir}`);
     logger.debug(`findCustomFiles - subPath: "${subPath}"`);
@@ -107112,12 +107388,12 @@ class FileScanner2 {
 init_logger();
 var import_fs_extra21 = __toESM(require_lib(), 1);
 import { lstat as lstat10, mkdir as mkdir32, readdir as readdir31, stat as stat20 } from "node:fs/promises";
-import { join as join120 } from "node:path";
+import { join as join122 } from "node:path";
 
 // src/services/transformers/commands-prefix/content-transformer.ts
 init_logger();
 import { readFile as readFile56, readdir as readdir30, writeFile as writeFile31 } from "node:fs/promises";
-import { join as join119 } from "node:path";
+import { join as join121 } from "node:path";
 var TRANSFORMABLE_EXTENSIONS = new Set([
   ".md",
   ".txt",
@@ -107177,7 +107453,7 @@ async function transformCommandReferences(directory, options2 = {}) {
   async function processDirectory(dir) {
     const entries = await readdir30(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join119(dir, entry.name);
+      const fullPath = join121(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -107252,14 +107528,14 @@ function shouldApplyPrefix(options2) {
 // src/services/transformers/commands-prefix/prefix-applier.ts
 async function applyPrefix(extractDir) {
   validatePath(extractDir, "extractDir");
-  const commandsDir = join120(extractDir, ".claude", "commands");
+  const commandsDir = join122(extractDir, ".claude", "commands");
   if (!await import_fs_extra21.pathExists(commandsDir)) {
     logger.verbose("No commands directory found, skipping prefix application");
     return;
   }
   logger.info("Applying /ck: prefix to slash commands...");
-  const backupDir = join120(extractDir, ".commands-backup");
-  const tempDir = join120(extractDir, ".commands-prefix-temp");
+  const backupDir = join122(extractDir, ".commands-backup");
+  const tempDir = join122(extractDir, ".commands-prefix-temp");
   try {
     const entries = await readdir31(commandsDir);
     if (entries.length === 0) {
@@ -107267,7 +107543,7 @@ async function applyPrefix(extractDir) {
       return;
     }
     if (entries.length === 1 && entries[0] === "ck") {
-      const ckDir2 = join120(commandsDir, "ck");
+      const ckDir2 = join122(commandsDir, "ck");
       const ckStat = await stat20(ckDir2);
       if (ckStat.isDirectory()) {
         logger.verbose("Commands already have /ck: prefix, skipping");
@@ -107277,17 +107553,17 @@ async function applyPrefix(extractDir) {
     await import_fs_extra21.copy(commandsDir, backupDir);
     logger.verbose("Created backup of commands directory");
     await mkdir32(tempDir, { recursive: true });
-    const ckDir = join120(tempDir, "ck");
+    const ckDir = join122(tempDir, "ck");
     await mkdir32(ckDir, { recursive: true });
     let processedCount = 0;
     for (const entry of entries) {
-      const sourcePath = join120(commandsDir, entry);
+      const sourcePath = join122(commandsDir, entry);
       const stats = await lstat10(sourcePath);
       if (stats.isSymbolicLink()) {
         logger.warning(`Skipping symlink for security: ${entry}`);
         continue;
       }
-      const destPath = join120(ckDir, entry);
+      const destPath = join122(ckDir, entry);
       await import_fs_extra21.copy(sourcePath, destPath, {
         overwrite: false,
         errorOnExist: true
@@ -107305,7 +107581,7 @@ async function applyPrefix(extractDir) {
     await import_fs_extra21.move(tempDir, commandsDir);
     await import_fs_extra21.remove(backupDir);
     logger.success("Successfully reorganized commands to /ck: prefix");
-    const claudeDir3 = join120(extractDir, ".claude");
+    const claudeDir3 = join122(extractDir, ".claude");
     logger.info("Transforming command references in file contents...");
     const transformResult = await transformCommandReferences(claudeDir3, {
       verbose: logger.isVerbose()
@@ -107343,20 +107619,20 @@ async function applyPrefix(extractDir) {
 // src/services/transformers/commands-prefix/prefix-cleaner.ts
 init_metadata_migration();
 import { lstat as lstat12, readdir as readdir33 } from "node:fs/promises";
-import { join as join122 } from "node:path";
+import { join as join124 } from "node:path";
 init_logger();
 var import_fs_extra23 = __toESM(require_lib(), 1);
 
 // src/services/transformers/commands-prefix/file-processor.ts
 import { lstat as lstat11, readdir as readdir32 } from "node:fs/promises";
-import { join as join121 } from "node:path";
+import { join as join123 } from "node:path";
 init_logger();
 var import_fs_extra22 = __toESM(require_lib(), 1);
 async function scanDirectoryFiles(dir) {
   const files = [];
   const entries = await readdir32(dir);
   for (const entry of entries) {
-    const fullPath = join121(dir, entry);
+    const fullPath = join123(dir, entry);
     const stats = await lstat11(fullPath);
     if (stats.isSymbolicLink()) {
       continue;
@@ -107484,8 +107760,8 @@ function isDifferentKitDirectory(dirName, currentKit) {
 async function cleanupCommandsDirectory(targetDir, isGlobal, options2 = {}) {
   const { dryRun = false } = options2;
   validatePath(targetDir, "targetDir");
-  const claudeDir3 = isGlobal ? targetDir : join122(targetDir, ".claude");
-  const commandsDir = join122(claudeDir3, "commands");
+  const claudeDir3 = isGlobal ? targetDir : join124(targetDir, ".claude");
+  const commandsDir = join124(claudeDir3, "commands");
   const accumulator = {
     results: [],
     deletedCount: 0,
@@ -107527,7 +107803,7 @@ async function cleanupCommandsDirectory(targetDir, isGlobal, options2 = {}) {
   }
   const metadataForChecks = options2.kitType ? createKitSpecificMetadata(metadata, options2.kitType) : metadata;
   for (const entry of entries) {
-    const entryPath = join122(commandsDir, entry);
+    const entryPath = join124(commandsDir, entry);
     const stats = await lstat12(entryPath);
     if (stats.isSymbolicLink()) {
       addSymlinkSkip(entry, accumulator);
@@ -107576,6 +107852,18 @@ class CommandsPrefix {
 init_logger();
 init_output_manager();
 var import_fs_extra24 = __toESM(require_lib(), 1);
+function normalizeManifestPath(path17) {
+  return path17.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\/+$/, "");
+}
+function filterDeletedInstalledFiles(installedFiles, deletedPaths) {
+  if (deletedPaths.length === 0)
+    return installedFiles;
+  const deleted = deletedPaths.map((path17) => normalizeManifestPath(path17)).filter(Boolean);
+  return installedFiles.filter((file) => {
+    const normalized = normalizeManifestPath(file);
+    return !deleted.some((path17) => normalized === path17 || normalized.startsWith(`${path17}/`) || normalized === `.claude/${path17}` || normalized.startsWith(`.claude/${path17}/`));
+  });
+}
 async function handleMerge(ctx) {
   if (ctx.cancelled || !ctx.extractDir || !ctx.resolvedDir || !ctx.claudeDir || !ctx.kit || !ctx.kitType) {
     return ctx;
@@ -107584,7 +107872,7 @@ async function handleMerge(ctx) {
   let customClaudeFiles = [];
   if (!ctx.options.fresh) {
     logger.info("Scanning for custom .claude files...");
-    const scanSourceDir = ctx.options.global ? join123(ctx.extractDir, ".claude") : ctx.extractDir;
+    const scanSourceDir = ctx.options.global ? join125(ctx.extractDir, ".claude") : ctx.extractDir;
     const scanTargetSubdir = ctx.options.global ? "" : ".claude";
     customClaudeFiles = await FileScanner2.findCustomFiles(ctx.resolvedDir, scanSourceDir, scanTargetSubdir);
   } else {
@@ -107623,7 +107911,7 @@ async function handleMerge(ctx) {
   merger.setRestoreCkHooks(ctx.options.restoreCkHooks);
   merger.setProjectDir(ctx.resolvedDir);
   merger.setKitName(ctx.kit.name);
-  merger.setZombiePrunerHookDir(join123(ctx.claudeDir, "hooks"));
+  merger.setZombiePrunerHookDir(join125(ctx.claudeDir, "hooks"));
   if (ctx.kitType) {
     merger.setMultiKitContext(ctx.claudeDir, ctx.kitType);
   }
@@ -107652,8 +107940,8 @@ async function handleMerge(ctx) {
       return { ...ctx, cancelled: true };
     }
   }
-  const sourceDir = ctx.options.global ? join123(ctx.extractDir, ".claude") : ctx.extractDir;
-  const sourceMetadataPath = ctx.options.global ? join123(sourceDir, "metadata.json") : join123(sourceDir, ".claude", "metadata.json");
+  const sourceDir = ctx.options.global ? join125(ctx.extractDir, ".claude") : ctx.extractDir;
+  const sourceMetadataPath = ctx.options.global ? join125(sourceDir, "metadata.json") : join125(sourceDir, ".claude", "metadata.json");
   let sourceMetadata = null;
   try {
     if (await import_fs_extra24.pathExists(sourceMetadataPath)) {
@@ -107672,9 +107960,11 @@ async function handleMerge(ctx) {
     const summary = buildConflictSummary(fileConflicts, [], []);
     displayConflictSummary(summary);
   }
+  let deletedPaths = [];
   try {
     if (sourceMetadata?.deletions && sourceMetadata.deletions.length > 0) {
       const deletionResult = await handleDeletions(sourceMetadata, ctx.claudeDir, ctx.kitType);
+      deletedPaths = deletionResult.deletedPaths;
       if (deletionResult.deletedPaths.length > 0) {
         logger.info(`Removed ${deletionResult.deletedPaths.length} deprecated file(s)`);
         for (const path17 of deletionResult.deletedPaths) {
@@ -107688,7 +107978,7 @@ async function handleMerge(ctx) {
   } catch (error) {
     logger.debug(`Cleanup of deprecated files failed: ${error}`);
   }
-  const installedFiles = merger.getAllInstalledFiles();
+  const installedFiles = filterDeletedInstalledFiles(merger.getAllInstalledFiles(), deletedPaths);
   const filesToTrack = buildFileTrackingList({
     installedFiles,
     claudeDir: ctx.claudeDir,
@@ -107702,7 +107992,8 @@ async function handleMerge(ctx) {
     releaseTag: installedVersion,
     mode: ctx.options.global ? "global" : "local",
     kitType: ctx.kitType,
-    ignoredSkills: merger.getIgnoredSkillDirectories()
+    ignoredSkills: merger.getIgnoredSkillDirectories(),
+    installModePreference: ctx.options.global && ctx.kitType === "engineer" ? ctx.options.installMode : undefined
   });
   return {
     ...ctx,
@@ -107711,7 +108002,7 @@ async function handleMerge(ctx) {
   };
 }
 // src/commands/init/phases/migration-handler.ts
-import { join as join131 } from "node:path";
+import { join as join133 } from "node:path";
 
 // src/domains/skills/skills-detector.ts
 init_logger();
@@ -107727,7 +108018,7 @@ init_types3();
 var import_fs_extra25 = __toESM(require_lib(), 1);
 import { createHash as createHash8 } from "node:crypto";
 import { readFile as readFile58, readdir as readdir34, writeFile as writeFile32 } from "node:fs/promises";
-import { join as join124, relative as relative28 } from "node:path";
+import { join as join126, relative as relative28 } from "node:path";
 
 class SkillsManifestManager {
   static MANIFEST_FILENAME = ".skills-manifest.json";
@@ -107749,12 +108040,12 @@ class SkillsManifestManager {
     return manifest;
   }
   static async writeManifest(skillsDir2, manifest) {
-    const manifestPath = join124(skillsDir2, SkillsManifestManager.MANIFEST_FILENAME);
+    const manifestPath = join126(skillsDir2, SkillsManifestManager.MANIFEST_FILENAME);
     await writeFile32(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
     logger.debug(`Wrote manifest to: ${manifestPath}`);
   }
   static async readManifest(skillsDir2) {
-    const manifestPath = join124(skillsDir2, SkillsManifestManager.MANIFEST_FILENAME);
+    const manifestPath = join126(skillsDir2, SkillsManifestManager.MANIFEST_FILENAME);
     if (!await import_fs_extra25.pathExists(manifestPath)) {
       logger.debug(`No manifest found at: ${manifestPath}`);
       return null;
@@ -107777,7 +108068,7 @@ class SkillsManifestManager {
       return "flat";
     }
     for (const dir of dirs.slice(0, 3)) {
-      const dirPath = join124(skillsDir2, dir.name);
+      const dirPath = join126(skillsDir2, dir.name);
       const subEntries = await readdir34(dirPath, { withFileTypes: true });
       const hasSubdirs = subEntries.some((entry) => entry.isDirectory());
       if (hasSubdirs) {
@@ -107796,7 +108087,7 @@ class SkillsManifestManager {
       const entries = await readdir34(skillsDir2, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory() && !BUILD_ARTIFACT_DIRS.includes(entry.name) && !entry.name.startsWith(".")) {
-          const skillPath = join124(skillsDir2, entry.name);
+          const skillPath = join126(skillsDir2, entry.name);
           const hash = await SkillsManifestManager.hashDirectory(skillPath);
           skills.push({
             name: entry.name,
@@ -107808,11 +108099,11 @@ class SkillsManifestManager {
       const categories = await readdir34(skillsDir2, { withFileTypes: true });
       for (const category of categories) {
         if (category.isDirectory() && !BUILD_ARTIFACT_DIRS.includes(category.name) && !category.name.startsWith(".")) {
-          const categoryPath = join124(skillsDir2, category.name);
+          const categoryPath = join126(skillsDir2, category.name);
           const skillEntries = await readdir34(categoryPath, { withFileTypes: true });
           for (const skillEntry of skillEntries) {
             if (skillEntry.isDirectory() && !skillEntry.name.startsWith(".")) {
-              const skillPath = join124(categoryPath, skillEntry.name);
+              const skillPath = join126(categoryPath, skillEntry.name);
               const hash = await SkillsManifestManager.hashDirectory(skillPath);
               skills.push({
                 name: skillEntry.name,
@@ -107842,7 +108133,7 @@ class SkillsManifestManager {
     const files = [];
     const entries = await readdir34(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join124(dirPath, entry.name);
+      const fullPath = join126(dirPath, entry.name);
       if (entry.name.startsWith(".") || BUILD_ARTIFACT_DIRS.includes(entry.name)) {
         continue;
       }
@@ -107964,7 +108255,7 @@ function getPathMapping(skillName, oldBasePath, newBasePath) {
 // src/domains/skills/detection/script-detector.ts
 var import_fs_extra26 = __toESM(require_lib(), 1);
 import { readdir as readdir35 } from "node:fs/promises";
-import { join as join125 } from "node:path";
+import { join as join127 } from "node:path";
 async function scanDirectory(skillsDir2) {
   if (!await import_fs_extra26.pathExists(skillsDir2)) {
     return ["flat", []];
@@ -107977,12 +108268,12 @@ async function scanDirectory(skillsDir2) {
   let totalSkillLikeCount = 0;
   const allSkills = [];
   for (const dir of dirs) {
-    const dirPath = join125(skillsDir2, dir.name);
+    const dirPath = join127(skillsDir2, dir.name);
     const subEntries = await readdir35(dirPath, { withFileTypes: true });
     const subdirs = subEntries.filter((entry) => entry.isDirectory() && !entry.name.startsWith("."));
     if (subdirs.length > 0) {
       for (const subdir of subdirs.slice(0, 3)) {
-        const subdirPath = join125(dirPath, subdir.name);
+        const subdirPath = join127(dirPath, subdir.name);
         const subdirFiles = await readdir35(subdirPath, { withFileTypes: true });
         const hasSkillMarker = subdirFiles.some((file) => file.isFile() && (file.name === "skill.md" || file.name === "README.md" || file.name === "readme.md" || file.name === "config.json" || file.name === "package.json"));
         if (hasSkillMarker) {
@@ -108139,12 +108430,12 @@ class SkillsMigrationDetector {
 // src/domains/skills/skills-migrator.ts
 init_logger();
 init_types3();
-import { join as join130 } from "node:path";
+import { join as join132 } from "node:path";
 
 // src/domains/skills/migrator/migration-executor.ts
 init_logger();
 import { copyFile as copyFile6, mkdir as mkdir33, readdir as readdir36, rm as rm13 } from "node:fs/promises";
-import { join as join126 } from "node:path";
+import { join as join128 } from "node:path";
 var import_fs_extra28 = __toESM(require_lib(), 1);
 
 // src/domains/skills/skills-migration-prompts.ts
@@ -108309,8 +108600,8 @@ async function copySkillDirectory(sourceDir, destDir) {
   await mkdir33(destDir, { recursive: true });
   const entries = await readdir36(sourceDir, { withFileTypes: true });
   for (const entry of entries) {
-    const sourcePath = join126(sourceDir, entry.name);
-    const destPath = join126(destDir, entry.name);
+    const sourcePath = join128(sourceDir, entry.name);
+    const destPath = join128(destDir, entry.name);
     if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
       continue;
     }
@@ -108325,7 +108616,7 @@ async function executeInternal(mappings, customizations, currentSkillsDir, inter
   const migrated = [];
   const preserved = [];
   const errors2 = [];
-  const tempDir = join126(currentSkillsDir, "..", ".skills-migration-temp");
+  const tempDir = join128(currentSkillsDir, "..", ".skills-migration-temp");
   await mkdir33(tempDir, { recursive: true });
   try {
     for (const mapping of mappings) {
@@ -108346,9 +108637,9 @@ async function executeInternal(mappings, customizations, currentSkillsDir, inter
           }
         }
         const category = mapping.category;
-        const targetPath = category ? join126(tempDir, category, skillName) : join126(tempDir, skillName);
+        const targetPath = category ? join128(tempDir, category, skillName) : join128(tempDir, skillName);
         if (category) {
-          await mkdir33(join126(tempDir, category), { recursive: true });
+          await mkdir33(join128(tempDir, category), { recursive: true });
         }
         await copySkillDirectory(currentSkillPath, targetPath);
         migrated.push(skillName);
@@ -108415,7 +108706,7 @@ init_logger();
 init_types3();
 var import_fs_extra29 = __toESM(require_lib(), 1);
 import { copyFile as copyFile7, mkdir as mkdir34, readdir as readdir37, rm as rm14, stat as stat21 } from "node:fs/promises";
-import { basename as basename27, join as join127, normalize as normalize9 } from "node:path";
+import { basename as basename27, join as join129, normalize as normalize9 } from "node:path";
 function validatePath2(path17, paramName) {
   if (!path17 || typeof path17 !== "string") {
     throw new SkillsMigrationError(`${paramName} must be a non-empty string`);
@@ -108441,7 +108732,7 @@ class SkillsBackupManager {
     const timestamp = Date.now();
     const randomSuffix = Math.random().toString(36).substring(2, 8);
     const backupDirName = `${SkillsBackupManager.BACKUP_PREFIX}${timestamp}-${randomSuffix}`;
-    const backupDir = parentDir ? join127(parentDir, backupDirName) : join127(skillsDir2, "..", backupDirName);
+    const backupDir = parentDir ? join129(parentDir, backupDirName) : join129(skillsDir2, "..", backupDirName);
     logger.info(`Creating backup at: ${backupDir}`);
     try {
       await mkdir34(backupDir, { recursive: true });
@@ -108492,7 +108783,7 @@ class SkillsBackupManager {
     }
     try {
       const entries = await readdir37(parentDir, { withFileTypes: true });
-      const backups = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith(SkillsBackupManager.BACKUP_PREFIX)).map((entry) => join127(parentDir, entry.name));
+      const backups = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith(SkillsBackupManager.BACKUP_PREFIX)).map((entry) => join129(parentDir, entry.name));
       backups.sort().reverse();
       return backups;
     } catch (error) {
@@ -108520,8 +108811,8 @@ class SkillsBackupManager {
   static async copyDirectory(sourceDir, destDir) {
     const entries = await readdir37(sourceDir, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = join127(sourceDir, entry.name);
-      const destPath = join127(destDir, entry.name);
+      const sourcePath = join129(sourceDir, entry.name);
+      const destPath = join129(destDir, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
         continue;
       }
@@ -108537,7 +108828,7 @@ class SkillsBackupManager {
     let size = 0;
     const entries = await readdir37(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join127(dirPath, entry.name);
+      const fullPath = join129(dirPath, entry.name);
       if (entry.isSymbolicLink()) {
         continue;
       }
@@ -108573,12 +108864,12 @@ init_skip_directories();
 import { createHash as createHash9 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { readFile as readFile59, readdir as readdir38 } from "node:fs/promises";
-import { join as join128, relative as relative29 } from "node:path";
+import { join as join130, relative as relative29 } from "node:path";
 async function getAllFiles(dirPath) {
   const files = [];
   const entries = await readdir38(dirPath, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join128(dirPath, entry.name);
+    const fullPath = join130(dirPath, entry.name);
     if (entry.name.startsWith(".") || BUILD_ARTIFACT_DIRS.includes(entry.name) || entry.isSymbolicLink()) {
       continue;
     }
@@ -108705,7 +108996,7 @@ async function detectFileChanges(currentSkillPath, baselineSkillPath) {
 init_types3();
 var import_fs_extra31 = __toESM(require_lib(), 1);
 import { readdir as readdir39 } from "node:fs/promises";
-import { join as join129, normalize as normalize10 } from "node:path";
+import { join as join131, normalize as normalize10 } from "node:path";
 function validatePath3(path17, paramName) {
   if (!path17 || typeof path17 !== "string") {
     throw new SkillsMigrationError(`${paramName} must be a non-empty string`);
@@ -108726,13 +109017,13 @@ async function scanSkillsDirectory(skillsDir2) {
   if (dirs.length === 0) {
     return ["flat", []];
   }
-  const firstDirPath = join129(skillsDir2, dirs[0].name);
+  const firstDirPath = join131(skillsDir2, dirs[0].name);
   const subEntries = await readdir39(firstDirPath, { withFileTypes: true });
   const subdirs = subEntries.filter((entry) => entry.isDirectory() && !entry.name.startsWith("."));
   if (subdirs.length > 0) {
     let skillLikeCount = 0;
     for (const subdir of subdirs.slice(0, 3)) {
-      const subdirPath = join129(firstDirPath, subdir.name);
+      const subdirPath = join131(firstDirPath, subdir.name);
       const subdirFiles = await readdir39(subdirPath, { withFileTypes: true });
       const hasSkillMarker = subdirFiles.some((file) => file.isFile() && (file.name === "skill.md" || file.name === "README.md" || file.name === "readme.md" || file.name === "config.json" || file.name === "package.json"));
       if (hasSkillMarker) {
@@ -108742,7 +109033,7 @@ async function scanSkillsDirectory(skillsDir2) {
     if (skillLikeCount > 0) {
       const skills = [];
       for (const dir of dirs) {
-        const categoryPath = join129(skillsDir2, dir.name);
+        const categoryPath = join131(skillsDir2, dir.name);
         const skillDirs = await readdir39(categoryPath, { withFileTypes: true });
         skills.push(...skillDirs.filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name));
       }
@@ -108752,7 +109043,7 @@ async function scanSkillsDirectory(skillsDir2) {
   return ["flat", dirs.map((dir) => dir.name)];
 }
 async function findSkillPath(skillsDir2, skillName) {
-  const flatPath = join129(skillsDir2, skillName);
+  const flatPath = join131(skillsDir2, skillName);
   if (await import_fs_extra31.pathExists(flatPath)) {
     return { path: flatPath, category: undefined };
   }
@@ -108761,8 +109052,8 @@ async function findSkillPath(skillsDir2, skillName) {
     if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name === "node_modules") {
       continue;
     }
-    const categoryPath = join129(skillsDir2, entry.name);
-    const skillPath = join129(categoryPath, skillName);
+    const categoryPath = join131(skillsDir2, entry.name);
+    const skillPath = join131(categoryPath, skillName);
     if (await import_fs_extra31.pathExists(skillPath)) {
       return { path: skillPath, category: entry.name };
     }
@@ -108856,7 +109147,7 @@ class SkillsMigrator {
         }
       }
       if (options2.backup && !options2.dryRun) {
-        const claudeDir3 = join130(currentSkillsDir, "..");
+        const claudeDir3 = join132(currentSkillsDir, "..");
         result.backupPath = await SkillsBackupManager.createBackup(currentSkillsDir, claudeDir3);
         logger.success(`Backup created at: ${result.backupPath}`);
       }
@@ -108917,7 +109208,7 @@ async function handleMigration(ctx) {
     logger.debug("Skipping skills migration (fresh installation)");
     return ctx;
   }
-  const newSkillsDir = join131(ctx.extractDir, ".claude", "skills");
+  const newSkillsDir = join133(ctx.extractDir, ".claude", "skills");
   const currentSkillsDir = PathResolver.buildSkillsPath(ctx.resolvedDir, ctx.options.global);
   if (!await import_fs_extra32.pathExists(newSkillsDir) || !await import_fs_extra32.pathExists(currentSkillsDir)) {
     return ctx;
@@ -108941,13 +109232,13 @@ async function handleMigration(ctx) {
 }
 // src/commands/init/phases/opencode-handler.ts
 import { cp as cp4, readdir as readdir41, rm as rm15 } from "node:fs/promises";
-import { join as join133 } from "node:path";
+import { join as join135 } from "node:path";
 
 // src/services/transformers/opencode-path-transformer.ts
 init_logger();
 import { readFile as readFile60, readdir as readdir40, writeFile as writeFile33 } from "node:fs/promises";
 import { platform as platform15 } from "node:os";
-import { extname as extname6, join as join132 } from "node:path";
+import { extname as extname6, join as join134 } from "node:path";
 var IS_WINDOWS2 = platform15() === "win32";
 function getOpenCodeGlobalPath() {
   return "$HOME/.config/opencode/";
@@ -109008,7 +109299,7 @@ async function transformPathsForGlobalOpenCode(directory, options2 = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir40(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join132(dir, entry.name);
+      const fullPath = join134(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".")) {
           continue;
@@ -109047,7 +109338,7 @@ async function handleOpenCode(ctx) {
   if (ctx.cancelled || !ctx.extractDir || !ctx.resolvedDir) {
     return ctx;
   }
-  const openCodeSource = join133(ctx.extractDir, ".opencode");
+  const openCodeSource = join135(ctx.extractDir, ".opencode");
   if (!await import_fs_extra33.pathExists(openCodeSource)) {
     logger.debug("No .opencode directory in archive, skipping");
     return ctx;
@@ -109065,8 +109356,8 @@ async function handleOpenCode(ctx) {
     await import_fs_extra33.ensureDir(targetDir);
     const entries = await readdir41(openCodeSource, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = join133(openCodeSource, entry.name);
-      const targetPath = join133(targetDir, entry.name);
+      const sourcePath = join135(openCodeSource, entry.name);
+      const targetPath = join135(targetDir, entry.name);
       if (await import_fs_extra33.pathExists(targetPath)) {
         if (!ctx.options.forceOverwrite) {
           logger.verbose(`Skipping existing: ${entry.name}`);
@@ -109166,7 +109457,7 @@ Please use only one download method.`);
 }
 // src/commands/init/phases/post-install-handler.ts
 init_projects_registry();
-import { join as join134 } from "node:path";
+import { join as join136 } from "node:path";
 init_logger();
 init_path_resolver();
 var import_fs_extra34 = __toESM(require_lib(), 1);
@@ -109175,8 +109466,8 @@ async function handlePostInstall(ctx) {
     return ctx;
   }
   if (ctx.options.global) {
-    const claudeMdSource = join134(ctx.extractDir, "CLAUDE.md");
-    const claudeMdDest = join134(ctx.resolvedDir, "CLAUDE.md");
+    const claudeMdSource = join136(ctx.extractDir, "CLAUDE.md");
+    const claudeMdDest = join136(ctx.resolvedDir, "CLAUDE.md");
     if (await import_fs_extra34.pathExists(claudeMdSource)) {
       if (ctx.options.fresh || !await import_fs_extra34.pathExists(claudeMdDest)) {
         await import_fs_extra34.copy(claudeMdSource, claudeMdDest);
@@ -109224,7 +109515,7 @@ async function handlePostInstall(ctx) {
   }
   if (!ctx.options.skipSetup) {
     await promptSetupWizardIfNeeded({
-      envPath: join134(ctx.claudeDir, ".env"),
+      envPath: join136(ctx.claudeDir, ".env"),
       claudeDir: ctx.claudeDir,
       isGlobal: ctx.options.global,
       isNonInteractive: ctx.isNonInteractive,
@@ -109246,8 +109537,8 @@ async function handlePostInstall(ctx) {
 }
 // src/commands/init/phases/plugin-install-handler.ts
 init_codex_plugin_installer();
-import { cpSync as cpSync2, existsSync as existsSync70, mkdirSync as mkdirSync6, readFileSync as readFileSync22, rmSync as rmSync5, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join137 } from "node:path";
+import { cpSync as cpSync2, existsSync as existsSync70, mkdirSync as mkdirSync6, readFileSync as readFileSync24, rmSync as rmSync5, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join139 } from "node:path";
 
 // src/domains/installation/plugin/migrate-legacy-to-plugin.ts
 init_install_mode_detector();
@@ -109256,12 +109547,12 @@ import {
   cpSync,
   existsSync as existsSync68,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync21,
+  readFileSync as readFileSync23,
   readdirSync as readdirSync11,
   rmSync as rmSync3,
   writeFileSync as writeFileSync7
 } from "node:fs";
-import { dirname as dirname43, join as join135, relative as relative31, resolve as resolve45 } from "node:path";
+import { dirname as dirname43, join as join137, relative as relative31, resolve as resolve45 } from "node:path";
 
 // src/domains/installation/plugin/plugin-installer.ts
 init_install_mode_detector();
@@ -109321,10 +109612,10 @@ class PluginInstaller {
     return this.run(["plugin", "install", `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`, "--scope", scope], this.opts());
   }
   async enable() {
-    return this.run(["plugin", "enable", CK_PLUGIN_NAME], this.opts());
+    return this.run(["plugin", "enable", `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`], this.opts());
   }
   async update() {
-    return this.run(["plugin", "update", CK_PLUGIN_NAME], this.opts());
+    return this.run(["plugin", "update", `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`], this.opts());
   }
   async uninstall() {
     return this.run(["plugin", "uninstall", CK_PLUGIN_NAME], this.opts());
@@ -109386,7 +109677,7 @@ async function migrateLegacyToPlugin(opts) {
   let backupDir = null;
   let removedPaths = [];
   if (before.legacy.installed) {
-    backupDir = join135(claudeDir3, "backups", `ck-legacy-${ts.replace(/[:.]/g, "-")}`);
+    backupDir = join137(claudeDir3, "backups", `ck-legacy-${ts.replace(/[:.]/g, "-")}`);
     mkdirSync5(backupDir, { recursive: true });
     removedPaths = removeLegacy(claudeDir3, backupDir);
   }
@@ -109421,7 +109712,7 @@ function base(action, modeBefore, pluginVerified) {
 var PLUGIN_SUPPLIED_LEGACY_PREFIXES2 = ["agents/", "skills/"];
 var LEGACY_SENTINEL_FILENAMES = new Set([".gitignore"]);
 function defaultLegacyRemover(claudeDir3, backupDir) {
-  const meta = readJsonSafe3(join135(claudeDir3, "metadata.json"));
+  const meta = readJsonSafe3(join137(claudeDir3, "metadata.json"));
   const files = collectTrackedFiles2(meta);
   const removed = [];
   for (const file of files) {
@@ -109459,7 +109750,7 @@ function removeOrphanLegacySentinels(claudeDir3, backupDir, removedTrackedPaths)
   }
   const removed = [];
   for (const root of [...rootsToSweep].sort(compareLegacyPaths)) {
-    const rootAbs = join135(claudeDir3, root);
+    const rootAbs = join137(claudeDir3, root);
     if (!existsSync68(rootAbs))
       continue;
     const sentinels = findLegacySentinels(rootAbs).sort((a3, b3) => compareLegacyPaths(relative31(claudeDir3, a3), relative31(claudeDir3, b3)));
@@ -109483,7 +109774,7 @@ function findLegacySentinels(dir) {
     return out;
   }
   for (const entry of entries.sort((a3, b3) => compareLegacyPaths(a3.name, b3.name))) {
-    const abs = join135(dir, entry.name);
+    const abs = join137(dir, entry.name);
     if (entry.isDirectory()) {
       out.push(...findLegacySentinels(abs));
     } else if (entry.isFile() && LEGACY_SENTINEL_FILENAMES.has(entry.name)) {
@@ -109511,7 +109802,7 @@ function directoryContainsOnlySentinels(dir) {
     return false;
   }
   for (const entry of entries) {
-    const abs = join135(dir, entry.name);
+    const abs = join137(dir, entry.name);
     if (entry.isDirectory()) {
       if (!directoryContainsOnlySentinels(abs))
         return false;
@@ -109532,7 +109823,7 @@ function checksumMatches2(filePath, expected) {
     return false;
   }
   try {
-    const actual = createHash10("sha256").update(readFileSync21(filePath)).digest("hex");
+    const actual = createHash10("sha256").update(readFileSync23(filePath)).digest("hex");
     return actual.toLowerCase() === expected.toLowerCase();
   } catch {
     return false;
@@ -109586,14 +109877,14 @@ function compareLegacyPaths(a3, b3) {
   return 0;
 }
 function collectTrackedFiles2(meta) {
-  if (!isRecord3(meta))
+  if (!isRecord5(meta))
     return [];
   const out = [];
   const push2 = (arr) => {
     if (!Array.isArray(arr))
       return;
     for (const f3 of arr) {
-      if (isRecord3(f3) && typeof f3.path === "string") {
+      if (isRecord5(f3) && typeof f3.path === "string") {
         const ownership = f3.ownership === "user" || f3.ownership === "ck-modified" ? f3.ownership : "ck";
         out.push({
           path: f3.path,
@@ -109603,9 +109894,9 @@ function collectTrackedFiles2(meta) {
       }
     }
   };
-  if (isRecord3(meta.kits)) {
+  if (isRecord5(meta.kits)) {
     const engineer = meta.kits[ENGINEER_KIT_KEY];
-    if (isRecord3(engineer))
+    if (isRecord5(engineer))
       push2(engineer.files);
   } else {
     push2(meta.files);
@@ -109613,7 +109904,7 @@ function collectTrackedFiles2(meta) {
   return out;
 }
 function writeReceipt(claudeDir3, receipt) {
-  const receiptPath = join135(claudeDir3, ".ck-migration-log.json");
+  const receiptPath = join137(claudeDir3, ".ck-migration-log.json");
   const existing = readJsonSafe3(receiptPath);
   const history = Array.isArray(existing) ? existing : [];
   history.push(receipt);
@@ -109623,7 +109914,7 @@ function writeReceipt(claudeDir3, receipt) {
 }
 function readJsonSafe3(filePath) {
   try {
-    return JSON.parse(readFileSync21(filePath, "utf-8"));
+    return JSON.parse(readFileSync23(filePath, "utf-8"));
   } catch {
     return null;
   }
@@ -109662,14 +109953,14 @@ async function refreshExistingPlugin(installer, pluginSourceDir, enabled) {
   }
   return { ok: true };
 }
-function isRecord3(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 // src/domains/installation/plugin/uninstall-plugin.ts
 init_install_mode_detector();
 import { existsSync as existsSync69, rmSync as rmSync4 } from "node:fs";
-import { join as join136 } from "node:path";
+import { join as join138 } from "node:path";
 init_path_resolver();
 async function uninstallEnginePlugin(opts = {}) {
   const claudeDir3 = opts.claudeDir ?? PathResolver.getGlobalKitDir();
@@ -109691,7 +109982,7 @@ async function uninstallEnginePlugin(opts = {}) {
   }
   let staleCacheRemoved = false;
   const marketplace = state.marketplace ?? CK_MARKETPLACE_NAME;
-  const cacheDir = join136(claudeDir3, "plugins", "cache", marketplace, CK_PLUGIN_NAME);
+  const cacheDir = join138(claudeDir3, "plugins", "cache", marketplace, CK_PLUGIN_NAME);
   if (existsSync69(cacheDir)) {
     rmSync4(cacheDir, { recursive: true, force: true });
     staleCacheRemoved = true;
@@ -109735,8 +110026,12 @@ async function handlePluginInstall(ctx, deps = {}) {
     try {
       const result = await removeCodex();
       logCodexPluginCleanup(result);
+      if (result.pluginStillInstalled) {
+        cleanupError = new Error(`Codex plugin cleanup failed for legacy install mode: ${result.error ?? "plugin remains registered"}`);
+      }
     } catch (err) {
       logger.verbose(`Codex plugin cleanup skipped: ${err.message}`);
+      cleanupError = err;
     }
     if (cleanupError) {
       throw cleanupError;
@@ -109760,7 +110055,13 @@ async function handlePluginInstall(ctx, deps = {}) {
     try {
       const result = await installCodex({ pluginSourceDir });
       logCodexPluginResult(result);
+      if (ctx.options.installMode === "plugin" && result.action === "install-failed") {
+        throw new Error(`Codex plugin install failed: ${result.error ?? result.action}`);
+      }
     } catch (err) {
+      if (ctx.options.installMode === "plugin") {
+        throw err;
+      }
       logger.verbose(`Codex plugin install skipped: ${err.message}`);
     }
   } catch (err) {
@@ -109779,14 +110080,14 @@ function logLegacyPluginCleanup(result) {
   }
 }
 function stagePluginSource(extractDir, stageBaseDir) {
-  const base2 = stageBaseDir ?? join137(PathResolver.getCacheDir(true), "ck-plugin-source");
-  const payloadSrc = join137(extractDir, ".claude");
+  const base2 = stageBaseDir ?? join139(PathResolver.getCacheDir(true), "ck-plugin-source");
+  const payloadSrc = join139(extractDir, ".claude");
   if (!existsSync70(payloadSrc)) {
     throw new Error(`plugin payload not found in archive: ${payloadSrc}`);
   }
   rmSync5(base2, { recursive: true, force: true });
   mkdirSync6(base2, { recursive: true });
-  const stagedPayload = join137(base2, ".claude");
+  const stagedPayload = join139(base2, ".claude");
   cpSync2(payloadSrc, stagedPayload, { recursive: true });
   ensureCodexPluginManifest(stagedPayload);
   const claudeMarketplace = {
@@ -109794,8 +110095,8 @@ function stagePluginSource(extractDir, stageBaseDir) {
     owner: { name: "ClaudeKit" },
     plugins: [{ name: "ck", source: "./.claude", description: "ClaudeKit Engineer" }]
   };
-  mkdirSync6(join137(base2, ".claude-plugin"), { recursive: true });
-  writeFileSync8(join137(base2, ".claude-plugin", "marketplace.json"), `${JSON.stringify(claudeMarketplace, null, 2)}
+  mkdirSync6(join139(base2, ".claude-plugin"), { recursive: true });
+  writeFileSync8(join139(base2, ".claude-plugin", "marketplace.json"), `${JSON.stringify(claudeMarketplace, null, 2)}
 `, "utf-8");
   const codexMarketplace = {
     name: "claudekit",
@@ -109809,24 +110110,24 @@ function stagePluginSource(extractDir, stageBaseDir) {
       }
     ]
   };
-  mkdirSync6(join137(base2, ".agents", "plugins"), { recursive: true });
-  writeFileSync8(join137(base2, ".agents", "plugins", "marketplace.json"), `${JSON.stringify(codexMarketplace, null, 2)}
+  mkdirSync6(join139(base2, ".agents", "plugins"), { recursive: true });
+  writeFileSync8(join139(base2, ".agents", "plugins", "marketplace.json"), `${JSON.stringify(codexMarketplace, null, 2)}
 `, "utf-8");
   return base2;
 }
 function ensureCodexPluginManifest(pluginRoot) {
-  const manifestPath = join137(pluginRoot, ".codex-plugin", "plugin.json");
+  const manifestPath = join139(pluginRoot, ".codex-plugin", "plugin.json");
   if (existsSync70(manifestPath))
     return;
-  const claudeManifest = readJsonSafe4(join137(pluginRoot, ".claude-plugin", "plugin.json"));
+  const claudeManifest = readJsonSafe4(join139(pluginRoot, ".claude-plugin", "plugin.json"));
   const manifest = pruneUndefined({
-    name: stringField(claudeManifest, "name") ?? "ck",
-    version: stringField(claudeManifest, "version") ?? "0.0.0",
-    description: stringField(claudeManifest, "description") ?? "ClaudeKit Engineer — multi-agent planning, code review, debugging, and workflow skills for Codex.",
+    name: stringField2(claudeManifest, "name") ?? "ck",
+    version: stringField2(claudeManifest, "version") ?? "0.0.0",
+    description: stringField2(claudeManifest, "description") ?? "ClaudeKit Engineer — multi-agent planning, code review, debugging, and workflow skills for Codex.",
     author: authorField(claudeManifest),
-    homepage: stringField(claudeManifest, "homepage"),
-    repository: stringField(claudeManifest, "repository"),
-    license: stringField(claudeManifest, "license"),
+    homepage: stringField2(claudeManifest, "homepage"),
+    repository: stringField2(claudeManifest, "repository"),
+    license: stringField2(claudeManifest, "license"),
     keywords: ["claudekit", "codex", "skills", "agents", "workflow"],
     skills: "./skills/",
     interface: {
@@ -109839,25 +110140,25 @@ function ensureCodexPluginManifest(pluginRoot) {
       websiteURL: "https://github.com/claudekit/claudekit-engineer"
     }
   });
-  mkdirSync6(join137(pluginRoot, ".codex-plugin"), { recursive: true });
+  mkdirSync6(join139(pluginRoot, ".codex-plugin"), { recursive: true });
   writeFileSync8(manifestPath, `${JSON.stringify(manifest, null, 2)}
 `, "utf-8");
 }
 function readJsonSafe4(filePath) {
   try {
-    const parsed = JSON.parse(readFileSync22(filePath, "utf-8"));
-    return isRecord4(parsed) ? parsed : null;
+    const parsed = JSON.parse(readFileSync24(filePath, "utf-8"));
+    return isRecord6(parsed) ? parsed : null;
   } catch {
     return null;
   }
 }
-function stringField(source, key) {
+function stringField2(source, key) {
   const value = source?.[key];
   return typeof value === "string" && value.trim() !== "" ? value : undefined;
 }
 function authorField(source) {
   const author = source?.author;
-  if (isRecord4(author) && typeof author.name === "string" && author.name.trim() !== "") {
+  if (isRecord6(author) && typeof author.name === "string" && author.name.trim() !== "") {
     return { name: author.name };
   }
   return { name: "ClaudeKit" };
@@ -109865,7 +110166,7 @@ function authorField(source) {
 function pruneUndefined(value) {
   return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== undefined));
 }
-function isRecord4(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function logPluginResult(result) {
@@ -109911,7 +110212,7 @@ function logCodexPluginCleanup(result) {
 init_config_manager();
 init_github_client();
 import { mkdir as mkdir36 } from "node:fs/promises";
-import { join as join140, resolve as resolve48 } from "node:path";
+import { join as join142, resolve as resolve48 } from "node:path";
 
 // src/domains/github/kit-access-checker.ts
 init_error2();
@@ -110084,7 +110385,7 @@ init_hook_health_checker();
 // src/domains/installation/fresh-installer.ts
 init_metadata_migration();
 import { existsSync as existsSync71, readdirSync as readdirSync12, rmSync as rmSync6, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
-import { basename as basename28, dirname as dirname44, join as join138, resolve as resolve46 } from "node:path";
+import { basename as basename28, dirname as dirname44, join as join140, resolve as resolve46 } from "node:path";
 init_logger();
 init_safe_spinner();
 var import_fs_extra35 = __toESM(require_lib(), 1);
@@ -110166,7 +110467,7 @@ async function removeFilesByOwnership(claudeDir3, analysis, includeModified) {
     logger.debug(`${KIT_MANIFEST_FILE} was self-tracked; skipping from delete loop — will be rewritten by updateMetadataAfterFresh`);
   }
   for (const file of filesToRemove) {
-    const fullPath = join138(claudeDir3, file.path);
+    const fullPath = join140(claudeDir3, file.path);
     if (!existsSync71(fullPath)) {
       continue;
     }
@@ -110194,7 +110495,7 @@ async function removeFilesByOwnership(claudeDir3, analysis, includeModified) {
   };
 }
 async function updateMetadataAfterFresh(claudeDir3, removedFiles, metadata) {
-  const metadataPath = join138(claudeDir3, KIT_MANIFEST_FILE);
+  const metadataPath = join140(claudeDir3, KIT_MANIFEST_FILE);
   const removedSet = new Set(removedFiles);
   if (metadata.kits) {
     for (const kitName of Object.keys(metadata.kits)) {
@@ -110225,8 +110526,8 @@ function getFreshBackupTargets(claudeDir3, analysis, includeModified) {
       mutatePaths: filesToRemove.length > 0 ? ["metadata.json"] : []
     };
   }
-  const deletePaths = CLAUDEKIT_SUBDIRECTORIES.filter((subdir) => existsSync71(join138(claudeDir3, subdir)));
-  if (existsSync71(join138(claudeDir3, "metadata.json"))) {
+  const deletePaths = CLAUDEKIT_SUBDIRECTORIES.filter((subdir) => existsSync71(join140(claudeDir3, subdir)));
+  if (existsSync71(join140(claudeDir3, "metadata.json"))) {
     deletePaths.push("metadata.json");
   }
   return {
@@ -110248,7 +110549,7 @@ async function removeSubdirectoriesFallback(claudeDir3) {
   const removedFiles = [];
   let removedDirCount = 0;
   for (const subdir of CLAUDEKIT_SUBDIRECTORIES) {
-    const subdirPath = join138(claudeDir3, subdir);
+    const subdirPath = join140(claudeDir3, subdir);
     if (await import_fs_extra35.pathExists(subdirPath)) {
       rmSync6(subdirPath, { recursive: true, force: true });
       removedDirCount++;
@@ -110256,7 +110557,7 @@ async function removeSubdirectoriesFallback(claudeDir3) {
       logger.debug(`Removed subdirectory: ${subdir}/`);
     }
   }
-  const metadataPath = join138(claudeDir3, "metadata.json");
+  const metadataPath = join140(claudeDir3, "metadata.json");
   if (await import_fs_extra35.pathExists(metadataPath)) {
     unlinkSync5(metadataPath);
     removedFiles.push("metadata.json");
@@ -110334,7 +110635,7 @@ async function handleFreshInstallation(claudeDir3, prompts) {
 var import_fs_extra36 = __toESM(require_lib(), 1);
 import { cp as cp5, mkdir as mkdir35, readdir as readdir42, rename as rename11, rm as rm16, stat as stat22 } from "node:fs/promises";
 import { homedir as homedir47 } from "node:os";
-import { dirname as dirname45, join as join139, normalize as normalize11, resolve as resolve47 } from "node:path";
+import { dirname as dirname45, join as join141, normalize as normalize11, resolve as resolve47 } from "node:path";
 var LEGACY_KIT_MARKERS = [
   "metadata.json",
   ".ck.json",
@@ -110373,10 +110674,10 @@ function getLegacyWindowsGlobalKitDirCandidates(env2 = process.env, homeDir = ho
   const localAppData = safeEnvPath(env2.LOCALAPPDATA);
   const appData = safeEnvPath(env2.APPDATA);
   if (localAppData) {
-    candidates.push(join139(localAppData, ".claude"));
+    candidates.push(join141(localAppData, ".claude"));
   }
   if (appData) {
-    candidates.push(join139(appData, ".claude"));
+    candidates.push(join141(appData, ".claude"));
   }
   if (homeDir) {
     candidates.push(`${withoutTrailingSeparators(homeDir)}.claude`);
@@ -110394,7 +110695,7 @@ async function hasKitMarkers(dir) {
   if (!await isDirectory(dir))
     return false;
   for (const marker of LEGACY_KIT_MARKERS) {
-    if (await import_fs_extra36.pathExists(join139(dir, marker))) {
+    if (await import_fs_extra36.pathExists(join141(dir, marker))) {
       return true;
     }
   }
@@ -110696,7 +110997,7 @@ async function handleSelection(ctx) {
   }
   if (!ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
+    const claudeDir3 = prefix ? join142(resolvedDir, prefix) : resolvedDir;
     try {
       const existingMetadata = await readManifest(claudeDir3);
       if (existingMetadata?.kits) {
@@ -110733,7 +111034,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
+    const claudeDir3 = prefix ? join142(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir3, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -110753,7 +111054,7 @@ async function handleSelection(ctx) {
     let currentVersion = null;
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
+      const claudeDir3 = prefix ? join142(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir3);
       currentVersion = existingMetadata?.kits?.[kitType]?.version || null;
       if (currentVersion) {
@@ -110822,7 +111123,7 @@ async function handleSelection(ctx) {
   if (ctx.options.yes && !ctx.options.fresh && !ctx.options.force && !ctx.options.restoreCkHooks && releaseTag && !isOfflineMode && !pendingKits?.length) {
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
+      const claudeDir3 = prefix ? join142(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir3);
       const installedKitVersion = existingMetadata?.kits?.[kitType]?.version;
       if (installedKitVersion && versionsMatch(installedKitVersion, releaseTag)) {
@@ -110851,7 +111152,7 @@ async function handleSelection(ctx) {
 }
 // src/commands/init/phases/sync-handler.ts
 import { copyFile as copyFile8, mkdir as mkdir37, open as open5, readFile as readFile61, rename as rename12, stat as stat23, unlink as unlink13, writeFile as writeFile35 } from "node:fs/promises";
-import { dirname as dirname46, join as join141, resolve as resolve49 } from "node:path";
+import { dirname as dirname46, join as join143, resolve as resolve49 } from "node:path";
 init_logger();
 init_path_resolver();
 var import_fs_extra38 = __toESM(require_lib(), 1);
@@ -110861,13 +111162,13 @@ async function handleSync(ctx) {
     return ctx;
   }
   const resolvedDir = ctx.options.global ? PathResolver.getGlobalKitDir() : resolve49(ctx.options.dir || ".");
-  const claudeDir3 = ctx.options.global ? resolvedDir : join141(resolvedDir, ".claude");
+  const claudeDir3 = ctx.options.global ? resolvedDir : join143(resolvedDir, ".claude");
   if (!await import_fs_extra38.pathExists(claudeDir3)) {
     logger.error("Cannot sync: no .claude directory found");
     ctx.prompts.note("Run 'ck init' without --sync to install first.", "No Installation Found");
     return { ...ctx, cancelled: true };
   }
-  const metadataPath = join141(claudeDir3, "metadata.json");
+  const metadataPath = join143(claudeDir3, "metadata.json");
   if (!await import_fs_extra38.pathExists(metadataPath)) {
     logger.error("Cannot sync: no metadata.json found");
     ctx.prompts.note(`Your installation may be from an older version.
@@ -110967,7 +111268,7 @@ function getLockTimeout() {
 var STALE_LOCK_THRESHOLD_MS = 5 * 60 * 1000;
 async function acquireSyncLock(global3) {
   const cacheDir = PathResolver.getCacheDir(global3);
-  const lockPath = join141(cacheDir, ".sync-lock");
+  const lockPath = join143(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
   await mkdir37(dirname46(lockPath), { recursive: true });
@@ -111013,11 +111314,11 @@ async function executeSyncMerge(ctx) {
   const releaseLock = await acquireSyncLock(ctx.options.global);
   try {
     const trackedFiles = ctx.syncTrackedFiles;
-    const upstreamDir = ctx.options.global ? join141(ctx.extractDir, ".claude") : ctx.extractDir;
+    const upstreamDir = ctx.options.global ? join143(ctx.extractDir, ".claude") : ctx.extractDir;
     let sourceMetadata = null;
     let deletions = [];
     try {
-      const sourceMetadataPath = join141(upstreamDir, "metadata.json");
+      const sourceMetadataPath = join143(upstreamDir, "metadata.json");
       if (await import_fs_extra38.pathExists(sourceMetadataPath)) {
         const content = await readFile61(sourceMetadataPath, "utf-8");
         sourceMetadata = JSON.parse(content);
@@ -111079,7 +111380,7 @@ async function executeSyncMerge(ctx) {
         try {
           const sourcePath = await validateSyncPath(upstreamDir, file.path);
           const targetPath = await validateSyncPath(ctx.claudeDir, file.path);
-          const targetDir = join141(targetPath, "..");
+          const targetDir = join143(targetPath, "..");
           try {
             await mkdir37(targetDir, { recursive: true });
           } catch (mkdirError) {
@@ -111250,7 +111551,7 @@ async function createBackup(claudeDir3, files, backupDir) {
       const sourcePath = await validateSyncPath(claudeDir3, file.path);
       if (await import_fs_extra38.pathExists(sourcePath)) {
         const targetPath = await validateSyncPath(backupDir, file.path);
-        const targetDir = join141(targetPath, "..");
+        const targetDir = join143(targetPath, "..");
         await mkdir37(targetDir, { recursive: true });
         await copyFile8(sourcePath, targetPath);
       }
@@ -111265,7 +111566,7 @@ async function createBackup(claudeDir3, files, backupDir) {
 }
 // src/commands/init/phases/transform-handler.ts
 init_config_manager();
-import { join as join145 } from "node:path";
+import { join as join147 } from "node:path";
 
 // src/services/transformers/folder-path-transformer.ts
 init_logger();
@@ -111276,38 +111577,38 @@ init_logger();
 init_types3();
 var import_fs_extra39 = __toESM(require_lib(), 1);
 import { rename as rename13, rm as rm17 } from "node:fs/promises";
-import { join as join142, relative as relative32 } from "node:path";
+import { join as join144, relative as relative32 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join142(extractDir, DEFAULT_FOLDERS.docs);
+    const docsPath = join144(extractDir, DEFAULT_FOLDERS.docs);
     if (await import_fs_extra39.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join142(extractDir, folders.docs)
+        to: join144(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join142(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    const claudeDocsPath = join144(extractDir, ".claude", DEFAULT_FOLDERS.docs);
     if (await import_fs_extra39.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join142(extractDir, ".claude", folders.docs)
+        to: join144(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join142(extractDir, DEFAULT_FOLDERS.plans);
+    const plansPath = join144(extractDir, DEFAULT_FOLDERS.plans);
     if (await import_fs_extra39.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join142(extractDir, folders.plans)
+        to: join144(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join142(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    const claudePlansPath = join144(extractDir, ".claude", DEFAULT_FOLDERS.plans);
     if (await import_fs_extra39.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join142(extractDir, ".claude", folders.plans)
+        to: join144(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -111348,7 +111649,7 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 init_logger();
 init_types3();
 import { readFile as readFile62, readdir as readdir43, writeFile as writeFile36 } from "node:fs/promises";
-import { join as join143, relative as relative33 } from "node:path";
+import { join as join145, relative as relative33 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -111401,7 +111702,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
   let replacementsCount = 0;
   const entries = await readdir43(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join143(dir, entry.name);
+    const fullPath = join145(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -111538,7 +111839,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 init_logger();
 import { readFile as readFile63, readdir as readdir44, writeFile as writeFile37 } from "node:fs/promises";
 import { homedir as homedir48, platform as platform16 } from "node:os";
-import { extname as extname7, join as join144 } from "node:path";
+import { extname as extname7, join as join146 } from "node:path";
 var IS_WINDOWS3 = platform16() === "win32";
 var HOME_PREFIX = "$HOME";
 function getHomeDirPrefix() {
@@ -111548,7 +111849,7 @@ function normalizeInstallPath(path17) {
   return path17.replace(/\\/g, "/").replace(/\/+$/, "");
 }
 function getDefaultGlobalClaudeDir() {
-  return normalizeInstallPath(join144(homedir48(), ".claude"));
+  return normalizeInstallPath(join146(homedir48(), ".claude"));
 }
 function getCustomGlobalClaudeDir(targetClaudeDir) {
   if (!targetClaudeDir)
@@ -111679,7 +111980,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir44(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join144(dir, entry.name);
+      const fullPath = join146(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -111758,7 +112059,7 @@ async function handleTransforms(ctx) {
       logger.debug(ctx.options.global ? "Saved folder configuration to ~/.claude/.ck.json" : "Saved folder configuration to .claude/.ck.json");
     }
   }
-  const claudeDir3 = ctx.options.global ? ctx.resolvedDir : join145(ctx.resolvedDir, ".claude");
+  const claudeDir3 = ctx.options.global ? ctx.resolvedDir : join147(ctx.resolvedDir, ".claude");
   return {
     ...ctx,
     foldersConfig,
@@ -111986,7 +112287,7 @@ var import_picocolors30 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync72 } from "node:fs";
 import { readFile as readFile67, rm as rm18, unlink as unlink14 } from "node:fs/promises";
 import { homedir as homedir52 } from "node:os";
-import { basename as basename30, dirname as dirname49, join as join149, resolve as resolve50 } from "node:path";
+import { basename as basename30, dirname as dirname49, join as join151, resolve as resolve50 } from "node:path";
 init_logger();
 
 // src/ui/ck-cli-design/next-steps-footer.ts
@@ -112201,13 +112502,13 @@ init_dist2();
 init_model_taxonomy();
 import { mkdir as mkdir39, readFile as readFile66, writeFile as writeFile39 } from "node:fs/promises";
 import { homedir as homedir51 } from "node:os";
-import { dirname as dirname47, join as join148 } from "node:path";
+import { dirname as dirname47, join as join150 } from "node:path";
 
 // src/commands/portable/models-dev-cache.ts
 init_logger();
 import { mkdir as mkdir38, readFile as readFile64, rename as rename14, writeFile as writeFile38 } from "node:fs/promises";
 import { homedir as homedir49 } from "node:os";
-import { join as join146 } from "node:path";
+import { join as join148 } from "node:path";
 
 class ModelsDevUnavailableError extends Error {
   constructor(message, cause) {
@@ -112219,13 +112520,13 @@ var MODELS_DEV_URL = "https://models.dev/api.json";
 var CACHE_TTL_MS3 = 24 * 60 * 60 * 1000;
 var FETCH_TIMEOUT_MS = 1e4;
 function defaultCacheDir() {
-  return join146(homedir49(), ".config", "claudekit", "cache");
+  return join148(homedir49(), ".config", "claudekit", "cache");
 }
 function cacheFilePath(cacheDir) {
-  return join146(cacheDir, "models-dev.json");
+  return join148(cacheDir, "models-dev.json");
 }
 function tmpFilePath(cacheDir) {
-  return join146(cacheDir, "models-dev.json.tmp");
+  return join148(cacheDir, "models-dev.json.tmp");
 }
 async function readCacheEntry(cacheDir) {
   const filePath = cacheFilePath(cacheDir);
@@ -112300,14 +112601,14 @@ async function getModelsDevCatalog(opts = {}) {
 init_logger();
 import { readFile as readFile65 } from "node:fs/promises";
 import { homedir as homedir50, platform as platform17 } from "node:os";
-import { join as join147 } from "node:path";
+import { join as join149 } from "node:path";
 function resolveOpenCodeAuthPath(homeDir) {
   if (platform17() === "win32") {
-    const dataRoot2 = process.env.LOCALAPPDATA ?? join147(homeDir, "AppData", "Local");
-    return join147(dataRoot2, "opencode", "auth.json");
+    const dataRoot2 = process.env.LOCALAPPDATA ?? join149(homeDir, "AppData", "Local");
+    return join149(dataRoot2, "opencode", "auth.json");
   }
-  const dataRoot = process.env.XDG_DATA_HOME ?? join147(homeDir, ".local", "share");
-  return join147(dataRoot, "opencode", "auth.json");
+  const dataRoot = process.env.XDG_DATA_HOME ?? join149(homeDir, ".local", "share");
+  return join149(dataRoot, "opencode", "auth.json");
 }
 async function readAuthedProviders(homeDir) {
   const authPath = resolveOpenCodeAuthPath(homeDir);
@@ -112409,9 +112710,9 @@ function messageForReason(reason) {
 }
 function getOpenCodeConfigPath(options2) {
   if (options2.global) {
-    return join148(options2.homeDir ?? homedir51(), ".config", "opencode", "opencode.json");
+    return join150(options2.homeDir ?? homedir51(), ".config", "opencode", "opencode.json");
   }
-  return join148(options2.cwd ?? process.cwd(), "opencode.json");
+  return join150(options2.cwd ?? process.cwd(), "opencode.json");
 }
 function makeCatalogOpts(options2) {
   return {
@@ -113284,7 +113585,7 @@ function appendFallbackSkillActionsToPlan(plan, skills, selectedProviders, insta
         reason: "New item, not previously installed",
         reasonCode: "new-item",
         reasonCopy: "New - not previously installed",
-        targetPath: join149(basePath, skill.name),
+        targetPath: join151(basePath, skill.name),
         type: "skill"
       });
     }
@@ -113512,7 +113813,7 @@ function resolveHookTargetPath(item, provider, global3) {
   const converted = convertItem(item, pathConfig.format, provider, { global: global3 });
   if (converted.error)
     return null;
-  const targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join149(basePath, converted.filename);
+  const targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join151(basePath, converted.filename);
   const resolvedTarget = resolve50(targetPath).replace(/\\/g, "/");
   const resolvedBase = resolve50(basePath).replace(/\\/g, "/").replace(/\/+$/, "");
   if (resolvedTarget !== resolvedBase && !resolvedTarget.startsWith(`${resolvedBase}/`)) {
@@ -113523,7 +113824,7 @@ function resolveHookTargetPath(item, provider, global3) {
 async function processMetadataDeletions(skillSourcePath, installGlobally) {
   if (!skillSourcePath)
     return;
-  const sourceMetadataPath = join149(resolve50(skillSourcePath, ".."), "metadata.json");
+  const sourceMetadataPath = join151(resolve50(skillSourcePath, ".."), "metadata.json");
   if (!existsSync72(sourceMetadataPath))
     return;
   let sourceMetadata;
@@ -113536,7 +113837,7 @@ async function processMetadataDeletions(skillSourcePath, installGlobally) {
   }
   if (!sourceMetadata.deletions || sourceMetadata.deletions.length === 0)
     return;
-  const claudeDir3 = installGlobally ? join149(homedir52(), ".claude") : join149(process.cwd(), ".claude");
+  const claudeDir3 = installGlobally ? join151(homedir52(), ".claude") : join151(process.cwd(), ".claude");
   if (!existsSync72(claudeDir3))
     return;
   try {
@@ -113664,8 +113965,8 @@ async function migrateCommand(options2) {
     let requestedGlobal = options2.global ?? false;
     let installGlobally = requestedGlobal;
     if (options2.global === undefined && !options2.yes) {
-      const projectTarget = join149(process.cwd(), ".claude");
-      const globalTarget = join149(homedir52(), ".claude");
+      const projectTarget = join151(process.cwd(), ".claude");
+      const globalTarget = join151(homedir52(), ".claude");
       const scopeChoice = await ie({
         message: "Installation scope",
         options: [
@@ -113738,7 +114039,7 @@ async function migrateCommand(options2) {
     }).join(`
 `));
     if (sourceGlobalOnly) {
-      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join149(homedir52(), ".claude"))}`));
+      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join151(homedir52(), ".claude"))}`));
     } else {
       f2.info(import_picocolors30.default.dim(`  CWD: ${process.cwd()}`));
     }
@@ -114047,7 +114348,7 @@ async function migrateCommand(options2) {
     for (const [hooksProvider, entry] of successfulHookFiles) {
       if (entry.files.length === 0)
         continue;
-      const sourceSettingsPath = hooksSource ? join149(dirname49(hooksSource), "settings.json") : undefined;
+      const sourceSettingsPath = hooksSource ? join151(dirname49(hooksSource), "settings.json") : undefined;
       const mergeResult = await migrateHooksSettings({
         sourceProvider: "claude-code",
         targetProvider: hooksProvider,
@@ -114425,7 +114726,7 @@ async function handleDirectorySetup(ctx) {
 // src/commands/new/phases/project-creation.ts
 init_config_manager();
 init_github_client();
-import { join as join150 } from "node:path";
+import { join as join152 } from "node:path";
 init_logger();
 init_output_manager();
 init_types3();
@@ -114551,7 +114852,7 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
   output.section("Installing");
   logger.verbose("Installation target", { directory: resolvedDir });
   const merger = new FileMerger;
-  const claudeDir3 = join150(resolvedDir, ".claude");
+  const claudeDir3 = join152(resolvedDir, ".claude");
   merger.setMultiKitContext(claudeDir3, kit);
   if (validOptions.exclude && validOptions.exclude.length > 0) {
     merger.addIgnorePatterns(validOptions.exclude);
@@ -114598,7 +114899,7 @@ async function handleProjectCreation(ctx) {
 }
 // src/commands/new/phases/post-setup.ts
 init_projects_registry();
-import { join as join151 } from "node:path";
+import { join as join153 } from "node:path";
 init_package_installer();
 init_logger();
 init_path_resolver();
@@ -114630,9 +114931,9 @@ async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts)
       withSudo: validOptions.withSudo
     });
   }
-  const claudeDir3 = join151(resolvedDir, ".claude");
+  const claudeDir3 = join153(resolvedDir, ".claude");
   await promptSetupWizardIfNeeded({
-    envPath: join151(claudeDir3, ".env"),
+    envPath: join153(claudeDir3, ".env"),
     claudeDir: claudeDir3,
     isGlobal: false,
     isNonInteractive: isNonInteractive2,
@@ -114702,7 +115003,7 @@ Please use only one download method.`);
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync75, statSync as statSync13 } from "node:fs";
-import { dirname as dirname53, isAbsolute as isAbsolute15, join as join154, parse as parse7, resolve as resolve55 } from "node:path";
+import { dirname as dirname53, isAbsolute as isAbsolute15, join as join156, parse as parse7, resolve as resolve55 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 init_config();
@@ -114712,14 +115013,14 @@ init_logger();
 init_output_manager();
 var import_picocolors32 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync74, statSync as statSync12 } from "node:fs";
-import { basename as basename31, dirname as dirname51, join as join153, relative as relative34, resolve as resolve53 } from "node:path";
+import { basename as basename31, dirname as dirname51, join as join155, relative as relative34, resolve as resolve53 } from "node:path";
 
 // src/commands/plan/plan-dependencies.ts
 init_config();
 init_plan_parser();
 init_plans_registry();
 import { existsSync as existsSync73 } from "node:fs";
-import { dirname as dirname50, join as join152 } from "node:path";
+import { dirname as dirname50, join as join154 } from "node:path";
 async function resolvePlanDependencies(references, currentPlanFile, options2 = {}) {
   if (references.length === 0)
     return [];
@@ -114739,7 +115040,7 @@ async function resolvePlanDependencies(references, currentPlanFile, options2 = {
       };
     }
     const scopeRoot = resolvePlanDirForScope(scope, projectRoot, config);
-    const planFile = join152(scopeRoot, planId, "plan.md");
+    const planFile = join154(scopeRoot, planId, "plan.md");
     const isSelfReference = planFile === currentPlanFile;
     if (!existsSync73(planFile)) {
       return {
@@ -114881,7 +115182,7 @@ async function handleStatus(target, options2) {
   }
   const effectiveTarget = !resolvedTarget && globalBaseDir ? globalBaseDir : resolvedTarget;
   const t = effectiveTarget ? resolve53(effectiveTarget) : null;
-  const plansDir = t && existsSync74(t) && statSync12(t).isDirectory() && !existsSync74(join153(t, "plan.md")) ? t : null;
+  const plansDir = t && existsSync74(t) && statSync12(t).isDirectory() && !existsSync74(join155(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -115310,7 +115611,7 @@ function resolvePlanFile(target, baseDir) {
     const stat24 = statSync13(t);
     if (stat24.isFile())
       return t;
-    const candidate = join154(t, "plan.md");
+    const candidate = join156(t, "plan.md");
     if (existsSync75(candidate))
       return candidate;
   }
@@ -115318,7 +115619,7 @@ function resolvePlanFile(target, baseDir) {
     let dir = process.cwd();
     const root = parse7(dir).root;
     while (dir !== root) {
-      const candidate = join154(dir, "plan.md");
+      const candidate = join156(dir, "plan.md");
       if (existsSync75(candidate))
         return candidate;
       dir = dirname53(dir);
@@ -115839,10 +116140,10 @@ init_agents();
 var import_gray_matter12 = __toESM(require_gray_matter(), 1);
 var import_picocolors37 = __toESM(require_picocolors(), 1);
 import { readFile as readFile68 } from "node:fs/promises";
-import { join as join156 } from "node:path";
+import { join as join158 } from "node:path";
 
 // src/commands/skills/installed-skills-inventory.ts
-import { join as join155, resolve as resolve57 } from "node:path";
+import { join as join157, resolve as resolve57 } from "node:path";
 init_path_resolver();
 var SCOPE_SORT_ORDER = {
   project: 0,
@@ -115854,8 +116155,8 @@ async function getActiveClaudeSkillInstallations(options2 = {}) {
   const projectClaudeDir = resolve57(projectDir, ".claude");
   const projectScopeAliasesGlobal = projectClaudeDir === globalDir;
   const [projectSkills, globalSkills] = await Promise.all([
-    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join155(projectClaudeDir, "skills")),
-    scanSkills2(join155(globalDir, "skills"))
+    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join157(projectClaudeDir, "skills")),
+    scanSkills2(join157(globalDir, "skills"))
   ]);
   const projectIds = new Set(projectSkills.map((skill) => skill.id));
   const globalIds = new Set(globalSkills.map((skill) => skill.id));
@@ -116016,7 +116317,7 @@ async function handleValidate2(sourcePath) {
   spinner.stop(`Checked ${skills.length} skill(s)`);
   let hasIssues = false;
   for (const skill of skills) {
-    const skillMdPath = join156(skill.path, "SKILL.md");
+    const skillMdPath = join158(skill.path, "SKILL.md");
     try {
       const content = await readFile68(skillMdPath, "utf-8");
       const { data } = import_gray_matter12.default(content, {
@@ -116599,7 +116900,7 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync14, rmSync as rmSync8 } from "node:fs";
-import { basename as basename33, join as join159, resolve as resolve58, sep as sep14 } from "node:path";
+import { basename as basename33, join as join161, resolve as resolve58, sep as sep14 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
@@ -116608,7 +116909,7 @@ var import_fs_extra44 = __toESM(require_lib(), 1);
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
 import { readdirSync as readdirSync13, rmSync as rmSync7 } from "node:fs";
-import { dirname as dirname54, join as join157 } from "node:path";
+import { dirname as dirname54, join as join159 } from "node:path";
 init_logger();
 init_safe_prompts();
 var import_fs_extra42 = __toESM(require_lib(), 1);
@@ -116668,7 +116969,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
       const remainingFiles = metadata.kits?.[remainingKit]?.files || [];
       for (const file of remainingFiles) {
         const relativePath = normalizeTrackedPath(file.path);
-        if (await import_fs_extra42.pathExists(join157(installation.path, relativePath))) {
+        if (await import_fs_extra42.pathExists(join159(installation.path, relativePath))) {
           result.retainedManifestPaths.push(relativePath);
         }
       }
@@ -116676,7 +116977,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     const kitFiles = metadata.kits[kit].files || [];
     for (const trackedFile of kitFiles) {
       const relativePath = normalizeTrackedPath(trackedFile.path);
-      const filePath = join157(installation.path, relativePath);
+      const filePath = join159(installation.path, relativePath);
       if (preservedPaths.has(relativePath)) {
         result.toPreserve.push({ path: relativePath, reason: "shared with other kit" });
         continue;
@@ -116709,7 +117010,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
   }
   for (const trackedFile of allTrackedFiles) {
     const relativePath = normalizeTrackedPath(trackedFile.path);
-    const filePath = join157(installation.path, relativePath);
+    const filePath = join159(installation.path, relativePath);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -116760,7 +117061,7 @@ init_settings_merger();
 init_command_normalizer();
 init_logger();
 var import_fs_extra43 = __toESM(require_lib(), 1);
-import { join as join158 } from "node:path";
+import { join as join160 } from "node:path";
 var CK_JSON_FILE2 = ".ck.json";
 var SETTINGS_FILE = "settings.json";
 var EMPTY_RESULT = {
@@ -116882,7 +117183,7 @@ async function cleanupCkJson(ckJsonPath, data, removedKitNames, dryRun) {
   return false;
 }
 async function cleanupUninstalledSettings(installationPath, options2) {
-  const ckJsonPath = join158(installationPath, CK_JSON_FILE2);
+  const ckJsonPath = join160(installationPath, CK_JSON_FILE2);
   if (!await import_fs_extra43.pathExists(ckJsonPath)) {
     return { ...EMPTY_RESULT };
   }
@@ -116897,7 +117198,7 @@ async function cleanupUninstalledSettings(installationPath, options2) {
   const removedKitNames = options2.kit ? [options2.kit] : Object.keys(kits);
   const { hooks, servers } = resolveRemovalTargets(kits, removedKitNames, options2.remainingKits);
   const result = { ...EMPTY_RESULT };
-  const settingsPath = join158(installationPath, SETTINGS_FILE);
+  const settingsPath = join160(installationPath, SETTINGS_FILE);
   const settings = await SettingsMerger.readSettingsFile(settingsPath);
   if (settings) {
     result.hooksRemoved = removeHooksFromSettings(settings, hooks);
@@ -117011,8 +117312,8 @@ async function removeInstallations(installations, options2) {
       }
       const mutatePaths = getUninstallMutatePaths({
         retainedManifestPaths: analysis.retainedManifestPaths,
-        settingsFileExists: await import_fs_extra44.pathExists(join159(installation.path, "settings.json")),
-        ckJsonExists: await import_fs_extra44.pathExists(join159(installation.path, ".ck.json"))
+        settingsFileExists: await import_fs_extra44.pathExists(join161(installation.path, "settings.json")),
+        ckJsonExists: await import_fs_extra44.pathExists(join161(installation.path, ".ck.json"))
       });
       let backup = null;
       if (analysis.toDelete.length > 0 || mutatePaths.length > 0) {
@@ -117040,7 +117341,7 @@ async function removeInstallations(installations, options2) {
         let removedCount = 0;
         let cleanedDirs = 0;
         for (const item of analysis.toDelete) {
-          const filePath = join159(installation.path, item.path);
+          const filePath = join161(installation.path, item.path);
           if (!await import_fs_extra44.pathExists(filePath))
             continue;
           if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -117467,7 +117768,7 @@ ${import_picocolors40.default.bold(import_picocolors40.default.cyan(result.kitCo
 init_logger();
 import { existsSync as existsSync82 } from "node:fs";
 import { rm as rm19 } from "node:fs/promises";
-import { join as join166 } from "node:path";
+import { join as join168 } from "node:path";
 var import_picocolors41 = __toESM(require_picocolors(), 1);
 
 // src/commands/watch/phases/implementation-runner.ts
@@ -117986,7 +118287,7 @@ function spawnAndCollect3(command, args) {
 
 // src/commands/watch/phases/issue-processor.ts
 import { mkdir as mkdir40, writeFile as writeFile42 } from "node:fs/promises";
-import { join as join162 } from "node:path";
+import { join as join164 } from "node:path";
 
 // src/commands/watch/phases/approval-detector.ts
 init_logger();
@@ -118364,9 +118665,9 @@ async function checkAwaitingApproval(state, setup, options2, watchLog, projectDi
 
 // src/commands/watch/phases/plan-dir-finder.ts
 import { readdir as readdir46, stat as stat24 } from "node:fs/promises";
-import { join as join161 } from "node:path";
+import { join as join163 } from "node:path";
 async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
-  const plansRoot = join161(cwd2, "plans");
+  const plansRoot = join163(cwd2, "plans");
   try {
     const entries = await readdir46(plansRoot);
     const tenMinAgo = Date.now() - 10 * 60 * 1000;
@@ -118375,14 +118676,14 @@ async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
     for (const entry of entries) {
       if (entry === "watch" || entry === "reports" || entry === "visuals")
         continue;
-      const dirPath = join161(plansRoot, entry);
+      const dirPath = join163(plansRoot, entry);
       const dirStat = await stat24(dirPath);
       if (!dirStat.isDirectory())
         continue;
       if (dirStat.mtimeMs < tenMinAgo)
         continue;
       try {
-        await stat24(join161(dirPath, "plan.md"));
+        await stat24(join163(dirPath, "plan.md"));
       } catch {
         continue;
       }
@@ -118613,13 +118914,13 @@ async function handlePlanGeneration(issue, state, config, setup, options2, watch
     stats.plansCreated++;
     const detectedPlanDir = await findRecentPlanDir(projectDir, issue.number, watchLog);
     if (detectedPlanDir) {
-      state.activeIssues[numStr].planPath = join162(detectedPlanDir, "plan.md");
+      state.activeIssues[numStr].planPath = join164(detectedPlanDir, "plan.md");
       watchLog.info(`Plan directory detected: ${detectedPlanDir}`);
     } else {
       try {
-        const planDir = join162(projectDir, "plans", "watch");
+        const planDir = join164(projectDir, "plans", "watch");
         await mkdir40(planDir, { recursive: true });
-        const planFilePath = join162(planDir, `issue-${issue.number}-plan.md`);
+        const planFilePath = join164(planDir, `issue-${issue.number}-plan.md`);
         await writeFile42(planFilePath, planResult.planText, "utf-8");
         state.activeIssues[numStr].planPath = planFilePath;
         watchLog.info(`Plan saved (fallback) to ${planFilePath}`);
@@ -118926,18 +119227,18 @@ init_logger();
 import { spawnSync as spawnSync7 } from "node:child_process";
 import { existsSync as existsSync79 } from "node:fs";
 import { readdir as readdir47, stat as stat25 } from "node:fs/promises";
-import { join as join163 } from "node:path";
+import { join as join165 } from "node:path";
 async function scanForRepos(parentDir) {
   const repos = [];
   const entries = await readdir47(parentDir);
   for (const entry of entries) {
     if (entry.startsWith("."))
       continue;
-    const fullPath = join163(parentDir, entry);
+    const fullPath = join165(parentDir, entry);
     const entryStat = await stat25(fullPath);
     if (!entryStat.isDirectory())
       continue;
-    const gitDir = join163(fullPath, ".git");
+    const gitDir = join165(fullPath, ".git");
     if (!existsSync79(gitDir))
       continue;
     const result = spawnSync7("gh", ["repo", "view", "--json", "owner,name"], {
@@ -118964,7 +119265,7 @@ init_logger();
 import { spawnSync as spawnSync8 } from "node:child_process";
 import { existsSync as existsSync80 } from "node:fs";
 import { homedir as homedir53 } from "node:os";
-import { join as join164 } from "node:path";
+import { join as join166 } from "node:path";
 async function validateSetup(cwd2) {
   const workDir = cwd2 ?? process.cwd();
   const ghVersion = spawnSync8("gh", ["--version"], { encoding: "utf-8", timeout: 1e4 });
@@ -118995,7 +119296,7 @@ Run this command from a directory with a GitHub remote.`);
   } catch {
     throw new Error(`Failed to parse repository info: ${ghRepo.stdout}`);
   }
-  const skillsPath = join164(homedir53(), ".claude", "skills");
+  const skillsPath = join166(homedir53(), ".claude", "skills");
   const skillsAvailable = existsSync80(skillsPath);
   if (!skillsAvailable) {
     logger.warning(`ClaudeKit Engineer skills not found at ${skillsPath}`);
@@ -119014,7 +119315,7 @@ init_path_resolver();
 import { createWriteStream as createWriteStream3, statSync as statSync14 } from "node:fs";
 import { existsSync as existsSync81 } from "node:fs";
 import { mkdir as mkdir42, rename as rename15 } from "node:fs/promises";
-import { join as join165 } from "node:path";
+import { join as join167 } from "node:path";
 
 class WatchLogger {
   logStream = null;
@@ -119022,7 +119323,7 @@ class WatchLogger {
   logPath = null;
   maxBytes;
   constructor(logDir, maxBytes = 0) {
-    this.logDir = logDir ?? join165(PathResolver.getClaudeKitDir(), "logs");
+    this.logDir = logDir ?? join167(PathResolver.getClaudeKitDir(), "logs");
     this.maxBytes = maxBytes;
   }
   async init() {
@@ -119031,7 +119332,7 @@ class WatchLogger {
         await mkdir42(this.logDir, { recursive: true });
       }
       const dateStr = formatDate(new Date);
-      this.logPath = join165(this.logDir, `watch-${dateStr}.log`);
+      this.logPath = join167(this.logDir, `watch-${dateStr}.log`);
       this.logStream = createWriteStream3(this.logPath, { flags: "a", mode: 384 });
     } catch (error) {
       logger.warning(`Cannot create watch log file: ${error instanceof Error ? error.message : "Unknown"}`);
@@ -119213,7 +119514,7 @@ async function watchCommand(options2) {
 }
 async function discoverRepos(options2, watchLog) {
   const cwd2 = process.cwd();
-  const isGitRepo = existsSync82(join166(cwd2, ".git"));
+  const isGitRepo = existsSync82(join168(cwd2, ".git"));
   if (options2.force) {
     await forceRemoveLock(watchLog);
   }
@@ -119470,8 +119771,8 @@ function registerCommands(cli) {
 // src/cli/version-display.ts
 init_package();
 init_config_version_checker();
-import { existsSync as existsSync94, readFileSync as readFileSync27 } from "node:fs";
-import { join as join178 } from "node:path";
+import { existsSync as existsSync94, readFileSync as readFileSync29 } from "node:fs";
+import { join as join180 } from "node:path";
 
 // src/domains/versioning/version-checker.ts
 init_version_utils();
@@ -119486,14 +119787,14 @@ init_logger();
 init_path_resolver();
 import { existsSync as existsSync93 } from "node:fs";
 import { mkdir as mkdir43, readFile as readFile73, writeFile as writeFile45 } from "node:fs/promises";
-import { join as join177 } from "node:path";
+import { join as join179 } from "node:path";
 
 class VersionCacheManager {
   static CACHE_FILENAME = "version-check.json";
   static CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
   static getCacheFile() {
     const cacheDir = PathResolver.getCacheDir(false);
-    return join177(cacheDir, VersionCacheManager.CACHE_FILENAME);
+    return join179(cacheDir, VersionCacheManager.CACHE_FILENAME);
   }
   static async load() {
     const cacheFile = VersionCacheManager.getCacheFile();
@@ -119804,13 +120105,13 @@ async function displayVersion() {
   let localInstalledKits = [];
   let globalInstalledKits = [];
   const globalKitDir = PathResolver.getGlobalKitDir();
-  const globalMetadataPath = join178(globalKitDir, "metadata.json");
+  const globalMetadataPath = join180(globalKitDir, "metadata.json");
   const prefix = PathResolver.getPathPrefix(false);
-  const localMetadataPath = prefix ? join178(process.cwd(), prefix, "metadata.json") : join178(process.cwd(), "metadata.json");
+  const localMetadataPath = prefix ? join180(process.cwd(), prefix, "metadata.json") : join180(process.cwd(), "metadata.json");
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
   if (!isLocalSameAsGlobal && existsSync94(localMetadataPath)) {
     try {
-      const rawMetadata = JSON.parse(readFileSync27(localMetadataPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync29(localMetadataPath, "utf-8"));
       const metadata = MetadataSchema.parse(rawMetadata);
       const kitsDisplay = formatInstalledKits(metadata);
       if (kitsDisplay) {
@@ -119824,7 +120125,7 @@ async function displayVersion() {
   }
   if (existsSync94(globalMetadataPath)) {
     try {
-      const rawMetadata = JSON.parse(readFileSync27(globalMetadataPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync29(globalMetadataPath, "utf-8"));
       const metadata = MetadataSchema.parse(rawMetadata);
       const kitsDisplay = formatInstalledKits(metadata);
       if (kitsDisplay) {