claudekit-cli 4.0.0-dev.9 → 4.1.0-dev.1

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.0.0-dev.9",
-	"generatedAt": "2026-05-11T02:26:45.500Z",
+	"version": "4.1.0-dev.1",
+	"generatedAt": "2026-05-11T16:31:48.410Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -13095,6 +13095,14 @@ function isManagedAgentBlock(content) {
   const hasAgentConfig = /^\s*config_file\s*=\s*"agents\/.+?"\s*$/m.test(content);
   return hasAgentTable && (hasDescription || hasAgentConfig);
 }
+function repairInlineAgentTableHeaders(content, lineEnding) {
+  let repairedCount = 0;
+  const repairedContent = content.replace(/([^\r\n])(\[agents\.(?:"[^"\r\n]+"|[^\]\r\n]+)\][ \t]*(?:#[^\r\n]*)?)(?=\r?\n|$)/g, (_match, prefix, header) => {
+    repairedCount += 1;
+    return `${prefix}${lineEnding}${header}`;
+  });
+  return { content: repairedContent, repairedCount };
+}
 function extractManagedAgentEntries(existing) {
   const entries = new Map;
   const escapedStart = escapeRegExp(SENTINEL_START);
@@ -13150,22 +13158,27 @@ function stripRanges(content, ranges) {
 function analyzeConfigToml(existing) {
   const lineEnding = detectLineEnding(existing);
   const warnings = [];
+  const repairResult = repairInlineAgentTableHeaders(existing, lineEnding);
+  const normalizedContent = repairResult.content;
+  if (repairResult.repairedCount > 0) {
+    warnings.push(`Repaired ${repairResult.repairedCount} inline [agents.*] table header(s) in config.toml`);
+  }
   const escapedStart = escapeRegExp(SENTINEL_START);
   const escapedEnd = escapeRegExp(SENTINEL_END);
   const startLineRegex = new RegExp(`^${escapedStart}\\s*$`, "gm");
   const endLineRegex = new RegExp(`^${escapedEnd}\\s*$`, "gm");
-  const startCount = [...existing.matchAll(startLineRegex)].length;
-  const endCount = [...existing.matchAll(endLineRegex)].length;
+  const startCount = [...normalizedContent.matchAll(startLineRegex)].length;
+  const endCount = [...normalizedContent.matchAll(endLineRegex)].length;
   const blockRegex = new RegExp(`^${escapedStart}\\s*\\r?\\n[\\s\\S]*?^${escapedEnd}\\s*(?:\\r?\\n)?`, "gm");
   const candidateRanges = [];
-  let match = blockRegex.exec(existing);
+  let match = blockRegex.exec(normalizedContent);
   while (match) {
     candidateRanges.push({
       start: match.index,
       end: match.index + match[0].length,
       content: match[0]
     });
-    match = blockRegex.exec(existing);
+    match = blockRegex.exec(normalizedContent);
   }
   const candidateCount = candidateRanges.length;
   const unmatchedStart = Math.max(0, startCount - candidateCount);
@@ -13173,7 +13186,8 @@ function analyzeConfigToml(existing) {
   if (unmatchedStart > 0 || unmatchedEnd > 0) {
     return {
       lineEnding,
-      unmanagedContent: existing,
+      normalizedContent,
+      unmanagedContent: normalizedContent,
       warnings,
       error: "Malformed CK managed agent sentinels in config.toml (unmatched start/end markers). Please clean up sentinels manually."
     };
@@ -13182,9 +13196,10 @@ function analyzeConfigToml(existing) {
   if (managedRanges.length > 1) {
     warnings.push(`Found ${managedRanges.length} CK-managed agent blocks in config.toml; collapsing into one managed block`);
   }
-  const unmanagedContent = stripRanges(existing, managedRanges);
+  const unmanagedContent = stripRanges(normalizedContent, managedRanges);
   return {
     lineEnding,
+    normalizedContent,
     unmanagedContent,
     warnings
   };
@@ -13367,6 +13382,7 @@ async function installCodexToml(items, provider, portableType, options2) {
         snapshottedPaths.add(configTomlPath);
         const existingConfig = configSnapshot.content ?? "";
         const configAnalysis = analyzeConfigToml(existingConfig);
+        const normalizedConfig = configAnalysis.normalizedContent;
         allWarnings.push(...configAnalysis.warnings);
         if (configAnalysis.error) {
           return {
@@ -13378,7 +13394,7 @@ async function installCodexToml(items, provider, portableType, options2) {
             warnings: allWarnings.length > 0 ? allWarnings : undefined
           };
         }
-        const existingManagedEntries = extractManagedAgentEntries(existingConfig);
+        const existingManagedEntries = extractManagedAgentEntries(normalizedConfig);
         const unmanagedAgentSlugs = extractUnmanagedAgentSlugs(configAnalysis.unmanagedContent);
         for (const item of items) {
           const result = convertItem(item, pathConfig.format, provider, {
@@ -13436,6 +13452,9 @@ async function installCodexToml(items, provider, portableType, options2) {
           });
         }
         if (pendingInstalls.length === 0) {
+          if (normalizedConfig !== existingConfig) {
+            await writeFile2(configTomlPath, normalizedConfig, "utf-8");
+          }
           return {
             provider,
             providerDisplayName: config.displayName,
@@ -13454,7 +13473,7 @@ async function installCodexToml(items, provider, portableType, options2) {
         const managedBlock = sortedEntries.join(`
 
 `);
-        const mergeResult = mergeConfigTomlWithDiagnostics(existingConfig, managedBlock);
+        const mergeResult = mergeConfigTomlWithDiagnostics(normalizedConfig, managedBlock);
         allWarnings.push(...mergeResult.warnings);
         if (mergeResult.error) {
           return {
@@ -13537,7 +13556,13 @@ async function cleanupStaleCodexConfigEntries(options2) {
   try {
     return await withCodexTargetLock(configTomlPath, async () => {
       let content = await readFile3(configTomlPath, "utf-8");
+      let contentChanged = false;
       const allStaleSlugs = [];
+      const initialAnalysis = analyzeConfigToml(content);
+      if (!initialAnalysis.error && initialAnalysis.normalizedContent !== content) {
+        content = initialAnalysis.normalizedContent;
+        contentChanged = true;
+      }
       const managedEntries = extractManagedAgentEntries(content);
       if (managedEntries.size > 0) {
         const validEntries = new Map;
@@ -13553,6 +13578,7 @@ async function cleanupStaleCodexConfigEntries(options2) {
           if (validEntries.size === 0) {
             const analysis2 = analyzeConfigToml(content);
             content = analysis2.unmanagedContent;
+            contentChanged = true;
           } else {
             const sortedEntries = [...validEntries.entries()].sort(([a3], [b3]) => a3.localeCompare(b3)).map(([, entry]) => entry);
             const managedBlock = sortedEntries.join(`
@@ -13563,6 +13589,7 @@ async function cleanupStaleCodexConfigEntries(options2) {
               logger.verbose(`[codex-cleanup] Phase 1 merge failed: ${mergeResult.error}`);
             } else {
               content = mergeResult.content;
+              contentChanged = true;
             }
           }
         }
@@ -13587,12 +13614,17 @@ async function cleanupStaleCodexConfigEntries(options2) {
         content = content.replace(/\n{3,}/g, `
 
 `);
+        contentChanged = true;
         allStaleSlugs.push(...legacyStaleSlugs);
       }
-      if (allStaleSlugs.length === 0)
+      if (allStaleSlugs.length === 0 && !contentChanged)
         return [];
       await writeFile2(configTomlPath, content, "utf-8");
-      logger.verbose(`[codex-cleanup] Removed ${allStaleSlugs.length} stale config.toml entries: ${allStaleSlugs.join(", ")}`);
+      if (allStaleSlugs.length > 0) {
+        logger.verbose(`[codex-cleanup] Removed ${allStaleSlugs.length} stale config.toml entries: ${allStaleSlugs.join(", ")}`);
+      } else {
+        logger.verbose("[codex-cleanup] Repaired malformed inline agent table headers");
+      }
       return allStaleSlugs;
     });
   } catch (error) {
@@ -16105,10 +16137,14 @@ var init_frontmatter_parser = __esm(() => {
 import { readdir } from "node:fs/promises";
 import { homedir as homedir6 } from "node:os";
 import { join as join6 } from "node:path";
-function getAgentSourcePath() {
+function getAgentSourcePath(globalOnly = false) {
+  const globalPath = join6(homedir6(), ".claude/agents");
+  if (globalOnly) {
+    return findFirstExistingPath([globalPath]);
+  }
   return findFirstExistingPath([
     ...getProjectLayoutCandidates(process.cwd(), "agents"),
-    join6(home3, ".claude/agents")
+    globalPath
   ]);
 }
 async function discoverAgents(sourcePath) {
@@ -16145,12 +16181,10 @@ async function findAgentByName(name, sourcePath) {
   const agents = await discoverAgents(sourcePath);
   return agents.find((a3) => a3.name.toLowerCase() === name.toLowerCase()) || null;
 }
-var home3;
 var init_agents_discovery = __esm(() => {
   init_kit_layout();
   init_logger();
   init_frontmatter_parser();
-  home3 = homedir6();
 });
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
@@ -20787,10 +20821,14 @@ var init_safe_prompts = __esm(() => {
 import { readdir as readdir4 } from "node:fs/promises";
 import { homedir as homedir10 } from "node:os";
 import { join as join16, relative as relative3 } from "node:path";
-function getCommandSourcePath() {
+function getCommandSourcePath(globalOnly = false) {
+  const globalPath = join16(homedir10(), ".claude/commands");
+  if (globalOnly) {
+    return findFirstExistingPath([globalPath]);
+  }
   return findFirstExistingPath([
     ...getProjectLayoutCandidates(process.cwd(), "commands"),
-    join16(home4, ".claude/commands")
+    globalPath
   ]);
 }
 async function scanCommandDir(dir, rootDir) {
@@ -20840,12 +20878,11 @@ async function findCommandByName(name, sourcePath) {
   const commands = await discoverCommands(sourcePath);
   return commands.find((c2) => c2.name.toLowerCase() === name.toLowerCase()) || commands.find((c2) => c2.displayName?.toLowerCase() === name.toLowerCase()) || null;
 }
-var home4, SKIP_DIRS;
+var SKIP_DIRS;
 var init_commands_discovery = __esm(() => {
   init_kit_layout();
   init_logger();
   init_frontmatter_parser();
-  home4 = homedir10();
   SKIP_DIRS = ["node_modules", ".git", "dist", "build"];
 });
 
@@ -49268,7 +49305,7 @@ function resolveAgentDirs() {
       dirs.push({ path: candidate, label: rel });
     }
   }
-  const globalPath = join28(home5, ".claude", "agents");
+  const globalPath = join28(home3, ".claude", "agents");
   dirs.push({ path: globalPath, label: "~/.claude/agents" });
   const seen = new Set;
   return dirs.filter(({ path: path3 }) => {
@@ -49357,11 +49394,11 @@ function registerAgentsBrowserRoutes(app) {
     res.status(404).json({ error: "Agent not found" });
   });
 }
-var home5;
+var home3;
 var init_agents_routes = __esm(() => {
   init_frontmatter_parser();
   init_kit_layout();
-  home5 = homedir15();
+  home3 = homedir15();
 });
 
 // src/schemas/ck-config.schema.json
@@ -51413,10 +51450,10 @@ function mergeServers(lists) {
 function isSafeProjectPath(projectPath) {
   if (projectPath.includes(".."))
     return false;
-  const home6 = homedir23();
+  const home4 = homedir23();
   try {
     const resolved = resolve14(projectPath);
-    if (!resolved.startsWith(home6))
+    if (!resolved.startsWith(home4))
       return false;
     return existsSync21(resolved);
   } catch {
@@ -51742,26 +51779,34 @@ async function copyHooksCompanionDirs(sourceDir, targetDir) {
 function resolveSourceOrigin(sourcePath) {
   if (!sourcePath)
     return "global";
-  const home6 = homedir24();
+  const home4 = homedir24();
   const cwd2 = process.cwd();
-  if (cwd2 === home6)
+  if (cwd2 === home4)
     return "global";
   const cwdPrefix = cwd2.endsWith(sep6) ? cwd2 : `${cwd2}${sep6}`;
   if (sourcePath === cwd2 || sourcePath.startsWith(cwdPrefix))
     return "project";
   return "global";
 }
-function getConfigSourcePath() {
+function getConfigSourcePath(globalOnly = false) {
+  if (globalOnly)
+    return getGlobalConfigSourcePath();
   return findExistingProjectConfigPath(process.cwd()) ?? getGlobalConfigSourcePath();
 }
 function getGlobalConfigSourcePath() {
   return join41(homedir24(), ".claude", "CLAUDE.md");
 }
-function getRulesSourcePath() {
-  return findExistingProjectLayoutPath(process.cwd(), "rules") ?? join41(homedir24(), ".claude", "rules");
+function getRulesSourcePath(globalOnly = false) {
+  const globalPath = join41(homedir24(), ".claude", "rules");
+  if (globalOnly)
+    return globalPath;
+  return findExistingProjectLayoutPath(process.cwd(), "rules") ?? globalPath;
 }
-function getHooksSourcePath() {
-  return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? join41(homedir24(), ".claude", "hooks");
+function getHooksSourcePath(globalOnly = false) {
+  const globalPath = join41(homedir24(), ".claude", "hooks");
+  if (globalOnly)
+    return globalPath;
+  return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? globalPath;
 }
 async function discoverConfig(sourcePath) {
   const path3 = sourcePath ?? getConfigSourcePath();
@@ -54266,12 +54311,12 @@ function scrubHookEntry(entry, event, capabilities, pathRewrite) {
 }
 function rewriteCommandPath(command, pathRewrite) {
   if (pathRewrite.commandSubstitutions && pathRewrite.commandSubstitutions.size > 0) {
-    const home6 = homedir26();
+    const home4 = homedir26();
     for (const [originalAbsPath, wrapperAbsPath] of pathRewrite.commandSubstitutions) {
       const candidates = new Set([
         originalAbsPath,
-        originalAbsPath.replace(home6, "$HOME"),
-        originalAbsPath.replace(home6, "~")
+        originalAbsPath.replace(home4, "$HOME"),
+        originalAbsPath.replace(home4, "~")
       ]);
       for (const candidate of candidates) {
         if (command.includes(candidate)) {
@@ -56077,13 +56122,17 @@ __export(exports_skills_discovery, {
 import { readFile as readFile24, readdir as readdir13, stat as stat9 } from "node:fs/promises";
 import { homedir as homedir28 } from "node:os";
 import { dirname as dirname15, join as join45 } from "node:path";
-function getSkillSourcePath() {
+function getSkillSourcePath(globalOnly = false) {
+  const globalPath = join45(homedir28(), ".claude/skills");
+  if (globalOnly) {
+    return findFirstExistingPath([globalPath]);
+  }
   const bundledRoot = join45(process.cwd(), "node_modules", "claudekit-engineer");
   return findFirstExistingPath([
     join45(bundledRoot, "skills"),
     ...getProjectLayoutCandidates(bundledRoot, "skills"),
     ...getProjectLayoutCandidates(process.cwd(), "skills"),
-    join45(home6, ".claude/skills")
+    globalPath
   ]);
 }
 async function hasSkillMd(dir) {
@@ -56196,13 +56245,12 @@ async function findSkillByName(name, sourcePath) {
   const skills = await discoverSkills(sourcePath);
   return skills.find((s) => s.name.toLowerCase() === name.toLowerCase()) || null;
 }
-var import_gray_matter5, home6, SKIP_DIRS3;
+var import_gray_matter5, SKIP_DIRS3;
 var init_skills_discovery = __esm(() => {
   init_kit_layout();
   init_skill_frontmatter_validator();
   init_logger();
   import_gray_matter5 = __toESM(require_gray_matter(), 1);
-  home6 = homedir28();
   SKIP_DIRS3 = ["node_modules", ".git", "dist", "build", ".venv", "__pycache__", "common"];
 });
 
@@ -56843,13 +56891,13 @@ function recordHookRegistrationOutcome(provider, mergeResult, warnings, feedback
 function warnConversionFallback(warning) {
   console.warn(`[migrate] Falling back to raw checksum for ${sanitizeUntrusted(warning.provider)} ${sanitizeUntrusted(warning.type)} "${sanitizeUntrusted(warning.item, 80)}" because ${sanitizeUntrusted(warning.format)} conversion failed: ${sanitizeUntrusted(warning.error, 260)}`);
 }
-async function discoverMigrationItems(include, configSource) {
-  const agentsSource = include.agents ? getAgentSourcePath() : null;
-  const commandsSource = include.commands ? getCommandSourcePath() : null;
-  const skillsSource = include.skills ? getSkillSourcePath() : null;
-  const hooksSource = include.hooks ? getHooksSourcePath() : null;
-  const configSourcePath = include.config ? configSource ?? getConfigSourcePath() : null;
-  const rulesSourcePath = include.rules ? getRulesSourcePath() : null;
+async function discoverMigrationItems(include, configSource, globalOnly = false) {
+  const agentsSource = include.agents ? getAgentSourcePath(globalOnly) : null;
+  const commandsSource = include.commands ? getCommandSourcePath(globalOnly) : null;
+  const skillsSource = include.skills ? getSkillSourcePath(globalOnly) : null;
+  const hooksSource = include.hooks ? getHooksSourcePath(globalOnly) : null;
+  const configSourcePath = include.config ? configSource ?? getConfigSourcePath(globalOnly) : null;
+  const rulesSourcePath = include.rules ? getRulesSourcePath(globalOnly) : null;
   const [agents, commands, skills, configItem, ruleItems, hookItems] = await Promise.all([
     agentsSource ? discoverAgents(agentsSource) : Promise.resolve([]),
     commandsSource ? discoverCommands(commandsSource) : Promise.resolve([]),
@@ -56926,12 +56974,12 @@ function registerMigrationRoutes(app) {
       };
       const discovered = await discoverMigrationItems(includeAll);
       const cwd2 = process.cwd();
-      const home7 = homedir29();
+      const home4 = homedir29();
       res.status(200).json({
         cwd: cwd2,
         targetPaths: {
           project: join46(cwd2, ".claude"),
-          global: join46(home7, ".claude")
+          global: join46(home4, ".claude")
         },
         sourcePaths: discovered.sourcePaths,
         sourceOrigins: {
@@ -57542,7 +57590,7 @@ function registerMigrationRoutes(app) {
       const configSource = sourceParsed.value;
       const effectiveGlobal = requestedGlobal;
       const warnings = [];
-      const discovered = await discoverMigrationItems(include, configSource);
+      const discovered = await discoverMigrationItems(include, configSource, requestedGlobal);
       const hasItems = discovered.agents.length > 0 || discovered.commands.length > 0 || discovered.skills.length > 0 || discovered.configItem !== null || discovered.ruleItems.length > 0 || discovered.hookItems.length > 0;
       if (!hasItems) {
         res.status(200).json({
@@ -60553,8 +60601,8 @@ function toDateStr(d3) {
   return `${y3}-${m2}-${day}`;
 }
 async function scanActivityMetrics(periodDays) {
-  const home7 = homedir33();
-  const projectsDir2 = join56(home7, ".claude", "projects");
+  const home4 = homedir33();
+  const projectsDir2 = join56(home4, ".claude", "projects");
   const cutoff = new Date;
   cutoff.setDate(cutoff.getDate() - periodDays);
   const dailyMap = new Map;
@@ -60624,29 +60672,29 @@ async function scanActivityMetrics(periodDays) {
   return { totalSessions, projects: projectActivities, dailyCounts };
 }
 async function resolveSessionDir(projectId) {
-  const home7 = homedir33();
+  const home4 = homedir33();
   if (projectId.startsWith("discovered-")) {
     try {
       const encodedPathB64 = projectId.slice("discovered-".length);
       const projectPath = Buffer.from(encodedPathB64, "base64url").toString("utf-8");
       const claudeEncoded = encodePath(projectPath);
-      return join56(home7, ".claude", "projects", claudeEncoded);
+      return join56(home4, ".claude", "projects", claudeEncoded);
     } catch {
       return null;
     }
   }
   if (projectId === "current") {
     const cwdEncoded = encodePath(process.cwd());
-    return join56(home7, ".claude", "projects", cwdEncoded);
+    return join56(home4, ".claude", "projects", cwdEncoded);
   }
   if (projectId === "global") {
-    const globalEncoded = encodePath(join56(home7, ".claude"));
-    return join56(home7, ".claude", "projects", globalEncoded);
+    const globalEncoded = encodePath(join56(home4, ".claude"));
+    return join56(home4, ".claude", "projects", globalEncoded);
   }
   const registered = await ProjectsRegistryManager.getProject(projectId);
   if (registered) {
     const claudeEncoded = encodePath(registered.path);
-    return join56(home7, ".claude", "projects", claudeEncoded);
+    return join56(home4, ".claude", "projects", claudeEncoded);
   }
   return null;
 }
@@ -60798,8 +60846,8 @@ async function parseSessionDetail(filePath, limit, offset) {
 }
 function registerSessionRoutes(app) {
   app.get("/api/sessions", async (_req, res) => {
-    const home7 = homedir33();
-    const projectsDir2 = join56(home7, ".claude", "projects");
+    const home4 = homedir33();
+    const projectsDir2 = join56(home4, ".claude", "projects");
     if (!existsSync37(projectsDir2)) {
       res.json({ projects: [] });
       return;
@@ -61482,10 +61530,10 @@ function hasOpenCodeInstallSignal2() {
     join59(process.cwd(), "opencode.jsonc"),
     join59(process.cwd(), ".opencode/agents"),
     join59(process.cwd(), ".opencode/commands"),
-    join59(home7, ".config/opencode/AGENTS.md"),
-    join59(home7, ".config/opencode/agents"),
-    join59(home7, ".config/opencode/commands"),
-    join59(home7, ".opencode", "bin", OPENCODE_BINARY_NAME2)
+    join59(home4, ".config/opencode/AGENTS.md"),
+    join59(home4, ".config/opencode/agents"),
+    join59(home4, ".config/opencode/commands"),
+    join59(home4, ".opencode", "bin", OPENCODE_BINARY_NAME2)
   ]);
 }
 async function detectInstalledAgents() {
@@ -61509,108 +61557,108 @@ function isSkillInstalled(skillName, agent, options2) {
   const installPath = getInstallPath(skillName, agent, options2);
   return existsSync38(installPath);
 }
-var home7, OPENCODE_BINARY_NAME2, agents;
+var home4, OPENCODE_BINARY_NAME2, agents;
 var init_agents = __esm(() => {
-  home7 = homedir37();
+  home4 = homedir37();
   OPENCODE_BINARY_NAME2 = platform5() === "win32" ? "opencode.exe" : "opencode";
   agents = {
     "claude-code": {
       name: "claude-code",
       displayName: "Claude Code",
       projectPath: ".claude/skills",
-      globalPath: join59(home7, ".claude/skills"),
-      detect: async () => existsSync38(join59(home7, ".claude"))
+      globalPath: join59(home4, ".claude/skills"),
+      detect: async () => existsSync38(join59(home4, ".claude"))
     },
     cursor: {
       name: "cursor",
       displayName: "Cursor",
       projectPath: ".cursor/skills",
-      globalPath: join59(home7, ".cursor/skills"),
-      detect: async () => existsSync38(join59(home7, ".cursor"))
+      globalPath: join59(home4, ".cursor/skills"),
+      detect: async () => existsSync38(join59(home4, ".cursor"))
     },
     codex: {
       name: "codex",
       displayName: "Codex",
       projectPath: ".codex/skills",
-      globalPath: join59(home7, ".codex/skills"),
-      detect: async () => existsSync38(join59(home7, ".codex"))
+      globalPath: join59(home4, ".codex/skills"),
+      detect: async () => existsSync38(join59(home4, ".codex"))
     },
     opencode: {
       name: "opencode",
       displayName: "OpenCode",
       projectPath: ".claude/skills",
-      globalPath: join59(home7, ".claude/skills"),
+      globalPath: join59(home4, ".claude/skills"),
       detect: async () => hasOpenCodeInstallSignal2()
     },
     goose: {
       name: "goose",
       displayName: "Goose",
       projectPath: ".goose/skills",
-      globalPath: join59(home7, ".config/goose/skills"),
-      detect: async () => existsSync38(join59(home7, ".config/goose"))
+      globalPath: join59(home4, ".config/goose/skills"),
+      detect: async () => existsSync38(join59(home4, ".config/goose"))
     },
     "gemini-cli": {
       name: "gemini-cli",
       displayName: "Gemini CLI",
       projectPath: ".agents/skills",
-      globalPath: join59(home7, ".agents/skills"),
-      detect: async () => existsSync38(join59(home7, ".gemini"))
+      globalPath: join59(home4, ".agents/skills"),
+      detect: async () => existsSync38(join59(home4, ".gemini"))
     },
     antigravity: {
       name: "antigravity",
       displayName: "Antigravity",
       projectPath: ".agent/skills",
-      globalPath: join59(home7, ".gemini/antigravity/skills"),
-      detect: async () => existsSync38(join59(process.cwd(), ".agent")) || existsSync38(join59(home7, ".gemini/antigravity"))
+      globalPath: join59(home4, ".gemini/antigravity/skills"),
+      detect: async () => existsSync38(join59(process.cwd(), ".agent")) || existsSync38(join59(home4, ".gemini/antigravity"))
     },
     "github-copilot": {
       name: "github-copilot",
       displayName: "GitHub Copilot",
       projectPath: ".github/skills",
-      globalPath: join59(home7, ".copilot/skills"),
-      detect: async () => existsSync38(join59(home7, ".copilot"))
+      globalPath: join59(home4, ".copilot/skills"),
+      detect: async () => existsSync38(join59(home4, ".copilot"))
     },
     amp: {
       name: "amp",
       displayName: "Amp",
       projectPath: ".agents/skills",
-      globalPath: join59(home7, ".config/agents/skills"),
-      detect: async () => existsSync38(join59(home7, ".config/amp"))
+      globalPath: join59(home4, ".config/agents/skills"),
+      detect: async () => existsSync38(join59(home4, ".config/amp"))
     },
     kilo: {
       name: "kilo",
       displayName: "Kilo Code",
       projectPath: ".kilocode/skills",
-      globalPath: join59(home7, ".kilocode/skills"),
-      detect: async () => existsSync38(join59(home7, ".kilocode"))
+      globalPath: join59(home4, ".kilocode/skills"),
+      detect: async () => existsSync38(join59(home4, ".kilocode"))
     },
     roo: {
       name: "roo",
       displayName: "Roo Code",
       projectPath: ".roo/skills",
-      globalPath: join59(home7, ".roo/skills"),
-      detect: async () => existsSync38(join59(home7, ".roo"))
+      globalPath: join59(home4, ".roo/skills"),
+      detect: async () => existsSync38(join59(home4, ".roo"))
     },
     windsurf: {
       name: "windsurf",
       displayName: "Windsurf",
       projectPath: ".windsurf/skills",
-      globalPath: join59(home7, ".codeium/windsurf/skills"),
-      detect: async () => existsSync38(join59(home7, ".codeium/windsurf"))
+      globalPath: join59(home4, ".codeium/windsurf/skills"),
+      detect: async () => existsSync38(join59(home4, ".codeium/windsurf"))
     },
     cline: {
       name: "cline",
       displayName: "Cline",
       projectPath: ".cline/skills",
-      globalPath: join59(home7, ".cline/skills"),
-      detect: async () => existsSync38(join59(home7, ".cline"))
+      globalPath: join59(home4, ".cline/skills"),
+      detect: async () => existsSync38(join59(home4, ".cline"))
     },
     openhands: {
       name: "openhands",
       displayName: "OpenHands",
       projectPath: ".openhands/skills",
-      globalPath: join59(home7, ".openhands/skills"),
-      detect: async () => existsSync38(join59(home7, ".openhands"))
+      globalPath: join59(home4, ".openhands/skills"),
+      detect: async () => existsSync38(join59(home4, ".openhands"))
     }
   };
 });
@@ -61727,11 +61775,11 @@ async function syncRegistry() {
   }
   return { removed };
 }
-var home8, REGISTRY_PATH2, SkillInstallationSchema, SkillRegistrySchema, REGISTRY_PATH_MIGRATIONS;
+var home5, REGISTRY_PATH2, SkillInstallationSchema, SkillRegistrySchema, REGISTRY_PATH_MIGRATIONS;
 var init_skills_registry = __esm(() => {
   init_zod();
-  home8 = homedir38();
-  REGISTRY_PATH2 = join60(home8, ".claudekit", "skill-registry.json");
+  home5 = homedir38();
+  REGISTRY_PATH2 = join60(home5, ".claudekit", "skill-registry.json");
   SkillInstallationSchema = exports_external.object({
     skill: exports_external.string(),
     agent: exports_external.string(),
@@ -62842,7 +62890,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.0.0-dev.9",
+    version: "4.1.0-dev.1",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -71064,6 +71112,40 @@ function parseNameReason(str2) {
   }
   return [str2.slice(0, colonIndex).trim(), str2.slice(colonIndex + 1).trim()];
 }
+function matchesSystemToolName(name, toolName) {
+  return name === toolName || name.startsWith(`${toolName} `) || name.includes(`(${toolName})`);
+}
+function getSystemToolKey(failure) {
+  const [name] = parseNameReason(failure);
+  const lowerName = name.toLowerCase().replace(/\s+/g, " ");
+  for (const toolName of SYSTEM_TOOL_KEYS) {
+    if (matchesSystemToolName(lowerName, toolName)) {
+      return toolName;
+    }
+  }
+  return;
+}
+function isSystemToolFailure(failure) {
+  return getSystemToolKey(failure) !== undefined;
+}
+function isWindowsSummary(summary) {
+  return Boolean(summary.remediation.winget_packages || summary.remediation.pip_retry.includes(".ps1") || summary.remediation.pip_retry.includes("\\"));
+}
+function getSystemPackageCommand(summary, systemFailures) {
+  if (isWindowsSummary(summary)) {
+    const packageIds = new Set;
+    for (const failure of systemFailures) {
+      const key = getSystemToolKey(failure);
+      if (key)
+        packageIds.add(WINDOWS_SYSTEM_PACKAGES[key]);
+    }
+    if (packageIds.size > 0) {
+      return `winget install ${Array.from(packageIds).join(" ")}`;
+    }
+    return summary.remediation.winget_packages;
+  }
+  return summary.remediation.sudo_packages || undefined;
+}
 function displayInstallErrors(skillsDir2) {
   const summaryPath = join90(skillsDir2, ".install-error-summary.json");
   if (!existsSync58(summaryPath)) {
@@ -71079,6 +71161,12 @@ function displayInstallErrors(skillsDir2) {
     return;
   }
   try {
+    const systemOptionalFailures = summary.optional_failures.filter(isSystemToolFailure);
+    const pythonOptionalFailures = summary.optional_failures.filter((f3) => !isSystemToolFailure(f3));
+    const systemPackageCommand = getSystemPackageCommand(summary, [
+      ...systemOptionalFailures,
+      ...summary.skipped
+    ]);
     if (summary.critical_failures.length > 0) {
       logger.error("");
       logger.error("━━━ Critical Failures ━━━");
@@ -71112,17 +71200,17 @@ function displayInstallErrors(skillsDir2) {
     logger.info("");
     logger.info("━━━ How to Fix ━━━");
     logger.info("");
-    if (summary.optional_failures.some((f3) => f3.includes("no wheel") || f3.includes("build tools") || f3.includes("build failed")) && summary.remediation.build_tools) {
+    if (pythonOptionalFailures.some((f3) => f3.includes("no wheel") || f3.includes("build tools") || f3.includes("build failed")) && summary.remediation.build_tools) {
       logger.info("Install build tools (one-time):");
       logger.info(`  ${summary.remediation.build_tools}`);
       logger.info("");
     }
-    if (summary.skipped.length > 0 && summary.remediation.sudo_packages) {
+    if ((summary.skipped.length > 0 || systemOptionalFailures.length > 0) && systemPackageCommand) {
       logger.info("Install system packages:");
-      logger.info(`  ${summary.remediation.sudo_packages}`);
+      logger.info(`  ${systemPackageCommand}`);
       logger.info("");
     }
-    if (summary.optional_failures.length > 0 && summary.remediation.pip_retry) {
+    if (pythonOptionalFailures.length > 0 && summary.remediation.pip_retry) {
       logger.info("Then retry failed packages manually:");
       logger.info(`  ${summary.remediation.pip_retry}`);
     }
@@ -71159,9 +71247,16 @@ function hasInstallState(skillsDir2) {
   const stateFilePath = join90(skillsDir2, ".install-state.json");
   return existsSync58(stateFilePath);
 }
-var WHICH_COMMAND_TIMEOUT_MS = 5000;
+var WHICH_COMMAND_TIMEOUT_MS = 5000, WINDOWS_SYSTEM_PACKAGES, SYSTEM_TOOL_KEYS;
 var init_install_error_handler = __esm(() => {
   init_logger();
+  WINDOWS_SYSTEM_PACKAGES = {
+    ffmpeg: "Gyan.FFmpeg",
+    imagemagick: "ImageMagick.ImageMagick",
+    librsvg: "GNOME.librsvg",
+    "rsvg-convert": "GNOME.librsvg"
+  };
+  SYSTEM_TOOL_KEYS = Object.keys(WINDOWS_SYSTEM_PACKAGES);
 });
 
 // src/services/package-installer/skills-installer.ts
@@ -71223,8 +71318,8 @@ async function installSkillsDependencies(skillsDir2, options2 = {}) {
     logger.info(`  Platform: ${platform9 === "win32" ? "Windows (PowerShell)" : "Unix (bash)"}`);
     if (logger.isVerbose()) {
       try {
-        const { readFile: readFile45 } = await import("node:fs/promises");
-        const scriptContent = await readFile45(scriptPath, "utf-8");
+        const { readFile: readFile46 } = await import("node:fs/promises");
+        const scriptContent = await readFile46(scriptPath, "utf-8");
         const previewLines = scriptContent.split(`
 `).slice(0, 20);
         logger.verbose("Script preview (first 20 lines):");
@@ -71420,11 +71515,11 @@ var init_skills_installer2 = __esm(() => {
 
 // src/services/package-installer/gemini-mcp/config-manager.ts
 import { existsSync as existsSync59 } from "node:fs";
-import { mkdir as mkdir23, readFile as readFile45, writeFile as writeFile22 } from "node:fs/promises";
+import { mkdir as mkdir23, readFile as readFile46, writeFile as writeFile22 } from "node:fs/promises";
 import { dirname as dirname29, join as join92 } from "node:path";
 async function readJsonFile(filePath) {
   try {
-    const content = await readFile45(filePath, "utf-8");
+    const content = await readFile46(filePath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : "Unknown error";
@@ -71438,7 +71533,7 @@ async function addGeminiToGitignore(projectDir) {
   try {
     let content = "";
     if (existsSync59(gitignorePath)) {
-      content = await readFile45(gitignorePath, "utf-8");
+      content = await readFile46(gitignorePath, "utf-8");
       const lines = content.split(`
 `).map((line) => line.trim()).filter((line) => !line.startsWith("#"));
       const geminiPatterns = [".gemini/", ".gemini", "/.gemini/", "/.gemini"];
@@ -74007,7 +74102,7 @@ __export(exports_worktree_manager, {
   cleanupAllWorktrees: () => cleanupAllWorktrees
 });
 import { existsSync as existsSync70 } from "node:fs";
-import { readFile as readFile65, writeFile as writeFile37 } from "node:fs/promises";
+import { readFile as readFile66, writeFile as writeFile37 } from "node:fs/promises";
 import { join as join151 } from "node:path";
 async function createWorktree(projectDir, issueNumber, baseBranch) {
   const worktreePath = join151(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
@@ -74072,7 +74167,7 @@ async function cleanupAllWorktrees(projectDir) {
 async function ensureGitignore(projectDir) {
   const gitignorePath = join151(projectDir, ".gitignore");
   try {
-    const content = existsSync70(gitignorePath) ? await readFile65(gitignorePath, "utf-8") : "";
+    const content = existsSync70(gitignorePath) ? await readFile66(gitignorePath, "utf-8") : "";
     if (!content.includes(".worktrees")) {
       const newContent = content.endsWith(`
 `) ? `${content}.worktrees/
@@ -75994,12 +76089,12 @@ var init_types6 = __esm(() => {
 });
 
 // src/commands/content/phases/state-manager.ts
-import { readFile as readFile67, rename as rename15, writeFile as writeFile40 } from "node:fs/promises";
+import { readFile as readFile68, rename as rename15, writeFile as writeFile40 } from "node:fs/promises";
 import { join as join164 } from "node:path";
 async function loadContentConfig(projectDir) {
   const configPath = join164(projectDir, CK_CONFIG_FILE2);
   try {
-    const raw2 = await readFile67(configPath, "utf-8");
+    const raw2 = await readFile68(configPath, "utf-8");
     const json = JSON.parse(raw2);
     return ContentConfigSchema.parse(json.content ?? {});
   } catch {
@@ -76015,7 +76110,7 @@ async function saveContentConfig(projectDir, config) {
 async function loadContentState(projectDir) {
   const configPath = join164(projectDir, CK_CONFIG_FILE2);
   try {
-    const raw2 = await readFile67(configPath, "utf-8");
+    const raw2 = await readFile68(configPath, "utf-8");
     const json = JSON.parse(raw2);
     const contentBlock = json.content ?? {};
     return ContentStateSchema.parse(contentBlock.state ?? {});
@@ -76042,7 +76137,7 @@ async function saveContentState(projectDir, state) {
 }
 async function readJsonSafe(filePath) {
   try {
-    const raw2 = await readFile67(filePath, "utf-8");
+    const raw2 = await readFile68(filePath, "utf-8");
     return JSON.parse(raw2);
   } catch {
     return {};
@@ -85449,16 +85544,16 @@ async function checkPathRefsValid(projectDir) {
       };
     }
     const baseDir = dirname27(claudeMdPath);
-    const home9 = homedir41();
+    const home6 = homedir41();
     const broken = [];
     for (const ref of refs) {
       let refPath;
       if (ref.startsWith("$HOME") || ref.startsWith("${HOME}") || ref.startsWith("%USERPROFILE%")) {
-        refPath = normalize6(ref.replace(/^\$\{?HOME\}?/, home9).replace("%USERPROFILE%", home9));
+        refPath = normalize6(ref.replace(/^\$\{?HOME\}?/, home6).replace("%USERPROFILE%", home6));
       } else if (ref.startsWith("$CLAUDE_PROJECT_DIR") || ref.startsWith("${CLAUDE_PROJECT_DIR}") || ref.startsWith("%CLAUDE_PROJECT_DIR%")) {
         refPath = normalize6(ref.replace(/^\$\{?CLAUDE_PROJECT_DIR\}?/, projectDir).replace("%CLAUDE_PROJECT_DIR%", projectDir));
       } else if (ref.startsWith("~")) {
-        refPath = normalize6(ref.replace(/^~/, home9));
+        refPath = normalize6(ref.replace(/^~/, home6));
       } else if (ref.startsWith("/")) {
         refPath = normalize6(ref);
       } else if (/^[A-Za-z]:/.test(ref)) {
@@ -85467,7 +85562,7 @@ async function checkPathRefsValid(projectDir) {
         refPath = resolve32(baseDir, ref);
       }
       const normalizedPath = normalize6(refPath);
-      const isWithinHome = normalizedPath.startsWith(home9);
+      const isWithinHome = normalizedPath.startsWith(home6);
       const isWithinBase2 = normalizedPath.startsWith(normalize6(baseDir));
       const isAbsoluteAllowed = ref.startsWith("/") || /^[A-Za-z]:/.test(ref);
       if (!isWithinHome && !isWithinBase2 && !isAbsoluteAllowed) {
@@ -86596,12 +86691,12 @@ function extractHookScriptPath(cmd) {
 }
 function resolveHookScriptPath(scriptPath, projectDir) {
   let resolved = scriptPath.replace(/\\/g, "/");
-  const home9 = homedir42();
-  resolved = resolved.replace(/^\$\{?HOME\}?/, home9);
+  const home6 = homedir42();
+  resolved = resolved.replace(/^\$\{?HOME\}?/, home6);
   resolved = resolved.replace(/^\$\{?CLAUDE_PROJECT_DIR\}?/, projectDir);
-  resolved = resolved.replace(/^%USERPROFILE%/, home9);
+  resolved = resolved.replace(/^%USERPROFILE%/, home6);
   resolved = resolved.replace(/^%CLAUDE_PROJECT_DIR%/, projectDir);
-  resolved = resolved.replace(/^~\//, `${home9}/`);
+  resolved = resolved.replace(/^~\//, `${home6}/`);
   if (resolved.startsWith(".claude/") || resolved === ".claude") {
     resolved = join83(projectDir, resolved);
   }
@@ -88650,8 +88745,8 @@ class ReportGenerator {
     };
   }
   scrubPath(path7) {
-    const home9 = process.env.HOME || process.env.USERPROFILE || "";
-    return home9 ? path7.replace(home9, "~") : path7;
+    const home6 = process.env.HOME || process.env.USERPROFILE || "";
+    return home6 ? path7.replace(home6, "~") : path7;
   }
   getStatusIcon(status) {
     switch (status) {
@@ -88765,8 +88860,8 @@ class DoctorUIRenderer {
     }
   }
   shortenPath(path7) {
-    const home9 = process.env.HOME || process.env.USERPROFILE || "";
-    let shortened = home9 ? path7.replace(home9, "~") : path7;
+    const home6 = process.env.HOME || process.env.USERPROFILE || "";
+    let shortened = home6 ? path7.replace(home6, "~") : path7;
     const maxLen = 50;
     if (shortened.length > maxLen) {
       const start = shortened.slice(0, 20);
@@ -88943,14 +89038,13 @@ init_github_client();
 init_config_version_checker();
 
 // src/domains/sync/sync-engine.ts
-import { lstat as lstat6, readFile as readFile44, readlink as readlink2, realpath as realpath6, stat as stat14 } from "node:fs/promises";
+import { lstat as lstat6, readFile as readFile45, readlink as readlink2, realpath as realpath6, stat as stat14 } from "node:fs/promises";
 import { isAbsolute as isAbsolute8, join as join88, normalize as normalize8, relative as relative17 } from "node:path";
 
 // src/services/file-operations/ownership-checker.ts
 init_metadata_migration();
 import { createHash as createHash6 } from "node:crypto";
-import { createReadStream as createReadStream2 } from "node:fs";
-import { stat as stat13 } from "node:fs/promises";
+import { readFile as readFile44, stat as stat13 } from "node:fs/promises";
 import { relative as relative16 } from "node:path";
 
 // src/shared/concurrent-file-ops.ts
@@ -88964,18 +89058,12 @@ async function mapWithLimit(items, fn, concurrency = DEFAULT_CONCURRENCY) {
 // src/services/file-operations/ownership-checker.ts
 class OwnershipChecker {
   static async calculateChecksum(filePath) {
-    return new Promise((resolve34, reject) => {
-      const hash = createHash6("sha256");
-      const stream = createReadStream2(filePath);
-      stream.on("data", (chunk) => hash.update(chunk));
-      stream.on("end", () => {
-        resolve34(hash.digest("hex"));
-      });
-      stream.on("error", (err) => {
-        stream.destroy();
-        reject(new Error(operationError("Checksum calculation", filePath, err.message)));
-      });
-    });
+    try {
+      return createHash6("sha256").update(await readFile44(filePath)).digest("hex");
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      throw new Error(operationError("Checksum calculation", filePath, message));
+    }
   }
   static async checkOwnership(filePath, metadata, claudeDir3) {
     try {
@@ -90388,7 +90476,7 @@ class SyncEngine {
       if (lstats.size > MAX_SYNC_FILE_SIZE) {
         throw new Error(`File too large for sync (${Math.round(lstats.size / 1024 / 1024)}MB > ${MAX_SYNC_FILE_SIZE / 1024 / 1024}MB limit)`);
       }
-      const buffer = await readFile44(filePath);
+      const buffer = await readFile45(filePath);
       if (buffer.includes(0)) {
         return { content: "", isBinary: true };
       }
@@ -101730,7 +101818,7 @@ import { dirname as dirname35, join as join109 } from "node:path";
 // src/domains/config/installed-settings-tracker.ts
 init_shared();
 import { existsSync as existsSync63 } from "node:fs";
-import { mkdir as mkdir31, readFile as readFile48, writeFile as writeFile24 } from "node:fs/promises";
+import { mkdir as mkdir31, readFile as readFile49, writeFile as writeFile24 } from "node:fs/promises";
 import { dirname as dirname34, join as join108 } from "node:path";
 var CK_JSON_FILE = ".ck.json";
 
@@ -101755,7 +101843,7 @@ class InstalledSettingsTracker {
       return { hooks: [], mcpServers: [] };
     }
     try {
-      const content = await readFile48(ckJsonPath, "utf-8");
+      const content = await readFile49(ckJsonPath, "utf-8");
       const data = JSON.parse(content);
       const installed = data.kits?.[this.kitName]?.installedSettings;
       if (installed) {
@@ -101772,7 +101860,7 @@ class InstalledSettingsTracker {
     try {
       let data = {};
       if (existsSync63(ckJsonPath)) {
-        const content = await readFile48(ckJsonPath, "utf-8");
+        const content = await readFile49(ckJsonPath, "utf-8");
         data = JSON.parse(content);
       }
       if (!data.kits) {
@@ -103348,7 +103436,7 @@ import { join as join117 } from "node:path";
 
 // src/services/transformers/commands-prefix/content-transformer.ts
 init_logger();
-import { readFile as readFile52, readdir as readdir29, writeFile as writeFile28 } from "node:fs/promises";
+import { readFile as readFile53, readdir as readdir29, writeFile as writeFile28 } from "node:fs/promises";
 import { join as join116 } from "node:path";
 var TRANSFORMABLE_EXTENSIONS = new Set([
   ".md",
@@ -103417,7 +103505,7 @@ async function transformCommandReferences(directory, options2 = {}) {
         await processDirectory(fullPath);
       } else if (entry.isFile() && shouldTransformFile(entry.name)) {
         try {
-          const content = await readFile52(fullPath, "utf-8");
+          const content = await readFile53(fullPath, "utf-8");
           const { transformed, changes } = transformCommandContent(content);
           if (changes > 0) {
             if (options2.dryRun) {
@@ -103954,7 +104042,7 @@ init_skip_directories();
 init_types3();
 var import_fs_extra24 = __toESM(require_lib(), 1);
 import { createHash as createHash7 } from "node:crypto";
-import { readFile as readFile54, readdir as readdir33, writeFile as writeFile29 } from "node:fs/promises";
+import { readFile as readFile55, readdir as readdir33, writeFile as writeFile29 } from "node:fs/promises";
 import { join as join121, relative as relative25 } from "node:path";
 
 class SkillsManifestManager {
@@ -103988,7 +104076,7 @@ class SkillsManifestManager {
       return null;
     }
     try {
-      const content = await readFile54(manifestPath, "utf-8");
+      const content = await readFile55(manifestPath, "utf-8");
       const data = JSON.parse(content);
       const manifest = SkillsManifestSchema.parse(data);
       logger.debug(`Read manifest from: ${manifestPath}`);
@@ -104060,7 +104148,7 @@ class SkillsManifestManager {
     files.sort();
     for (const file of files) {
       const relativePath = relative25(dirPath, file);
-      const content = await readFile54(file);
+      const content = await readFile55(file);
       hash.update(relativePath);
       hash.update(content);
     }
@@ -104799,8 +104887,8 @@ import { relative as relative27 } from "node:path";
 // src/domains/skills/customization/hash-calculator.ts
 init_skip_directories();
 import { createHash as createHash8 } from "node:crypto";
-import { createReadStream as createReadStream3 } from "node:fs";
-import { readFile as readFile55, readdir as readdir37 } from "node:fs/promises";
+import { createReadStream as createReadStream2 } from "node:fs";
+import { readFile as readFile56, readdir as readdir37 } from "node:fs/promises";
 import { join as join125, relative as relative26 } from "node:path";
 async function getAllFiles(dirPath) {
   const files = [];
@@ -104822,7 +104910,7 @@ async function getAllFiles(dirPath) {
 async function hashFile(filePath) {
   return new Promise((resolve40, reject) => {
     const hash = createHash8("sha256");
-    const stream = createReadStream3(filePath);
+    const stream = createReadStream2(filePath);
     stream.on("data", (chunk) => hash.update(chunk));
     stream.on("end", () => {
       resolve40(hash.digest("hex"));
@@ -104839,7 +104927,7 @@ async function hashDirectory(dirPath) {
   files.sort();
   for (const file of files) {
     const relativePath = relative26(dirPath, file);
-    const content = await readFile55(file);
+    const content = await readFile56(file);
     hash.update(relativePath);
     hash.update(content);
   }
@@ -105173,7 +105261,7 @@ import { join as join130 } from "node:path";
 
 // src/services/transformers/opencode-path-transformer.ts
 init_logger();
-import { readFile as readFile56, readdir as readdir39, writeFile as writeFile30 } from "node:fs/promises";
+import { readFile as readFile57, readdir as readdir39, writeFile as writeFile30 } from "node:fs/promises";
 import { platform as platform14 } from "node:os";
 import { extname as extname5, join as join129 } from "node:path";
 var IS_WINDOWS2 = platform14() === "win32";
@@ -105244,7 +105332,7 @@ async function transformPathsForGlobalOpenCode(directory, options2 = {}) {
         await processDirectory2(fullPath);
       } else if (entry.isFile() && shouldTransformFile2(entry.name)) {
         try {
-          const content = await readFile56(fullPath, "utf-8");
+          const content = await readFile57(fullPath, "utf-8");
           const { transformed, changes } = transformOpenCodeContent(content);
           if (changes > 0) {
             await writeFile30(fullPath, transformed, "utf-8");
@@ -106270,7 +106358,7 @@ async function handleSelection(ctx) {
   };
 }
 // src/commands/init/phases/sync-handler.ts
-import { copyFile as copyFile8, mkdir as mkdir36, open as open5, readFile as readFile57, rename as rename10, stat as stat22, unlink as unlink12, writeFile as writeFile32 } from "node:fs/promises";
+import { copyFile as copyFile8, mkdir as mkdir36, open as open5, readFile as readFile58, rename as rename10, stat as stat22, unlink as unlink12, writeFile as writeFile32 } from "node:fs/promises";
 import { dirname as dirname38, join as join134, resolve as resolve43 } from "node:path";
 init_logger();
 init_path_resolver();
@@ -106438,7 +106526,7 @@ async function executeSyncMerge(ctx) {
     try {
       const sourceMetadataPath = join134(upstreamDir, "metadata.json");
       if (await import_fs_extra36.pathExists(sourceMetadataPath)) {
-        const content = await readFile57(sourceMetadataPath, "utf-8");
+        const content = await readFile58(sourceMetadataPath, "utf-8");
         const sourceMetadata = JSON.parse(content);
         deletions = sourceMetadata.deletions || [];
       }
@@ -106736,7 +106824,7 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 // src/services/transformers/folder-transform/path-replacer.ts
 init_logger();
 init_types3();
-import { readFile as readFile58, readdir as readdir41, writeFile as writeFile33 } from "node:fs/promises";
+import { readFile as readFile59, readdir as readdir41, writeFile as writeFile33 } from "node:fs/promises";
 import { join as join136, relative as relative29 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
@@ -106803,7 +106891,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
       if (!shouldTransform)
         continue;
       try {
-        const content = await readFile58(fullPath, "utf-8");
+        const content = await readFile59(fullPath, "utf-8");
         let newContent = content;
         let changeCount = 0;
         for (const { regex: regex2, replacement } of compiledReplacements) {
@@ -106925,7 +107013,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 
 // src/services/transformers/global-path-transformer.ts
 init_logger();
-import { readFile as readFile59, readdir as readdir42, writeFile as writeFile34 } from "node:fs/promises";
+import { readFile as readFile60, readdir as readdir42, writeFile as writeFile34 } from "node:fs/promises";
 import { homedir as homedir46, platform as platform15 } from "node:os";
 import { extname as extname6, join as join137 } from "node:path";
 var IS_WINDOWS3 = platform15() === "win32";
@@ -107076,7 +107164,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
         await processDirectory2(fullPath);
       } else if (entry.isFile() && shouldTransformFile3(entry.name)) {
         try {
-          const content = await readFile59(fullPath, "utf-8");
+          const content = await readFile60(fullPath, "utf-8");
           const { transformed, changes } = transformContent(content, {
             targetClaudeDir: options2.targetClaudeDir
           });
@@ -107337,7 +107425,7 @@ async function initCommand(options2) {
 init_dist2();
 var import_picocolors30 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync65 } from "node:fs";
-import { readFile as readFile63, rm as rm16, unlink as unlink13 } from "node:fs/promises";
+import { readFile as readFile64, rm as rm16, unlink as unlink13 } from "node:fs/promises";
 import { homedir as homedir51 } from "node:os";
 import { basename as basename27, join as join142, resolve as resolve46 } from "node:path";
 init_logger();
@@ -107502,11 +107590,11 @@ function wrapText(value, width) {
 }
 function formatDisplayPath(value) {
   const normalized = value.replace(/\\/g, "/");
-  const home9 = homedir47().replace(/\\/g, "/");
-  if (normalized === home9)
+  const home6 = homedir47().replace(/\\/g, "/");
+  if (normalized === home6)
     return "~";
-  if (normalized.startsWith(`${home9}/`)) {
-    return normalized.replace(home9, "~");
+  if (normalized.startsWith(`${home6}/`)) {
+    return normalized.replace(home6, "~");
   }
   return normalized;
 }
@@ -107814,13 +107902,13 @@ init_model_taxonomy();
 init_logger();
 init_dist2();
 init_model_taxonomy();
-import { mkdir as mkdir38, readFile as readFile62, writeFile as writeFile36 } from "node:fs/promises";
+import { mkdir as mkdir38, readFile as readFile63, writeFile as writeFile36 } from "node:fs/promises";
 import { homedir as homedir50 } from "node:os";
 import { dirname as dirname39, join as join141 } from "node:path";
 
 // src/commands/portable/models-dev-cache.ts
 init_logger();
-import { mkdir as mkdir37, readFile as readFile60, rename as rename12, writeFile as writeFile35 } from "node:fs/promises";
+import { mkdir as mkdir37, readFile as readFile61, rename as rename12, writeFile as writeFile35 } from "node:fs/promises";
 import { homedir as homedir48 } from "node:os";
 import { join as join139 } from "node:path";
 
@@ -107845,7 +107933,7 @@ function tmpFilePath(cacheDir) {
 async function readCacheEntry(cacheDir) {
   const filePath = cacheFilePath(cacheDir);
   try {
-    const raw2 = await readFile60(filePath, "utf-8");
+    const raw2 = await readFile61(filePath, "utf-8");
     const parsed = JSON.parse(raw2);
     if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) && "fetchedAt" in parsed && typeof parsed.fetchedAt === "string" && "payload" in parsed && typeof parsed.payload === "object" && parsed.payload !== null) {
       return parsed;
@@ -107913,7 +108001,7 @@ async function getModelsDevCatalog(opts = {}) {
 
 // src/commands/portable/opencode-model-discovery.ts
 init_logger();
-import { readFile as readFile61 } from "node:fs/promises";
+import { readFile as readFile62 } from "node:fs/promises";
 import { homedir as homedir49, platform as platform17 } from "node:os";
 import { join as join140 } from "node:path";
 function resolveOpenCodeAuthPath(homeDir) {
@@ -107927,7 +108015,7 @@ function resolveOpenCodeAuthPath(homeDir) {
 async function readAuthedProviders(homeDir) {
   const authPath = resolveOpenCodeAuthPath(homeDir);
   try {
-    const raw2 = await readFile61(authPath, "utf-8");
+    const raw2 = await readFile62(authPath, "utf-8");
     const parsed = JSON.parse(raw2);
     if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
       return Object.keys(parsed);
@@ -107960,8 +108048,8 @@ function pickGenericModel(models) {
   return sorted[0] ?? null;
 }
 async function resolveOpenCodeDefaultModel(opts = {}) {
-  const home9 = opts.homeDir ?? homedir49();
-  const authedProviders = await readAuthedProviders(home9);
+  const home6 = opts.homeDir ?? homedir49();
+  const authedProviders = await readAuthedProviders(home6);
   if (authedProviders.length === 0) {
     return { ok: false, reason: "no-auth", authedProviders: [] };
   }
@@ -108129,7 +108217,7 @@ async function ensureOpenCodeModel(options2) {
   const configPath = getOpenCodeConfigPath(options2);
   let existing = null;
   try {
-    const raw2 = await readFile62(configPath, "utf-8");
+    const raw2 = await readFile63(configPath, "utf-8");
     const parsed = JSON.parse(raw2);
     if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
       existing = parsed;
@@ -109002,7 +109090,7 @@ async function processMetadataDeletions(skillSourcePath, installGlobally) {
     return;
   let sourceMetadata;
   try {
-    const content = await readFile63(sourceMetadataPath, "utf-8");
+    const content = await readFile64(sourceMetadataPath, "utf-8");
     sourceMetadata = JSON.parse(content);
   } catch (error) {
     logger.debug(`[migrate] Failed to parse source metadata.json: ${error}`);
@@ -109040,15 +109128,16 @@ async function migrateCommand(options2) {
     const scope = resolveMigrationScope(process.argv.slice(2), options2);
     const spinner = de();
     spinner.start("Discovering portable items...");
-    const agentSource = scope.agents ? getAgentSourcePath() : null;
-    const commandSource = scope.commands ? getCommandSourcePath() : null;
-    const skillSource = scope.skills ? getSkillSourcePath() : null;
-    const hooksSource = scope.hooks ? getHooksSourcePath() : null;
-    const rulesSourcePath = scope.rules ? getRulesSourcePath() : null;
+    const sourceGlobalOnly = options2.global === true;
+    const agentSource = scope.agents ? getAgentSourcePath(sourceGlobalOnly) : null;
+    const commandSource = scope.commands ? getCommandSourcePath(sourceGlobalOnly) : null;
+    const skillSource = scope.skills ? getSkillSourcePath(sourceGlobalOnly) : null;
+    const hooksSource = scope.hooks ? getHooksSourcePath(sourceGlobalOnly) : null;
+    const rulesSourcePath = scope.rules ? getRulesSourcePath(sourceGlobalOnly) : null;
     const agents2 = agentSource ? await discoverAgents(agentSource) : [];
     const commands = commandSource ? await discoverCommands(commandSource) : [];
     const skills = skillSource ? await discoverSkills(skillSource) : [];
-    const configItem = scope.config ? await discoverConfig(options2.source) : null;
+    const configItem = scope.config ? await discoverConfig(options2.source ?? (sourceGlobalOnly ? getConfigSourcePath(true) : undefined)) : null;
     const ruleItems = rulesSourcePath ? await discoverRules(rulesSourcePath) : [];
     const { items: hookItems, skippedShellHooks } = hooksSource ? await discoverHooks(hooksSource) : { items: [], skippedShellHooks: [] };
     if (skippedShellHooks.length > 0) {
@@ -109196,7 +109285,11 @@ async function migrateCommand(options2) {
       title: "ck migrate"
     }).join(`
 `));
-    f2.info(import_picocolors30.default.dim(`  CWD: ${process.cwd()}`));
+    if (sourceGlobalOnly) {
+      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join142(homedir51(), ".claude"))}`));
+    } else {
+      f2.info(import_picocolors30.default.dim(`  CWD: ${process.cwd()}`));
+    }
     console.log();
     console.log(renderPanel({
       title: "Found",
@@ -109286,7 +109379,7 @@ async function migrateCommand(options2) {
       for (const action of conflictActions) {
         if (!action.diff && action.targetPath && existsSync65(action.targetPath)) {
           try {
-            const targetContent = await readFile63(action.targetPath, "utf-8");
+            const targetContent = await readFile64(action.targetPath, "utf-8");
             const sourceItem = effectiveAgents.find((a3) => a3.name === action.item) || effectiveCommands.find((c2) => c2.name === action.item) || (effectiveConfigItem?.name === action.item ? effectiveConfigItem : null) || effectiveRuleItems.find((r2) => r2.name === action.item) || effectiveHookItems.find((h2) => h2.name === action.item);
             if (sourceItem) {
               const providerConfig = providers[action.provider];
@@ -111292,7 +111385,7 @@ init_skills_registry();
 init_skills_uninstaller();
 var import_gray_matter12 = __toESM(require_gray_matter(), 1);
 var import_picocolors37 = __toESM(require_picocolors(), 1);
-import { readFile as readFile64 } from "node:fs/promises";
+import { readFile as readFile65 } from "node:fs/promises";
 import { join as join148 } from "node:path";
 
 // src/commands/skills/types.ts
@@ -111431,7 +111524,7 @@ async function handleValidate2(sourcePath) {
   for (const skill of skills) {
     const skillMdPath = join148(skill.path, "SKILL.md");
     try {
-      const content = await readFile64(skillMdPath, "utf-8");
+      const content = await readFile65(skillMdPath, "utf-8");
       const { data } = import_gray_matter12.default(content, {
         engines: { javascript: { parse: () => ({}) } }
       });
@@ -113947,7 +114040,7 @@ init_ck_config_manager();
 init_file_io();
 init_logger();
 import { existsSync as existsSync71 } from "node:fs";
-import { mkdir as mkdir40, readFile as readFile66 } from "node:fs/promises";
+import { mkdir as mkdir40, readFile as readFile67 } from "node:fs/promises";
 import { dirname as dirname46 } from "node:path";
 var PROCESSED_ISSUES_CAP = 500;
 async function readCkJson(projectDir) {
@@ -113955,7 +114048,7 @@ async function readCkJson(projectDir) {
   try {
     if (!existsSync71(configPath))
       return {};
-    const content = await readFile66(configPath, "utf-8");
+    const content = await readFile67(configPath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     logger.warning(`Failed to parse .ck.json: ${error instanceof Error ? error.message : "Unknown"}`);
@@ -114667,7 +114760,7 @@ init_types3();
 init_logger();
 init_path_resolver();
 import { existsSync as existsSync86 } from "node:fs";
-import { mkdir as mkdir42, readFile as readFile68, writeFile as writeFile41 } from "node:fs/promises";
+import { mkdir as mkdir42, readFile as readFile69, writeFile as writeFile41 } from "node:fs/promises";
 import { join as join168 } from "node:path";
 
 class VersionCacheManager {
@@ -114684,7 +114777,7 @@ class VersionCacheManager {
         logger.debug("Version check cache not found");
         return null;
       }
-      const content = await readFile68(cacheFile, "utf-8");
+      const content = await readFile69(cacheFile, "utf-8");
       const cache5 = JSON.parse(content);
       if (!cache5.lastCheck || !cache5.currentVersion || !cache5.latestVersion) {
         logger.debug("Invalid cache structure, ignoring");

package/package.json

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