@fitlab-ai/agent-infra 0.5.1 → 0.5.2

package/templates/.agents/skills/restore-task/{SKILL.md → SKILL.en.md}

@@ -1,11 +1,11 @@
 ---
 name: restore-task
-description: "Restore local task files from GitHub Issue comments"
+description: "Restore local task files from platform Issue comments"
 ---
 
 # Restore Task
 
-Restore local task workspace files from GitHub Issue comments that contain sync markers.
+Restore local task workspace files from platform Issue comments that contain sync markers.
 
 ## Boundary / Critical Rules
 
@@ -21,19 +21,13 @@ Restore local task workspace files from GitHub Issue comments that contain sync
 Check:
 - required `{issue-number}`
 - optional `{task-id}`
-- `gh auth status`
+- read `.agents/rules/issue-pr-commands.md` first and use its authentication commands to verify current platform access
 
 If the user provided `{task-id}`, validate the `TASK-{yyyyMMdd-HHmmss}` format.
 
 ### 2. Fetch Issue Comments
 
-Read all Issue comments while preserving the original order and comment IDs.
-
-Suggested command:
-
-```bash
-gh api "repos/{owner}/{repo}/issues/{issue-number}/comments" --paginate
-```
+Read all Issue comments by following the "Read Issue comments" command in `.agents/rules/issue-pr-commands.md`, preserving the original order and comment IDs.
 
 ### 3. Determine the task-id and Files to Restore
 
@@ -152,7 +146,7 @@ Stop after completing the checklist. Do not continue the workflow automatically.
 ## Error Handling
 
 - Issue missing or inaccessible
-- `gh` unavailable or unauthenticated
+- Platform CLI unavailable or unauthenticated
 - No sync-marked comments found
 - Unable to determine a unique `task-id`
 - Target directory already exists

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

@@ -1,11 +1,11 @@
 ---
 name: restore-task
-description: "从 GitHub Issue 评论还原本地任务文件"
+description: "从平台 Issue 评论还原本地任务文件"
 ---
 
 # 还原任务
 
-从带有 sync 标记的 GitHub Issue 评论中恢复本地任务工作区文件。
+从带有 sync 标记的平台 Issue 评论中恢复本地任务工作区文件。
 
 ## 行为边界 / 关键规则
 
@@ -21,19 +21,13 @@ description: "从 GitHub Issue 评论还原本地任务文件"
 检查：
 - 必填参数 `{issue-number}`
 - 可选参数 `{task-id}`
-- `gh auth status`
+- 执行前先读取 `.agents/rules/issue-pr-commands.md`，并按其中的认证命令验证当前平台访问能力
 
 如果用户传入了 `{task-id}`，校验其格式为 `TASK-{yyyyMMdd-HHmmss}`。
 
 ### 2. 获取 Issue 评论
 
-读取 Issue 的全部评论，保留原始顺序和评论 ID。
-
-建议命令：
-
-```bash
-gh api "repos/{owner}/{repo}/issues/{issue-number}/comments" --paginate
-```
+按 `.agents/rules/issue-pr-commands.md` 中的 “Issue 评论读取” 命令读取 Issue 的全部评论，保留原始顺序和评论 ID。
 
 ### 3. 确定 task-id 与待恢复文件
 
@@ -152,7 +146,7 @@ node .agents/scripts/validate-artifact.js gate restore-task .agents/workspace/ac
 ## 错误处理
 
 - Issue 不存在或无权访问
-- `gh` 未认证
+- 平台 CLI 未认证
 - 找不到带 sync 标记的评论
 - 无法唯一确定 `task-id`
 - 目标目录已存在

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

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 /**
  * sync-templates.js — Deterministic template sync for managed & ejected files.
  *
@@ -20,6 +19,9 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const DEFAULTS = {
+  "platform": {
+    "type": "github"
+  },
   "sandbox": {
     "runtimes": [
       "node20"
@@ -74,7 +76,11 @@ const DEFAULTS = {
   }
 };
 
-const INSTALLER_VERSION = "v0.5.1";
+const INSTALLER_VERSION = "v0.5.2";
+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']);
+const KNOWN_LANGUAGES = new Set(['en', 'zh-CN']);
 
 function norm(p) { return p.replace(/\\/g, '/'); }
 
@@ -132,6 +138,53 @@ function renderPathname(p, project) {
   return p.replace(/_project_/g, project);
 }
 
+function variantExt(relativePath) {
+  return path.extname(relativePath);
+}
+
+function variantBase(relativePath) {
+  const ext = variantExt(relativePath);
+  return relativePath.slice(0, -ext.length);
+}
+
+function withVariant(relativePath, variant) {
+  const ext = variantExt(relativePath);
+  const base = variantBase(relativePath);
+  return `${base}.${variant}${ext}`;
+}
+
+function stripVariant(relativePath, variant) {
+  return relativePath.replace(new RegExp(`\\.${variant.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.`), '.');
+}
+
+function isPlatformVariant(relativePath, platform) {
+  const platforms = new Set([...KNOWN_PLATFORMS, platform]);
+  for (const candidate of platforms) {
+    if (relativePath.includes(`.${candidate}.`)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isLangVariant(relativePath) {
+  for (const lang of KNOWN_LANGUAGES) {
+    if (relativePath.includes(`.${lang}.`)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function stripLangVariant(relativePath) {
+  for (const lang of KNOWN_LANGUAGES) {
+    if (relativePath.includes(`.${lang}.`)) {
+      return stripVariant(relativePath, lang);
+    }
+  }
+  return relativePath;
+}
+
 function isTemplateDir(dir) {
   try {
     return fs.statSync(dir).isDirectory();
@@ -140,37 +193,107 @@ function isTemplateDir(dir) {
   }
 }
 
-function resolveInstalledTemplateDir(nodeModulesRoot) {
-  if (!nodeModulesRoot) return null;
-  const candidate = path.join(nodeModulesRoot, '@fitlab-ai', 'agent-infra', 'templates');
-  return isTemplateDir(candidate) ? candidate : null;
+function verifyPackageDir(dir) {
+  const pkgPath = path.join(dir, 'package.json');
+  if (!fs.existsSync(pkgPath)) {
+    return { templateRoot: null, reason: `package.json not found at ${pkgPath}` };
+  }
+
+  let pkg;
+  try {
+    pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+  } catch {
+    return { templateRoot: null, reason: `invalid package.json at ${pkgPath}` };
+  }
+
+  if (pkg.name !== PACKAGE_NAME) {
+    const packageName = typeof pkg.name === 'string' && pkg.name ? pkg.name : 'an unknown package';
+    return { templateRoot: null, reason: `${pkgPath} belongs to ${packageName}` };
+  }
+
+  const templateRoot = path.join(dir, 'templates');
+  if (!isTemplateDir(templateRoot)) {
+    return { templateRoot: null, reason: `templates/ not found at ${templateRoot}` };
+  }
+
+  return { templateRoot, reason: null };
 }
 
-function resolveTemplateRoot(projectRoot) {
+function resolveUnixTemplateRoot(name) {
+  let linkPath;
   try {
-    const globalRoot = childProcess.execSync('npm root -g', {
+    linkPath = childProcess.execSync(`command -v ${name}`, {
       encoding: 'utf8',
       stdio: ['pipe', 'pipe', 'pipe']
     }).trim();
-    const globalTemplateRoot = resolveInstalledTemplateDir(globalRoot);
-    if (globalTemplateRoot) return globalTemplateRoot;
   } catch {
-    // npm may be unavailable or not configured.
+    return { templateRoot: null, reason: 'not found in PATH' };
   }
 
+  if (!linkPath) {
+    return { templateRoot: null, reason: 'not found in PATH' };
+  }
+
+  let realPath;
   try {
-    const localRoot = childProcess.execSync('npm root', {
-      cwd: projectRoot,
+    realPath = fs.realpathSync(linkPath);
+  } catch {
+    return { templateRoot: null, reason: `cannot resolve symlink target for ${linkPath}` };
+  }
+
+  let dir = path.dirname(realPath);
+  while (true) {
+    const pkgPath = path.join(dir, 'package.json');
+    if (fs.existsSync(pkgPath)) {
+      return verifyPackageDir(dir);
+    }
+
+    const parentDir = path.dirname(dir);
+    if (parentDir === dir) {
+      break;
+    }
+    dir = parentDir;
+  }
+
+  return { templateRoot: null, reason: `no package.json found above ${realPath}` };
+}
+
+function resolveWindowsTemplateRoot(name) {
+  let output;
+  try {
+    output = childProcess.execSync(`where ${name}`, {
       encoding: 'utf8',
       stdio: ['pipe', 'pipe', 'pipe']
     }).trim();
-    const localTemplateRoot = resolveInstalledTemplateDir(localRoot);
-    if (localTemplateRoot) return localTemplateRoot;
   } catch {
-    // npm may be unavailable or the project may not have a local install.
+    return { templateRoot: null, reason: 'not found in PATH' };
+  }
+
+  const wrapperPaths = output.split(/\r?\n/).map(line => line.trim()).filter(Boolean);
+  if (wrapperPaths.length === 0) {
+    return { templateRoot: null, reason: 'not found in PATH' };
   }
 
-  return null;
+  const wrapperPath = wrapperPaths.find(line => /\.cmd$/i.test(line)) || wrapperPaths[0];
+  const packageDir = path.join(path.dirname(wrapperPath), 'node_modules', '@fitlab-ai', 'agent-infra');
+  return verifyPackageDir(packageDir);
+}
+
+function resolveTemplateRoot() {
+  const resolver = process.platform === 'win32'
+    ? resolveWindowsTemplateRoot
+    : resolveUnixTemplateRoot;
+  const errors = [];
+
+  for (const name of ['ai', 'agent-infra']) {
+    const result = resolver(name);
+    if (result.templateRoot) {
+      return result.templateRoot;
+    }
+    errors.push({ name, reason: result.reason });
+  }
+
+  return { templateRoot: null, errors };
 }
 
 function isBinary(fp) {
@@ -194,30 +317,60 @@ function gitUrl(dir) {
 function langSelect(rels, lang, allSet, project) {
   const sel = new Map();
 
-  if (lang === 'zh-CN') {
-    for (const r of rels) {
-      if (!r.includes('.zh-CN.')) continue;
-      const target = norm(renderPathname(r.replace(/\.zh-CN\./, '.'), project));
+  for (const r of rels) {
+    if (r.includes(`.${lang}.`)) {
+      const target = norm(renderPathname(stripVariant(r, lang), project));
       sel.set(target, r);
-    }
-    for (const r of rels) {
-      if (r.includes('.zh-CN.')) continue;
+    } else if (!isLangVariant(r)) {
       const target = norm(renderPathname(r, project));
-      if (sel.has(target)) continue;
-      const ext = path.extname(r), base = r.slice(0, -ext.length);
-      if (allSet.has(norm(base + '.zh-CN' + ext))) continue;
-      sel.set(target, r);
-    }
-  } else {
-    for (const r of rels) {
-      if (r.includes('.zh-CN.')) continue;
-      sel.set(norm(renderPathname(r, project)), r);
+      if (!sel.has(target)) {
+        sel.set(target, r);
+      }
     }
   }
 
   return sel;
 }
 
+function platformSelect(entries, platform, project) {
+  const sel = new Map();
+
+  for (const [target, src] of entries) {
+    if (!target.includes(`.${platform}.`)) continue;
+    sel.set(norm(renderPathname(stripVariant(target, platform), project)), src);
+  }
+
+  for (const [target, src] of entries) {
+    const normalizedTarget = norm(renderPathname(target, project));
+    if (sel.has(normalizedTarget)) continue;
+    if (isPlatformVariant(target, platform)) continue;
+    sel.set(normalizedTarget, src);
+  }
+
+  return sel;
+}
+
+function entryVariantRels(entry, allSet, platform) {
+  const rels = [];
+  const normalized = norm(entry);
+  const candidates = [
+    normalized,
+    withVariant(normalized, 'en'),
+    withVariant(normalized, 'zh-CN'),
+    withVariant(normalized, platform),
+    withVariant(withVariant(normalized, platform), 'en'),
+    withVariant(withVariant(normalized, platform), 'zh-CN')
+  ];
+
+  for (const candidate of candidates) {
+    if (allSet.has(candidate) && !rels.includes(candidate)) {
+      rels.push(candidate);
+    }
+  }
+
+  return rels;
+}
+
 function syncTemplates(projectRoot, templateRootOverride) {
   const configDir = path.join(projectRoot, '.agents');
   const cfgPath = path.join(configDir, '.airc.json');
@@ -228,14 +381,35 @@ function syncTemplates(projectRoot, templateRootOverride) {
 
   const cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
   const configPathRel = norm(path.relative(projectRoot, cfgPath));
-  const templateRoot = templateRootOverride || resolveTemplateRoot(projectRoot);
+  let templateRoot = templateRootOverride;
   if (!templateRoot) {
-    return { error: 'Template source not found. Install via npm: npm install -g @fitlab-ai/agent-infra' };
+    const resolvedTemplateRoot = resolveTemplateRoot();
+    if (typeof resolvedTemplateRoot === 'string') {
+      templateRoot = resolvedTemplateRoot;
+    } else {
+      const details = resolvedTemplateRoot.errors
+        .map(({ name, reason }) => `  - ${name}: ${reason}`)
+        .join('\n');
+      return {
+        error: [
+          'Template source not found.',
+          '',
+          'Attempted binary lookups:',
+          details,
+          '',
+          'Please ensure agent-infra is installed and available on PATH.',
+          'If already installed, upgrade to the latest version or reinstall:',
+          '  npm install -g @fitlab-ai/agent-infra',
+          '  brew upgrade fitlab-ai/agent-infra/agent-infra || brew install fitlab-ai/agent-infra/agent-infra'
+        ].join('\n')
+      };
+    }
   }
   const version = INSTALLER_VERSION;
   const hadTemplateSource = Object.prototype.hasOwnProperty.call(cfg, 'templateSource');
 
   const { project, org, language: lang = 'en' } = cfg;
+  const platformType = cfg.platform?.type || DEFAULTS.platform.type;
   const vars = { project, org };
 
   const managed = [...(cfg.files.managed || [])];
@@ -274,15 +448,11 @@ function syncTemplates(projectRoot, templateRootOverride) {
       entryRels = walkDir(dir).map(f => norm(path.relative(templateRoot, f)));
     } else {
       entryRels = [];
-      const n = norm(entry);
-      if (allSet.has(n)) entryRels.push(n);
-      const ext = path.extname(entry), base = entry.slice(0, -ext.length);
-      const zh = norm(base + '.zh-CN' + ext);
-      if (allSet.has(zh)) entryRels.push(zh);
+      entryRels = entryVariantRels(entry, allSet, platformType);
       if (!entryRels.length) continue;
     }
 
-    const selected = langSelect(entryRels, lang, allSet, project);
+    const selected = platformSelect(langSelect(entryRels, lang, allSet, project), platformType, project);
 
     for (const [tgt, src] of selected) {
       if (expectedTargets) expectedTargets.add(tgt);
@@ -345,13 +515,10 @@ function syncTemplates(projectRoot, templateRootOverride) {
       continue;
     }
 
-    let src = norm(entry);
-    if (lang === 'zh-CN') {
-      const ext = path.extname(entry), base = entry.slice(0, -ext.length);
-      const zh = norm(base + '.zh-CN' + ext);
-      if (allSet.has(zh)) src = zh;
-    }
-    if (!allSet.has(src)) continue;
+    const selected = platformSelect(langSelect(entryVariantRels(entry, allSet, platformType), lang, allSet, project), platformType, project);
+    const target = norm(renderPathname(entry, project));
+    const src = selected.get(target);
+    if (!src) continue;
 
     const content = renderContent(fs.readFileSync(path.join(templateRoot, src), 'utf8'), vars);
     const dir = path.dirname(dstFull);
@@ -364,22 +531,15 @@ function syncTemplates(projectRoot, templateRootOverride) {
   for (const entry of merged) {
     if (entry.includes('*')) {
       const hits = allRels.filter(r => {
-        const t = norm(renderPathname(
-          r.includes('.zh-CN.') ? r.replace(/\.zh-CN\./, '.') : r, project
-        ));
+        const t = norm(renderPathname(stripLangVariant(r), project));
         return globMatch(entry, t);
       });
-      for (const [t, s] of langSelect(hits, lang, allSet, project)) {
+      for (const [t, s] of platformSelect(langSelect(hits, lang, allSet, project), platformType, project)) {
         if (!mergedMap.has(t)) mergedMap.set(t, s);
       }
     } else {
-      const rels = [];
-      const n = norm(entry);
-      if (allSet.has(n)) rels.push(n);
-      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 = langSelect(rels, lang, allSet, project);
+      const rels = entryVariantRels(entry, allSet, platformType);
+      const selected = platformSelect(langSelect(rels, lang, allSet, project), platformType, project);
       for (const [t, s] of selected) {
         if (!mergedMap.has(t)) mergedMap.set(t, s);
       }