@fitlab-ai/agent-infra 0.3.1 → 0.4.0

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

@@ -2,8 +2,8 @@
 /**
  * sync-templates.js — Deterministic template sync for managed & ejected files.
  *
- * Handles SKILL steps: 2 (git pull), 3.0 (registry sync), 4 (managed),
- * 6 (ejected), 7 (.airc.json update).
+ * Handles SKILL steps: 2 (detect template source version), 3.0 (registry sync), 4 (managed),
+ * 6 (ejected), 7 (.agents/.airc.json update).
  *
  * Merged files (step 5) are NOT handled — they require AI semantic merge.
  * The report includes `merged.pending` so the AI knows what to process.
@@ -16,39 +16,19 @@
 
 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';
 
-// Keep these helpers aligned with lib/paths.js for clone installs.
-function resolveInstallDir() {
-  return path.join(os.homedir(), '.agent-infra');
-}
-
-function resolveTemplateDir() {
-  const clonePath = path.join(resolveInstallDir(), 'templates');
-  if (fs.existsSync(clonePath)) {
-    return clonePath;
-  }
-
-  return null;
-}
-
 const DEFAULTS = {
   "files": {
     "managed": [
       ".agents/skills/",
       ".agents/templates/",
       ".agents/workflows/",
-      ".agent-workspace/README.md",
+      ".agents/workspace/README.md",
       ".claude/commands/",
-      ".editorconfig",
+      ".claude/hooks/",
       ".gemini/commands/",
-      ".github/hooks/",
-      ".github/ISSUE_TEMPLATE/",
-      ".github/PULL_REQUEST_TEMPLATE.md",
-      ".github/release.yml",
-      ".github/workflows/pr-title-check.yml",
       ".opencode/commands/"
     ],
     "merged": [
@@ -67,20 +47,16 @@ const DEFAULTS = {
       ".claude/settings.json",
       ".codex/README.md",
       ".gemini/settings.json",
-      ".github/dependabot.yml",
       ".gitignore",
-      ".mailmap",
       ".opencode/COMMAND_STYLE_GUIDE.md",
       ".opencode/README.md",
-      "AGENTS.md",
-      "CONTRIBUTING.md",
-      "SECURITY.md"
+      "AGENTS.md"
     ],
     "ejected": []
   }
 };
 
-const INSTALLER_VERSION = "0.3.1";
+const INSTALLER_VERSION = "v0.4.0";
 
 function norm(p) { return p.replace(/\\/g, '/'); }
 
@@ -139,34 +115,17 @@ function renderPathname(p, project) {
 }
 
 function resolveProjectTemplateDir(projectRoot, templateSource) {
-  const fallbackRoot = resolveTemplateDir();
+  if (!templateSource) return null;
 
-  const candidates = [];
-  if (templateSource) {
-    if (path.isAbsolute(templateSource)) {
-      candidates.push(templateSource);
-    } else {
-      if (fallbackRoot) {
-        candidates.push(path.resolve(path.dirname(fallbackRoot), templateSource));
-      }
-      candidates.push(path.resolve(projectRoot, templateSource));
-    }
-  }
-  if (fallbackRoot) {
-    candidates.push(fallbackRoot);
-  }
+  const candidate = path.isAbsolute(templateSource)
+    ? templateSource
+    : path.resolve(projectRoot, templateSource);
 
-  for (const candidate of candidates) {
-    try {
-      if (fs.statSync(candidate).isDirectory()) {
-        return candidate;
-      }
-    } catch {
-      // Keep scanning until a valid directory is found.
-    }
+  try {
+    return fs.statSync(candidate).isDirectory() ? candidate : null;
+  } catch {
+    return null;
   }
-
-  return null;
 }
 
 function isBinary(fp) {
@@ -179,15 +138,6 @@ function isBinary(fp) {
   return false;
 }
 
-function fileModule(rel) {
-  const p = norm(rel);
-  if (p.startsWith('.github/')) return 'github';
-  if (p.startsWith('.agents/') || p.startsWith('.claude/') ||
-      p.startsWith('.gemini/') || p.startsWith('.opencode/') ||
-      p.startsWith('.codex/') || p === 'AGENTS.md') return 'ai';
-  return null;
-}
-
 function gitUrl(dir) {
   try {
     return childProcess.execSync('git remote get-url origin', {
@@ -196,9 +146,6 @@ function gitUrl(dir) {
   } catch { return null; }
 }
 
-// Public-facing docs should keep all available language variants in sync.
-const MULTI_LANG = new Set(['SECURITY.md']);
-
 function langSelect(rels, lang, allSet, project) {
   const sel = new Map();
 
@@ -227,44 +174,57 @@ function langSelect(rels, lang, allSet, project) {
 }
 
 function syncTemplates(projectRoot) {
-  const cfgPath = path.join(projectRoot, '.airc.json');
+  const configDir = path.join(projectRoot, '.agents');
+  const cfgPath = path.join(configDir, '.airc.json');
+  const legacyCfgPaths = [
+    path.join(projectRoot, '.airc.json'),
+    path.join(projectRoot, '.agent-infra', 'config.json')
+  ];
+  const workspacePath = path.join(configDir, 'workspace');
+  const legacyWorkspacePaths = [
+    path.join(projectRoot, '.agent-workspace'),
+    path.join(projectRoot, '.agent-infra', 'workspace')
+  ];
+
   if (!fs.existsSync(cfgPath)) {
-    return { error: 'No .airc.json in project root.' };
+    for (const legacyCfgPath of legacyCfgPaths) {
+      if (!fs.existsSync(legacyCfgPath)) continue;
+      fs.mkdirSync(configDir, { recursive: true });
+      fs.renameSync(legacyCfgPath, cfgPath);
+      break;
+    }
+  }
+  if (!fs.existsSync(workspacePath)) {
+    for (const legacyWorkspacePath of legacyWorkspacePaths) {
+      if (!fs.existsSync(legacyWorkspacePath)) continue;
+      fs.mkdirSync(configDir, { recursive: true });
+      fs.renameSync(legacyWorkspacePath, workspacePath);
+      break;
+    }
   }
 
-  const cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
-  const templateRoot = resolveProjectTemplateDir(projectRoot, cfg.templateSource);
-  if (!templateRoot) {
-    return { error: 'Template source not found. Install: curl -fsSL https://raw.githubusercontent.com/fitlab-ai/agent-infra/main/install.sh | sh' };
+  try {
+    const legacyConfigDir = path.join(projectRoot, '.agent-infra');
+    if (fs.existsSync(legacyConfigDir) && fs.readdirSync(legacyConfigDir).length === 0) {
+      fs.rmdirSync(legacyConfigDir);
+    }
+  } catch {
+    // Ignore cleanup failures for partially migrated directories.
   }
-  const installDir = resolveInstallDir();
 
-  const hasGit = fs.existsSync(path.join(installDir, '.git'));
-  if (hasGit) {
-    try { childProcess.execSync('git fetch --tags --quiet', { cwd: installDir, stdio: 'pipe' }); } catch { /* network */ }
+  if (!fs.existsSync(cfgPath)) {
+    return { error: 'No .agents/.airc.json in project root.' };
   }
 
-  let version = 'unknown';
-  if (hasGit) {
-    let tagOutput;
-    try {
-      tagOutput = childProcess.execSync('git tag --sort=-v:refname', {
-        cwd: installDir, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe']
-      }).trim();
-    } catch {
-      return { error: 'Failed to list tags in agent-infra repository. Please check git installation.' };
-    }
-    const latestTag = tagOutput.split('\n')[0];
-    if (!latestTag) {
-      return { error: 'No tags found in agent-infra repository. This is unexpected — please reinstall.' };
-    }
-    try { childProcess.execFileSync('git', ['checkout', latestTag, '--quiet'], { cwd: installDir, stdio: 'pipe' }); } catch { /* ignore */ }
-    version = latestTag;
-  } else {
-    version = INSTALLER_VERSION || version;
+  const cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
+  const configPathRel = norm(path.relative(projectRoot, cfgPath));
+  const templateRoot = resolveProjectTemplateDir(projectRoot, cfg.templateSource);
+  if (!templateRoot) {
+    return { error: 'Template source not found. Install via npm: npm install -g @fitlab-ai/agent-infra' };
   }
+  const version = INSTALLER_VERSION;
 
-  const { project, org, language: lang = 'en', modules = [] } = cfg;
+  const { project, org, language: lang = 'en' } = cfg;
   const vars = { project, org };
 
   const managed = [...(cfg.files.managed || [])];
@@ -275,7 +235,7 @@ function syncTemplates(projectRoot) {
     templateVersion: version,
     templateRoot: norm(templateRoot),
     registryAdded: [],
-    managed: { written: [], created: [], unchanged: [], skippedMerged: [], skippedModule: [], removed: [] },
+    managed: { written: [], created: [], unchanged: [], skippedMerged: [], removed: [] },
     ejected: { created: [], skipped: [] },
     merged:  { pending: [] },
     configUpdated: false,
@@ -292,8 +252,6 @@ function syncTemplates(projectRoot) {
 
   const allRels = walkDir(templateRoot).map(f => norm(path.relative(templateRoot, f)));
   const allSet = new Set(allRels);
-  const modSet = new Set(modules);
-
   for (const entry of managed) {
     const isDir = entry.endsWith('/');
     let entryRels;
@@ -313,19 +271,11 @@ function syncTemplates(projectRoot) {
       if (!entryRels.length) continue;
     }
 
-    const selected = MULTI_LANG.has(norm(entry))
-      ? entryRels.map(r => [norm(renderPathname(r, project)), r])
-      : langSelect(entryRels, lang, allSet, project);
+    const selected = langSelect(entryRels, lang, allSet, project);
 
     for (const [tgt, src] of selected) {
       if (expectedTargets) expectedTargets.add(tgt);
 
-      const mod = fileModule(tgt);
-      if (mod !== null && !modSet.has(mod)) {
-        report.managed.skippedModule.push(tgt);
-        continue;
-      }
-
       if (matchesAny(tgt, merged) || matchesAny(tgt, ejected)) {
         report.managed.skippedMerged.push(tgt);
         continue;
@@ -364,11 +314,9 @@ function syncTemplates(projectRoot) {
         const projFiles = walkDir(projDir).map(f => norm(path.relative(projectRoot, f)));
         for (const projFile of projFiles) {
           if (expectedTargets.has(projFile)) continue;
+          if (projFile === configPathRel) continue;
           if (matchesAny(projFile, merged) || matchesAny(projFile, ejected)) continue;
 
-          const mod = fileModule(projFile);
-          if (mod !== null && !modSet.has(mod)) continue;
-
           fs.unlinkSync(path.join(projectRoot, projFile));
           report.managed.removed.push(projFile);
         }
@@ -420,9 +368,7 @@ function syncTemplates(projectRoot) {
       const ext = path.extname(entry), base = entry.slice(0, -ext.length);
       const zh = norm(base + '.zh-CN' + ext);
       if (allSet.has(zh)) rels.push(zh);
-      const selected = MULTI_LANG.has(n)
-        ? rels.map(r => [norm(renderPathname(r, project)), r])
-        : langSelect(rels, lang, allSet, project);
+      const selected = langSelect(rels, lang, allSet, project);
       for (const [t, s] of selected) {
         if (!mergedMap.has(t)) mergedMap.set(t, s);
       }
@@ -433,8 +379,7 @@ function syncTemplates(projectRoot) {
   );
 
   const projUrl = gitUrl(projectRoot);
-  const instUrl = gitUrl(installDir);
-  report.selfUpdate = !!(projUrl && instUrl && projUrl === instUrl);
+  report.selfUpdate = !!(projUrl && /fitlab-ai\/agent-infra/.test(projUrl));
 
   const hasChanges = (
     report.managed.written.length +

package/templates/.agents/templates/handoff.md

@@ -55,6 +55,6 @@
 
 ## References
 
-- Task file: `.agent-workspace/active/task-XXX.md`
+- Task file: `.agents/workspace/active/task-XXX.md`
 - Related docs: [links or file paths]
 - Related issues: #XXX

package/templates/.agents/templates/handoff.zh-CN.md

@@ -55,6 +55,6 @@
 
 ## 参考资料
 
-- 任务文件：`.agent-workspace/active/task-XXX.md`
+- 任务文件：`.agents/workspace/active/task-XXX.md`
 - 相关文档：[链接或文件路径]
 - 相关 Issue：#XXX

package/templates/.agents/workflows/bug-fix.yaml

@@ -1,149 +1,149 @@
-# 缺陷修复工作流
-# 修复缺陷时使用此工作流。
+# Bug Fix Workflow
+# Use this workflow when fixing a bug.
 
 name: bug-fix
-description: 诊断和修复缺陷的工作流。
+description: Workflow for diagnosing and fixing a bug.
 
 steps:
   - name: analysis
-    description: 复现缺陷，识别根本原因，确定修复范围。
+    description: Reproduce the bug, identify the root cause, and determine the scope of the fix.
     recommended_agents:
       - claude
       - gemini
     tasks:
-      - 理解缺陷报告和预期行为
-      - 复现缺陷（如果可能）
-      - 追踪代码路径以识别根本原因
-      - 确定受影响的文件和组件
-      - 将发现记录在任务文件中
+      - Understand the bug report and expected behavior
+      - Reproduce the bug when possible
+      - Trace the code path to identify the root cause
+      - Determine impacted files and components
+      - Record findings in the task file
     inputs:
-      - 缺陷报告或 Issue 描述
-      - 复现步骤
-      - 项目代码库
+      - Bug report or issue description
+      - Reproduction steps
+      - Project codebase
     artifact_versioning:
       outputs:
         - name: analysis
           pattern: "analysis.md | analysis-r{N}.md"
-          rule: "扫描现有分析产物；首轮创建 analysis.md，后续修订创建 analysis-r{N}.md（N = 当前最高轮次 + 1）"
+          rule: "Scan existing analysis artifacts; create analysis.md for the first round, then analysis-r{N}.md for later revisions (N = current highest round + 1)"
     outputs:
-      - 根因分析
-      - 受影响文件列表
-      - 更新后的任务文件（分析部分）
+      - Root cause analysis
+      - List of impacted files
+      - Updated task file (analysis section)
 
   - name: design
-    description: 规划修复方案并考虑边界情况。
+    description: Plan the fix and consider edge cases.
     recommended_agents:
       - claude
     tasks:
-      - 确定修复缺陷的最佳方案
-      - 识别修复的潜在副作用
-      - 规划验证修复的测试用例
-      - 在任务文件中记录修复方案
+      - Determine the best approach for fixing the bug
+      - Identify potential side effects of the fix
+      - Plan test cases to validate the fix
+      - Record the fix plan in the task file
     inputs:
-      - 上一步的根因分析
-      - 项目架构
+      - Root cause analysis from the previous step
+      - Project architecture
     artifact_versioning:
       inputs:
         - name: analysis
           pattern: "analysis.md | analysis-r{N}.md"
-          rule: "读取最高轮次的分析产物作为设计输入"
+          rule: "Read the highest-round analysis artifact as design input"
       outputs:
         - name: plan
           pattern: "plan.md | plan-r{N}.md"
-          rule: "扫描现有方案产物；首轮创建 plan.md，后续修订创建 plan-r{N}.md（N = 当前最高轮次 + 1）"
+          rule: "Scan existing plan artifacts; create plan.md for the first round, then plan-r{N}.md for later revisions (N = current highest round + 1)"
     outputs:
-      - 任务文件中记录的修复方案
-      - 待添加的测试用例列表
+      - Fix plan recorded in the task file
+      - List of test cases to add
 
   - name: implementation
-    description: 实现缺陷修复并添加回归测试。
+    description: Implement the bug fix and add regression tests.
     recommended_agents:
       - codex
       - cursor
     tasks:
-      - 创建缺陷修复分支
-      - 实现修复
-      - 添加在没有修复时会失败的回归测试
-      - 验证现有测试仍然通过
-      - 确保代码遵循项目规范
+      - Create a bug-fix branch
+      - Implement the fix
+      - Add regression tests that would fail without the fix
+      - Verify that existing tests still pass
+      - Ensure the code follows project conventions
     inputs:
-      - 上一步的修复方案
-      - 项目编码标准
+      - Fix plan from the previous step
+      - Project coding standards
     artifact_versioning:
       outputs:
         - name: implementation
           pattern: "implementation.md | implementation-r{N}.md"
-          rule: "扫描现有实现产物；首轮创建 implementation.md，后续重实现创建 implementation-r{N}.md（N = 当前最高轮次 + 1）"
+          rule: "Scan existing implementation artifacts; create implementation.md for the first round, then implementation-r{N}.md for later re-implementations (N = current highest round + 1)"
     outputs:
-      - 包含实现的缺陷修复分支
-      - 回归测试文件
-      - 更新后的任务文件（实现备注）
+      - Bug-fix branch with the implementation
+      - Regression test files
+      - Updated task file (implementation notes)
 
   - name: review
-    description: 验证修复是否正确和完整。
+    description: Verify that the fix is correct and complete.
     recommended_agents:
       - claude
     tasks:
-      - 验证修复是否解决了根本原因
-      - 检查回归测试是否充分
-      - 确保未引入新问题
-      - 验证修复不会破坏现有功能
-      - 创建审查报告
+      - Verify that the fix addresses the root cause
+      - Check whether regression tests are sufficient
+      - Ensure no new issues were introduced
+      - Verify that the fix does not break existing functionality
+      - Create a review report
     inputs:
-      - 缺陷修复分支
-      - 根因分析
+      - Bug-fix branch
+      - Root cause analysis
     artifact_versioning:
       inputs:
         - name: implementation
           pattern: "implementation.md | implementation-r{N}.md"
-          rule: "读取最高轮次的实现产物作为审查输入"
+          rule: "Read the highest-round implementation artifact as review input"
       outputs:
         - name: review
           pattern: "review.md | review-r{N}.md"
-          rule: "扫描现有审查产物；首轮创建 review.md，后续轮次创建 review-r{N}.md（N = 当前最高轮次 + 1）"
+          rule: "Scan existing review artifacts; create review.md for the first round, then review-r{N}.md for later rounds (N = current highest round + 1)"
     outputs:
-      - 审查报告
-      - 问题列表（如有）
+      - Review report
+      - List of issues if any
 
   - name: fix
-    description: 处理审查中发现的问题。
+    description: Address issues found during review.
     recommended_agents:
       - codex
       - cursor
     tasks:
-      - 修复审查中识别的问题
-      - 根据需要更新测试
-      - 验证所有测试通过
+      - Fix issues identified in the review
+      - Update tests as needed
+      - Verify that all tests pass
     inputs:
-      - 审查报告
-      - 缺陷修复分支
+      - Review report
+      - Bug-fix branch
     artifact_versioning:
       inputs:
         - name: review
           pattern: "review.md | review-r{N}.md"
-          rule: "读取最高轮次的审查产物，并校验其与 task.md Activity Log 中最近一条 Code Review 记录一致"
+          rule: "Read the highest-round review artifact and verify that it matches the latest Code Review entry in the task.md Activity Log"
       outputs:
         - name: refinement
           pattern: "refinement.md | refinement-r{N}.md"
-          rule: "扫描现有修复产物；首轮创建 refinement.md，后续轮次创建 refinement-r{N}.md（N = 当前最高轮次 + 1）"
+          rule: "Scan existing refinement artifacts; create refinement.md for the first round, then refinement-r{N}.md for later rounds (N = current highest round + 1)"
     outputs:
-      - 包含修复的更新分支
-      - 更新后的任务文件
+      - Updated branch with fixes
+      - Updated task file
 
   - name: commit
-    description: 最终确认缺陷修复并创建拉取请求。
+    description: Finalize the bug fix and create a pull request.
     recommended_agents:
       - claude
       - human
     tasks:
-      - 确保所有测试通过
-      - 编写引用缺陷/Issue 的提交信息
-      - 创建包含缺陷修复描述的拉取请求
-      - 将 PR 关联到缺陷报告 Issue
-      - 将任务移至已完成
+      - Ensure all tests pass
+      - Write a commit message that references the bug or issue
+      - Create a pull request with a bug-fix summary
+      - Link the PR to the bug report issue
+      - Move the task to completed
     inputs:
-      - 最终缺陷修复分支
-      - 任务文件
+      - Final bug-fix branch
+      - Task file
     outputs:
-      - 拉取请求
-      - 已完成的任务文件（位于 .agent-workspace/completed/）
+      - Pull request
+      - Completed task file (stored in .agents/workspace/completed/)

package/templates/.agents/workflows/bug-fix.zh-CN.yaml

@@ -146,4 +146,4 @@ steps:
       - 任务文件
     outputs:
       - 拉取请求
-      - 已完成的任务文件（位于 .agent-workspace/completed/）
+      - 已完成的任务文件（位于 .agents/workspace/completed/）