@heihei0299/matt-skills 3.0.1 → 3.0.2

package/bin/cli.js

@@ -340,26 +340,12 @@ async function initCommand({ dest, all }) {
 async function syncCommand({ dest, all, dryRun, json, upstreamUrl, ref }) {
   const onlyProgramming = !all;
   if (dryRun) {
-    const { compare } = await import('../scripts/sync-upstream.js');
+    const { compare, formatComparison } = await import('../scripts/sync-upstream.js');
     const cmp = await compare({ upstreamUrl, ref, onlyProgramming });
     if (json) {
       process.stdout.write(JSON.stringify({ head: cmp.head, counts: cmp.counts, result: cmp.result, onlyProgramming }, null, 2) + '\n');
     } else {
-      const modeHint = onlyProgramming ? '（默认：engineering + 独有所需）' : '（全量上游）';
-      const lines = [];
-      lines.push(`上游 HEAD: ${cmp.head}`);
-      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) lines.push('✅ 已是最新，无差异');
-      else {
-        if (cmp.result.added.length) lines.push(`新增 (${cmp.result.added.length}): ${cmp.result.added.join(', ')}`);
-        if (cmp.result.updated.length) lines.push(`更新 (${cmp.result.updated.length}): ${cmp.result.updated.join(', ')}`);
-        if (cmp.result.renamed.length) lines.push(`重命名 (${cmp.result.renamed.length}): ${cmp.result.renamed.map((r) => `${r.from}→${r.to}`).join(', ')}`);
-        if (cmp.result.removed.length) lines.push(`删除 (${cmp.result.removed.length}): ${cmp.result.removed.join(', ')}`);
-        if (cmp.result.same.length) lines.push(`一致 (${cmp.result.same.length}): ${cmp.result.same.join(', ')}`);
-      }
-      process.stdout.write(lines.join('\n') + '\n');
+      process.stdout.write(formatComparison(cmp) + '\n');
     }
     const { rm } = await import('node:fs/promises');
     await rm(cmp.dest, { recursive: true, force: true });
@@ -559,7 +545,7 @@ function parseInstallArgs(args) {
 }
 
 async function checkCommand(args) {
-  const { compare } = await import('../scripts/sync-upstream.js');
+  const { compare, formatComparison } = await import('../scripts/sync-upstream.js');
   const json = args.includes('--json');
   const onlyProgramming = !args.includes('--all');
   const upstreamIdx = args.indexOf('--upstream');
@@ -572,22 +558,7 @@ async function checkCommand(args) {
   if (json) {
     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}`);
-    const modeHint = onlyProgramming ? '（默认：engineering + 独有所需）' : '（全量上游）';
-    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) {
-      lines.push('✅ 已是最新，无差异');
-    } else {
-      if (cmp.result.added.length) lines.push(`新增 (${cmp.result.added.length}): ${cmp.result.added.join(', ')}`);
-      if (cmp.result.updated.length) lines.push(`更新 (${cmp.result.updated.length}): ${cmp.result.updated.join(', ')}`);
-      if (cmp.result.renamed.length) lines.push(`重命名 (${cmp.result.renamed.length}): ${cmp.result.renamed.map((r) => `${r.from}→${r.to}`).join(', ')}`);
-      if (cmp.result.removed.length) lines.push(`删除 (${cmp.result.removed.length}): ${cmp.result.removed.join(', ')}`);
-      if (cmp.result.same.length) lines.push(`一致 (${cmp.result.same.length}): ${cmp.result.same.join(', ')}`);
-    }
-    process.stdout.write(lines.join('\n') + '\n');
+    process.stdout.write(formatComparison(cmp) + '\n');
   }
   const { rm } = await import('node:fs/promises');
   await rm(cmp.dest, { recursive: true, force: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heihei0299/matt-skills",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Agent skills + 项目配置模板：一条命令初始化 opencode / pi-agent 项目（含 mattpocock/skills 上游技能）",
   "type": "module",
   "bin": {

package/scripts/sync-upstream.js

@@ -111,12 +111,12 @@ async function collectLocalSkills(proprietary) {
 export async function compare({ upstreamUrl, tmpDir, ref, onlyProgramming = true } = {}) {
   const proprietary = await loadProprietary();
   const engineering = await loadEngineering();
+  const required = await loadRequired();
   const fetched = await fetchUpstream({ tmpDir, upstreamUrl, ref });
   const upstreamRoot = fetched.dest;
   const upstreamMapFull = await collectUpstreamSkills(upstreamRoot);
   const localMapFull = await collectLocalSkills(proprietary);
   // 默认范围：engineering 桶（编程）+ 独有所需（config/required.json，如 grill-to-spec 经 grill-with-docs 所需的 grilling）；--all 则含全部 productivity
-  const required = await loadRequired();
   const upstreamMap = onlyProgramming
     ? new Map([...upstreamMapFull.entries()].filter(([name, v]) => v.bucket === 'engineering' || required.has(name)))
     : upstreamMapFull;
@@ -242,7 +242,7 @@ export async function applySync({ upstreamUrl, tmpDir, ref, dryRun = false, forc
 
   return { ...cmp, dest: null, actions, head };
 }
-function formatTable(cmp) {
+export function formatComparison(cmp) {
   const { result, counts, head, onlyProgramming } = cmp;
   const lines = [];
   lines.push(`上游 HEAD: ${head}`);
@@ -307,7 +307,7 @@ Options:
     if (opts.json) {
       process.stdout.write(JSON.stringify({ head: res.head, result: res.result, actions: res.actions, dryRun: opts.dryRun, onlyProgramming }, null, 2) + '\n');
     } else {
-      process.stdout.write(formatTable(res) + '\n');
+      process.stdout.write(formatComparison(res) + '\n');
       if (res.actions.length) {
         process.stdout.write(`\n已执行 ${res.actions.length} 项:\n`);
         for (const a of res.actions) process.stdout.write(`  - ${a}\n`);
@@ -324,7 +324,7 @@ Options:
   if (opts.json) {
     process.stdout.write(JSON.stringify({ head: cmp.head, counts: cmp.counts, result: cmp.result, onlyProgramming }, null, 2) + '\n');
   } else {
-    process.stdout.write(formatTable(cmp) + '\n');
+    process.stdout.write(formatComparison(cmp) + '\n');
   }
   const hasDiff = cmp.result.added.length + cmp.result.updated.length + cmp.result.removed.length + cmp.result.renamed.length > 0;
   // 清理临时目录