codemini-cli 0.5.8 → 0.5.9

package/package.json

@@ -1,67 +1,67 @@
-{
-  "name": "codemini-cli",
-  "version": "0.5.8",
-  "description": "Coding CLI optimized for small-model workflows and Windows PowerShell",
-  "keywords": [
-    "cli",
-    "ai",
-    "coding-assistant",
-    "developer-tools",
-    "terminal",
-    "windows",
-    "powershell"
-  ],
-  "type": "module",
-  "homepage": "https://github.com/havingautism/Codemini-CLI#readme",
-  "bugs": {
-    "url": "https://github.com/havingautism/Codemini-CLI/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/havingautism/Codemini-CLI.git"
-  },
-  "bin": {
-    "codemini": "bin/coder.js",
-    "coder": "bin/coder.js"
-  },
-  "scripts": {
-    "start": "node bin/coder.js",
-    "test": "node --test tests/*.test.js",
-    "build:web": "npm install --prefix codemini-web && npm run build --prefix codemini-web",
-    "prepack": "npm run build:web",
-    "pack:offline": "npm pack",
-    "bump:patch": "npm version patch --no-git-tag-version",
-    "bump:minor": "npm version minor --no-git-tag-version",
-    "bump:major": "npm version major --no-git-tag-version"
-  },
-  "files": [
-    "bin",
-    "src",
-    "codemini-web/server.js",
-    "codemini-web/lib",
-    "codemini-web/dist",
-    "codemini-web/codemini_logo.png",
-    "souls",
-    "templates",
-    "skills",
-    "README.md",
-    "OPERATIONS.md",
-    "deployment.md"
-  ],
-  "engines": {
-    "node": ">=22"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "@cursorless/tree-sitter-wasms": "^0.8.1",
-    "cheerio": "^1.1.2",
-    "cli-truncate": "^6.0.0",
-    "ink": "^7.0.0",
-    "react": "^19.2.5",
-    "strip-ansi": "^7.2.0",
-    "web-tree-sitter": "^0.26.8"
-  },
-  "license": "MIT"
-}
+{
+  "name": "codemini-cli",
+  "version": "0.5.9",
+  "description": "Coding CLI optimized for small-model workflows and Windows PowerShell",
+  "keywords": [
+    "cli",
+    "ai",
+    "coding-assistant",
+    "developer-tools",
+    "terminal",
+    "windows",
+    "powershell"
+  ],
+  "type": "module",
+  "homepage": "https://github.com/havingautism/Codemini-CLI#readme",
+  "bugs": {
+    "url": "https://github.com/havingautism/Codemini-CLI/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/havingautism/Codemini-CLI.git"
+  },
+  "bin": {
+    "codemini": "bin/coder.js",
+    "coder": "bin/coder.js"
+  },
+  "scripts": {
+    "start": "node bin/coder.js",
+    "test": "node --test tests/*.test.js",
+    "build:web": "npm install --prefix codemini-web && npm run build --prefix codemini-web",
+    "prepack": "npm run build:web",
+    "pack:offline": "npm pack",
+    "bump:patch": "npm version patch --no-git-tag-version",
+    "bump:minor": "npm version minor --no-git-tag-version",
+    "bump:major": "npm version major --no-git-tag-version"
+  },
+  "files": [
+    "bin",
+    "src",
+    "codemini-web/server.js",
+    "codemini-web/lib",
+    "codemini-web/dist",
+    "codemini-web/codemini_logo.png",
+    "souls",
+    "templates",
+    "skills",
+    "README.md",
+    "OPERATIONS.md",
+    "deployment.md"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@cursorless/tree-sitter-wasms": "^0.8.1",
+    "cheerio": "^1.1.2",
+    "cli-truncate": "^6.0.0",
+    "ink": "^7.0.0",
+    "react": "^19.2.5",
+    "strip-ansi": "^7.2.0",
+    "web-tree-sitter": "^0.26.8"
+  },
+  "license": "MIT"
+}

package/skills/codemini.skills.json

@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "skills": {
+    "superpowers-lite": {
+      "description": "Default concise workflow for coding tasks; keep context tight, choose the right route, and verify before claiming success.",
+      "mode": "always",
+      "triggers": [],
+      "enabled": true,
+      "priority": 100
+    },
+    "brainstorm": {
+      "description": "Use when a feature or behavior request has multiple reasonable approaches and the missing piece is user preference, tradeoff choice, or key constraint.",
+      "mode": "agent_requested",
+      "triggers": [],
+      "enabled": true,
+      "priority": 70
+    },
+    "writing-plans": {
+      "description": "Use when you have a clear goal or approved design for a non-trivial task, before touching code.",
+      "mode": "agent_requested",
+      "triggers": [],
+      "enabled": true,
+      "priority": 75
+    },
+    "grill-me": {
+      "description": "Use when the user explicitly asks to pressure-test a plan, architecture choice, PR, launch, or product idea.",
+      "mode": "agent_requested",
+      "triggers": [],
+      "enabled": true,
+      "priority": 65
+    },
+    "project-requirements": {
+      "description": "Create a project requirements report with repository inspection and structured output artifacts.",
+      "mode": "manual",
+      "triggers": [],
+      "enabled": true,
+      "priority": 50
+    }
+  }
+}

package/src/commands/skill.js

@@ -77,9 +77,15 @@ export async function listSkillEntries({ scope = 'all', cwd = process.cwd() } =
       name: command.name,
       version: command.metadata?.version || '0.0.0',
       description: command.metadata?.description || '',
+      mode: command.metadata?.mode || '',
+      triggers: Array.isArray(command.metadata?.triggers) ? command.metadata.triggers : [],
       scope: itemScope,
       path: command.path,
-      enabled: itemScope === 'builtin' ? true : config.skills?.enabled?.[command.name] !== false
+      enabled: command.metadata?.enabled === false
+        ? false
+        : itemScope === 'builtin'
+          ? true
+          : config.skills?.enabled?.[command.name] !== false
     });
   }
   return entries.sort((a, b) => `${a.scope}:${a.name}`.localeCompare(`${b.scope}:${b.name}`));
@@ -93,14 +99,19 @@ async function readSkillMeta(name, { scope = 'all', cwd = process.cwd() } = {})
   }
   const dir = path.dirname(found.path);
   const manifestPath = path.join(dir, 'manifest.json');
+  const catalogPath = path.join(path.dirname(dir), 'codemini.skills.json');
   let manifest = null;
   try {
-    manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8'));
+    const catalog = JSON.parse(await fs.readFile(catalogPath, 'utf8'));
+    manifest = catalog?.skills?.[found.name] || null;
   } catch {
-    manifest = null;
+    try {
+      manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8'));
+    } catch {
+      manifest = null;
+    }
   }
-  const entryFile = manifest?.entry || 'SKILL.md';
-  const skillPath = found.path || path.join(dir, entryFile);
+  const skillPath = found.path || path.join(dir, 'SKILL.md');
   try {
     const content = await fs.readFile(skillPath, 'utf8');
     const firstLines = content.split('\n').slice(0, 20).join('\n');

package/src/core/chat-runtime.js

@@ -136,6 +136,7 @@ function getCompletionCopy(language = 'zh') {
         'soul.preset': 'soul 预设',
         'soul.custom_path': '自定义 soul 路径',
         'policy.safe_mode': '安全模式开关',
+        'policy.allowed_paths': '安全模式目录白名单',
         'policy.allow_dangerous_commands': '危险命令开关'
       },
       optionHints: {
@@ -145,6 +146,7 @@ function getCompletionCopy(language = 'zh') {
         'execution.mode': '可选：auto | normal | plan',
         'shell.default': '常用：bash | powershell',
         'policy.safe_mode': '可选：true | false',
+        'policy.allowed_paths': 'JSON 数组，例如 ["D:\\\\shared"]',
         'policy.allow_dangerous_commands': '可选：true | false',
         'context.prompt_budget_audit': '可选：true | false'
       },
@@ -243,6 +245,7 @@ function getCompletionCopy(language = 'zh') {
         'soul.preset': 'soul preset',
         'soul.custom_path': 'custom soul prompt path',
         'policy.safe_mode': 'safe mode switch',
+        'policy.allowed_paths': 'safe-mode allowed path roots',
         'policy.allow_dangerous_commands': 'dangerous command allowance'
       },
       optionHints: {
@@ -252,6 +255,7 @@ function getCompletionCopy(language = 'zh') {
         'execution.mode': 'options: auto | normal | plan',
         'shell.default': 'common: bash | powershell',
         'policy.safe_mode': 'options: true | false',
+        'policy.allowed_paths': 'JSON array, for example ["D:\\\\shared"]',
         'policy.allow_dangerous_commands': 'options: true | false',
         'context.prompt_budget_audit': 'options: true | false'
       },
@@ -1265,6 +1269,7 @@ function isBundledSkillCommand(command) {
 }
 
 function isSkillEnabled(config, name, command = null) {
+  if (command?.metadata?.enabled === false) return false;
   if (isBundledSkillCommand(command)) return true;
   return config.skills?.enabled?.[name] !== false;
 }
@@ -2301,6 +2306,9 @@ function buildRuntimeStateSnapshot({ currentSession, config, model, executionMod
     maxContextTokens,
     pendingPlanApproval: planState?.status === 'pending_approval'
       ? { goal: planState.goal, summary: planState.finalSummary || planState.summary, filePath: planState.filePath, steps: planState.steps || [] }
+      : null,
+    pendingReflectSkill: planState?.status === 'pending_reflect_skill'
+      ? buildPendingReflectSkillSnapshot(planState)
       : null
   };
   Object.defineProperties(snapshot, {
@@ -2314,11 +2322,6 @@ function buildRuntimeStateSnapshot({ currentSession, config, model, executionMod
       enumerable: false,
       writable: false
     },
-    pendingReflectSkill: {
-      value: currentSession?.planState?.status === 'pending_reflect_skill',
-      enumerable: false,
-      writable: false
-    },
     replyLanguage: {
       value: getReplyLanguage(config),
       enumerable: false,
@@ -2329,7 +2332,6 @@ function buildRuntimeStateSnapshot({ currentSession, config, model, executionMod
         ...snapshot,
         currentContextTokens,
         contextUsagePct,
-        pendingReflectSkill: currentSession?.planState?.status === 'pending_reflect_skill',
         replyLanguage: getReplyLanguage(config)
       }),
       enumerable: false,
@@ -2513,6 +2515,21 @@ function buildPendingReflectSkillMessage(reflectState) {
   return lines.join('\n');
 }
 
+function buildPendingReflectSkillSnapshot(reflectState) {
+  const candidates = Array.isArray(reflectState?.candidates) ? reflectState.candidates : [];
+  const candidate = candidates[0] || null;
+  if (!candidate) return null;
+  return {
+    scope: reflectState?.targetScope || 'project',
+    request: reflectState?.request || '',
+    name: candidate.name || '',
+    description: candidate.description || '',
+    confidence: Number(candidate.confidence ?? 0.75),
+    targetPath: candidate.targetPath || '',
+    content: candidate.content || ''
+  };
+}
+
 function buildApprovedPlanExecutionPrompt(planState, approvalText = '') {
   const requirementPacket = buildGoalRequirementPacket(planState?.goal || '', 'coder');
   const lines = [
@@ -2740,8 +2757,10 @@ async function askModel({
     }
   }
 
+  const shouldGenerateTitle = text
+    ? !session.messages.some((msg) => msg?.role === 'user')
+    : false;
   if (text) {
-    const shouldGenerateTitle = !session.messages.some((msg) => msg?.role === 'user');
     const modelExtra =
       typeof modelText === 'string' && modelText && modelText !== text ? { model_content: modelText } : {};
     const userMessage = stampedMessage('user', text, modelExtra);
@@ -2773,7 +2792,16 @@ async function askModel({
 
   const { definitions, handlers, formatters, deferredDefinitions, dispose: disposeTools } = getBuiltinTools({
     workspaceRoot: process.cwd(),
-    config,
+    config: {
+      ...config,
+      policy: {
+        ...(config.policy || {}),
+        allowed_paths: [
+          ...(Array.isArray(config.policy?.allowed_paths) ? config.policy.allowed_paths : []),
+          path.join(getSessionsDir(), String(session.id))
+        ]
+      }
+    },
     sessionId: session.id,
     onSystemEvent: onAgentEvent,
     getTodos: () => normalizeTodos(session.todos),
@@ -3004,7 +3032,7 @@ async function askModel({
     await flushScheduledSave();
     await saveSession(session);
     // Generate a better title asynchronously after saving
-    if (shouldReplaceSessionTitle(session.title)) {
+    if (shouldGenerateTitle) {
       const titleSessionId = session.id;
       generateSessionTitle({
         userText: text,
@@ -4242,11 +4270,22 @@ export async function createChatRuntime({
   if (hasPendingPlanApproval(currentSession)) {
     executionMode = 'plan';
   }
+  let compactState = null;
+  const normalizeCompactThreshold = (value, fallback = 60) => {
+    const num = Number(value);
+    if (!Number.isFinite(num)) return fallback;
+    return Math.min(95, Math.max(50, num));
+  };
+  const syncCompactStateFromConfig = () => {
+    if (!compactState) return;
+    compactState.threshold = normalizeCompactThreshold(config.context?.preflight_trigger_pct, 60);
+  };
   const syncRuntimeFromConfig = async ({ model: nextModel } = {}) => {
     const configuredMode = String(config.execution?.mode || 'normal');
     executionMode = hasPendingPlanApproval(currentSession)
       ? 'plan'
       : (['normal', 'auto', 'plan'].includes(configuredMode) ? configuredMode : 'normal');
+    syncCompactStateFromConfig();
 
     const resolvedModel = String(nextModel || '').trim();
     if (resolvedModel) {
@@ -4269,10 +4308,10 @@ export async function createChatRuntime({
   // Set up tool result store under session directory
   const sessionResultsDir = path.join(getSessionsDir(), String(currentSession.id));
   setResultDir(sessionResultsDir);
-  const compactState = {
+  compactState = {
     backupMessages: null,
     autoEnabled: true,
-    threshold: 60,
+    threshold: normalizeCompactThreshold(config.context?.preflight_trigger_pct, 60),
     mode: 'conservative'
   };
   let compactedForModel = currentSession.compact?.view || null;
@@ -4356,6 +4395,7 @@ export async function createChatRuntime({
     'soul.preset',
     'soul.custom_path',
     'policy.safe_mode',
+    'policy.allowed_paths',
     'policy.allow_dangerous_commands'
   ];
 
@@ -4777,6 +4817,11 @@ export async function createChatRuntime({
   };
 
   const persistAssistantExchange = async (userText, assistantText, { includeUser = true, extra = {} } = {}) => {
+    const priorUserCount = currentSession.messages.filter((msg) => msg?.role === 'user').length;
+    const priorAssistantCount = currentSession.messages.filter((msg) => msg?.role === 'assistant').length;
+    const shouldGenerateTitle =
+      (includeUser && userText && priorUserCount === 0) ||
+      (!includeUser && userText && priorUserCount === 1 && priorAssistantCount === 0);
     if (includeUser && userText) {
       appendSessionMessage(stampedMessage('user', userText));
     }
@@ -4787,7 +4832,7 @@ export async function createChatRuntime({
     currentSession.mode = executionMode || config.execution?.mode || 'normal';
     await saveSession(currentSession);
     // Generate a better title asynchronously after saving
-    if (shouldReplaceSessionTitle(currentSession.title)) {
+    if (shouldGenerateTitle || shouldReplaceSessionTitle(currentSession.title)) {
       const titleSessionId = currentSession.id;
       generateSessionTitle({
         userText,
@@ -5115,6 +5160,7 @@ export async function createChatRuntime({
           });
           currentSession.planState = null;
           executionMode = 'auto';
+          if (onAgentEvent) onAgentEvent({ type: 'reflect:approval_cleared' });
           await reloadCommandsAndSkills();
           const text = `Reflect skill written and loaded: /${written.draft.name}\nPath: ${written.filePath}`;
           await persistLocalExchange(line, text, { includeUser: false });
@@ -5172,6 +5218,12 @@ export async function createChatRuntime({
               workspaceRoot: process.cwd()
             })
           };
+          if (onAgentEvent) {
+            onAgentEvent({
+              type: 'reflect:pending_approval',
+              draft: buildPendingReflectSkillSnapshot(currentSession.planState)
+            });
+          }
           const text = `Reflect skill draft revised.\n${buildPendingReflectSkillMessage(currentSession.planState)}`;
           await persistLocalExchange(line, text);
           return { type: 'system', text };
@@ -5209,6 +5261,7 @@ export async function createChatRuntime({
         if (hasPendingReflectSkill(currentSession)) {
           currentSession.planState = null;
           executionMode = 'auto';
+          if (onAgentEvent) onAgentEvent({ type: 'reflect:approval_cleared' });
           const text = 'Reflect skill draft discarded.';
           await persistLocalExchange(line, text, { includeUser: false });
           return { type: 'system', text };
@@ -5668,6 +5721,12 @@ export async function createChatRuntime({
           request: parsedReflect.request,
           candidates
         };
+        if (onAgentEvent) {
+          onAgentEvent({
+            type: 'reflect:pending_approval',
+            draft: buildPendingReflectSkillSnapshot(currentSession.planState)
+          });
+        }
         const text = buildPendingReflectSkillMessage(currentSession.planState);
         await persistLocalExchange(line, text);
         return { type: 'system', text };
@@ -5735,7 +5794,7 @@ export async function createChatRuntime({
           await resetConfig();
           config = await loadConfig();
           await syncRuntimeFromConfig({ model: resolveDefaultModel(config) });
-          compactState.threshold = 60;
+          syncCompactStateFromConfig();
           compactState.mode = 'conservative';
           compactState.autoEnabled = true;
           const text = 'Config reset complete';

package/src/core/command-loader.js

@@ -11,6 +11,8 @@ import { readSkillRegistry } from './skill-registry.js';
 
 const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const BUNDLED_SKILLS_DIR = path.resolve(MODULE_DIR, '..', '..', 'skills');
+const SKILL_CATALOG_FILE = 'codemini.skills.json';
+const FRONTMATTER_READ_BYTES = 16 * 1024;
 
 function parseArrayText(value) {
   const inner = value.slice(1, -1).trim();
@@ -46,6 +48,79 @@ function parseFrontmatter(raw) {
   return { metadata, content };
 }
 
+function readFrontmatterMetadata(filePath) {
+  let fd;
+  try {
+    fd = fs.openSync(filePath, 'r');
+    const buffer = Buffer.alloc(FRONTMATTER_READ_BYTES);
+    const bytesRead = fs.readSync(fd, buffer, 0, buffer.length, 0);
+    const raw = buffer.subarray(0, bytesRead).toString('utf8');
+    if (!raw.startsWith('---\n')) return {};
+    const end = raw.indexOf('\n---\n', 4);
+    if (end === -1) return {};
+    return parseFrontmatter(raw.slice(0, end + 5)).metadata;
+  } catch {
+    return {};
+  } finally {
+    if (fd !== undefined) {
+      try { fs.closeSync(fd); } catch {}
+    }
+  }
+}
+
+function readSkillCatalog(baseDir) {
+  const catalogPath = path.join(baseDir, SKILL_CATALOG_FILE);
+  try {
+    const parsed = JSON.parse(fs.readFileSync(catalogPath, 'utf8'));
+    return parsed && typeof parsed === 'object' && parsed.skills && typeof parsed.skills === 'object'
+      ? parsed.skills
+      : {};
+  } catch {
+    return {};
+  }
+}
+
+function normalizeStringArray(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => String(item || '').trim()).filter(Boolean);
+  }
+  const single = String(value || '').trim();
+  return single ? [single] : [];
+}
+
+function catalogMetadata(catalog, name) {
+  const entry = catalog?.[name];
+  if (!entry || typeof entry !== 'object') return {};
+  return {
+    ...(entry.description ? { description: String(entry.description) } : {}),
+    ...(entry.mode ? { mode: String(entry.mode) } : {}),
+    ...(entry.enabled !== undefined ? { enabled: entry.enabled !== false } : {}),
+    ...(entry.priority !== undefined ? { priority: Number(entry.priority) } : {}),
+    triggers: normalizeStringArray(entry.triggers)
+  };
+}
+
+function commandWithContent(command, parsedContent) {
+  if (parsedContent !== undefined) {
+    return { ...command, content: parsedContent };
+  }
+
+  let cached;
+  let loaded = false;
+  return Object.defineProperty({ ...command }, 'content', {
+    enumerable: true,
+    configurable: true,
+    get() {
+      if (!loaded) {
+        const raw = fs.readFileSync(command.path, 'utf8');
+        cached = parseFrontmatter(raw).content;
+        loaded = true;
+      }
+      return cached;
+    }
+  });
+}
+
 function safeEntries(dir) {
   try {
     return fs.readdirSync(dir);
@@ -104,77 +179,95 @@ function loadMarkdownCommandsFromDir(baseDir, source, out) {
 
 function loadLegacySkillsFromDir(baseDir, source, out) {
   if (!fs.existsSync(baseDir)) return;
+  const catalog = readSkillCatalog(baseDir);
   for (const entry of safeEntries(baseDir)) {
     if (!isSafeEntry(entry)) continue;
     const full = path.join(baseDir, entry);
     const stat = fs.statSync(full);
     if (!stat.isDirectory()) continue;
+    const catalogMeta = catalogMetadata(catalog, entry);
     const skillFile = path.join(full, 'SKILL.md');
     if (!fs.existsSync(skillFile)) continue;
-    const raw = fs.readFileSync(skillFile, 'utf8');
-    const parsed = parseFrontmatter(raw);
-    setCommand(out, entry, {
+    const frontmatter = readFrontmatterMetadata(skillFile);
+    setCommand(out, entry, commandWithContent({
       name: entry,
       source: `${source}-skill`,
       path: skillFile,
       metadata: {
-        description: parsed.metadata.description || 'Legacy skill',
+        ...frontmatter,
+        ...catalogMeta,
+        description: catalogMeta.description || frontmatter.description || 'Legacy skill',
         type: 'skill'
-      },
-      content: parsed.content
-    });
+      }
+    }));
   }
 }
 
 function loadBundledSkillsFromDir(baseDir, out) {
   if (!fs.existsSync(baseDir)) return;
+  const catalog = readSkillCatalog(baseDir);
   for (const entry of safeEntries(baseDir)) {
     if (!isSafeEntry(entry)) continue;
     const full = path.join(baseDir, entry);
     const stat = fs.statSync(full);
     if (!stat.isDirectory()) continue;
+    const catalogMeta = catalogMetadata(catalog, entry);
     const skillFile = path.join(full, 'SKILL.md');
     if (!fs.existsSync(skillFile)) continue;
-    const raw = fs.readFileSync(skillFile, 'utf8');
-    const parsed = parseFrontmatter(raw);
-    setCommand(out, entry, {
+    const frontmatter = readFrontmatterMetadata(skillFile);
+    setCommand(out, entry, commandWithContent({
       name: entry,
       source: 'bundled-skill',
       path: skillFile,
       metadata: {
-        ...parsed.metadata,
+        ...frontmatter,
+        ...catalogMeta,
         type: 'skill',
-        version: parsed.metadata.version || '0.1.0',
-        description: parsed.metadata.description || 'Bundled skill'
-      },
-      content: parsed.content
-    });
+        version: frontmatter.version || '0.1.0',
+        description: catalogMeta.description || frontmatter.description || 'Bundled skill'
+      }
+    }));
+  }
+}
+
+function applySkillCatalogPatches(baseDir, out) {
+  const catalog = readSkillCatalog(baseDir);
+  for (const name of Object.keys(catalog)) {
+    const existing = out.get(name);
+    if (!existing || existing.metadata?.type !== 'skill') continue;
+    const meta = catalogMetadata(catalog, name);
+    existing.metadata = {
+      ...existing.metadata,
+      ...meta,
+      description: meta.description || existing.metadata.description || ''
+    };
   }
 }
 
 function loadInstalledSkillsFromRegistry(baseDir, registry, out) {
   if (!registry || !Array.isArray(registry.skills)) return;
+  const catalog = readSkillCatalog(baseDir);
   for (const skill of registry.skills) {
     if (skill.enabled === false) continue;
     const name = skill.name;
     if (out.has(name)) continue;
+    const catalogMeta = catalogMetadata(catalog, name);
     const entry = skill.entryFile || 'SKILL.md';
     const full = path.join(baseDir, name, entry);
     if (!fs.existsSync(full)) continue;
-    const raw = fs.readFileSync(full, 'utf8');
-    const parsed = parseFrontmatter(raw);
-    setCommand(out, name, {
+    const frontmatter = readFrontmatterMetadata(full);
+    setCommand(out, name, commandWithContent({
       name,
       source: 'registry-skill',
       path: full,
       metadata: {
-        ...parsed.metadata,
+        ...frontmatter,
+        ...catalogMeta,
         type: 'skill',
-        version: skill.version || parsed.metadata.version || '0.0.0',
-        description: skill.description || parsed.metadata.description || 'Installed skill'
-      },
-      content: parsed.content
-    });
+        version: skill.version || frontmatter.version || '0.0.0',
+        description: catalogMeta.description || skill.description || frontmatter.description || 'Installed skill'
+      }
+    }));
   }
 }
 
@@ -201,10 +294,12 @@ export async function loadCommandsAndSkills(cwd = process.cwd()) {
   const commands = new Map();
 
   loadBundledSkillsFromDir(BUNDLED_SKILLS_DIR, commands);
+  applySkillCatalogPatches(getProjectSkillsDir(cwd), commands);
   loadMarkdownCommandsFromDir(getCommandsDir(), 'global', commands);
   loadMarkdownCommandsFromDir(getProjectCommandsDir(cwd), 'project', commands);
   loadLegacySkillsFromDir(getSkillsDir(), 'global', commands);
   loadLegacySkillsFromDir(getProjectSkillsDir(cwd), 'project', commands);
+  applySkillCatalogPatches(getProjectSkillsDir(cwd), commands);
   const registry = await readSkillRegistry();
   loadInstalledSkillsFromRegistry(getSkillsDir(), registry, commands);