@fitlab-ai/agent-infra 0.5.4 → 0.5.6

package/templates/.agents/skills/refine-task/SKILL.zh-CN.md

@@ -62,8 +62,8 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则跳过并继续）：
 - 执行前先读取 `.agents/rules/issue-sync.md`，完成 upstream 仓库检测和权限检测
 - 按 issue-sync.md 设置 `status: in-progress`
-- 发布 `{refinement-artifact}` 评论
 - 创建或更新 `<!-- sync-issue:{task-id}:task -->` 评论（按 issue-sync.md 的 task.md 评论同步规则）
+- 发布 `{refinement-artifact}` 评论
 
 ### 7. 完成校验
 

package/templates/.agents/skills/review-task/SKILL.en.md

@@ -56,8 +56,8 @@ Update task.md and append:
 If task.md contains a valid `issue_number`, perform these sync actions (skip and continue on any failure):
 - Read `.agents/rules/issue-sync.md` before syncing, and complete upstream repository detection plus permission detection
 - Set `status: in-progress` by following issue-sync.md
-- Publish the `{review-artifact}` comment
 - Create or update the `<!-- sync-issue:{task-id}:task -->` comment (follow the task.md comment sync rule in issue-sync.md)
+- Publish the `{review-artifact}` comment
 
 ### 7. Verification Gate
 

package/templates/.agents/skills/review-task/SKILL.zh-CN.md

@@ -56,8 +56,8 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则跳过并继续）：
 - 执行前先读取 `.agents/rules/issue-sync.md`，完成 upstream 仓库检测和权限检测
 - 按 issue-sync.md 设置 `status: in-progress`
-- 发布 `{review-artifact}` 评论
 - 创建或更新 `<!-- sync-issue:{task-id}:task -->` 评论（按 issue-sync.md 的 task.md 评论同步规则）
+- 发布 `{review-artifact}` 评论
 
 ### 7. 完成校验
 

package/templates/.agents/skills/update-agent-infra/scripts/sync-templates.js

@@ -15,6 +15,7 @@
 
 import childProcess from 'node:child_process';
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -56,6 +57,7 @@ const DEFAULTS = {
       ".claude/hooks/",
       ".gemini/commands/",
       ".github/hooks/check-version-format.sh",
+      ".github/scripts/",
       ".opencode/commands/"
     ],
     "merged": [
@@ -76,7 +78,7 @@ const DEFAULTS = {
   }
 };
 
-const INSTALLER_VERSION = "v0.5.4";
+const INSTALLER_VERSION = "v0.5.6";
 const PACKAGE_NAME = '@fitlab-ai/agent-infra';
 // Add a new identifier here only after shipping matching .{platform}. template variants.
 const KNOWN_PLATFORMS = new Set(['github']);
@@ -123,6 +125,292 @@ function removeEmptyDirs(dir) {
   }
 }
 
+function parseSkillFrontmatter(filePath) {
+  const content = fs.readFileSync(filePath, 'utf8');
+  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/);
+  if (!match) return {};
+
+  const result = {};
+  const lines = match[1].split(/\r?\n/);
+  const normalizeValue = (value) => value.replace(/^["']|["']$/g, '').trim();
+
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index];
+    const pair = line.match(/^([A-Za-z0-9_-]+):\s*(.*)$/);
+    if (!pair) continue;
+
+    const [, key, rawValue] = pair;
+    if (rawValue === '>') {
+      const block = [];
+      for (let offset = index + 1; offset < lines.length; offset += 1) {
+        const nextLine = lines[offset];
+        if (!/^\s+/.test(nextLine)) break;
+
+        block.push(nextLine.trim());
+        index = offset;
+      }
+      result[key] = block.join(' ').trim();
+      continue;
+    }
+
+    result[key] = normalizeValue(rawValue);
+  }
+
+  return result;
+}
+
+function listTemplateSkillNames(templateRoot) {
+  const templateSkillsDir = path.join(templateRoot, '.agents/skills');
+  if (!fs.existsSync(templateSkillsDir)) return new Set();
+
+  return new Set(
+    fs.readdirSync(templateSkillsDir, { withFileTypes: true })
+      .filter((entry) => entry.isDirectory())
+      .map((entry) => entry.name)
+  );
+}
+
+function detectCustomSkills(projectRoot, templateSkillNames) {
+  const skillsDir = path.join(projectRoot, '.agents/skills');
+  if (!fs.existsSync(skillsDir)) return [];
+
+  return fs.readdirSync(skillsDir, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory() && !templateSkillNames.has(entry.name))
+    .map((entry) => {
+      const skillMd = path.join(skillsDir, entry.name, 'SKILL.md');
+      if (!fs.existsSync(skillMd)) return null;
+
+      const meta = parseSkillFrontmatter(skillMd);
+      return {
+        dirName: entry.name,
+        name: meta.name || entry.name,
+        description: meta.description || '',
+        args: meta.args || null
+      };
+    })
+    .filter(Boolean)
+    .sort((left, right) => left.dirName.localeCompare(right.dirName));
+}
+
+function isCustomProtected(targetPath, customSkills, project) {
+  const normalized = norm(targetPath);
+
+  return customSkills.some(({ dirName }) => (
+    normalized.startsWith(`.agents/skills/${dirName}/`) ||
+    normalized === `.claude/commands/${dirName}.md` ||
+    normalized === `.opencode/commands/${dirName}.md` ||
+    normalized === '.gemini/commands/' + project + '/' + dirName + '.toml'
+  ));
+}
+
+function expandHome(inputPath) {
+  if (inputPath === '~') return os.homedir();
+  if (inputPath.startsWith('~/')) {
+    return path.join(os.homedir(), inputPath.slice(2));
+  }
+
+  return path.resolve(inputPath);
+}
+
+function writeIfChanged(projectRoot, targetPath, content, reportBucket) {
+  const fullPath = path.join(projectRoot, targetPath);
+  const exists = fs.existsSync(fullPath);
+
+  if (exists && fs.readFileSync(fullPath, 'utf8') === content) {
+    reportBucket.unchanged.push(targetPath);
+    return;
+  }
+
+  const dir = path.dirname(fullPath);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(fullPath, content, 'utf8');
+
+  (exists ? reportBucket.updated : reportBucket.generated).push(targetPath);
+}
+
+function syncCustomSkillSources(projectRoot, sources, report, templateSkillNames) {
+  const skillsDir = path.join(projectRoot, '.agents/skills');
+  const syncedSkills = new Map();
+
+  for (const source of sources) {
+    if (source?.type !== 'local') continue;
+    if (typeof source.path !== 'string' || source.path.trim() === '') {
+      report.custom.sourceErrors.push({ source: String(source?.path || ''), reason: 'invalid path' });
+      continue;
+    }
+
+    const srcDir = expandHome(source.path);
+    if (!fs.existsSync(srcDir) || !fs.statSync(srcDir).isDirectory()) {
+      report.custom.sourceErrors.push({ source: source.path, reason: 'directory not found' });
+      continue;
+    }
+
+    for (const entry of fs.readdirSync(srcDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+      if (templateSkillNames.has(entry.name)) {
+        report.custom.sourceErrors.push({
+          source: source.path,
+          reason: `skill ${entry.name} conflicts with built-in skill`
+        });
+        continue;
+      }
+
+      const skillSrcDir = path.join(srcDir, entry.name);
+      const skillMd = path.join(skillSrcDir, 'SKILL.md');
+      if (!fs.existsSync(skillMd)) continue;
+
+      const skillDstDir = path.join(skillsDir, entry.name);
+      const trackedFiles = syncedSkills.get(entry.name) || new Set();
+      syncedSkills.set(entry.name, trackedFiles);
+
+      for (const srcFile of walkDir(skillSrcDir)) {
+        const relPath = norm(path.relative(skillSrcDir, srcFile));
+        const dstFile = path.join(skillDstDir, relPath);
+        const projectPath = norm(path.relative(projectRoot, dstFile));
+        const srcContent = fs.readFileSync(srcFile);
+        const existed = fs.existsSync(dstFile);
+
+        trackedFiles.add(relPath);
+
+        if (existed) {
+          const dstContent = fs.readFileSync(dstFile);
+          if (srcContent.equals(dstContent)) {
+            report.custom.unchanged.push(projectPath);
+            continue;
+          }
+        }
+
+        const dir = path.dirname(dstFile);
+        if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(dstFile, srcContent);
+
+        (existed ? report.custom.updated : report.custom.generated).push(projectPath);
+      }
+    }
+  }
+
+  return syncedSkills;
+}
+
+function cleanStaleSyncedFiles(projectRoot, syncedSkills, report) {
+  const skillsDir = path.join(projectRoot, '.agents/skills');
+
+  for (const [skillName, expectedFiles] of syncedSkills) {
+    const skillDir = path.join(skillsDir, skillName);
+    if (!fs.existsSync(skillDir)) continue;
+
+    const actualFiles = walkDir(skillDir).map((filePath) => norm(path.relative(skillDir, filePath)));
+    const removedBefore = report.custom.removed.length;
+
+    for (const actualFile of actualFiles) {
+      if (expectedFiles.has(actualFile)) continue;
+
+      const staleFile = path.join(skillDir, actualFile);
+      fs.unlinkSync(staleFile);
+      report.custom.removed.push(norm(path.relative(projectRoot, staleFile)));
+    }
+
+    if (report.custom.removed.length > removedBefore) {
+      removeEmptyDirs(skillDir);
+    }
+  }
+}
+
+function generateClaudeCommand(skill, lang) {
+  const isZhCN = lang === 'zh-CN';
+  const lines = ['---', `description: ${JSON.stringify(skill.description)}`];
+
+  if (skill.args) {
+    lines.push(`usage: ${JSON.stringify(`/${skill.dirName} ${skill.args}`)}`);
+  }
+
+  lines.push('---', '');
+  lines.push(
+    isZhCN
+      ? `读取并执行 \`.agents/skills/${skill.dirName}/SKILL.md\` 中的 ${skill.dirName} 技能。`
+      : `Read and execute the ${skill.dirName} skill from \`.agents/skills/${skill.dirName}/SKILL.md\`.`
+  );
+  lines.push('');
+  lines.push(isZhCN ? '严格按照技能中定义的所有步骤执行。' : 'Follow all steps defined in the skill exactly.');
+
+  return `${lines.join('\n')}\n`;
+}
+
+function generateGeminiCommand(skill, lang) {
+  const isZhCN = lang === 'zh-CN';
+  const promptLines = [];
+
+  if (skill.args) {
+    promptLines.push(isZhCN ? '参数：{{args}}' : 'Arguments: {{args}}');
+    promptLines.push('');
+  }
+
+  promptLines.push(
+    isZhCN
+      ? `读取并执行 \`.agents/skills/${skill.dirName}/SKILL.md\` 中的 ${skill.dirName} 技能。`
+      : `Read and execute the ${skill.dirName} skill from \`.agents/skills/${skill.dirName}/SKILL.md\`.`
+  );
+  promptLines.push('');
+  promptLines.push(isZhCN ? '严格按照技能中定义的所有步骤执行。' : 'Follow all steps defined in the skill exactly.');
+
+  return [
+    `description = ${JSON.stringify(skill.description)}`,
+    'prompt = """',
+    ...promptLines,
+    '"""'
+  ].join('\n') + '\n';
+}
+
+function generateOpenCodeCommand(skill, lang) {
+  const isZhCN = lang === 'zh-CN';
+  const lines = [
+    '---',
+    `description: ${JSON.stringify(skill.description)}`,
+    'agent: general',
+    'subtask: false',
+    '---',
+    ''
+  ];
+
+  if (skill.args) {
+    lines.push(isZhCN ? '参数：$ARGUMENTS' : 'Arguments: $ARGUMENTS');
+    lines.push('');
+  }
+
+  lines.push(
+    isZhCN
+      ? `读取并执行 \`.agents/skills/${skill.dirName}/SKILL.md\` 中的 ${skill.dirName} 技能。`
+      : `Read and execute the ${skill.dirName} skill from \`.agents/skills/${skill.dirName}/SKILL.md\`.`
+  );
+  lines.push('');
+  lines.push(isZhCN ? '严格按照技能中定义的所有步骤执行。' : 'Follow all steps defined in the skill exactly.');
+
+  return `${lines.join('\n')}\n`;
+}
+
+function generateCustomCommands(projectRoot, customSkills, project, lang, report) {
+  for (const skill of customSkills) {
+    writeIfChanged(
+      projectRoot,
+      `.claude/commands/${skill.dirName}.md`,
+      generateClaudeCommand(skill, lang),
+      report.custom.commands
+    );
+    writeIfChanged(
+      projectRoot,
+      '.gemini/commands/' + project + '/' + skill.dirName + '.toml',
+      generateGeminiCommand(skill, lang),
+      report.custom.commands
+    );
+    writeIfChanged(
+      projectRoot,
+      `.opencode/commands/${skill.dirName}.md`,
+      generateOpenCodeCommand(skill, lang),
+      report.custom.commands
+    );
+  }
+}
+
 function matchesAny(rel, patterns) {
   const n = norm(rel);
   return patterns.some(p => norm(p) === n || globMatch(p, n));
@@ -411,6 +699,8 @@ function syncTemplates(projectRoot, templateRootOverride) {
   const { project, org, language: lang = 'en' } = cfg;
   const platformType = cfg.platform?.type || DEFAULTS.platform.type;
   const vars = { project, org };
+  const templateSkillNames = listTemplateSkillNames(templateRoot);
+  const protectedCustomSkills = detectCustomSkills(projectRoot, templateSkillNames);
 
   const managed = [...(cfg.files.managed || [])];
   const merged  = [...(cfg.files.merged  || [])];
@@ -421,6 +711,15 @@ function syncTemplates(projectRoot, templateRootOverride) {
     templateRoot: norm(templateRoot),
     registryAdded: [],
     managed: { written: [], created: [], unchanged: [], skippedMerged: [], removed: [] },
+    custom: {
+      detected: [],
+      generated: [],
+      updated: [],
+      unchanged: [],
+      removed: [],
+      sourceErrors: [],
+      commands: { generated: [], updated: [], unchanged: [] }
+    },
     ejected: { created: [], skipped: [] },
     merged:  { pending: [] },
     configUpdated: false,
@@ -496,6 +795,7 @@ function syncTemplates(projectRoot, templateRootOverride) {
         for (const projFile of projFiles) {
           if (expectedTargets.has(projFile)) continue;
           if (projFile === configPathRel) continue;
+          if (isCustomProtected(projFile, protectedCustomSkills, project)) continue;
           if (matchesAny(projFile, merged) || matchesAny(projFile, ejected)) continue;
 
           fs.unlinkSync(path.join(projectRoot, projFile));
@@ -508,6 +808,16 @@ function syncTemplates(projectRoot, templateRootOverride) {
     }
   }
 
+  const sources = Array.isArray(cfg.skills?.sources) ? cfg.skills.sources : [];
+  if (sources.length > 0) {
+    const syncedSkills = syncCustomSkillSources(projectRoot, sources, report, templateSkillNames);
+    cleanStaleSyncedFiles(projectRoot, syncedSkills, report);
+  }
+
+  const customSkills = detectCustomSkills(projectRoot, templateSkillNames);
+  report.custom.detected = customSkills.map((skill) => skill.dirName);
+  generateCustomCommands(projectRoot, customSkills, project, lang, report);
+
   for (const entry of ejected) {
     const dstFull = path.join(projectRoot, entry);
     if (fs.existsSync(dstFull)) {
@@ -556,6 +866,11 @@ function syncTemplates(projectRoot, templateRootOverride) {
     report.managed.written.length +
     report.managed.created.length +
     report.managed.removed.length +
+    report.custom.generated.length +
+    report.custom.updated.length +
+    report.custom.removed.length +
+    report.custom.commands.generated.length +
+    report.custom.commands.updated.length +
     report.ejected.created.length +
     report.registryAdded.length
   ) > 0;

package/templates/.github/scripts/sync-labels-to-set.sh

@@ -0,0 +1,110 @@
+#!/bin/sh
+# Ensure the labels matching --prefix on an issue or PR equal the set passed via
+# repeated --target flags (0, 1, or N labels).
+# Algorithm must stay in sync with .agents/rules/issue-sync.md.
+
+set -e
+
+usage() {
+  printf 'Usage: %s --repo <owner/repo> (--issue <number> | --pr <number>) --prefix <prefix> [--target <label> ...]\n' "$0" >&2
+  exit 1
+}
+
+append_target() {
+  if [ -n "$targets" ]; then
+    targets=$(printf '%s\n%s' "$targets" "$1")
+  else
+    targets=$1
+  fi
+}
+
+repo=""
+number=""
+kind=""
+prefix=""
+targets=""
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --repo)
+      [ $# -ge 2 ] || usage
+      repo=$2
+      shift 2
+      ;;
+    --issue)
+      [ $# -ge 2 ] || usage
+      [ -z "$kind" ] || usage
+      kind="issue"
+      number=$2
+      shift 2
+      ;;
+    --pr)
+      [ $# -ge 2 ] || usage
+      [ -z "$kind" ] || usage
+      kind="pr"
+      number=$2
+      shift 2
+      ;;
+    --prefix)
+      [ $# -ge 2 ] || usage
+      prefix=$2
+      shift 2
+      ;;
+    --target)
+      [ $# -ge 2 ] || usage
+      append_target "$2"
+      shift 2
+      ;;
+    *)
+      printf 'Unknown argument: %s\n' "$1" >&2
+      usage
+      ;;
+  esac
+done
+
+[ -n "$repo" ] || usage
+[ -n "$number" ] || usage
+[ -n "$kind" ] || usage
+[ -n "$prefix" ] || usage
+
+while IFS= read -r label; do
+  [ -z "$label" ] && continue
+  case "$label" in
+    "$prefix"*) ;;
+    *)
+      printf 'Target "%s" must start with prefix "%s"\n' "$label" "$prefix" >&2
+      exit 1
+      ;;
+  esac
+done <<EOF
+$targets
+EOF
+
+current_labels=$(gh "$kind" view "$number" \
+  --repo "$repo" \
+  --json labels --jq ".labels[].name | select(startswith(\"$prefix\"))" \
+  2>/dev/null || true)
+
+while IFS= read -r label; do
+  [ -z "$label" ] && continue
+  if ! printf '%s\n' "$targets" | grep -qxF "$label"; then
+    gh "$kind" edit "$number" \
+      --repo "$repo" \
+      --remove-label "$label" \
+      2>/dev/null || true
+  fi
+done <<EOF
+$current_labels
+EOF
+
+while IFS= read -r label; do
+  [ -z "$label" ] && continue
+  if ! printf '%s\n' "$current_labels" | grep -qxF "$label"; then
+    gh "$kind" edit "$number" \
+      --repo "$repo" \
+      --add-label "$label" \
+      2>/dev/null || true
+  fi
+done <<EOF
+$targets
+EOF

package/templates/.github/workflows/metadata-sync.yml

@@ -54,6 +54,13 @@ jobs:
           printf 'type=%s\n' "$type" >> "$GITHUB_OUTPUT"
           printf 'milestone=%s\n' "$milestone" >> "$GITHUB_OUTPUT"
 
+      - name: Checkout shared scripts
+        if: steps.metadata.outputs.is_task_comment == 'true' && steps.metadata.outputs.type != ''
+        uses: actions/checkout@v6
+        with:
+          sparse-checkout: .github/scripts
+          sparse-checkout-cone-mode: false
+
       - name: Sync type label
         if: steps.metadata.outputs.is_task_comment == 'true' && steps.metadata.outputs.type != ''
         env:
@@ -72,27 +79,11 @@ jobs:
           esac
 
           if [ -n "$TYPE_LABEL" ]; then
-            current_type_labels=$(gh issue view "$ISSUE_NUMBER" \
+            .github/scripts/sync-labels-to-set.sh \
               --repo "$GITHUB_REPOSITORY" \
-              --json labels --jq '.labels[].name | select(startswith("type:"))' \
-              2>/dev/null || true)
-
-            printf '%s\n' "$current_type_labels" | while IFS= read -r label; do
-              [ -z "$label" ] && continue
-              if [ "$label" != "$TYPE_LABEL" ]; then
-                gh issue edit "$ISSUE_NUMBER" \
-                  --repo "$GITHUB_REPOSITORY" \
-                  --remove-label "$label" \
-                  2>/dev/null || true
-              fi
-            done || true
-
-            if ! printf '%s\n' "$current_type_labels" | grep -qxF "$TYPE_LABEL"; then
-              gh issue edit "$ISSUE_NUMBER" \
-                --repo "$GITHUB_REPOSITORY" \
-                --add-label "$TYPE_LABEL" \
-                2>/dev/null || true
-            fi
+              --issue "$ISSUE_NUMBER" \
+              --prefix "type:" \
+              --target "$TYPE_LABEL"
           fi
 
       - name: Sync milestone

package/templates/.github/workflows/pr-label.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout base branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Sync in-labels
         env:
@@ -37,28 +37,19 @@ jobs:
             | map("in: " + .key)
             | .[]?')
 
-          current_labels=$(gh pr view "$PR_NUMBER" \
+          set -- \
             --repo "$GITHUB_REPOSITORY" \
-            --json labels --jq '.labels[].name | select(startswith("in: "))' \
-            2>/dev/null || true)
+            --pr "$PR_NUMBER" \
+            --prefix "in: "
 
-          printf '%s\n' "$should_labels" | while IFS= read -r label; do
+          while IFS= read -r label; do
             [ -z "$label" ] && continue
-            if ! printf '%s\n' "$current_labels" | grep -qxF "$label"; then
-              gh pr edit "$PR_NUMBER" \
-                --repo "$GITHUB_REPOSITORY" \
-                --add-label "$label" 2>/dev/null || true
-            fi
-          done
+            set -- "$@" --target "$label"
+          done <<EOF
+          $should_labels
+          EOF
 
-          printf '%s\n' "$current_labels" | while IFS= read -r label; do
-            [ -z "$label" ] && continue
-            if ! printf '%s\n' "$should_labels" | grep -qxF "$label"; then
-              gh pr edit "$PR_NUMBER" \
-                --repo "$GITHUB_REPOSITORY" \
-                --remove-label "$label" 2>/dev/null || true
-            fi
-          done
+          .github/scripts/sync-labels-to-set.sh "$@"
 
       - name: Assign PR creator if unassigned
         env: