@fitlab-ai/agent-infra 0.7.1 → 0.7.2

package/templates/.agents/skills/code-task/reference/fix-mode.en.md

@@ -4,6 +4,11 @@ Read this file before changing code during fix mode.
 
 ## Plan the Fixes
 
+**Verify each finding first (mandatory before editing)**: for every finding in `{review-artifact}`, Read/Grep the cited `file:line` and the corresponding `git diff` to confirm the issue is real:
+- Holds → include it in the classification and fixes below
+- Unfounded / based on a wrong `file:line` / hallucinated → do not change code; give a counter-argument in the report's `## Per-Finding Verification` section and record it under unresolved issues
+- Do not expand fixes to issues the review did not list
+
 Classify and prioritize work:
 1. **Blockers first**
 2. **Then major issues**
@@ -18,7 +23,7 @@ Detailed priority rules:
 - Blockers must all be fixed before anything else
 - Major issues should all be fixed in the same pass unless a blocker prevents progress
 - Minor issues are optional only after Blockers and Majors are resolved
-- If you disagree with a finding, record that disagreement under unresolved issues instead of silently skipping it
+- If you disagree with a finding, or judge it hallucinated after verification, do not silently skip it; give a counter-argument in the report's `## Per-Finding Verification` section and record it under unresolved issues
 
 ### Meta-category: env-blocked
 
@@ -66,9 +71,9 @@ Fix status:
 
 Next step - re-review or commit:
 - Re-review (always recommended):
-  - Claude Code / OpenCode: /review-code {task-id}
-  - Gemini CLI: /agent-infra:review-code {task-id}
-  - Codex CLI: $review-code {task-id}
+  - Claude Code / OpenCode: /review-code {task-ref}
+  - Gemini CLI: /agent-infra:review-code {task-ref}
+  - Codex CLI: $review-code {task-ref}
 - Commit directly (optional; only when all issues are resolved and changes are low risk):
   - Claude Code / OpenCode: /commit
   - Gemini CLI: /agent-infra:commit
@@ -79,7 +84,7 @@ Next step - re-review or commit:
 
 1. **Prerequisite**: a code review artifact must exist (`review-code.md` or `review-code-r{N}.md`)
 2. **No auto-commit**: do not run `git commit`
-3. **Scope discipline**: only fix reviewed issues
+3. **Scope discipline**: verify each reviewed issue one by one — fix it if it holds, rebut it if it does not; do not expand to issues the review did not list
 4. **Disagreement handling**: record any disagreement in the report
 5. **Re-review**: always recommend `review-code` as the default next step after fix mode
 6. **Consistency**: the latest review artifact, Activity Log entry, and code report must reference the same round

package/templates/.agents/skills/code-task/reference/fix-mode.zh-CN.md

@@ -4,6 +4,11 @@
 
 ## 规划修复
 
+**先逐条核实（动手前必做）**：对 `{review-artifact}` 的每一条发现，先 Read/Grep 其引用的 `file:line` 与对应 `git diff`，确认问题真实存在：
+- 成立 → 纳入下方分类与修复
+- 不成立 / 基于错误 `file:line` / 幻觉 → 不改代码，在报告 `## 对审查发现的逐条核实` 给出反证，并记入 unresolved issues
+- 不擅自把修复扩大到审查未列出的问题
+
 按以下顺序分类并确定优先级：
 1. **先处理 Blocker**
 2. **再处理 Major**
@@ -18,7 +23,7 @@
 - 所有 Blocker 都必须最先修完
 - 只要没有被 Blocker 阻塞，所有 Major 都应在同一轮一并修复
 - 只有在 Blocker 和 Major 都解决后，Minor 才是可选项
-- 如果你不同意某条审查意见，不要静默跳过，而是把分歧记录到 unresolved issues
+- 如果你不同意某条审查意见，或核实后判定为幻觉，不要静默跳过，而是在报告 `## 对审查发现的逐条核实` 给出反证并记录到 unresolved issues
 
 ### 元类目：env-blocked
 
@@ -66,9 +71,9 @@ env-blocked 项不在修复范围。处理规则：
 
 下一步 - 重新审查或提交：
 - 重新审查（始终推荐）：
-  - Claude Code / OpenCode：/review-code {task-id}
-  - Gemini CLI：/agent-infra:review-code {task-id}
-  - Codex CLI：$review-code {task-id}
+  - Claude Code / OpenCode：/review-code {task-ref}
+  - Gemini CLI：/agent-infra:review-code {task-ref}
+  - Codex CLI：$review-code {task-ref}
 - 直接提交（可选；仅在所有问题已解决且风险可控时）：
   - Claude Code / OpenCode：/commit
   - Gemini CLI：/agent-infra:commit
@@ -79,7 +84,7 @@ env-blocked 项不在修复范围。处理规则：
 
 1. **前置条件**：必须存在代码审查产物（`review-code.md` 或 `review-code-r{N}.md`）
 2. **禁止自动提交**：不要执行 `git commit`
-3. **范围约束**：只修复审查中列出的问题
+3. **范围约束**：逐条核实审查列出的问题，成立则修复、不成立则反驳；不扩大到审查未列出的问题
 4. **分歧处理**：如果不同意审查意见，要在报告里明确记录
 5. **重新审查**：修复后始终推荐执行 `review-code`
 6. **一致性**：最新审查产物、Activity Log 记录和修复报告必须引用同一轮次

package/templates/.agents/skills/code-task/reference/output-template.en.md

@@ -14,7 +14,7 @@ Output files:
 - Code report: .agents/workspace/active/{task-id}/{code-artifact}
 
 Next step - code review:
-  - Claude Code / OpenCode: /review-code {task-id}
-  - Gemini CLI: /{{project}}:review-code {task-id}
-  - Codex CLI: $review-code {task-id}
+  - Claude Code / OpenCode: /review-code {task-ref}
+  - Gemini CLI: /{{project}}:review-code {task-ref}
+  - Codex CLI: $review-code {task-ref}
 ```

package/templates/.agents/skills/code-task/reference/output-template.zh-CN.md

@@ -14,7 +14,7 @@
 - 实现报告：.agents/workspace/active/{task-id}/{code-artifact}
 
 下一步 - 代码审查：
-  - Claude Code / OpenCode：/review-code {task-id}
-  - Gemini CLI：/agent-infra:review-code {task-id}
-  - Codex CLI：$review-code {task-id}
+  - Claude Code / OpenCode：/review-code {task-ref}
+  - Gemini CLI：/agent-infra:review-code {task-ref}
+  - Codex CLI：$review-code {task-ref}
 ```

package/templates/.agents/skills/code-task/reference/report-template.en.md

@@ -62,6 +62,14 @@ $ {command}
 
 {describe any deviation from the approved plan}
 
+## Per-Finding Verification
+
+> Fix mode only; for an initial implementation write "(initial implementation this round, no review findings)". Read/Grep-verify each finding of the previous `review-code` before acting on it.
+
+| Finding | Reproduced? | Disposition (fix / rebut) |
+|------|----------|----------------------|
+| {finding} | {yes/no, with file:line or command} | {fix note, or counter-argument + recorded under unresolved} |
+
 ## Items for Review
 
 **Focus areas for reviewers**:

package/templates/.agents/skills/code-task/reference/report-template.zh-CN.md

@@ -62,6 +62,14 @@ $ {command}
 
 {describe any deviation from the approved plan}
 
+## 对审查发现的逐条核实
+
+> 仅修复模式填写；初次实现写「（本轮为初次实现，无审查发现）」。对上一轮 `review-code` 的每条发现先 Read/Grep 核实再处置。
+
+| 发现 | 是否复现 | 处置（修复 / 反驳） |
+|------|----------|----------------------|
+| {finding} | {是/否，附 file:line 或命令} | {修复说明，或反证 + 记入 unresolved} |
+
 ## 供审查关注的内容
 
 **建议审查者重点关注**:

package/templates/.agents/skills/commit/SKILL.en.md

@@ -19,7 +19,7 @@ When updating related `task.md` frontmatter, read `.agents/rules/version-stamp.m
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## 1. Check Local Modifications (CRITICAL)
 
@@ -58,7 +58,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 > The full four-case status matrix, prerequisite checks, and multi-TUI next-step commands live in `reference/task-status-update.md`. Read `reference/task-status-update.md` before updating task state.
 
-> **IMPORTANT**: When showing the next step, output every TUI command format in full and directly use the standard template from `reference/task-status-update.md`. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: When showing the next step, output every TUI command format in full and directly use the standard template from `reference/task-status-update.md`. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 Append the Commit Activity Log entry and choose exactly one next-step case:
 - final commit -> `complete-task {task-id}`

package/templates/.agents/skills/commit/SKILL.zh-CN.md

@@ -19,7 +19,7 @@ description: "提交当前变更到 Git"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 1. 检查本地修改（关键）
 
@@ -58,7 +58,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 > 完整的 4 种状态分支、前置条件检查和多 TUI 下一步命令见 `reference/task-status-update.md`。更新任务状态前，先读取 `reference/task-status-update.md`。
 
-> **重要**：向用户展示下一步时，必须完整输出所有 TUI 命令格式，并直接使用 `reference/task-status-update.md` 中对应场景的标准模板。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：向用户展示下一步时，必须完整输出所有 TUI 命令格式，并直接使用 `reference/task-status-update.md` 中对应场景的标准模板。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 追加 Commit 的 Activity Log，并且只能选择一个下一步分支：
 - 最终提交 -> `complete-task {task-id}`

package/templates/.agents/skills/commit/reference/task-status-update.en.md

@@ -50,9 +50,9 @@ Required next-step commands:
 
 ```text
 Next step - complete and archive the task:
-  - Claude Code / OpenCode: /complete-task {task-id}
-  - Gemini CLI: /agent-infra:complete-task {task-id}
-  - Codex CLI: $complete-task {task-id}
+  - Claude Code / OpenCode: /complete-task {task-ref}
+  - Gemini CLI: /agent-infra:complete-task {task-ref}
+  - Codex CLI: $complete-task {task-ref}
 ```
 
 ### Case 2: More Work Remains
@@ -75,9 +75,9 @@ Required next-step commands:
 
 ```text
 Next step - code review:
-  - Claude Code / OpenCode: /review-code {task-id}
-  - Gemini CLI: /agent-infra:review-code {task-id}
-  - Codex CLI: $review-code {task-id}
+  - Claude Code / OpenCode: /review-code {task-ref}
+  - Gemini CLI: /agent-infra:review-code {task-ref}
+  - Codex CLI: $review-code {task-ref}
 ```
 
 ### Case 4: Ready for PR
@@ -91,9 +91,9 @@ Required next-step commands:
 
 ```text
 Next step - create Pull Request:
-  - Claude Code / OpenCode: /create-pr {task-id}
-  - Gemini CLI: /agent-infra:create-pr {task-id}
-  - Codex CLI: $create-pr {task-id}
+  - Claude Code / OpenCode: /create-pr {task-ref}
+  - Gemini CLI: /agent-infra:create-pr {task-ref}
+  - Codex CLI: $create-pr {task-ref}
 ```
 
 > Note: beyond the four cases, if `task.md` contains a valid `pr_number`, the commit skill must sync the PR summary via `reference/pr-summary-sync.md` before entering the verification gate.

package/templates/.agents/skills/commit/reference/task-status-update.zh-CN.md

@@ -50,9 +50,9 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ```text
 下一步 - 完成并归档任务：
-  - Claude Code / OpenCode: /complete-task {task-id}
-  - Gemini CLI: /agent-infra:complete-task {task-id}
-  - Codex CLI: $complete-task {task-id}
+  - Claude Code / OpenCode: /complete-task {task-ref}
+  - Gemini CLI: /agent-infra:complete-task {task-ref}
+  - Codex CLI: $complete-task {task-ref}
 ```
 
 ### 场景 2：还有后续工作
@@ -75,9 +75,9 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ```text
 下一步 - 代码审查：
-  - Claude Code / OpenCode: /review-code {task-id}
-  - Gemini CLI: /agent-infra:review-code {task-id}
-  - Codex CLI: $review-code {task-id}
+  - Claude Code / OpenCode: /review-code {task-ref}
+  - Gemini CLI: /agent-infra:review-code {task-ref}
+  - Codex CLI: $review-code {task-ref}
 ```
 
 ### 场景 4：准备创建 PR
@@ -91,9 +91,9 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ```text
 下一步 - 创建 Pull Request：
-  - Claude Code / OpenCode: /create-pr {task-id}
-  - Gemini CLI: /agent-infra:create-pr {task-id}
-  - Codex CLI: $create-pr {task-id}
+  - Claude Code / OpenCode: /create-pr {task-ref}
+  - Gemini CLI: /agent-infra:create-pr {task-ref}
+  - Codex CLI: $create-pr {task-ref}
 ```
 
 > 注意：四个场景之外，只要 `task.md` 中存在有效 `pr_number`，commit 技能必须先按 `reference/pr-summary-sync.md` 同步 PR 摘要，再进入完成校验。

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

@@ -28,7 +28,7 @@ Before the state check is complete, do not make external-state assertions such a
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -89,7 +89,7 @@ Update `.agents/workspace/active/{task-id}/task.md`:
 - Verify and check off all items in `## Completion Checklist` (change `- [ ]` to `- [x]`)
 - **Append** to `## Activity Log` (do NOT overwrite previous entries):
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Completed** by {agent} — Task moved to completed/
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Complete Task** by {agent} — Task moved to completed/
   ```
 
 ### 4. Move Task
@@ -146,6 +146,8 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
+> The completion timestamp line (the last line of the whole output) uses `date "+%Y-%m-%d %H:%M:%S"` (local timezone, no offset) and always sits at the very end of the output for at-a-glance scanning across windows. This skill renders no "Next steps" commands but still prints the line.
+
 Output format:
 ```
 Task {task-id} completed; task directory moved to completed/.
@@ -157,6 +159,8 @@ Task info:
 
 Deliverables:
 - {List of key outputs: files modified, tests added, etc.}
+
+Completed at: {completion-time}
 ```
 
 

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

@@ -28,7 +28,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证任务存在
@@ -88,7 +88,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - 逐项验证并勾选 `## 完成检查清单` 中的所有条目（将 `- [ ]` 改为 `- [x]`）
 - **追加**到 `## Activity Log`（不要覆盖之前的记录）：
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Completed** by {agent} — Task moved to completed/
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Complete Task** by {agent} — Task moved to completed/
   ```
 
 ### 4. 转移任务
@@ -145,6 +145,8 @@ node .agents/scripts/validate-artifact.js gate complete-task .agents/workspace/c
 
 > 仅在校验通过后执行本步骤。
 
+> 完成时间收尾行（整段输出的最后一行）取值 `date "+%Y-%m-%d %H:%M:%S"`（本地时区、不带偏移），固定放在输出的绝对末尾，便于多窗口扫视。本 skill 不渲染「下一步」命令，但仍统一打印该收尾行。
+
 输出格式：
 ```
 任务 {task-id} 已完成，任务目录已转移到 completed/。
@@ -156,6 +158,8 @@ node .agents/scripts/validate-artifact.js gate complete-task .agents/workspace/c
 
 交付物：
 - {关键产出列表：修改的文件、添加的测试等}
+
+Completed at: {completion-time}
 ```
 
 

package/templates/.agents/skills/complete-task/config/verify.en.json

@@ -18,7 +18,7 @@
       "require_completed_at": true
     },
     "activity-log": {
-      "expected_action_pattern": "Completed",
+      "expected_action_pattern": "(Complete Task|Completed)",
       "freshness_minutes": 30
     },
     "completion-checklist": {

package/templates/.agents/skills/complete-task/config/verify.zh-CN.json

@@ -18,7 +18,7 @@
       "require_completed_at": true
     },
     "activity-log": {
-      "expected_action_pattern": "Completed",
+      "expected_action_pattern": "(Complete Task|Completed)",
       "freshness_minutes": 30
     },
     "completion-checklist": {

package/templates/.agents/skills/create-pr/SKILL.en.md

@@ -13,7 +13,7 @@ Version stamp rule: when creating or updating `task.md` frontmatter, read `.agen
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Execution Flow
 
@@ -28,9 +28,9 @@ Branch on the result:
 ```
 This project does not enable the PR flow (`.agents/.airc.json` sets `requiresPullRequest: false`).
 No Pull Request is required; run instead:
-  - Claude Code / OpenCode: /complete-task {task-id}
-  - Gemini CLI: /agent-infra:complete-task {task-id}
-  - Codex CLI: $complete-task {task-id}
+  - Claude Code / OpenCode: /complete-task {task-ref}
+  - Gemini CLI: /agent-infra:complete-task {task-ref}
+  - Codex CLI: $complete-task {task-ref}
 ```
 
 ### 1. Parse Command Arguments
@@ -96,7 +96,7 @@ Get the current time:
 date "+%Y-%m-%d %H:%M:%S%:z"
 ```
 
-If `{task-id}` is available, update task.md with `pr_number`, `updated_at`, `agent_infra_version`, and append the PR Created Activity Log entry including metadata-sync and summary results.
+If `{task-id}` is available, update task.md with `pr_number`, `updated_at`, `agent_infra_version`, and append the Create PR Activity Log entry including metadata-sync and summary results.
 
 ### 9. Verification Gate
 
@@ -117,7 +117,7 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 Explain the created PR URL, summarize metadata sync and summary-comment results, and recommend `complete-task {task-id}` once the workflow is truly done.
 

package/templates/.agents/skills/create-pr/SKILL.zh-CN.md

@@ -13,7 +13,7 @@ description: "创建 Pull Request 到目标分支"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行流程
 
@@ -28,9 +28,9 @@ description: "创建 Pull Request 到目标分支"
 ```
 当前项目未启用 PR 流程（`.agents/.airc.json` 中 `requiresPullRequest: false`）。
 无需创建 Pull Request，请直接运行：
-  - Claude Code / OpenCode：/complete-task {task-id}
-  - Gemini CLI：/agent-infra:complete-task {task-id}
-  - Codex CLI：$complete-task {task-id}
+  - Claude Code / OpenCode：/complete-task {task-ref}
+  - Gemini CLI：/agent-infra:complete-task {task-ref}
+  - Codex CLI：$complete-task {task-ref}
 ```
 
 ### 1. 解析命令参数
@@ -96,7 +96,7 @@ description: "创建 Pull Request 到目标分支"
 date "+%Y-%m-%d %H:%M:%S%:z"
 ```
 
-如果获取到了 `{task-id}`，更新 task.md 的 `pr_number`、`updated_at`、`agent_infra_version`，并追加 PR Created 的 Activity Log，记录元数据同步和摘要发布结果。
+如果获取到了 `{task-id}`，更新 task.md 的 `pr_number`、`updated_at`、`agent_infra_version`，并追加 Create PR 的 Activity Log，记录元数据同步和摘要发布结果。
 
 ### 9. 完成校验
 
@@ -117,7 +117,7 @@ node .agents/scripts/validate-artifact.js gate create-pr .agents/workspace/activ
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 说明 PR URL、元数据同步结果、摘要评论结果，并在工作流真正完成后推荐执行 `complete-task {task-id}`。
 

package/templates/.agents/skills/create-pr/config/verify.json

@@ -15,7 +15,7 @@
       ]
     },
     "activity-log": {
-      "expected_action_pattern": "PR Created",
+      "expected_action_pattern": "(Create PR|PR Created)",
       "freshness_minutes": 30
     },
     "platform-sync": {
@@ -26,6 +26,7 @@
       "verify_pr_assignee": true,
       "verify_issue_fields": true,
       "verify_milestone": true,
+      "verify_milestone_specific": true,
       "expected_pr_comment_marker_key": "prSummary"
     }
   }

package/templates/.agents/skills/create-pr/reference/comment-publish.en.md

@@ -12,4 +12,4 @@ Read this file before creating or updating the single reviewer-facing PR summary
 
 ## Result Reporting
 
-Reuse the normalized result string from `.agents/rules/pr-sync.md` in this skill's user output or `PR Created` Activity Log.
+Reuse the normalized result string from `.agents/rules/pr-sync.md` in this skill's user output or `Create PR` Activity Log.

package/templates/.agents/skills/create-pr/reference/comment-publish.zh-CN.md

@@ -12,4 +12,4 @@
 
 ## 结果回传
 
-将 `.agents/rules/pr-sync.md` 中的结果回传字符串用于当前 skill 的用户输出或 `PR Created` Activity Log 复用。
+将 `.agents/rules/pr-sync.md` 中的结果回传字符串用于当前 skill 的用户输出或 `Create PR` Activity Log 复用。

package/templates/.agents/skills/create-pr/reference/pr-body-template.en.md

@@ -69,7 +69,7 @@ Final user output should include this follow-up path:
 ```text
 Next steps:
   - complete the task after the workflow truly finishes:
-    - Claude Code / OpenCode: /complete-task {task-id}
-    - Gemini CLI: /agent-infra:complete-task {task-id}
-    - Codex CLI: $complete-task {task-id}
+    - Claude Code / OpenCode: /complete-task {task-ref}
+    - Gemini CLI: /agent-infra:complete-task {task-ref}
+    - Codex CLI: $complete-task {task-ref}
 ```

package/templates/.agents/skills/create-pr/reference/pr-body-template.zh-CN.md

@@ -69,7 +69,7 @@ Milestone 规则：
 ```text
 Next steps:
   - complete the task after the workflow truly finishes:
-    - Claude Code / OpenCode: /complete-task {task-id}
-    - Gemini CLI: /agent-infra:complete-task {task-id}
-    - Codex CLI: $complete-task {task-id}
+    - Claude Code / OpenCode: /complete-task {task-ref}
+    - Gemini CLI: /agent-infra:complete-task {task-ref}
+    - Codex CLI: $complete-task {task-ref}
 ```

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

@@ -24,7 +24,7 @@ Version stamp rule: when creating or updating `task.md` frontmatter, read `.agen
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -109,12 +109,12 @@ Update `.agents/workspace/active/{task-id}/task.md`:
 - `## Context` -> `- **Branch**:`: update it to the generated branch name
 - **Append** to `## Activity Log` (do NOT overwrite previous entries):
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Task Created** by {agent} — Task created from description
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Create Task** by {agent} — Task created from description
   ```
 
 ### 4. Cascade Issue Creation via `.agents/rules/create-issue.md`
 
-After task.md is written and `Task Created` is recorded, read `.agents/rules/create-issue.md` first and follow the steps it describes to create an Issue.
+After task.md is written and `Create Task` is recorded, read `.agents/rules/create-issue.md` first and follow the steps it describes to create an Issue.
 
 The rule's content is determined by the configured code platform:
 - A platform that supports Issue creation: contains the full flow for auth detection, template detection, label/type/milestone inference, the create-Issue call, and writing back to `task.md`
@@ -130,7 +130,7 @@ Handle the result:
 
 ### 5. Verification Gate
 
-**Allocate short id first** (writes `short_id` back to task.md and the registry entry; the validation gate will read it):
+**Allocate short id first** (ensures the registry entry is allocated; the validation gate will read it):
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -155,14 +155,14 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 Scenario A: when an Issue was created, output:
 ```
 Task created and Issue creation cascaded successfully.
 
 Task information:
-- Task ID: {task-id}
+- Task ID: {task-id} (short id {task-ref})
 - Title: {title}
 - Type: {type}
 - Workflow: {workflow}
@@ -172,9 +172,9 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /{{project}}:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /{{project}}:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 ```
 
 Scenario B: when no Issue was created, output:
@@ -182,7 +182,7 @@ Scenario B: when no Issue was created, output:
 Task created.
 
 Task information:
-- Task ID: {task-id}
+- Task ID: {task-id} (short id {task-ref})
 - Title: {title}
 - Type: {type}
 - Workflow: {workflow}
@@ -191,9 +191,9 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /{{project}}:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /{{project}}:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 ```
 
 Scenario C: when Issue creation failed, output:
@@ -201,7 +201,7 @@ Scenario C: when Issue creation failed, output:
 Task created, but cascade Issue creation failed.
 
 Task information:
-- Task ID: {task-id}
+- Task ID: {task-id} (short id {task-ref})
 - Title: {title}
 - Type: {type}
 - Workflow: {workflow}
@@ -215,9 +215,9 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /{{project}}:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /{{project}}:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 
 For later platform sync: after fixing auth / network / template issues, manually run the Issue creation flow in `.agents/rules/create-issue.md` for this task; or manually create/find an Issue and write `issue_number` into task.md so later skills can take over cascade sync.
 ```