@fitlab-ai/agent-infra 0.4.3 → 0.4.4

package/README.md

@@ -380,7 +380,7 @@ The generated `.agents/.airc.json` file is the central contract between the boot
   "project": "my-project",
   "org": "my-org",
   "language": "en",
-  "templateVersion": "v0.4.3",
+  "templateVersion": "v0.4.4",
   "files": {
     "managed": [
       ".agents/workspace/README.md",

package/README.zh-CN.md

@@ -380,7 +380,7 @@ import-issue #42                    从 GitHub Issue 导入任务
   "project": "my-project",
   "org": "my-org",
   "language": "en",
-  "templateVersion": "v0.4.3",
+  "templateVersion": "v0.4.4",
   "files": {
     "managed": [
       ".agents/workspace/README.md",

package/lib/defaults.json

@@ -6,8 +6,9 @@
     "managed": [
       ".agents/QUICKSTART.md",
       ".agents/README.md",
-      ".agents/skills/",
+      ".agents/rules/",
       ".agents/scripts/",
+      ".agents/skills/",
       ".agents/templates/",
       ".agents/workflows/",
       ".agents/workspace/README.md",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fitlab-ai/agent-infra",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Bootstrap tool for AI multi-tool collaboration infrastructure — works with Claude Code, Codex, Gemini CLI, and OpenCode",
   "license": "MIT",
   "type": "module",

package/templates/.agents/rules/issue-sync.md

@@ -23,6 +23,15 @@ Use `while IFS= read -r label` so labels like `status: in-progress` are handled
 
 If `gh` fails, skip and continue. Do not fail the skill.
 
+## Assignee Sync
+
+When a skill creates or imports an Issue, automatically add the current executor as assignee:
+
+- `create-issue`: use `--assignee @me` in the `gh issue create` command
+- `import-issue`: run `gh issue edit {issue-number} --add-assignee @me 2>/dev/null || true` after import
+
+`@me` is resolved by `gh` CLI to the authenticated user. The operation is idempotent (adding an existing assignee is a no-op). If the command fails (e.g. insufficient permissions), skip and continue.
+
 ## `in:` Label Sync
 
 Read the `labels.in` mapping from `.agents/.airc.json`.

package/templates/.agents/rules/issue-sync.zh-CN.md

@@ -23,6 +23,15 @@ fi
 
 如果 `gh` 命令失败，跳过并继续，不中断技能执行。
 
+## Assignee 同步
+
+当技能创建或导入 Issue 时，自动将当前执行者添加为 assignee：
+
+- `create-issue`：在 `gh issue create` 命令中使用 `--assignee @me` 参数
+- `import-issue`：导入后执行 `gh issue edit {issue-number} --add-assignee @me 2>/dev/null || true`
+
+`@me` 由 `gh` CLI 自动解析为当前认证用户。此操作是幂等的（重复添加不会报错）。如果命令失败（如权限不足），跳过并继续。
+
 ## `in:` label 同步
 
 读取 `.agents/.airc.json` 的 `labels.in` 映射。

package/templates/.agents/rules/milestone-inference.md

@@ -0,0 +1,102 @@
+# Milestone Inference Rules
+
+Read this file before `create-issue`, `implement-task`, or `create-pr` handles a milestone.
+
+## General Principles
+
+- Narrow the milestone over the skill lifecycle: release line -> concrete version -> reuse
+- Every phase must fall back safely instead of blocking the skill
+- If `gh` is unavailable, unauthenticated, or the GitHub API call fails, skip milestone handling and continue
+- Only use milestones that actually exist in the repository; if a target milestone is unavailable, apply the fallback for that phase
+
+## Branch Mode Detection
+
+Use the following command to detect whether the repository has remote release-line branches:
+
+```bash
+git branch -r | grep -v 'HEAD' | grep -E 'origin/[0-9]+\.[0-9]+\.x$'
+```
+
+- Any output: multi-version branch mode
+- No output: trunk mode
+
+## Phase 1: `create-issue`
+
+Goal: choose a coarse-grained release line when the Issue is created.
+
+Priority:
+1. If task.md provides a valid explicit `milestone`, use it
+2. Otherwise infer a release line:
+   - Trunk mode: query open `X.Y.x` milestones and choose the lowest release line
+   - Multi-version branch mode: try open `X.Y.x` milestones and choose the lowest release line; if that is not reliable, fall back to `General Backlog`
+3. If the inferred release line does not exist, fall back to `General Backlog`
+4. If `General Backlog` also does not exist, omit `--milestone`
+
+Suggested release-line query:
+
+```bash
+gh api "repos/{owner}/{repo}/milestones?state=open&per_page=100" \
+  --jq '.[].title'
+```
+
+Only match titles in `X.Y.x` format and choose the smallest major/minor pair numerically.
+
+## Phase 2: `implement-task`
+
+Goal: narrow the Issue milestone from a release line to a concrete version when implementation starts.
+
+Preconditions:
+- task.md contains a valid `issue_number`
+- the current Issue milestone matches the release-line format `X.Y.x`
+
+Sequence:
+1. Query the current Issue milestone
+2. If it is not in `X.Y.x` format, treat it as already specific enough and keep it unchanged
+3. If it is in `X.Y.x` format, narrow it according to branch mode:
+   - Trunk mode: query open concrete-version milestones on that release line (for example `0.4.4`) and choose the latest one
+   - Multi-version branch mode:
+     - If the task branch was created from `origin/X.Y.x`, choose the latest concrete version on that line
+     - If the task branch was created from `main`, find the highest release line and choose the latest concrete version on that line
+4. When a target concrete version is found, run:
+
+```bash
+gh issue edit {issue-number} --milestone "{version}"
+```
+
+5. If the target milestone does not exist or the branch ancestry cannot be determined reliably, keep the original milestone unchanged
+
+Suggested concrete-version query:
+
+```bash
+gh api "repos/{owner}/{repo}/milestones?state=open&per_page=100" \
+  --jq '.[].title'
+```
+
+- Release-line match: `^X\.Y\.x$`
+- Concrete-version match: `^X\.Y\.[0-9]+$`
+- "Latest" means the largest patch number
+
+Suggested branch-origin checks:
+
+```bash
+git merge-base --is-ancestor origin/{release-line} HEAD
+git merge-base --is-ancestor origin/main HEAD
+```
+
+If neither check is reliable or the remote refs are unavailable, keep the original milestone and avoid guessing.
+
+## Phase 3: `create-pr`
+
+Goal: reuse the linked Issue milestone on the PR instead of inferring a new one.
+
+Sequence:
+1. If `issue_number` exists, query the Issue milestone
+2. If the Issue has a milestone, run:
+
+```bash
+gh pr edit {pr-number} --milestone "{milestone}"
+```
+
+3. If the Issue has no milestone, skip PR milestone assignment
+
+Do not infer a PR milestone separately from task.md, branch names, tags, or `General Backlog`.

package/templates/.agents/rules/milestone-inference.zh-CN.md

@@ -0,0 +1,102 @@
+# Milestone 推断规则
+
+在 `create-issue`、`implement-task` 或 `create-pr` 处理 milestone 之前先读取本文件。
+
+## 通用原则
+
+- milestone 在技能生命周期中逐步收窄：版本线 -> 具体版本 -> 复用
+- 任一步骤推断失败时都必须回退，不得阻塞技能执行
+- 如果 `gh` CLI 不可用、未认证，或 GitHub API 请求失败，跳过 milestone 处理并继续
+- 只使用仓库中实际存在的 milestone；目标 milestone 不存在时按各阶段 fallback 处理
+
+## 分支模式检测
+
+使用以下命令检测仓库是否存在远程 release line 分支：
+
+```bash
+git branch -r | grep -v 'HEAD' | grep -E 'origin/[0-9]+\.[0-9]+\.x$'
+```
+
+- 有输出：多版本分支模式
+- 无输出：主干模式
+
+## 阶段 1：`create-issue`
+
+目标：在创建 Issue 时先确定粗粒度版本线。
+
+优先级：
+1. `task.md` 显式存在 `milestone` 字段且值有效 -> 直接使用
+2. 否则推断版本线：
+   - 主干模式：查询 open 的 `X.Y.x` 里程碑，取最低版本线
+   - 多版本分支模式：优先查询 open 的 `X.Y.x` 里程碑，取最低版本线；如果无法确定则回退到 `General Backlog`
+3. 推断出的版本线不存在 -> 回退到 `General Backlog`
+4. `General Backlog` 也不存在 -> 省略 `--milestone`
+
+版本线查询建议：
+
+```bash
+gh api "repos/{owner}/{repo}/milestones?state=open&per_page=100" \
+  --jq '.[].title'
+```
+
+只匹配 `X.Y.x` 格式的标题；按 major、minor 数值升序取最小版本线。
+
+## 阶段 2：`implement-task`
+
+目标：开始开发时，把 Issue milestone 从版本线收窄到具体版本。
+
+前置条件：
+- `task.md` 存在有效 `issue_number`
+- 当前 Issue milestone 为版本线格式 `X.Y.x`
+
+执行顺序：
+1. 查询 Issue 当前 milestone
+2. 如果 milestone 不是 `X.Y.x` 格式 -> 视为已足够具体，保持不变
+3. 如果 milestone 是 `X.Y.x` -> 按分支模式收窄：
+   - 主干模式：查询该版本线下 open 的具体版本 milestone（如 `0.4.4`），取最新版本
+   - 多版本分支模式：
+     - 当前任务分支来自 `origin/X.Y.x` release line -> 在该版本线下取最新具体版本
+     - 当前任务分支来自 `main` -> 找最高版本线，再取该版本线下的最新具体版本
+4. 找到目标具体版本后，执行：
+
+```bash
+gh issue edit {issue-number} --milestone "{version}"
+```
+
+5. 如果目标 milestone 不存在或无法可靠判断 -> 保持原 milestone 不变
+
+具体版本查询建议：
+
+```bash
+gh api "repos/{owner}/{repo}/milestones?state=open&per_page=100" \
+  --jq '.[].title'
+```
+
+- 版本线匹配：`^X\.Y\.x$`
+- 具体版本匹配：`^X\.Y\.[0-9]+$`
+- “最新”按 patch 数值最大确定
+
+分支来源判断建议：
+
+```bash
+git merge-base --is-ancestor origin/{release-line} HEAD
+git merge-base --is-ancestor origin/main HEAD
+```
+
+如果两个判断都不可靠或远程引用缺失，保持原 milestone，不做错误推断。
+
+## 阶段 3：`create-pr`
+
+目标：PR 直接复用关联 Issue 的 milestone，不再独立推断。
+
+执行顺序：
+1. 如果存在 `issue_number`，查询 Issue milestone
+2. Issue 有 milestone -> 执行：
+
+```bash
+gh pr edit {pr-number} --milestone "{milestone}"
+```
+
+3. Issue 没有 milestone -> 跳过，不设置 PR milestone
+
+不要再使用 `task.md`、分支名、tag 或 `General Backlog` 为 PR 单独推断 milestone。

package/templates/.agents/scripts/validate-artifact.js

@@ -154,6 +154,8 @@ function runCheck(type, context) {
       return checkArtifact(context);
     case "activity-log":
       return checkActivityLog(context);
+    case "completion-checklist":
+      return checkCompletionChecklist(context);
     case "github-sync":
       return checkGithubSync(context);
     default:
@@ -176,7 +178,7 @@ function checkTaskMeta({ taskDir, config }) {
     return failResult("task-meta", `Missing required fields: ${missingFields.join(", ")}`);
   }
 
-  const invalidDates = ["created_at", "updated_at", "completed_at", "blocked_at"]
+  const invalidDates = ["created_at", "updated_at", "completed_at", "blocked_at", "cancelled_at"]
     .filter((field) => !isBlank(metadata[field]) && !DATE_TIME_PATTERN.test(metadata[field]));
   if (invalidDates.length > 0) {
     return failResult("task-meta", `Invalid date format in: ${invalidDates.join(", ")}`);
@@ -216,6 +218,10 @@ function checkTaskMeta({ taskDir, config }) {
     return failResult("task-meta", "Expected blocked_at to be present");
   }
 
+  if (config.require_cancelled_at && isBlank(metadata.cancelled_at)) {
+    return failResult("task-meta", "Expected cancelled_at to be present");
+  }
+
   if (config.match_task_dir !== false) {
     const expectedTaskId = path.basename(taskDir);
     if (metadata.id !== expectedTaskId) {
@@ -338,6 +344,43 @@ function checkActivityLog({ taskDir, config }) {
   return passResult("activity-log", `Latest entry '${latestAction}' at ${latestTimestamp}`);
 }
 
+function checkCompletionChecklist({ taskDir, config }) {
+  const task = loadTask(taskDir);
+  if (!task.ok) {
+    return failResult("completion-checklist", task.message);
+  }
+
+  const checklist = getSectionContent(task.content, ["完成检查清单", "Completion Checklist"]);
+  if (!checklist) {
+    return failResult("completion-checklist", "Completion Checklist section not found");
+  }
+
+  const items = checklist
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => /^- \[(?: |x|X)\] .+$/.test(line));
+
+  if (items.length === 0) {
+    return failResult("completion-checklist", "Completion Checklist has no checkbox items");
+  }
+
+  if (config.require_all_checked) {
+    const unchecked = items
+      .map((line) => line.match(/^- \[ \] (.+)$/))
+      .filter(Boolean)
+      .map((match) => match[1].trim());
+
+    if (unchecked.length > 0) {
+      return failResult(
+        "completion-checklist",
+        `Completion Checklist has unchecked items: ${unchecked.join(", ")}`
+      );
+    }
+  }
+
+  return passResult("completion-checklist", `Completion Checklist valid (${items.length} items checked)`);
+}
+
 function checkGithubSync({ taskDir, config, artifactFile }) {
   const context = buildSyncContext({ taskDir, config, artifactFile });
   if (context.earlyReturn) {
@@ -356,7 +399,9 @@ function checkGithubSync({ taskDir, config, artifactFile }) {
     checkCommentContent,
     checkTaskCommentContent,
     checkInLabelsMatchPr,
-    checkSyncedRequirements
+    checkSyncedRequirements,
+    checkIssueType,
+    checkMilestone
   ];
 
   for (const subCheck of subChecks) {
@@ -536,7 +581,7 @@ function fetchRemoteData(context) {
     "view",
     String(context.issueNumber),
     "--json",
-    "state,labels,body"
+    "state,labels,body,milestone"
   ], context.taskDir));
   if (!issueResult.ok) {
     return {
@@ -599,14 +644,37 @@ function fetchRemoteData(context) {
     prComments = flattenComments(prCommentsResult.value);
   }
 
+  let issueType;
+  if (context.config.verify_issue_type) {
+    const issueTypeResult = withRetry(() => ghText([
+      "api",
+      `repos/${context.ownerRepo}/issues/${context.issueNumber}`,
+      "--jq",
+      ".type.name // empty"
+    ], context.taskDir));
+
+    if (issueTypeResult.ok) {
+      issueType = issueTypeResult.value || null;
+    }
+  }
+
   let prLabels = null;
-  if (context.config.verify_in_labels_match_pr && context.prNumber) {
+  let prMilestone;
+  if ((context.config.verify_in_labels_match_pr || context.config.verify_milestone) && context.prNumber) {
+    const prFields = [];
+    if (context.config.verify_in_labels_match_pr) {
+      prFields.push("labels");
+    }
+    if (context.config.verify_milestone) {
+      prFields.push("milestone");
+    }
+
     const prResult = withRetry(() => ghJson([
       "pr",
       "view",
       String(context.prNumber),
       "--json",
-      "labels"
+      prFields.join(",")
     ], context.taskDir));
 
     if (!prResult.ok) {
@@ -617,14 +685,21 @@ function fetchRemoteData(context) {
       };
     }
 
-    prLabels = extractLabelNames(prResult.value?.labels);
+    prLabels = context.config.verify_in_labels_match_pr
+      ? extractLabelNames(prResult.value?.labels)
+      : null;
+    prMilestone = context.config.verify_milestone
+      ? prResult.value?.milestone ?? null
+      : undefined;
   }
 
   return {
     issue,
     comments,
     prComments,
-    prLabels
+    prLabels,
+    issueType,
+    prMilestone
   };
 }
 
@@ -810,6 +885,59 @@ function checkSyncedRequirements(context, remoteData) {
   );
 }
 
+function checkIssueType(context, remoteData) {
+  if (!context.config.verify_issue_type) {
+    return null;
+  }
+
+  if (remoteData.issueType === undefined) {
+    return null;
+  }
+
+  if (!remoteData.issueType) {
+    return failResult(
+      "github-sync",
+      `Issue #${context.issueNumber} has no Issue Type set`,
+      "check_failed"
+    );
+  }
+
+  const expectedType = mapTaskTypeToIssueType(context.task.metadata.type);
+  if (expectedType && remoteData.issueType !== expectedType) {
+    return failResult(
+      "github-sync",
+      `Issue #${context.issueNumber} has type '${remoteData.issueType}', expected '${expectedType}' (from task type '${context.task.metadata.type}')`,
+      "check_failed"
+    );
+  }
+
+  return null;
+}
+
+function checkMilestone(context, remoteData) {
+  if (!context.config.verify_milestone) {
+    return null;
+  }
+
+  if (!remoteData.issue?.milestone?.title) {
+    return failResult(
+      "github-sync",
+      `Issue #${context.issueNumber} has no milestone set`,
+      "check_failed"
+    );
+  }
+
+  if (context.prNumber && remoteData.prMilestone !== undefined && !remoteData.prMilestone?.title) {
+    return failResult(
+      "github-sync",
+      `PR #${context.prNumber} has no milestone set`,
+      "check_failed"
+    );
+  }
+
+  return null;
+}
+
 function findCommentByMarker(comments, marker) {
   return (comments || []).find((comment) => typeof comment.body === "string" && comment.body.includes(marker)) || null;
 }
@@ -945,6 +1073,24 @@ function extractLabelNames(labels) {
     .filter((label) => typeof label === "string" && label.length > 0);
 }
 
+function mapTaskTypeToIssueType(taskType) {
+  const mapping = {
+    bug: "Bug",
+    bugfix: "Bug",
+    enhancement: "Feature",
+    feature: "Feature",
+    task: "Task",
+    documentation: "Task",
+    "dependency-upgrade": "Task",
+    chore: "Task",
+    docs: "Task",
+    refactor: "Task",
+    refactoring: "Task"
+  };
+
+  return mapping[taskType] || "Task";
+}
+
 function arraysEqual(left, right) {
   if (left.length !== right.length) {
     return false;
@@ -992,6 +1138,28 @@ function resolveOwnerRepo(taskDir) {
 }
 
 function ghJson(args, cwd) {
+  const result = ghCommand(args, cwd);
+  if (!result.ok) {
+    return result;
+  }
+
+  try {
+    return { ok: true, value: JSON.parse(result.value || "null") };
+  } catch (error) {
+    return { ok: false, type: "network_error", message: `Invalid JSON from gh: ${error.message}` };
+  }
+}
+
+function ghText(args, cwd) {
+  const result = ghCommand(args, cwd);
+  if (!result.ok) {
+    return result;
+  }
+
+  return { ok: true, value: String(result.value || "").trim() };
+}
+
+function ghCommand(args, cwd) {
   const result = spawnSync("gh", args, {
     cwd,
     encoding: "utf8",
@@ -1004,11 +1172,7 @@ function ghJson(args, cwd) {
     return { ok: false, type: classified.type, message: classified.message };
   }
 
-  try {
-    return { ok: true, value: JSON.parse(result.stdout || "null") };
-  } catch (error) {
-    return { ok: false, type: "network_error", message: `Invalid JSON from gh: ${error.message}` };
-  }
+  return { ok: true, value: result.stdout };
 }
 
 function ghPaginatedJson(args, cwd) {

package/templates/.agents/skills/analyze-task/config/verify.json

@@ -35,7 +35,9 @@
       "expected_status_label": "status: pending-design-work",
       "expected_comment_marker": "<!-- sync-issue:{task-id}:{artifact-stem} -->",
       "verify_comment_content": true,
-      "verify_task_comment_content": true
+      "verify_task_comment_content": true,
+      "verify_issue_type": true,
+      "verify_milestone": true
     }
   }
 }