@heihei0299/matt-skills 1.3.2 → 1.5.2

package/bin/cli.js

@@ -7,7 +7,26 @@ import prompts from 'prompts';
 
 const SKILLS_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', '.agents', 'skills');
 const TEMPLATE_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'template');
-const PROPRIETARY_SKILLS = new Set(['tdd-implement', 'grill-to-spec', 'diagnose-fix', 'commit-check', 'instance-test']);
+const PROPRIETARY_SKILLS = new Set(['ci-guard', 'tdd-implement', 'grill-to-spec', 'diagnose-fix', 'commit-check', 'scaffold-functional-test']);
+const PROPRIETARY_DEFAULT = new Set(['tdd-implement', 'diagnose-fix', 'commit-check', 'grill-to-spec']); // 默认仅装核心 3，--all 才装全部 6
+const ENGINEERING_PATH = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'config', 'engineering.json');
+let ENGINEERING_SKILLS = null;
+async function loadEngineeringSkills() {
+  if (ENGINEERING_SKILLS) return ENGINEERING_SKILLS;
+  try {
+    const raw = await readFile(ENGINEERING_PATH, 'utf8');
+    ENGINEERING_SKILLS = new Set(JSON.parse(raw));
+  } catch {
+    ENGINEERING_SKILLS = new Set(['ask-matt','code-review','codebase-design','diagnosing-bugs','domain-modeling','grill-with-docs','implement','improve-codebase-architecture','prototype','research','resolving-merge-conflicts','setup-matt-pocock-skills','tdd','to-spec','to-tickets','triage','wayfinder','wizard']);
+  }
+  return ENGINEERING_SKILLS;
+}
+function isProgrammingSkill(name, engineering) {
+  return PROPRIETARY_DEFAULT.has(name) || engineering.has(name);
+}
+function isProgrammingAll(name, engineering) {
+  return PROPRIETARY_SKILLS.has(name) || engineering.has(name);
+}
 process.stdout.on('error', (err) => {
   if (err.code === 'EPIPE') process.exit(0);
   throw err;
@@ -16,31 +35,37 @@ process.stdout.on('error', (err) => {
 const HELP = `matt-skills — install and manage this skill collection
 
 Usage:
-  matt-skills init [options]                   Initialize a project: template + upstream skills
-  matt-skills sync [--apply|--force] [--dest <path>] [--upstream <url>] [--ref <ref>] [--json]   Sync existing project to latest template + skills
-  matt-skills list [--json]                    List available skills and their descriptions
+  matt-skills init [options]                   Initialize a project: template + skills (.agents/skills)
+  matt-skills sync [--apply|--force] [--all] [--dest <path>] [--upstream <url>] [--ref <ref>] [--json]   Sync existing project to latest template + skills
+  matt-skills list [--all] [--json]            List available skills and their descriptions
   matt-skills install [options]                Install skills (interactive by default)
-  matt-skills check [--json] [--upstream <url>] [--ref <ref>]
+  matt-skills check [--all] [--json] [--upstream <url>] [--ref <ref>]
                                               Check if upstream skills are up to date (read-only)
   matt-skills --help                          Show this help
 
 Init options:
   --dest <path>   Target directory (default: current directory)
   --force         Overwrite existing files
+  --all           Include non-programming skills (productivity) and optional proprietary; default only core programming (engineering 18 + default proprietary 4 → 22)
 Sync options:
   --apply         Apply changes (safe incremental, respects custom AGENTS.md)
   --force         Hard overwrite (backup .bak + full sync)
+  --all           Include non-programming and optional proprietary; default only core programming (22)
   --dest <path>   Target directory (default: current directory)
   --upstream <url> Upstream repo URL (default: https://github.com/mattpocock/skills.git)
   --ref <ref>     Upstream ref (default: HEAD)
   --json          Output as JSON
 Check options:
+  --all           Include non-programming and optional proprietary; default only core programming (22)
   --json          Output as JSON
   --upstream <url> Upstream repo URL (default: https://github.com/mattpocock/skills.git)
   --ref <ref>     Upstream ref (default: HEAD)
+List options:
+  --all           List all skills (default only core programming 22)
+  --json          Output as JSON
 Install options:
-  --tools <a,b>   Install for the given tools (codex, pi, opencode, claude); skips tool selection
-  --all           Install all skills; skips skill selection
+  --tools <a,b>   Install for the given tools (codex, pi, opencode, claude); skips tool selection — 共享技能统一指向 .agents/skills，.pi/skills/.opencode/skills 仅用于项目自定义
+  --all           Install all skills (default only core programming 22); skips skill selection
   --force         Overwrite existing skills
   --global        Install to the user's global skill directories
   --project       Install to project skill directories (default)
@@ -63,12 +88,16 @@ function parseFrontmatter(text) {
   return fields;
 }
 
-async function listSkills() {
+async function listSkills({ onlyProgramming = false } = {}) {
   const entries = await readdir(SKILLS_DIR, { withFileTypes: true });
   const skills = [];
+  let engineering = null;
+  if (onlyProgramming) engineering = await loadEngineeringSkills();
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
     if (entry.name.endsWith('.bak')) continue;
+    if (entry.name === 'skill-creator') continue;
+    if (onlyProgramming && !isProgrammingSkill(entry.name, engineering)) continue;
     let content;
     try {
       content = await readFile(path.join(SKILLS_DIR, entry.name, 'SKILL.md'), 'utf8');
@@ -99,11 +128,13 @@ async function backupIfExists(p) {
 
 const TOOLS = ['codex', 'pi', 'opencode', 'claude'];
 
+// 统一源：共享技能全部在 .agents/skills，harness 的 .pi/skills/.opencode/skills 仅用于项目自定义
+// 为兼容历史，pi/opencode/claude 的项目安装仍解析但统一指向 .agents/skills，并给出提示
 const PROJECT_DIRS = {
   codex: '.agents/skills',
-  pi: '.pi/skills',
-  opencode: '.opencode/skills',
-  claude: '.claude/skills',
+  pi: '.agents/skills',
+  opencode: '.agents/skills',
+  claude: '.agents/skills',
 };
 
 const GLOBAL_DIRS = {
@@ -141,7 +172,10 @@ async function promptSkills(skills) {
 }
 
 async function installCommand({ dest, all, force, tools, global }) {
-  const skills = await listSkills();
+  const onlyProgramming = !all;
+  const engineering = onlyProgramming ? await loadEngineeringSkills() : null;
+  const skillsAll = await listSkills({ onlyProgramming: false });
+  const skills = onlyProgramming ? skillsAll.filter(s => isProgrammingSkill(s.name, engineering)) : skillsAll;
   let targets;
   if (dest) {
     targets = [{ tool: null, dir: path.resolve(process.cwd(), dest) }];
@@ -153,7 +187,18 @@ async function installCommand({ dest, all, force, tools, global }) {
       process.stdout.write('未选择任何工具，未安装任何技能\n');
       return;
     }
+    // 共享技能统一源提示：pi/opencode 的项目目录已改为 .agents/skills
+    const needsHint = selectedTools.some((t) => t === 'pi' || t === 'opencode');
+    if (needsHint && !global) {
+      process.stdout.write('提示：共享技能统一在 .agents/skills，.pi/skills/.opencode/skills 仅用于项目自定义技能\n');
+    }
     targets = selectedTools.map((tool) => ({ tool, dir: toolDir(tool, global) }));
+    // 去重：多个工具可能映射到同一目录（如 pi/opencode/codex 都指向 .agents/skills），合并去重避免重复计数
+    const seen = new Map();
+    for (const t of targets) {
+      if (!seen.has(t.dir)) seen.set(t.dir, t);
+    }
+    targets = [...seen.values()];
   }
   const selected = all ? skills.map((s) => s.name) : await promptSkills(skills);
   if (selected.length === 0) {
@@ -178,9 +223,10 @@ async function installCommand({ dest, all, force, tools, global }) {
   }
 }
 
-async function initCommand({ dest, force }) {
+async function initCommand({ dest, force, all }) {
   const target = dest ? path.resolve(process.cwd(), dest) : process.cwd();
   const marker = path.join(target, 'AGENTS.md');
+  const onlyProgramming = !all;
   if (!force && (await pathExists(marker))) {
     process.stdout.write('模板已存在（AGENTS.md），跳过；用 --force 覆盖\n');
   } else {
@@ -188,50 +234,66 @@ async function initCommand({ dest, force }) {
       const cur = path.join(target, 'AGENTS.md');
       if (await pathExists(cur)) await backupIfExists(cur);
       await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
-      process.stdout.write('模板：已覆盖（AGENTS.md、.opencode/、.pi/）\n');
+      process.stdout.write('模板：已覆盖（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
     } else {
       await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
-      process.stdout.write('模板：已复制（AGENTS.md、.opencode/、.pi/）\n');
+      process.stdout.write('模板：已复制（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
+    }
+    // 默认仅编程（engineering + proprietary），--all 才保留 productivity
+    if (onlyProgramming && path.resolve(target) !== path.resolve(path.join(path.dirname(fileURLToPath(import.meta.url)), '..'))) {
+      const engineering = await loadEngineeringSkills();
+      const skillsDirFilter = path.join(target, '.agents', 'skills');
+      try {
+        const entries = await readdir(skillsDirFilter, { withFileTypes: true });
+        for (const e of entries) {
+          if (!e.isDirectory()) continue;
+          if (e.name.endsWith('.bak') || e.name === '.git' || e.name === 'skill-creator') continue;
+          if (!isProgrammingSkill(e.name, engineering)) {
+            await rm(path.join(skillsDirFilter, e.name), { recursive: true, force: true });
+          }
+        }
+      } catch {}
     }
   }
-  const entries = await readdir(SKILLS_DIR, { withFileTypes: true });
-  const upstream = entries
-    .filter((e) => e.isDirectory() && !PROPRIETARY_SKILLS.has(e.name) && !e.name.endsWith('.bak'))
-    .map((e) => e.name)
-    .sort();
+  // 统计（区分编程 vs 全量）
   const skillsDir = path.join(target, '.agents', 'skills');
   let installed = 0;
-  let skipped = 0;
-  for (const name of upstream) {
-    const src = path.join(SKILLS_DIR, name);
-    const dst = path.join(skillsDir, name);
-    if (src === dst) {
-      skipped++;
-      continue;
-    }
-    if (!force && (await pathExists(dst))) {
-      skipped++;
-      continue;
+  try {
+    const entries = await readdir(skillsDir, { withFileTypes: true });
+    installed = entries.filter((e) => e.isDirectory() && !e.name.endsWith('.bak') && e.name !== '.git' && e.name !== 'skill-creator').length;
+  } catch {}
+  const allSkillsFull = await listSkills({ onlyProgramming: false });
+  const engineeringForStats = await loadEngineeringSkills();
+  const programmingCount = allSkillsFull.filter(s => isProgrammingSkill(s.name, engineeringForStats)).length;
+  const upstreamFull = allSkillsFull.filter((s) => !PROPRIETARY_SKILLS.has(s.name)).length;
+  const upstreamProg = allSkillsFull.filter((s) => !PROPRIETARY_SKILLS.has(s.name) && engineeringForStats.has(s.name)).length;
+  const displayTotal = onlyProgramming ? programmingCount : allSkillsFull.length;
+  const displayUpstream = onlyProgramming ? upstreamProg : upstreamFull;
+  if (path.resolve(skillsDir) === path.resolve(SKILLS_DIR)) {
+    process.stdout.write(`技能：已装 ${installed}、跳过 0（全量 ${allSkillsFull.length}，含上游 ${upstreamFull}；编程 ${programmingCount}，含上游 ${upstreamProg}）\n`);
+  } else {
+    if (onlyProgramming) {
+      process.stdout.write(`技能：已装 ${installed}（编程 ${displayTotal}，含上游 ${displayUpstream}；全量 ${allSkillsFull.length}，含上游 ${upstreamFull}）\n`);
+    } else {
+      process.stdout.write(`技能：已装 ${installed}（全量 ${displayTotal}，含上游 ${displayUpstream}）\n`);
     }
-    await cp(src, dst, { recursive: true, force: true });
-    installed++;
   }
-  process.stdout.write(`上游技能：已装 ${installed}、跳过 ${skipped}\n`);
   process.stdout.write(`目标路径：${target}\n`);
 }
-
-async function syncCommand({ dest, force, apply, upstreamUrl, ref, json }) {
+async function syncCommand({ dest, force, apply, upstreamUrl, ref, json, all }) {
+  const onlyProgramming = !all;
   // 默认：仅对比不写盘 (check 模式)，--apply / --force 显式写盘
   const doApply = apply || force;
   if (!doApply) {
     const { compare } = await import('../scripts/sync-upstream.js');
-    const cmp = await compare({ upstreamUrl, ref });
+    const cmp = await compare({ upstreamUrl, ref, onlyProgramming });
     if (json) {
-      process.stdout.write(JSON.stringify({ head: cmp.head, counts: cmp.counts, result: cmp.result }, null, 2) + '\n');
+      process.stdout.write(JSON.stringify({ head: cmp.head, counts: cmp.counts, result: cmp.result, onlyProgramming }, null, 2) + '\n');
     } else {
       const lines = [];
       lines.push(`上游 HEAD: ${cmp.head}`);
-      lines.push(`本地非独有: ${cmp.counts.local}  上游: ${cmp.counts.upstream}`);
+      const modeHint = onlyProgramming ? '（仅编程）' : '（全量）';
+      lines.push(`本地非独有: ${cmp.counts.local}  上游: ${cmp.counts.upstream} ${modeHint}`);
       lines.push('');
       const totalDiff = cmp.result.added.length + cmp.result.updated.length + cmp.result.removed.length + cmp.result.renamed.length;
       if (totalDiff === 0) {
@@ -254,15 +316,46 @@ async function syncCommand({ dest, force, apply, upstreamUrl, ref, json }) {
 
   const target = dest ? path.resolve(process.cwd(), dest) : process.cwd();
   const marker = path.join(target, 'AGENTS.md');
+  // 模板同步：仅编程模式下过滤 skills，仅同步 programming 子集
+  async function copyTemplateFiltered() {
+    if (!onlyProgramming) {
+      await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
+      return;
+    }
+    // 仅编程：分别复制非 skills 部分，skills 由后续 allSkills 循环处理
+    await cp(path.join(TEMPLATE_DIR, 'AGENTS.md'), path.join(target, 'AGENTS.md'), { force: true });
+    await cp(path.join(TEMPLATE_DIR, '.opencode'), path.join(target, '.opencode'), { recursive: true, force: true });
+    await cp(path.join(TEMPLATE_DIR, '.pi'), path.join(target, '.pi'), { recursive: true, force: true });
+    // .agents/skills 不通过模板拷贝，留给后续按 allSkills 精确同步
+    await mkdir(path.join(target, '.agents', 'skills'), { recursive: true });
+    // 若 .agents 下有非 skills 文件（未来扩展），也拷贝但排除 skills
+    try {
+      const agEntries = await readdir(path.join(TEMPLATE_DIR, '.agents'), { withFileTypes: true });
+      for (const e of agEntries) {
+        if (e.name === 'skills') continue;
+        const src = path.join(TEMPLATE_DIR, '.agents', e.name);
+        const dst = path.join(target, '.agents', e.name);
+        await cp(src, dst, { recursive: true, force: true });
+      }
+    } catch {}
+  }
   if (!(await pathExists(marker))) {
     process.stdout.write('未检测到现有项目（AGENTS.md 不存在），将执行全新初始化\n');
-    await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
-    process.stdout.write('模板：已复制（AGENTS.md、.opencode/、.pi/）\n');
+    if (onlyProgramming) {
+      await copyTemplateFiltered();
+    } else {
+      await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
+    }
+    process.stdout.write('模板：已复制（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
   } else if (force) {
     process.stdout.write('同步：检测到现有项目，将增量更新\n');
     await backupIfExists(path.join(target, 'AGENTS.md'));
-    await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
-    process.stdout.write('模板：已覆盖（AGENTS.md、.opencode/、.pi/）\n');
+    if (onlyProgramming) {
+      await copyTemplateFiltered();
+    } else {
+      await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
+    }
+    process.stdout.write('模板：已覆盖（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
   } else if (apply) {
     process.stdout.write('同步：检测到现有项目，将增量更新\n');
     let skipAgents = false;
@@ -271,32 +364,56 @@ async function syncCommand({ dest, force, apply, upstreamUrl, ref, json }) {
       if (content.includes('tdd-implement')) skipAgents = true;
     } catch {}
     if (skipAgents) {
-      await cp(path.join(TEMPLATE_DIR, '.opencode'), path.join(target, '.opencode'), { recursive: true, force: true });
-      await cp(path.join(TEMPLATE_DIR, '.pi'), path.join(target, '.pi'), { recursive: true, force: true });
+      if (onlyProgramming) {
+        await cp(path.join(TEMPLATE_DIR, '.opencode'), path.join(target, '.opencode'), { recursive: true, force: true });
+        await cp(path.join(TEMPLATE_DIR, '.pi'), path.join(target, '.pi'), { recursive: true, force: true });
+        // .agents 跳过 AGENTS.md 定制，skills 由后续处理
+        try {
+          const agEntries = await readdir(path.join(TEMPLATE_DIR, '.agents'), { withFileTypes: true });
+          for (const e of agEntries) {
+            if (e.name === 'skills') continue;
+            await cp(path.join(TEMPLATE_DIR, '.agents', e.name), path.join(target, '.agents', e.name), { recursive: true, force: true });
+          }
+        } catch {}
+      } else {
+        await cp(path.join(TEMPLATE_DIR, '.agents'), path.join(target, '.agents'), { recursive: true, force: true });
+        await cp(path.join(TEMPLATE_DIR, '.opencode'), path.join(target, '.opencode'), { recursive: true, force: true });
+        await cp(path.join(TEMPLATE_DIR, '.pi'), path.join(target, '.pi'), { recursive: true, force: true });
+      }
       process.stdout.write('模板：已同步（AGENTS.md 跳过，已含定制）\n');
     } else {
-      await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
-      process.stdout.write('模板：已同步（AGENTS.md、.opencode/、.pi/）\n');
+      if (onlyProgramming) {
+        await copyTemplateFiltered();
+      } else {
+        await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
+      }
+      process.stdout.write('模板：已同步（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
     }
   } else {
-    // fallback for any other doApply case (should not reach here because !doApply already returned)
     process.stdout.write('同步：检测到现有项目，将增量更新\n');
-    await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
-    process.stdout.write('模板：已同步（AGENTS.md、.opencode/、.pi/）\n');
+    if (onlyProgramming) {
+      await copyTemplateFiltered();
+    } else {
+      await cp(TEMPLATE_DIR, target, { recursive: true, force: true });
+    }
+    process.stdout.write('模板：已同步（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
   }
+  // 技能同步：按编程过滤（默认仅编程，--all 全量）
   const entries = await readdir(SKILLS_DIR, { withFileTypes: true });
-  const upstream = entries
-    .filter((e) => e.isDirectory() && !PROPRIETARY_SKILLS.has(e.name) && !e.name.endsWith('.bak'))
-    .map((e) => e.name)
-    .sort();
+  const allNames = entries.filter((e) => e.isDirectory() && !e.name.endsWith('.bak') && e.name !== 'skill-creator' && e.name !== '.git').map((e) => e.name);
+  let allSkills = allNames.sort();
+  if (onlyProgramming) {
+    const engineering = await loadEngineeringSkills();
+    allSkills = allSkills.filter(n => isProgrammingSkill(n, engineering));
+  }
   const skillsDir = path.join(target, '.agents', 'skills');
   await mkdir(skillsDir, { recursive: true });
   let installed = 0;
   let updated = 0;
-  for (const name of upstream) {
+  for (const name of allSkills) {
     const src = path.join(SKILLS_DIR, name);
     const dst = path.join(skillsDir, name);
-    if (src === dst) {
+    if (path.resolve(src) === path.resolve(dst)) {
       updated++;
       continue;
     }
@@ -310,6 +427,8 @@ async function syncCommand({ dest, force, apply, upstreamUrl, ref, json }) {
       installed++;
     }
   }
+  // --force 时删除多余；仅编程模式下多余指不在编程集合中的，--all 模式下多余指不在全量中的
+  // 默认 --apply 保留多余（不删除），符合“默认保留、--force 删除”
   if (force) {
     let localEntries = [];
     try {
@@ -319,12 +438,40 @@ async function syncCommand({ dest, force, apply, upstreamUrl, ref, json }) {
       if (!e.isDirectory()) continue;
       if (e.name.endsWith('.bak')) continue;
       if (e.name === '.git') continue;
-      if (PROPRIETARY_SKILLS.has(e.name)) continue;
-      if (upstream.includes(e.name)) continue;
+      if (e.name === 'skill-creator') continue;
+      if (allSkills.includes(e.name)) continue;
       await rm(path.join(skillsDir, e.name), { recursive: true, force: true });
     }
   }
-  process.stdout.write(`上游技能：新增 ${installed}、更新 ${updated}\n`);
+  // 旧镜像自动清理：.pi/skills 与 .opencode/skills 中残留的共享技能一律删除，保留项目自定义
+  // 仅清理当前全量/编程集合中的技能，避免误删自定义
+  for (const harness of ['.pi/skills', '.opencode/skills']) {
+    const dir = path.join(target, harness);
+    if (!(await pathExists(dir))) continue;
+    let hsEntries = [];
+    try { hsEntries = await readdir(dir, { withFileTypes: true }); } catch { continue; }
+    for (const e of hsEntries) {
+      if (!e.isDirectory()) continue;
+      if (e.name === '.git' || e.name.endsWith('.bak')) continue;
+      if (e.name === '.gitkeep' || e.name === 'README.md') continue;
+      if (allSkills.includes(e.name) || PROPRIETARY_SKILLS.has(e.name)) {
+        await rm(path.join(dir, e.name), { recursive: true, force: true });
+      }
+    }
+  }
+  // 清理过时的 .pi/settings.json 指向
+  try {
+    const piSettings = path.join(target, '.pi/settings.json');
+    if (await pathExists(piSettings)) {
+      const txt = await readFile(piSettings, 'utf8');
+      if (txt.includes('.opencode/skills') || txt.includes('../.opencode')) {
+        const { writeFile } = await import('node:fs/promises');
+        await writeFile(piSettings, '{}\n');
+      }
+    }
+  } catch {}
+  const modeLabel = onlyProgramming ? '编程' : '全量';
+  process.stdout.write(`技能：新增 ${installed}、更新 ${updated}（${modeLabel} ${allSkills.length}）\n`);
   process.stdout.write(`目标路径：${target}\n`);
 }
 
@@ -333,6 +480,7 @@ function parseInitArgs(args) {
   let force = false;
   let apply = false;
   let json = false;
+  let all = false;
   let upstreamUrl;
   let ref;
   for (let i = 0; i < args.length; i++) {
@@ -341,13 +489,14 @@ function parseInitArgs(args) {
     else if (arg.startsWith('--dest=')) dest = arg.slice('--dest='.length);
     else if (arg === '--force') force = true;
     else if (arg === '--apply') apply = true;
+    else if (arg === '--all') all = true;
     else if (arg === '--json') json = true;
     else if (arg === '--upstream') upstreamUrl = args[++i];
     else if (arg.startsWith('--upstream=')) upstreamUrl = arg.slice('--upstream='.length);
     else if (arg === '--ref') ref = args[++i];
     else if (arg.startsWith('--ref=')) ref = arg.slice('--ref='.length);
   }
-  return { dest, force, apply, json, upstreamUrl, ref };
+  return { dest, force, apply, json, all, upstreamUrl, ref };
 }
 
 function parseInstallArgs(args) {
@@ -376,17 +525,19 @@ function parseInstallArgs(args) {
 async function checkCommand(args) {
   const { compare } = await import('../scripts/sync-upstream.js');
   const json = args.includes('--json');
+  const onlyProgramming = !args.includes('--all');
   const upstreamIdx = args.indexOf('--upstream');
   const upstreamUrl = upstreamIdx !== -1 ? args[upstreamIdx + 1] : undefined;
   const refIdx = args.indexOf('--ref');
   const ref = refIdx !== -1 ? args[refIdx + 1] : undefined;
-  const cmp = await compare({ upstreamUrl, ref });
+  const cmp = await compare({ upstreamUrl, ref, onlyProgramming });
   if (json) {
-    process.stdout.write(JSON.stringify({ head: cmp.head, counts: cmp.counts, result: cmp.result }, null, 2) + '\n');
+    process.stdout.write(JSON.stringify({ head: cmp.head, counts: cmp.counts, result: cmp.result, onlyProgramming }, null, 2) + '\n');
   } else {
     const lines = [];
     lines.push(`上游 HEAD: ${cmp.head}`);
-    lines.push(`本地非独有: ${cmp.counts.local}  上游: ${cmp.counts.upstream}`);
+    const modeHint = onlyProgramming ? '（仅编程）' : '（全量）';
+    lines.push(`本地非独有: ${cmp.counts.local}  上游: ${cmp.counts.upstream} ${modeHint}`);
     lines.push('');
     const totalDiff = cmp.result.added.length + cmp.result.updated.length + cmp.result.removed.length + cmp.result.renamed.length;
     if (totalDiff === 0) {
@@ -414,7 +565,8 @@ async function main() {
   }
   const [command, ...rest] = args;
   if (command === 'list') {
-    const skills = await listSkills();
+    const onlyProgramming = !rest.includes('--all');
+    const skills = await listSkills({ onlyProgramming });
     if (rest.includes('--json')) {
       process.stdout.write(`${JSON.stringify(skills, null, 2)}\n`);
     } else {

package/config/engineering.json

@@ -0,0 +1,20 @@
+[
+  "ask-matt",
+  "code-review",
+  "codebase-design",
+  "diagnosing-bugs",
+  "domain-modeling",
+  "grill-with-docs",
+  "implement",
+  "improve-codebase-architecture",
+  "prototype",
+  "research",
+  "resolving-merge-conflicts",
+  "setup-matt-pocock-skills",
+  "tdd",
+  "to-spec",
+  "to-tickets",
+  "triage",
+  "wayfinder",
+  "wizard"
+]

package/config/proprietary.json

@@ -1 +1,8 @@
-["tdd-implement", "grill-to-spec", "diagnose-fix", "commit-check", "instance-test"]
+[
+  "ci-guard",
+  "tdd-implement",
+  "grill-to-spec",
+  "diagnose-fix",
+  "commit-check",
+  "scaffold-functional-test"
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heihei0299/matt-skills",
-  "version": "1.3.2",
+  "version": "1.5.2",
   "description": "Agent skills + 项目配置模板：一条命令初始化 opencode / pi-agent 项目（含 mattpocock/skills 上游技能）",
   "type": "module",
   "bin": {
@@ -12,6 +12,7 @@
     ".agents/skills/",
     "scripts/sync-upstream.js",
     "config/proprietary.json",
+    "config/engineering.json",
     "README.md"
   ],
   "scripts": {