claudekit-cli 4.1.1 → 4.2.1

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.1.1",
-	"generatedAt": "2026-05-11T16:31:15.910Z",
+	"version": "4.2.1",
+	"generatedAt": "2026-05-12T16:32:49.942Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -62890,7 +62890,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.1.1",
+    version: "4.2.1",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -62934,6 +62934,7 @@ var init_package = __esm(() => {
       "dev:all": "./scripts/dev-quick-start.sh all",
       metrics: "bun run scripts/workflow-metrics.ts",
       validate: "bun run typecheck && bun run lint && bun test && bun run ui:test && bun run build",
+      "ci:local": "bash scripts/ci-local.sh",
       "install:hooks": "./.githooks/install.sh",
       prepare: `node -e "try{require('child_process').execSync('git rev-parse --git-dir',{stdio:'ignore'});require('child_process').execSync('bash .githooks/install.sh',{stdio:'inherit'})}catch(e){console.warn('[i] Hook install skipped:',e.message)}"`,
       "help:check-parity": "bun run scripts/check-help-parity.ts",
@@ -64888,8 +64889,20 @@ function buildInitCommand(isGlobal, kit, beta, yes) {
 function resolveCkExecutable(platformName = process.platform) {
   return platformName === "win32" ? "ck.cmd" : "ck";
 }
-function shouldRunCkExecutableInShell(platformName = process.platform) {
-  return platformName === "win32";
+function resolveCkInitSpawnCommand(initArgs, options2 = {}) {
+  const execPath = options2.execPath ?? process.execPath;
+  const argv = options2.argv ?? process.argv;
+  const currentEntrypoint = argv[1];
+  if (currentEntrypoint) {
+    return {
+      command: execPath,
+      args: [currentEntrypoint, ...initArgs]
+    };
+  }
+  return {
+    command: resolveCkExecutable(options2.platformName),
+    args: initArgs
+  };
 }
 async function fetchLatestReleaseTag(kit, beta) {
   try {
@@ -64999,10 +65012,8 @@ async function promptKitUpdate(beta, yes, deps) {
       const displayCmd = `ck ${args.join(" ")}`;
       logger.info(`Running: ${displayCmd}`);
       const spawnFn = deps?.spawnInitFn ?? ((spawnArgs) => new Promise((resolve30) => {
-        const child = spawn2(resolveCkExecutable(), spawnArgs, {
-          stdio: "inherit",
-          shell: shouldRunCkExecutableInShell()
-        });
+        const initCommand = resolveCkInitSpawnCommand(spawnArgs);
+        const child = spawn2(initCommand.command, initCommand.args, { stdio: "inherit" });
         child.on("close", (code) => resolve30(code ?? 1));
         child.on("error", (err) => {
           logger.verbose(`Failed to spawn ck init: ${err.message}`);
@@ -74173,9 +74184,9 @@ __export(exports_worktree_manager, {
 });
 import { existsSync as existsSync70 } from "node:fs";
 import { readFile as readFile66, writeFile as writeFile37 } from "node:fs/promises";
-import { join as join151 } from "node:path";
+import { join as join152 } from "node:path";
 async function createWorktree(projectDir, issueNumber, baseBranch) {
-  const worktreePath = join151(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join152(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`);
@@ -74193,7 +74204,7 @@ async function createWorktree(projectDir, issueNumber, baseBranch) {
   return worktreePath;
 }
 async function removeWorktree(projectDir, issueNumber) {
-  const worktreePath = join151(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join152(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
   const branchName = `ck-watch/issue-${issueNumber}`;
   try {
     await spawnAndCollect("git", ["worktree", "remove", worktreePath, "--force"], projectDir);
@@ -74207,7 +74218,7 @@ async function listActiveWorktrees(projectDir) {
   try {
     const output2 = await spawnAndCollect("git", ["worktree", "list", "--porcelain"], projectDir);
     const issueNumbers = [];
-    const worktreePrefix = join151(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
+    const worktreePrefix = join152(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
     for (const line of output2.split(`
 `)) {
       if (line.startsWith("worktree ")) {
@@ -74235,7 +74246,7 @@ async function cleanupAllWorktrees(projectDir) {
   await spawnAndCollect("git", ["worktree", "prune"], projectDir).catch(() => {});
 }
 async function ensureGitignore(projectDir) {
-  const gitignorePath = join151(projectDir, ".gitignore");
+  const gitignorePath = join152(projectDir, ".gitignore");
   try {
     const content = existsSync70(gitignorePath) ? await readFile66(gitignorePath, "utf-8") : "";
     if (!content.includes(".worktrees")) {
@@ -74342,7 +74353,7 @@ import { createHash as createHash9 } from "node:crypto";
 import { existsSync as existsSync76, mkdirSync as mkdirSync5, readFileSync as readFileSync18, readdirSync as readdirSync11, statSync as statSync14 } from "node:fs";
 import { rename as rename14, writeFile as writeFile39 } from "node:fs/promises";
 import { homedir as homedir53 } from "node:os";
-import { basename as basename31, join as join158 } from "node:path";
+import { basename as basename31, join as join159 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
   if (!existsSync76(cachePath))
@@ -74385,25 +74396,25 @@ function computeSourceHash(repoPath) {
 }
 function getDocSourcePaths(repoPath) {
   const paths = [];
-  const docsDir = join158(repoPath, "docs");
+  const docsDir = join159(repoPath, "docs");
   if (existsSync76(docsDir)) {
     try {
       const files = readdirSync11(docsDir);
       for (const f3 of files) {
         if (f3.endsWith(".md"))
-          paths.push(join158(docsDir, f3));
+          paths.push(join159(docsDir, f3));
       }
     } catch {}
   }
-  const readme = join158(repoPath, "README.md");
+  const readme = join159(repoPath, "README.md");
   if (existsSync76(readme))
     paths.push(readme);
-  const stylesDir = join158(repoPath, "assets", "writing-styles");
+  const stylesDir = join159(repoPath, "assets", "writing-styles");
   if (existsSync76(stylesDir)) {
     try {
       const files = readdirSync11(stylesDir);
       for (const f3 of files) {
-        paths.push(join158(stylesDir, f3));
+        paths.push(join159(stylesDir, f3));
       }
     } catch {}
   }
@@ -74412,11 +74423,11 @@ function getDocSourcePaths(repoPath) {
 function getCacheFilePath(repoPath) {
   const repoName = basename31(repoPath).replace(/[^a-zA-Z0-9_-]/g, "_");
   const pathHash = createHash9("sha256").update(repoPath).digest("hex").slice(0, 8);
-  return join158(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
+  return join159(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
 }
 var CACHE_DIR, CACHE_TTL_MS5;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join158(homedir53(), ".claudekit", "cache");
+  CACHE_DIR = join159(homedir53(), ".claudekit", "cache");
   CACHE_TTL_MS5 = 24 * 60 * 60 * 1000;
 });
 
@@ -74597,7 +74608,7 @@ function extractContentFromResponse(response) {
 // src/commands/content/phases/docs-summarizer.ts
 import { execSync as execSync7 } from "node:child_process";
 import { existsSync as existsSync77, readFileSync as readFileSync19, readdirSync as readdirSync12 } from "node:fs";
-import { join as join159 } from "node:path";
+import { join as join160 } from "node:path";
 async function summarizeProjectDocs(repoPath, contentLogger) {
   const rawContent = collectRawDocs(repoPath);
   if (rawContent.total.length < 200) {
@@ -74651,12 +74662,12 @@ function collectRawDocs(repoPath) {
     return capped;
   };
   const docsContent = [];
-  const docsDir = join159(repoPath, "docs");
+  const docsDir = join160(repoPath, "docs");
   if (existsSync77(docsDir)) {
     try {
       const files = readdirSync12(docsDir).filter((f3) => f3.endsWith(".md")).sort();
       for (const f3 of files) {
-        const content = readCapped(join159(docsDir, f3), 5000);
+        const content = readCapped(join160(docsDir, f3), 5000);
         if (content) {
           docsContent.push(`### ${f3}
 ${content}`);
@@ -74670,21 +74681,21 @@ ${content}`);
   let brand = "";
   const brandCandidates = ["docs/brand-guidelines.md", "docs/design-guidelines.md"];
   for (const p of brandCandidates) {
-    brand = readCapped(join159(repoPath, p), 3000);
+    brand = readCapped(join160(repoPath, p), 3000);
     if (brand)
       break;
   }
   let styles3 = "";
-  const stylesDir = join159(repoPath, "assets", "writing-styles");
+  const stylesDir = join160(repoPath, "assets", "writing-styles");
   if (existsSync77(stylesDir)) {
     try {
       const files = readdirSync12(stylesDir).slice(0, 3);
-      styles3 = files.map((f3) => readCapped(join159(stylesDir, f3), 1000)).filter(Boolean).join(`
+      styles3 = files.map((f3) => readCapped(join160(stylesDir, f3), 1000)).filter(Boolean).join(`
 
 `);
     } catch {}
   }
-  const readme = readCapped(join159(repoPath, "README.md"), 3000);
+  const readme = readCapped(join160(repoPath, "README.md"), 3000);
   const total = [docs, brand, styles3, readme].join(`
 `);
   return { docs, brand, styles: styles3, readme, total };
@@ -74871,9 +74882,9 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 import { execSync as execSync8 } from "node:child_process";
 import { existsSync as existsSync78, mkdirSync as mkdirSync6, readdirSync as readdirSync13 } from "node:fs";
 import { homedir as homedir54 } from "node:os";
-import { join as join160 } from "node:path";
+import { join as join161 } from "node:path";
 async function generatePhoto(_content, context, config, platform18, contentId, contentLogger) {
-  const mediaDir = join160(config.contentDir.replace(/^~/, homedir54()), "media", String(contentId));
+  const mediaDir = join161(config.contentDir.replace(/^~/, homedir54()), "media", String(contentId));
   if (!existsSync78(mediaDir)) {
     mkdirSync6(mediaDir, { recursive: true });
   }
@@ -74898,7 +74909,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: join160(mediaDir, imageFile), ...dimensions, format: ext2 };
+      return { path: join161(mediaDir, imageFile), ...dimensions, format: ext2 };
     }
     contentLogger.warn(`Photo generation produced no image for content ${contentId}`);
     return null;
@@ -74988,7 +74999,7 @@ var init_content_creator = __esm(() => {
 // src/commands/content/phases/content-logger.ts
 import { createWriteStream as createWriteStream4, existsSync as existsSync79, mkdirSync as mkdirSync7, statSync as statSync15 } from "node:fs";
 import { homedir as homedir55 } from "node:os";
-import { join as join161 } from "node:path";
+import { join as join162 } from "node:path";
 
 class ContentLogger {
   stream = null;
@@ -74996,7 +75007,7 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join161(homedir55(), ".claudekit", "logs");
+    this.logDir = join162(homedir55(), ".claudekit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
@@ -75028,7 +75039,7 @@ class ContentLogger {
     }
   }
   getLogPath() {
-    return join161(this.logDir, `content-${this.getDateStr()}.log`);
+    return join162(this.logDir, `content-${this.getDateStr()}.log`);
   }
   write(level, message) {
     this.rotateIfNeeded();
@@ -75045,18 +75056,18 @@ class ContentLogger {
     if (dateStr !== this.currentDate) {
       this.close();
       this.currentDate = dateStr;
-      const logPath = join161(this.logDir, `content-${dateStr}.log`);
+      const logPath = join162(this.logDir, `content-${dateStr}.log`);
       this.stream = createWriteStream4(logPath, { flags: "a", mode: 384 });
       return;
     }
     if (this.maxBytes > 0 && this.stream) {
-      const logPath = join161(this.logDir, `content-${this.currentDate}.log`);
+      const logPath = join162(this.logDir, `content-${this.currentDate}.log`);
       try {
         const stat25 = statSync15(logPath);
         if (stat25.size >= this.maxBytes) {
           this.close();
           const suffix = Date.now();
-          const rotatedPath = join161(this.logDir, `content-${this.currentDate}-${suffix}.log`);
+          const rotatedPath = join162(this.logDir, `content-${this.currentDate}-${suffix}.log`);
           import("node:fs/promises").then(({ rename: rename15 }) => rename15(logPath, rotatedPath).catch(() => {}));
           this.stream = createWriteStream4(logPath, { flags: "w", mode: 384 });
         }
@@ -75282,7 +75293,7 @@ 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 existsSync81, readFileSync as readFileSync20, readdirSync as readdirSync14, statSync as statSync16 } from "node:fs";
-import { join as join162 } from "node:path";
+import { join as join163 } from "node:path";
 function detectCommits(repo, since) {
   try {
     const fetchUrl = sshToHttps(repo.remoteUrl);
@@ -75391,7 +75402,7 @@ function detectTags(repo, since) {
   }
 }
 function detectCompletedPlans(repo, since) {
-  const plansDir = join162(repo.path, "plans");
+  const plansDir = join163(repo.path, "plans");
   if (!existsSync81(plansDir))
     return [];
   const sinceMs = new Date(since).getTime();
@@ -75401,7 +75412,7 @@ function detectCompletedPlans(repo, since) {
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
-      const planFile = join162(plansDir, entry.name, "plan.md");
+      const planFile = join163(plansDir, entry.name, "plan.md");
       if (!existsSync81(planFile))
         continue;
       try {
@@ -75479,7 +75490,7 @@ function classifyCommit(event) {
 // src/commands/content/phases/repo-discoverer.ts
 import { execSync as execSync11 } from "node:child_process";
 import { readdirSync as readdirSync15 } from "node:fs";
-import { join as join163 } from "node:path";
+import { join as join164 } from "node:path";
 function discoverRepos2(cwd2) {
   const repos = [];
   if (isGitRepoRoot(cwd2)) {
@@ -75492,7 +75503,7 @@ function discoverRepos2(cwd2) {
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith("."))
         continue;
-      const dirPath = join163(cwd2, entry.name);
+      const dirPath = join164(cwd2, entry.name);
       if (isGitRepoRoot(dirPath)) {
         const info = getRepoInfo(dirPath);
         if (info)
@@ -76160,9 +76171,9 @@ var init_types6 = __esm(() => {
 
 // src/commands/content/phases/state-manager.ts
 import { readFile as readFile68, rename as rename15, writeFile as writeFile40 } from "node:fs/promises";
-import { join as join164 } from "node:path";
+import { join as join165 } from "node:path";
 async function loadContentConfig(projectDir) {
-  const configPath = join164(projectDir, CK_CONFIG_FILE2);
+  const configPath = join165(projectDir, CK_CONFIG_FILE2);
   try {
     const raw2 = await readFile68(configPath, "utf-8");
     const json = JSON.parse(raw2);
@@ -76172,13 +76183,13 @@ async function loadContentConfig(projectDir) {
   }
 }
 async function saveContentConfig(projectDir, config) {
-  const configPath = join164(projectDir, CK_CONFIG_FILE2);
+  const configPath = join165(projectDir, CK_CONFIG_FILE2);
   const json = await readJsonSafe(configPath);
   json.content = { ...json.content, ...config };
   await atomicWrite2(configPath, json);
 }
 async function loadContentState(projectDir) {
-  const configPath = join164(projectDir, CK_CONFIG_FILE2);
+  const configPath = join165(projectDir, CK_CONFIG_FILE2);
   try {
     const raw2 = await readFile68(configPath, "utf-8");
     const json = JSON.parse(raw2);
@@ -76189,7 +76200,7 @@ async function loadContentState(projectDir) {
   }
 }
 async function saveContentState(projectDir, state) {
-  const configPath = join164(projectDir, CK_CONFIG_FILE2);
+  const configPath = join165(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);
@@ -76471,7 +76482,7 @@ var init_platform_setup_x = __esm(() => {
 
 // src/commands/content/phases/setup-wizard.ts
 import { existsSync as existsSync82 } from "node:fs";
-import { join as join165 } from "node:path";
+import { join as join166 } 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 ")));
@@ -76539,8 +76550,8 @@ async function showRepoSummary(cwd2) {
 function detectBrandAssets(cwd2, contentLogger) {
   const repos = discoverRepos2(cwd2);
   for (const repo of repos) {
-    const hasGuidelines = existsSync82(join165(repo.path, "docs", "brand-guidelines.md"));
-    const hasStyles = existsSync82(join165(repo.path, "assets", "writing-styles"));
+    const hasGuidelines = existsSync82(join166(repo.path, "docs", "brand-guidelines.md"));
+    const hasStyles = existsSync82(join166(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`);
@@ -76682,9 +76693,9 @@ __export(exports_content_subcommands, {
 });
 import { existsSync as existsSync84, readFileSync as readFileSync21, unlinkSync as unlinkSync6 } from "node:fs";
 import { homedir as homedir57 } from "node:os";
-import { join as join166 } from "node:path";
+import { join as join167 } from "node:path";
 function isDaemonRunning() {
-  const lockFile = join166(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join167(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync84(lockFile))
     return { running: false, pid: null };
   try {
@@ -76716,7 +76727,7 @@ async function startContent(options2) {
   await contentCommand(options2);
 }
 async function stopContent() {
-  const lockFile = join166(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join167(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync84(lockFile)) {
     logger.info("Content daemon is not running.");
     return;
@@ -76755,9 +76766,9 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join166(homedir57(), ".claudekit", "logs");
+  const logDir = join167(homedir57(), ".claudekit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
-  const logPath = join166(logDir, `content-${dateStr}.log`);
+  const logPath = join167(logDir, `content-${dateStr}.log`);
   if (!existsSync84(logPath)) {
     logger.info("No content logs found for today.");
     return;
@@ -76789,13 +76800,13 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join166(homedir57(), ".claudekit", "locks");
+  LOCK_DIR = join167(homedir57(), ".claudekit", "locks");
 });
 
 // src/commands/content/content-command.ts
 import { existsSync as existsSync85, mkdirSync as mkdirSync9, unlinkSync as unlinkSync7, writeFileSync as writeFileSync7 } from "node:fs";
 import { homedir as homedir58 } from "node:os";
-import { join as join167 } from "node:path";
+import { join as join168 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
   const contentLogger = new ContentLogger;
@@ -76973,8 +76984,8 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join167(homedir58(), ".claudekit", "locks");
-  LOCK_FILE = join167(LOCK_DIR2, "ck-content.lock");
+  LOCK_DIR2 = join168(homedir58(), ".claudekit", "locks");
+  LOCK_FILE = join168(LOCK_DIR2, "ck-content.lock");
 });
 
 // src/commands/content/index.ts
@@ -85272,7 +85283,7 @@ function buildDuplicateInventoryCheck(projectSkills, globalSkills) {
   if (duplicates.length === 0) {
     return pass("ck-skill-inventory", "Skill Inventory", "No duplicate project/global skills");
   }
-  return warn("ck-skill-inventory", "Skill Inventory", `${duplicates.length} duplicate project/global skill(s)`, duplicates, "Keep one installation scope per skill; inspect with: ck skills list --installed");
+  return warn("ck-skill-inventory", "Skill Inventory", `${duplicates.length} duplicate project/global skill(s)`, duplicates, "Keep one installation scope per skill; inspect with: ck skills --list --installed");
 }
 function buildSkillOverridesCheck(settingsPath, read) {
   if (!read.settings || !Object.prototype.hasOwnProperty.call(read.settings, "skillOverrides")) {
@@ -111449,14 +111460,48 @@ init_skill_catalog_generator();
 init_skill_search_index();
 init_logger();
 init_agents();
-init_skills_discovery();
-init_skills_installer();
-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 readFile65 } from "node:fs/promises";
+import { join as join149 } from "node:path";
+
+// src/commands/skills/installed-skills-inventory.ts
 import { join as join148 } from "node:path";
+init_path_resolver();
+var SCOPE_SORT_ORDER = {
+  project: 0,
+  global: 1
+};
+async function getActiveClaudeSkillInstallations(options2 = {}) {
+  const projectDir = options2.projectDir ?? process.cwd();
+  const globalDir = options2.globalDir ?? PathResolver.getGlobalKitDir();
+  const [projectSkills, globalSkills] = await Promise.all([
+    scanSkills2(join148(projectDir, ".claude", "skills")),
+    scanSkills2(join148(globalDir, "skills"))
+  ]);
+  const projectIds = new Set(projectSkills.map((skill) => skill.id));
+  const globalIds = new Set(globalSkills.map((skill) => skill.id));
+  return [
+    ...projectSkills.map((skill) => ({
+      skill: skill.id,
+      scope: "project",
+      path: skill.file,
+      duplicateAcrossScopes: globalIds.has(skill.id)
+    })),
+    ...globalSkills.map((skill) => ({
+      skill: skill.id,
+      scope: "global",
+      path: skill.file,
+      duplicateAcrossScopes: projectIds.has(skill.id)
+    }))
+  ].sort((a3, b3) => a3.skill.localeCompare(b3.skill) || SCOPE_SORT_ORDER[a3.scope] - SCOPE_SORT_ORDER[b3.scope]);
+}
+
+// src/commands/skills/skills-command.ts
+init_skills_discovery();
+init_skills_installer();
+init_skills_registry();
+init_skills_uninstaller();
 
 // src/commands/skills/types.ts
 init_zod();
@@ -111592,7 +111637,7 @@ async function handleValidate2(sourcePath) {
   spinner.stop(`Checked ${skills.length} skill(s)`);
   let hasIssues = false;
   for (const skill of skills) {
-    const skillMdPath = join148(skill.path, "SKILL.md");
+    const skillMdPath = join149(skill.path, "SKILL.md");
     try {
       const content = await readFile65(skillMdPath, "utf-8");
       const { data } = import_gray_matter12.default(content, {
@@ -111628,30 +111673,55 @@ async function detectInstalledAgents2() {
 }
 async function listSkills2(showInstalled) {
   if (showInstalled) {
-    const installations = await getInstalledSkills();
-    if (installations.length === 0) {
-      f2.warn("No skills installed via ck skills.");
+    const [installations, activeClaudeSkills] = await Promise.all([
+      getInstalledSkills(),
+      getActiveClaudeSkillInstallations()
+    ]);
+    if (installations.length === 0 && activeClaudeSkills.length === 0) {
+      f2.warn("No installed skills found.");
       return;
     }
     console.log();
-    f2.step(import_picocolors37.default.bold("Installed Skills"));
-    console.log();
-    const bySkill = new Map;
-    for (const inst of installations) {
-      const list3 = bySkill.get(inst.skill) || [];
-      list3.push(inst);
-      bySkill.set(inst.skill, list3);
+    if (activeClaudeSkills.length > 0) {
+      f2.step(import_picocolors37.default.bold("Active Claude Code Skills"));
+      console.log();
+      const bySkill = new Map;
+      for (const inst of activeClaudeSkills) {
+        const list3 = bySkill.get(inst.skill) || [];
+        list3.push(inst);
+        bySkill.set(inst.skill, list3);
+      }
+      for (const [skill, installs] of bySkill) {
+        const duplicate = installs.some((inst) => inst.duplicateAcrossScopes) ? ` ${import_picocolors37.default.yellow("(project/global duplicate)")}` : "";
+        console.log(`  ${import_picocolors37.default.cyan(skill)}${duplicate}`);
+        for (const inst of installs) {
+          console.log(`    ${import_picocolors37.default.dim("→")} ${inst.scope}: ${import_picocolors37.default.dim(inst.path)}`);
+        }
+      }
+      console.log();
+      console.log(import_picocolors37.default.dim(`  ${activeClaudeSkills.length} active Claude Code skill installation(s)`));
+      console.log();
     }
-    for (const [skill, installs] of bySkill) {
-      console.log(`  ${import_picocolors37.default.cyan(skill)}`);
-      for (const inst of installs) {
-        const scope = inst.global ? "global" : "project";
-        console.log(`    ${import_picocolors37.default.dim("→")} ${inst.agent} (${scope}): ${import_picocolors37.default.dim(inst.path)}`);
+    if (installations.length > 0) {
+      f2.step(import_picocolors37.default.bold("Registry-managed Agent Skills"));
+      console.log();
+      const bySkill = new Map;
+      for (const inst of installations) {
+        const list3 = bySkill.get(inst.skill) || [];
+        list3.push(inst);
+        bySkill.set(inst.skill, list3);
       }
+      for (const [skill, installs] of bySkill) {
+        console.log(`  ${import_picocolors37.default.cyan(skill)}`);
+        for (const inst of installs) {
+          const scope = inst.global ? "global" : "project";
+          console.log(`    ${import_picocolors37.default.dim("→")} ${inst.agent} (${scope}): ${import_picocolors37.default.dim(inst.path)}`);
+        }
+      }
+      console.log();
+      console.log(import_picocolors37.default.dim(`  ${installations.length} registry-managed installation(s) across ${bySkill.size} skill(s)`));
     }
     console.log();
-    console.log(import_picocolors37.default.dim(`  ${installations.length} installation(s) across ${bySkill.size} skill(s)`));
-    console.log();
     return;
   }
   const sourcePath = getSkillSourcePath();
@@ -112150,7 +112220,7 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync10, rmSync as rmSync5 } from "node:fs";
-import { basename as basename30, join as join150, resolve as resolve53, sep as sep13 } from "node:path";
+import { basename as basename30, join as join151, resolve as resolve53, sep as sep13 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
@@ -112159,7 +112229,7 @@ var import_fs_extra41 = __toESM(require_lib(), 1);
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
 import { readdirSync as readdirSync9, rmSync as rmSync4 } from "node:fs";
-import { dirname as dirname45, join as join149 } from "node:path";
+import { dirname as dirname45, join as join150 } from "node:path";
 init_logger();
 init_safe_prompts();
 var import_fs_extra40 = __toESM(require_lib(), 1);
@@ -112219,7 +112289,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_extra40.pathExists(join149(installation.path, relativePath))) {
+        if (await import_fs_extra40.pathExists(join150(installation.path, relativePath))) {
           result.retainedManifestPaths.push(relativePath);
         }
       }
@@ -112227,7 +112297,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 = join149(installation.path, relativePath);
+      const filePath = join150(installation.path, relativePath);
       if (preservedPaths.has(relativePath)) {
         result.toPreserve.push({ path: relativePath, reason: "shared with other kit" });
         continue;
@@ -112260,7 +112330,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
   }
   for (const trackedFile of allTrackedFiles) {
     const relativePath = normalizeTrackedPath(trackedFile.path);
-    const filePath = join149(installation.path, relativePath);
+    const filePath = join150(installation.path, relativePath);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -112403,7 +112473,7 @@ async function removeInstallations(installations, options2) {
         let removedCount = 0;
         let cleanedDirs = 0;
         for (const item of analysis.toDelete) {
-          const filePath = join150(installation.path, item.path);
+          const filePath = join151(installation.path, item.path);
           if (!await import_fs_extra41.pathExists(filePath))
             continue;
           if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -112812,7 +112882,7 @@ ${import_picocolors40.default.bold(import_picocolors40.default.cyan(result.kitCo
 init_logger();
 import { existsSync as existsSync75 } from "node:fs";
 import { rm as rm17 } from "node:fs/promises";
-import { join as join157 } from "node:path";
+import { join as join158 } from "node:path";
 var import_picocolors41 = __toESM(require_picocolors(), 1);
 
 // src/commands/watch/phases/implementation-runner.ts
@@ -113331,7 +113401,7 @@ function spawnAndCollect3(command, args) {
 
 // src/commands/watch/phases/issue-processor.ts
 import { mkdir as mkdir39, writeFile as writeFile38 } from "node:fs/promises";
-import { join as join153 } from "node:path";
+import { join as join154 } from "node:path";
 
 // src/commands/watch/phases/approval-detector.ts
 init_logger();
@@ -113709,9 +113779,9 @@ async function checkAwaitingApproval(state, setup, options2, watchLog, projectDi
 
 // src/commands/watch/phases/plan-dir-finder.ts
 import { readdir as readdir44, stat as stat23 } from "node:fs/promises";
-import { join as join152 } from "node:path";
+import { join as join153 } from "node:path";
 async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
-  const plansRoot = join152(cwd2, "plans");
+  const plansRoot = join153(cwd2, "plans");
   try {
     const entries = await readdir44(plansRoot);
     const tenMinAgo = Date.now() - 10 * 60 * 1000;
@@ -113720,14 +113790,14 @@ async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
     for (const entry of entries) {
       if (entry === "watch" || entry === "reports" || entry === "visuals")
         continue;
-      const dirPath = join152(plansRoot, entry);
+      const dirPath = join153(plansRoot, entry);
       const dirStat = await stat23(dirPath);
       if (!dirStat.isDirectory())
         continue;
       if (dirStat.mtimeMs < tenMinAgo)
         continue;
       try {
-        await stat23(join152(dirPath, "plan.md"));
+        await stat23(join153(dirPath, "plan.md"));
       } catch {
         continue;
       }
@@ -113958,13 +114028,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 = join153(detectedPlanDir, "plan.md");
+      state.activeIssues[numStr].planPath = join154(detectedPlanDir, "plan.md");
       watchLog.info(`Plan directory detected: ${detectedPlanDir}`);
     } else {
       try {
-        const planDir = join153(projectDir, "plans", "watch");
+        const planDir = join154(projectDir, "plans", "watch");
         await mkdir39(planDir, { recursive: true });
-        const planFilePath = join153(planDir, `issue-${issue.number}-plan.md`);
+        const planFilePath = join154(planDir, `issue-${issue.number}-plan.md`);
         await writeFile38(planFilePath, planResult.planText, "utf-8");
         state.activeIssues[numStr].planPath = planFilePath;
         watchLog.info(`Plan saved (fallback) to ${planFilePath}`);
@@ -114271,18 +114341,18 @@ init_logger();
 import { spawnSync as spawnSync7 } from "node:child_process";
 import { existsSync as existsSync72 } from "node:fs";
 import { readdir as readdir45, stat as stat24 } from "node:fs/promises";
-import { join as join154 } from "node:path";
+import { join as join155 } from "node:path";
 async function scanForRepos(parentDir) {
   const repos = [];
   const entries = await readdir45(parentDir);
   for (const entry of entries) {
     if (entry.startsWith("."))
       continue;
-    const fullPath = join154(parentDir, entry);
+    const fullPath = join155(parentDir, entry);
     const entryStat = await stat24(fullPath);
     if (!entryStat.isDirectory())
       continue;
-    const gitDir = join154(fullPath, ".git");
+    const gitDir = join155(fullPath, ".git");
     if (!existsSync72(gitDir))
       continue;
     const result = spawnSync7("gh", ["repo", "view", "--json", "owner,name"], {
@@ -114309,7 +114379,7 @@ init_logger();
 import { spawnSync as spawnSync8 } from "node:child_process";
 import { existsSync as existsSync73 } from "node:fs";
 import { homedir as homedir52 } from "node:os";
-import { join as join155 } from "node:path";
+import { join as join156 } from "node:path";
 async function validateSetup(cwd2) {
   const workDir = cwd2 ?? process.cwd();
   const ghVersion = spawnSync8("gh", ["--version"], { encoding: "utf-8", timeout: 1e4 });
@@ -114340,7 +114410,7 @@ Run this command from a directory with a GitHub remote.`);
   } catch {
     throw new Error(`Failed to parse repository info: ${ghRepo.stdout}`);
   }
-  const skillsPath = join155(homedir52(), ".claude", "skills");
+  const skillsPath = join156(homedir52(), ".claude", "skills");
   const skillsAvailable = existsSync73(skillsPath);
   if (!skillsAvailable) {
     logger.warning(`ClaudeKit Engineer skills not found at ${skillsPath}`);
@@ -114359,7 +114429,7 @@ init_path_resolver();
 import { createWriteStream as createWriteStream3, statSync as statSync13 } from "node:fs";
 import { existsSync as existsSync74 } from "node:fs";
 import { mkdir as mkdir41, rename as rename13 } from "node:fs/promises";
-import { join as join156 } from "node:path";
+import { join as join157 } from "node:path";
 
 class WatchLogger {
   logStream = null;
@@ -114367,7 +114437,7 @@ class WatchLogger {
   logPath = null;
   maxBytes;
   constructor(logDir, maxBytes = 0) {
-    this.logDir = logDir ?? join156(PathResolver.getClaudeKitDir(), "logs");
+    this.logDir = logDir ?? join157(PathResolver.getClaudeKitDir(), "logs");
     this.maxBytes = maxBytes;
   }
   async init() {
@@ -114376,7 +114446,7 @@ class WatchLogger {
         await mkdir41(this.logDir, { recursive: true });
       }
       const dateStr = formatDate(new Date);
-      this.logPath = join156(this.logDir, `watch-${dateStr}.log`);
+      this.logPath = join157(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"}`);
@@ -114558,7 +114628,7 @@ async function watchCommand(options2) {
 }
 async function discoverRepos(options2, watchLog) {
   const cwd2 = process.cwd();
-  const isGitRepo = existsSync75(join157(cwd2, ".git"));
+  const isGitRepo = existsSync75(join158(cwd2, ".git"));
   if (options2.force) {
     await forceRemoveLock(watchLog);
   }
@@ -114816,7 +114886,7 @@ function registerCommands(cli) {
 init_package();
 init_config_version_checker();
 import { existsSync as existsSync87, readFileSync as readFileSync22 } from "node:fs";
-import { join as join169 } from "node:path";
+import { join as join170 } from "node:path";
 
 // src/domains/versioning/version-checker.ts
 init_version_utils();
@@ -114831,14 +114901,14 @@ init_logger();
 init_path_resolver();
 import { existsSync as existsSync86 } from "node:fs";
 import { mkdir as mkdir42, readFile as readFile69, writeFile as writeFile41 } from "node:fs/promises";
-import { join as join168 } from "node:path";
+import { join as join169 } 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 join168(cacheDir, VersionCacheManager.CACHE_FILENAME);
+    return join169(cacheDir, VersionCacheManager.CACHE_FILENAME);
   }
   static async load() {
     const cacheFile = VersionCacheManager.getCacheFile();
@@ -115149,9 +115219,9 @@ async function displayVersion() {
   let localInstalledKits = [];
   let globalInstalledKits = [];
   const globalKitDir = PathResolver.getGlobalKitDir();
-  const globalMetadataPath = join169(globalKitDir, "metadata.json");
+  const globalMetadataPath = join170(globalKitDir, "metadata.json");
   const prefix = PathResolver.getPathPrefix(false);
-  const localMetadataPath = prefix ? join169(process.cwd(), prefix, "metadata.json") : join169(process.cwd(), "metadata.json");
+  const localMetadataPath = prefix ? join170(process.cwd(), prefix, "metadata.json") : join170(process.cwd(), "metadata.json");
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
   if (!isLocalSameAsGlobal && existsSync87(localMetadataPath)) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "4.1.1",
+	"version": "4.2.1",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {
@@ -44,6 +44,7 @@
 		"dev:all": "./scripts/dev-quick-start.sh all",
 		"metrics": "bun run scripts/workflow-metrics.ts",
 		"validate": "bun run typecheck && bun run lint && bun test && bun run ui:test && bun run build",
+		"ci:local": "bash scripts/ci-local.sh",
 		"install:hooks": "./.githooks/install.sh",
 		"prepare": "node -e \"try{require('child_process').execSync('git rev-parse --git-dir',{stdio:'ignore'});require('child_process').execSync('bash .githooks/install.sh',{stdio:'inherit'})}catch(e){console.warn('[i] Hook install skipped:',e.message)}\"",
 		"help:check-parity": "bun run scripts/check-help-parity.ts",