@heihei0299/matt-skills 2.1.13 → 3.0.1

package/README.md

@@ -1,6 +1,6 @@
 # matt-skills
 
-面向项目仓库的 Agent skills 与配置模板。模板包含共享 skills、`AGENTS.md`、项目上下文占位文件，以及 pi / opencode 所需的项目配置。
+面向项目仓库的 Agent skills 与配置模板。模板包含项目 skeleton、`AGENTS.md`、项目上下文占位文件，以及 pi / opencode 所需的项目配置；共享 Skills 由 CLI 从 Workspace 的 canonical source 直接组装到目标项目。
 
 ## 模板内容
 
@@ -8,11 +8,12 @@
 template/
 ├── AGENTS.md                 Agent 行为路由与项目上下文入口
 ├── PROJECT.md                目标项目填写的目标、范围和主要入口
-├── .agents/skills/           共享 skills 的唯一项目级来源
 ├── .opencode/                opencode agents、commands、docs
 └── .pi/                      pi prompts、docs 与项目自定义 skills 占位
 ```
 
+共享 Skills 不作为 Template Snapshot 的持久化副本；`init`、`sync` 和 `install` 根据 distribution boundary 从 Workspace 的 canonical source 分发到目标项目的 `.agents/skills/`。
+
 - `PROJECT.md` 描述项目是什么；操作规则放在 `AGENTS.md`。
 - `.opencode/CONTEXT.md` / `.pi/CONTEXT.md` 保存领域术语与边界。
 - `.opencode/skills/` 与 `.pi/skills/` 仅用于项目自定义 skills。

package/bin/cli.js

@@ -6,12 +6,12 @@ import { fileURLToPath } from 'node:url';
 import prompts from 'prompts';
 import {
   PROPRIETARY_SKILLS,
-  isDefaultProgrammingSkill,
-  isDistributableProprietarySkill,
   isDistributableSkill,
   isRepoLocalSkill,
   REPO_LOCAL_SKILLS,
 } from './skill-boundaries.js';
+import { resolveSkillNames } from './skill-selection.js';
+import { loadSkillSet } from './skill-config.js';
 
 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');
@@ -19,32 +19,15 @@ const ENGINEERING_PATH = path.join(path.dirname(fileURLToPath(import.meta.url)),
 const REQUIRED_PATH = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'config', 'required.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']);
-  }
+  if (!ENGINEERING_SKILLS) ENGINEERING_SKILLS = await loadSkillSet(ENGINEERING_PATH, 'engineering');
   return ENGINEERING_SKILLS;
 }
+
 let REQUIRED_SKILLS = null;
 async function loadRequiredSkills() {
-  if (REQUIRED_SKILLS) return REQUIRED_SKILLS;
-  try {
-    const raw = await readFile(REQUIRED_PATH, 'utf8');
-    REQUIRED_SKILLS = new Set(JSON.parse(raw));
-  } catch {
-    REQUIRED_SKILLS = new Set(['grilling', 'grill-me', 'handoff']);
-  }
+  if (!REQUIRED_SKILLS) REQUIRED_SKILLS = await loadSkillSet(REQUIRED_PATH, 'required');
   return REQUIRED_SKILLS;
 }
-function isProgrammingSkill(name, engineering, required) {
-  return isDefaultProgrammingSkill(name, engineering, required);
-}
-function isProgrammingAll(name, engineering) {
-  return isDistributableProprietarySkill(name) || engineering.has(name);
-}
 process.stdout.on('error', (err) => {
   if (err.code === 'EPIPE') process.exit(0);
   throw err;
@@ -156,27 +139,35 @@ function parseFrontmatter(text) {
   return fields;
 }
 
-async function listSkills({ onlyProgramming = false } = {}) {
+async function listAvailableSkillNames() {
   const entries = await readdir(SKILLS_DIR, { withFileTypes: true });
+  return entries
+    .filter((entry) => entry.isDirectory())
+    .filter((entry) => !entry.name.endsWith('.bak'))
+    .filter((entry) => entry.name !== 'skill-creator' && entry.name !== '.git')
+    .map((entry) => entry.name);
+}
+
+async function listSkillNames({ onlyProgramming = false } = {}) {
+  return resolveSkillNames({
+    availableNames: await listAvailableSkillNames(),
+    mode: onlyProgramming ? 'default' : 'all',
+    engineering: onlyProgramming ? await loadEngineeringSkills() : [],
+    required: onlyProgramming ? await loadRequiredSkills() : [],
+  });
+}
+
+async function listSkills({ onlyProgramming = false } = {}) {
   const skills = [];
-  let engineering = null;
-  let required = null;
-  if (onlyProgramming) engineering = await loadEngineeringSkills();
-  if (onlyProgramming) required = await loadRequiredSkills();
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    if (entry.name.endsWith('.bak')) continue;
-    if (entry.name === 'skill-creator') continue;
-    if (isRepoLocalSkill(entry.name)) continue;
-    if (onlyProgramming && !isProgrammingSkill(entry.name, engineering, required)) continue;
+  for (const name of await listSkillNames({ onlyProgramming })) {
     let content;
     try {
-      content = await readFile(path.join(SKILLS_DIR, entry.name, 'SKILL.md'), 'utf8');
+      content = await readFile(path.join(SKILLS_DIR, name, 'SKILL.md'), 'utf8');
     } catch {
       continue;
     }
-    const { name, description } = parseFrontmatter(content);
-    if (name && description) skills.push({ name, description });
+    const { description } = parseFrontmatter(content);
+    if (description) skills.push({ name, description });
   }
   return skills.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
 }
@@ -193,7 +184,7 @@ async function pathExists(p) {
 function shouldCopyTemplatePath(src) {
   const relative = path.relative(TEMPLATE_DIR, src);
   const parts = relative.split(path.sep);
-  return !(parts[0] === '.agents' && parts[1] === 'skills' && isRepoLocalSkill(parts[2]));
+  return !(parts[0] === '.agents' && parts[1] === 'skills');
 }
 
 const TOOLS = ['codex', 'pi', 'opencode', 'claude'];
@@ -243,10 +234,8 @@ async function promptSkills(skills) {
 
 async function installCommand({ dest, all, force, tools, global }) {
   const onlyProgramming = !all;
-  const engineering = onlyProgramming ? await loadEngineeringSkills() : null;
-  const required = onlyProgramming ? await loadRequiredSkills() : null;
-  const skillsAll = await listSkills({ onlyProgramming: false });
-  const skills = onlyProgramming ? skillsAll.filter(s => isProgrammingSkill(s.name, engineering, required)) : skillsAll;
+  const skillNames = await listSkillNames({ onlyProgramming });
+  const skills = await listSkills({ onlyProgramming });
   let targets;
   if (dest) {
     targets = [{ tool: null, dir: path.resolve(process.cwd(), dest) }];
@@ -271,12 +260,12 @@ async function installCommand({ dest, all, force, tools, global }) {
     }
     targets = [...seen.values()];
   }
-  const selected = all ? skills.map((s) => s.name) : await promptSkills(skills);
+  const selected = all ? skillNames : await promptSkills(skills);
   if (selected.length === 0) {
     process.stdout.write('未选择任何技能，未安装任何技能\n');
     return;
   }
-  const knownDistributable = new Set(skills.map((skill) => skill.name));
+  const knownDistributable = new Set(skillNames);
   for (const name of selected) {
     if (!isDistributableSkill(name, knownDistributable)) {
       throw new Error(`${name} is repository-local or unavailable and cannot be distributed`);
@@ -312,23 +301,16 @@ async function initCommand({ dest, all }) {
       force: true,
       filter: shouldCopyTemplatePath,
     });
-    process.stdout.write('模板：已复制（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
-    // 默认范围（engineering + 独有所需 + 默认独有），--all 才保留其余 productivity
-    if (onlyProgramming && path.resolve(target) !== path.resolve(path.join(path.dirname(fileURLToPath(import.meta.url)), '..'))) {
-      const engineering = await loadEngineeringSkills();
-      const required = await loadRequiredSkills();
-      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, required)) {
-            await rm(path.join(skillsDirFilter, e.name), { recursive: true, force: true });
-          }
-        }
-      } catch {}
+    const selectedSkills = await listSkillNames({ onlyProgramming });
+    const skillsDir = path.join(target, '.agents', 'skills');
+    await mkdir(skillsDir, { recursive: true });
+    for (const name of selectedSkills) {
+      const source = path.join(SKILLS_DIR, name);
+      const destination = path.join(skillsDir, name);
+      if (path.resolve(source) === path.resolve(destination)) continue;
+      await cp(source, destination, { recursive: true, force: true });
     }
+    process.stdout.write('模板：已复制（AGENTS.md、.opencode/、.pi/）\n');
   }
   // 统计（区分编程 vs 全量）
   const skillsDir = path.join(target, '.agents', 'skills');
@@ -338,11 +320,10 @@ async function initCommand({ dest, all }) {
     installed = entries.filter((e) => e.isDirectory() && !e.name.endsWith('.bak') && e.name !== '.git' && e.name !== 'skill-creator' && !isRepoLocalSkill(e.name)).length;
   } catch {}
   const allSkillsFull = await listSkills({ onlyProgramming: false });
-  const engineeringForStats = await loadEngineeringSkills();
-  const requiredForStats = await loadRequiredSkills();
-  const programmingCount = allSkillsFull.filter(s => isProgrammingSkill(s.name, engineeringForStats, requiredForStats)).length;
+  const programmingSkills = await listSkills({ onlyProgramming: true });
+  const programmingCount = programmingSkills.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) || requiredForStats.has(s.name))).length;
+  const upstreamProg = programmingSkills.filter((s) => !PROPRIETARY_SKILLS.has(s.name)).length;
   const displayTotal = onlyProgramming ? programmingCount : allSkillsFull.length;
   const displayUpstream = onlyProgramming ? upstreamProg : upstreamFull;
   if (path.resolve(skillsDir) === path.resolve(SKILLS_DIR)) {
@@ -399,22 +380,10 @@ async function syncCommand({ dest, all, dryRun, json, upstreamUrl, ref }) {
       });
       return;
     }
-    // 默认范围：分别复制非 skills 部分，skills 由后续 allSkills 循环处理
+    // Skeleton only; shared Skills are copied from the canonical source below.
     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');
@@ -424,7 +393,7 @@ async function syncCommand({ dest, all, dryRun, json, upstreamUrl, ref }) {
       force: true,
       filter: shouldCopyTemplatePath,
     });
-    process.stdout.write('模板：已复制（AGENTS.md、.agents/skills、.opencode/、.pi/）\n');
+    process.stdout.write('模板：已复制（AGENTS.md、.opencode/、.pi/）\n');
   } else {
     process.stdout.write('同步：检测到现有项目，将增量更新\n');
     let skipAgents = false;
@@ -436,26 +405,8 @@ async function syncCommand({ dest, all, dryRun, json, upstreamUrl, ref }) {
       } catch {}
     }
     if (skipAgents) {
-      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,
-          filter: shouldCopyTemplatePath,
-        });
-        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 });
-      }
+      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 {
       if (onlyProgramming) await copyTemplateFiltered();
@@ -468,15 +419,7 @@ async function syncCommand({ dest, all, dryRun, json, upstreamUrl, ref }) {
     }
   }
   // 技能同步：--all 仅更新同名可分发技能内容，存在则覆盖，不存在则新增，并更新 AGENTS.md（由上一步已处理）；默认范围为默认 programming，不删多余
-  const entries = await readdir(SKILLS_DIR, { withFileTypes: true });
-  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();
-  allSkills = allSkills.filter((name) => !isRepoLocalSkill(name));
-  if (onlyProgramming) {
-    const engineering = await loadEngineeringSkills();
-    const required = await loadRequiredSkills();
-    allSkills = allSkills.filter(n => isProgrammingSkill(n, engineering, required));
-  }
+  const allSkills = await listSkillNames({ onlyProgramming });
   const skillsDir = path.join(target, '.agents', 'skills');
   await mkdir(skillsDir, { recursive: true });
   const preservedRepoLocal = [];
@@ -515,22 +458,8 @@ async function syncCommand({ dest, all, dryRun, json, upstreamUrl, ref }) {
       installed++;
     }
   }
-  // 旧镜像自动清理：.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)) {
-        await rm(path.join(dir, e.name), { recursive: true, force: true });
-      }
-    }
-  }
+  // Harness skill directories may contain project-local Skills. Preserve them because
+  // their origin cannot be distinguished safely from a historical shared mirror.
   // 清理过时的 .pi/settings.json 指向
   try {
     const piSettings = path.join(target, '.pi/settings.json');

package/bin/skill-boundaries.js

@@ -46,14 +46,6 @@ export function isDefaultProprietarySkill(name) {
   return DEFAULT_PROPRIETARY_SKILLS.has(name);
 }
 
-export function isDefaultProgrammingSkill(name, engineering, required) {
-  return (
-    DEFAULT_PROPRIETARY_SKILLS.has(name) ||
-    engineering.has(name) ||
-    (required && required.has(name))
-  );
-}
-
 export function isDistributableSkill(name, knownNames) {
   if (!knownNames) return isDistributableProprietarySkill(name);
   const known = knownNames instanceof Set ? knownNames : new Set(knownNames);

package/bin/skill-config.js

@@ -0,0 +1,21 @@
+import { readFile } from 'node:fs/promises';
+
+export async function loadSkillSet(file, label) {
+  let raw;
+  try {
+    raw = await readFile(file, 'utf8');
+  } catch (error) {
+    throw new Error(`unable to read ${label} skill config: ${error.message}`);
+  }
+
+  let value;
+  try {
+    value = JSON.parse(raw);
+  } catch (error) {
+    throw new Error(`invalid ${label} skill config: ${error.message}`);
+  }
+  if (!Array.isArray(value) || value.some((name) => typeof name !== 'string')) {
+    throw new Error(`invalid ${label} skill config: expected an array of strings`);
+  }
+  return new Set(value);
+}

package/bin/skill-selection.js

@@ -0,0 +1,27 @@
+import {
+  DEFAULT_PROPRIETARY_SKILLS,
+  isDistributableSkill,
+} from './skill-boundaries.js';
+
+function asSet(value) {
+  return value instanceof Set ? new Set(value) : new Set(value ?? []);
+}
+
+export function resolveSkillNames({ availableNames, mode = 'default', engineering, required }) {
+  if (mode !== 'default' && mode !== 'all') {
+    throw new Error(`unknown skill selection mode: ${mode}`);
+  }
+
+  const available = asSet(availableNames);
+  const candidates = mode === 'all'
+    ? available
+    : new Set([
+      ...asSet(engineering),
+      ...asSet(required),
+      ...DEFAULT_PROPRIETARY_SKILLS,
+    ]);
+
+  return [...candidates]
+    .filter((name) => available.has(name) && isDistributableSkill(name, available))
+    .sort();
+}

package/config/required.json

@@ -0,0 +1,5 @@
+[
+  "grilling",
+  "grill-me",
+  "handoff"
+]

package/package.json

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

package/scripts/sync-upstream.js

@@ -6,6 +6,7 @@ import path from 'node:path';
 import os from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { PROPRIETARY_SKILLS } from '../bin/skill-boundaries.js';
+import { loadSkillSet } from '../bin/skill-config.js';
 
 const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const LOCAL_SKILLS_DIR = path.join(ROOT, '.agents', 'skills');
@@ -23,20 +24,10 @@ async function loadProprietary() {
 }
 
 async function loadEngineering() {
-  try {
-    const raw = await readFile(ENGINEERING_PATH, 'utf8');
-    return new Set(JSON.parse(raw));
-  } catch {
-    return 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 loadSkillSet(ENGINEERING_PATH, 'engineering');
 }
 async function loadRequired() {
-  try {
-    const raw = await readFile(REQUIRED_PATH, 'utf8');
-    return new Set(JSON.parse(raw));
-  } catch {
-    return new Set(['grilling', 'grill-me', 'handoff']);
-  }
+  return loadSkillSet(REQUIRED_PATH, 'required');
 }
 
 async function hashFile(filePath) {

package/template/.opencode/CONTEXT.md

@@ -5,11 +5,11 @@ The domain vocabulary for this repo — two sections: how this repository is pos
 ## Repository
 
 **Template Repository** (模板仓库):
-This repository's identity. It is the config repo for mattpocock/skills: it distributes project-level config (AGENTS.md behavior routing, `.opencode/docs/agents/` discipline files, `.opencode/CONTEXT.md` glossary) plus the explicitly allowed distributable skills via `.agents/skills`. The workspace also retains repo-local maintenance skills that are never distributed. The workspace content is projected into `template/` as a Template Snapshot, and initializing a Target Repository is a one-time copy of that snapshot. The workspace copy also serves this repo's own sessions.
+This repository's identity. It is the config repo for mattpocock/skills: it distributes project-level config (AGENTS.md behavior routing, `.opencode/docs/agents/` discipline files, `.opencode/CONTEXT.md` glossary) and the explicitly allowed distributable Skills. The Workspace also retains repo-local maintenance Skills that are never distributed. The Template Snapshot projects the project skeleton; the CLI assembles selected distributable Skills from the Workspace when initializing or synchronizing a Target Repository. The Workspace copy also serves this repo's own sessions.
 _Avoid_: skill distribution repo
 
 **Upstream Repository** (上游仓库):
-mattpocock/skills — the source of the 26 skill bodies (skills/engineering + skills/productivity) that are mirrored into this repo's `.agents/skills` and then distributed via the Template Snapshot. This repo syncs them via `scripts/sync-upstream.js` and `matt-skills sync`.
+mattpocock/skills — the source of the 26 Skill bodies (skills/engineering + skills/productivity) that are mirrored into this repo's Workspace canonical Skill source and then distributed by the CLI. This repo syncs them via `scripts/sync-upstream.js` and `matt-skills sync`.
 _Avoid_: source repo, skill origin
 
 **Proprietary Skill** (独有技能):
@@ -17,23 +17,23 @@ A skill that does not exist upstream and lives only in this repo (currently ci-g
 _Avoid_: private skill, local skill
 
 **Workspace** (工作区):
-The root-level working copies of the template content — `.agents/skills/` (upstream plus all proprietary skills, single source), `.opencode/` (issue-audit agent, explicit-skill commands), `.pi/` (pi-agent prompts: `issue-audit`), `AGENTS.md`, `CONTEXT.md`, `docs/`. Where this repo's own sessions load, modify, and test the content. The template paths project only the distributable subset: `.agents/skills/` → `template/.agents/skills/`, `.opencode/commands/*.md` → `template/.opencode/commands/`, `.pi/prompts/issue-audit.md` → `template/.pi/prompts/issue-audit.md`, root-level `CONTEXT.md` and `docs/agents/` → `template/.opencode/` + `template/.pi/`. Harness-specific skill dirs `.pi/skills/` and `.opencode/skills/` are reserved for project-local custom skills (empty placeholders with `.gitkeep` + `README.md` in the template).
+The root-level working copies of the template content — `.agents/skills/` (upstream plus all proprietary Skills, the canonical shared Skill source), `.opencode/` (issue-audit agent, explicit-Skill commands), `.pi/` (pi-agent prompts: `issue-audit`), `AGENTS.md`, `CONTEXT.md`, `docs/`. This is where the repo's own sessions load, modify and test the content. The Template Snapshot projects only the distributable configuration and skeleton: `.opencode/commands/*.md` → `template/.opencode/commands/`, `.pi/prompts/issue-audit.md` → `template/.pi/prompts/issue-audit.md`, and root-level `CONTEXT.md` and `docs/agents/` → `template/.opencode/` + `template/.pi/`. The CLI assembles selected shared Skills from the canonical source into a Target Repository. Harness-specific Skill dirs `.pi/skills/` and `.opencode/skills/` are reserved for project-local custom Skills (empty placeholders with `.gitkeep` + `README.md` in the Template Snapshot).
 _Avoid_: working copy, source repo
 
 **Template Snapshot** (模板快照):
-Everything under `template/` — the distributable snapshot of workspace content: only allowed skills under `.agents/skills/` (single source for user projects), harness skill dirs `.pi/skills/` + `.opencode/skills/` as empty placeholders for project custom skills, distributable opencode commands under `.opencode/commands/`, the pi issue-audit command under `.pi/prompts/`, discipline files and glossary under `.opencode/` + `.pi/`, AGENTS.md at the top level, generated by `node scripts/build-template.js`, used to initialize other repositories. Repo-local skills and commands remain workspace-only. The sync direction is one-way: workspace → snapshot. `test/template-sync.test.js` guards the mirror stays in sync.
+Everything under `template/` — the distributable snapshot of project skeleton content: harness Skill dirs `.pi/skills/` + `.opencode/skills/` as empty placeholders for project custom Skills, distributable opencode commands under `.opencode/commands/`, the pi issue-audit command under `.pi/prompts/`, discipline files and glossary under `.opencode/` + `.pi/`, and AGENTS.md at the top level. It is generated by `node scripts/build-template.js` and used to initialize other repositories. Shared Skills and repo-local Skills remain in the Workspace; the CLI distributes only the selected shared Skills. The sync direction for the skeleton is one-way: Workspace → Template Snapshot. Template structure tests guard the content the snapshot owns.
 _Avoid_: release snapshot, published snapshot
 
 **Target Repository** (目标仓库):
-A repository initialized by copying `template/` into its root (`cp -r template/. <target>/`). It then loads all distributable shared skills from its own `.agents/skills/`, project-local custom skills from `.pi/skills/` / `.opencode/skills/` (if any), the distributable commands from `.opencode/commands/` (opencode) and the `issue-audit` command from `.pi/prompts/` (pi) / `.opencode/commands/` (opencode), and the project-level global config from `.opencode/` + `.pi/` and `AGENTS.md`. Repo-local matt-skills maintenance skills are not part of a Target Repository by default.
+A repository initialized by copying the Template Snapshot skeleton into its root and then receiving selected distributable shared Skills from the CLI. It loads shared Skills from its own `.agents/skills/`, project-local custom Skills from `.pi/skills/` / `.opencode/skills/` (if any), the distributable commands from `.opencode/commands/` (opencode) and the `issue-audit` command from `.pi/prompts/` (pi) / `.opencode/commands/` (opencode), and the project-level global config from `.opencode/` + `.pi/` and AGENTS.md. Repo-local matt-skills maintenance Skills are not part of a Target Repository by default.
 _Avoid_: inheriting repo, child repo
 
 **Initialize** (初始化):
-The one-time action of setting up a Target Repository: copying `template/` into its root (`cp -r template/. <target>/`). All distributable skills are already included via `template/.agents/skills/`; no separate upstream fetch is needed. Repo-local skills are intentionally absent. Copying, not inheriting — no runtime relationship survives the copy.
+The one-time action of setting up a Target Repository: copying the Template Snapshot skeleton into its root, then having the CLI create its shared Skill directory and copy the selected distributable Skills from the Workspace canonical source. No separate upstream fetch is needed. Repo-local Skills are intentionally absent. Copying, not inheriting — no runtime relationship survives the copy.
 _Avoid_: inherit, bootstrap
 
 **Sync** (同步):
-`matt-skills sync` 同步 Target Repository 的模板与技能：`--dry-run` 仅对比不写盘（`check`，`--json` 可解析，有差异 `exit 1`），默认安全增量（`AGENTS.md` 有定制如 `tdd-implement` 则跳过，`.agents/skills` 按默认 programming 范围覆盖但不删多余技能，`template/.opencode/.pi` 增量 `add/update`，旧镜像 `.pi/skills` + `.opencode/skills` 中残留的共享技能自动清理但保留项目自定义）、`--all` 仅更新同名可分发技能内容（存在则覆盖，不存在则新增）并更新 `AGENTS.md`（不跳过定制），不删多余技能。Repo-local skill 永远不新增、不覆盖、不删除，只在发现历史副本时提示保留。`update` 已合并到 `sync` 并删除。
+`matt-skills sync` 同步 Target Repository 的 skeleton 与 Skills：`--dry-run` 仅对比不写盘（`check`，`--json` 可解析，有差异 `exit 1`），默认安全增量（`AGENTS.md` 有定制如 `tdd-implement` 则跳过，canonical shared Skills 按默认 programming 范围覆盖但不删多余，Template Snapshot 的 `.opencode` / `.pi` 配置增量 add/update，`.pi/skills` 与 `.opencode/skills` 中已有的 project-local Skill 不按名称删除，避免把项目自定义 Skill 误删）、`--all` 仅更新同名可分发 Skill 内容（存在则覆盖，不存在则新增）并更新 `AGENTS.md`（不跳过定制），不删多余 Skill。Repo-local Skill 永远不新增、不覆盖、不删除，只在发现历史副本时提示保留。`update` 已合并到 `sync` 并删除。
 _Avoid_: update, force sync
 
 ## Skill Design

package/template/.pi/CONTEXT.md

@@ -5,11 +5,11 @@ The domain vocabulary for this repo — two sections: how this repository is pos
 ## Repository
 
 **Template Repository** (模板仓库):
-This repository's identity. It is the config repo for mattpocock/skills: it distributes project-level config (AGENTS.md behavior routing, `.opencode/docs/agents/` discipline files, `.opencode/CONTEXT.md` glossary) plus the explicitly allowed distributable skills via `.agents/skills`. The workspace also retains repo-local maintenance skills that are never distributed. The workspace content is projected into `template/` as a Template Snapshot, and initializing a Target Repository is a one-time copy of that snapshot. The workspace copy also serves this repo's own sessions.
+This repository's identity. It is the config repo for mattpocock/skills: it distributes project-level config (AGENTS.md behavior routing, `.opencode/docs/agents/` discipline files, `.opencode/CONTEXT.md` glossary) and the explicitly allowed distributable Skills. The Workspace also retains repo-local maintenance Skills that are never distributed. The Template Snapshot projects the project skeleton; the CLI assembles selected distributable Skills from the Workspace when initializing or synchronizing a Target Repository. The Workspace copy also serves this repo's own sessions.
 _Avoid_: skill distribution repo
 
 **Upstream Repository** (上游仓库):
-mattpocock/skills — the source of the 26 skill bodies (skills/engineering + skills/productivity) that are mirrored into this repo's `.agents/skills` and then distributed via the Template Snapshot. This repo syncs them via `scripts/sync-upstream.js` and `matt-skills sync`.
+mattpocock/skills — the source of the 26 Skill bodies (skills/engineering + skills/productivity) that are mirrored into this repo's Workspace canonical Skill source and then distributed by the CLI. This repo syncs them via `scripts/sync-upstream.js` and `matt-skills sync`.
 _Avoid_: source repo, skill origin
 
 **Proprietary Skill** (独有技能):
@@ -17,23 +17,23 @@ A skill that does not exist upstream and lives only in this repo (currently ci-g
 _Avoid_: private skill, local skill
 
 **Workspace** (工作区):
-The root-level working copies of the template content — `.agents/skills/` (upstream plus all proprietary skills, single source), `.opencode/` (issue-audit agent, explicit-skill commands), `.pi/` (pi-agent prompts: `issue-audit`), `AGENTS.md`, `CONTEXT.md`, `docs/`. Where this repo's own sessions load, modify, and test the content. The template paths project only the distributable subset: `.agents/skills/` → `template/.agents/skills/`, `.opencode/commands/*.md` → `template/.opencode/commands/`, `.pi/prompts/issue-audit.md` → `template/.pi/prompts/issue-audit.md`, root-level `CONTEXT.md` and `docs/agents/` → `template/.opencode/` + `template/.pi/`. Harness-specific skill dirs `.pi/skills/` and `.opencode/skills/` are reserved for project-local custom skills (empty placeholders with `.gitkeep` + `README.md` in the template).
+The root-level working copies of the template content — `.agents/skills/` (upstream plus all proprietary Skills, the canonical shared Skill source), `.opencode/` (issue-audit agent, explicit-Skill commands), `.pi/` (pi-agent prompts: `issue-audit`), `AGENTS.md`, `CONTEXT.md`, `docs/`. This is where the repo's own sessions load, modify and test the content. The Template Snapshot projects only the distributable configuration and skeleton: `.opencode/commands/*.md` → `template/.opencode/commands/`, `.pi/prompts/issue-audit.md` → `template/.pi/prompts/issue-audit.md`, and root-level `CONTEXT.md` and `docs/agents/` → `template/.opencode/` + `template/.pi/`. The CLI assembles selected shared Skills from the canonical source into a Target Repository. Harness-specific Skill dirs `.pi/skills/` and `.opencode/skills/` are reserved for project-local custom Skills (empty placeholders with `.gitkeep` + `README.md` in the Template Snapshot).
 _Avoid_: working copy, source repo
 
 **Template Snapshot** (模板快照):
-Everything under `template/` — the distributable snapshot of workspace content: only allowed skills under `.agents/skills/` (single source for user projects), harness skill dirs `.pi/skills/` + `.opencode/skills/` as empty placeholders for project custom skills, distributable opencode commands under `.opencode/commands/`, the pi issue-audit command under `.pi/prompts/`, discipline files and glossary under `.opencode/` + `.pi/`, AGENTS.md at the top level, generated by `node scripts/build-template.js`, used to initialize other repositories. Repo-local skills and commands remain workspace-only. The sync direction is one-way: workspace → snapshot. `test/template-sync.test.js` guards the mirror stays in sync.
+Everything under `template/` — the distributable snapshot of project skeleton content: harness Skill dirs `.pi/skills/` + `.opencode/skills/` as empty placeholders for project custom Skills, distributable opencode commands under `.opencode/commands/`, the pi issue-audit command under `.pi/prompts/`, discipline files and glossary under `.opencode/` + `.pi/`, and AGENTS.md at the top level. It is generated by `node scripts/build-template.js` and used to initialize other repositories. Shared Skills and repo-local Skills remain in the Workspace; the CLI distributes only the selected shared Skills. The sync direction for the skeleton is one-way: Workspace → Template Snapshot. Template structure tests guard the content the snapshot owns.
 _Avoid_: release snapshot, published snapshot
 
 **Target Repository** (目标仓库):
-A repository initialized by copying `template/` into its root (`cp -r template/. <target>/`). It then loads all distributable shared skills from its own `.agents/skills/`, project-local custom skills from `.pi/skills/` / `.opencode/skills/` (if any), the distributable commands from `.opencode/commands/` (opencode) and the `issue-audit` command from `.pi/prompts/` (pi) / `.opencode/commands/` (opencode), and the project-level global config from `.opencode/` + `.pi/` and `AGENTS.md`. Repo-local matt-skills maintenance skills are not part of a Target Repository by default.
+A repository initialized by copying the Template Snapshot skeleton into its root and then receiving selected distributable shared Skills from the CLI. It loads shared Skills from its own `.agents/skills/`, project-local custom Skills from `.pi/skills/` / `.opencode/skills/` (if any), the distributable commands from `.opencode/commands/` (opencode) and the `issue-audit` command from `.pi/prompts/` (pi) / `.opencode/commands/` (opencode), and the project-level global config from `.opencode/` + `.pi/` and AGENTS.md. Repo-local matt-skills maintenance Skills are not part of a Target Repository by default.
 _Avoid_: inheriting repo, child repo
 
 **Initialize** (初始化):
-The one-time action of setting up a Target Repository: copying `template/` into its root (`cp -r template/. <target>/`). All distributable skills are already included via `template/.agents/skills/`; no separate upstream fetch is needed. Repo-local skills are intentionally absent. Copying, not inheriting — no runtime relationship survives the copy.
+The one-time action of setting up a Target Repository: copying the Template Snapshot skeleton into its root, then having the CLI create its shared Skill directory and copy the selected distributable Skills from the Workspace canonical source. No separate upstream fetch is needed. Repo-local Skills are intentionally absent. Copying, not inheriting — no runtime relationship survives the copy.
 _Avoid_: inherit, bootstrap
 
 **Sync** (同步):
-`matt-skills sync` 同步 Target Repository 的模板与技能：`--dry-run` 仅对比不写盘（`check`，`--json` 可解析，有差异 `exit 1`），默认安全增量（`AGENTS.md` 有定制如 `tdd-implement` 则跳过，`.agents/skills` 按默认 programming 范围覆盖但不删多余技能，`template/.opencode/.pi` 增量 `add/update`，旧镜像 `.pi/skills` + `.opencode/skills` 中残留的共享技能自动清理但保留项目自定义）、`--all` 仅更新同名可分发技能内容（存在则覆盖，不存在则新增）并更新 `AGENTS.md`（不跳过定制），不删多余技能。Repo-local skill 永远不新增、不覆盖、不删除，只在发现历史副本时提示保留。`update` 已合并到 `sync` 并删除。
+`matt-skills sync` 同步 Target Repository 的 skeleton 与 Skills：`--dry-run` 仅对比不写盘（`check`，`--json` 可解析，有差异 `exit 1`），默认安全增量（`AGENTS.md` 有定制如 `tdd-implement` 则跳过，canonical shared Skills 按默认 programming 范围覆盖但不删多余，Template Snapshot 的 `.opencode` / `.pi` 配置增量 add/update，`.pi/skills` 与 `.opencode/skills` 中已有的 project-local Skill 不按名称删除，避免把项目自定义 Skill 误删）、`--all` 仅更新同名可分发 Skill 内容（存在则覆盖，不存在则新增）并更新 `AGENTS.md`（不跳过定制），不删多余 Skill。Repo-local Skill 永远不新增、不覆盖、不删除，只在发现历史副本时提示保留。`update` 已合并到 `sync` 并删除。
 _Avoid_: update, force sync
 
 ## Skill Design

package/template/.agents/skills/ask-matt/PHASE-BOUNDARIES.md

@@ -1,55 +0,0 @@
-# Phase boundaries
-
-A **phase** is a chunk of work inside a session: the grilling, the implementation, the QA. The definition is fuzzy on purpose: a phase ends when you think *"ok, we're done with that"*.
-
-The **phase boundary** is the gap between two phases, and it is the only place this decision belongs. Mid-phase there is no decision to make: continue, or split the work that's left into subagents. Compacting mid-phase makes the agent lose the thread.
-
-## The five options
-
-| Option       | What it does                                                    |
-| ------------ | --------------------------------------------------------------- |
-| **Continue** | Stay in the session. No context switch at all.                    |
-| **`/clear`** | Empty the context window and start from nothing.                  |
-| **`/handoff`** | Write a portable markdown file and seed a session anywhere with it. |
-| **Subagent** | Send the task to its own context window and get a report back.     |
-| **`/compact`** | Compress this context and seed a fresh session with the summary.  |
-
-## The tree
-
-Work top to bottom at the boundary. The first **yes** wins.
-
-**1. Can you continue in this session?** Two things make the answer yes: the next phase needs this phase as a **primary source**, or you have enough [smart zone](https://www.aihero.dev/ai-coding-dictionary/smart-zone) left (~150k tokens) for the next phase to fit. Grilling → implementation is the standard yes: the implementation wants the reasoning verbatim, not a summary of it. Continue costs nothing and loses nothing, so rule it out before anything else.
-
-**2. Is the context irrelevant to what comes next?** Is everything in this session (the exploration, the decisions, the dead ends) disposable? If so, **`/clear`**. It is the cheapest move on the board: it takes no time and hands back the whole window. `/clear` also isn't terminal: the old session stays resumable.
-
-The cost of getting this wrong is one-way. Clear a *relevant* context and you lose the **why** behind what you built, and no amount of reading the diff back gets it returned.
-
-**3. Do you need to hand off?** `/handoff` is narrow. You need it only when you are:
-
-- swapping to a **new harness** (Claude → Codex),
-- moving to a **new directory** or repo,
-- sending the work to a **colleague**,
-- or forking a side task you found **mid-phase** without derailing what you're doing.
-
-That list is the whole clause. What `/handoff` buys is **portability**: a file that travels. If nothing is travelling, you don't need it.
-
-**4. Can the task be done AFK?** Is it scoped tightly enough to run with you away from the keyboard, no steering? Then send it to a **subagent** and leave this session untouched. Automated review is the standard case: the agent reads the diff and reports, and you aren't needed while it does.
-
-**5. Otherwise, `/compact`.** Relevant context, same harness, same directory, and you need to stay in the loop: this is where the tree lands, and it lands here often. Pass it an instruction (`/compact we're going to QA this area`) so the summary keeps what the next phase needs.
-
-`/compact` is the **default, not the first reach**. It sits at the bottom because the four questions above it are all cheaper or more precise. The failure mode when people start here is a fresh session that is confidently wrong about a decision the summary flattened.
-
-## Primary and secondary sources
-
-Every move except **Continue** turns a **primary source** into a **secondary source**: the session as it happened, replaced by a summary of it. The trade is always the same shape:
-
-| Source                            | Information | Noise | Room to move |
-| --------------------------------- | ----------- | ----- | ------------ |
-| Primary (Continue)                | Full        | Lots  | Little       |
-| Secondary (`/compact`, `/handoff`) | Lossy       | Less  | Lots         |
-
-This is why question 1 comes first. You only pay the lossiness when staying costs more than it saves.
-
-## These are judgement calls
-
-The questions are not objective: each has taste in it, and the same boundary can go two ways on two days. The value is in asking them **in order**, at the boundary rather than in the middle of the work.