@fitlab-ai/agent-infra 0.9.0 → 0.9.2

package/templates/.agents/rules/testing-discipline.zh-CN.md

@@ -41,6 +41,24 @@ assert.match(content, /^name: code-task$/m);         // 正向断言已足够
 
 ## 项目级测试策略
 
-仓库特定的命令、目录约定、覆盖率阈值、CI 集成和报告服务应记录在项目自己的测试文档中。新增测试前先读取该策略，并按测试的可观察范围与运行成本选择对应层级。
+请为本仓库填写以下各项，记录选定行为及其边界，以便贡献者一致地选择并验证测试。
 
-如果项目没有定义分层测试套件，RED 与 GREEN 验证都使用项目的完整测试命令。不要在无关改动中自行引入测试层级或覆盖率门禁。
+### 1. 测试命令
+
+> TODO: 记录完整测试命令，以及开发期间使用的可选快速命令。
+
+### 2. 测试目录或层级
+
+> TODO: 记录测试目录或层级，以及选择对应目录或层级的规则。
+
+### 3. 覆盖率
+
+> TODO: 记录覆盖率采集方式、阈值，以及覆盖率是否阻塞变更。
+
+### 4. 持续集成
+
+> TODO: 记录运行测试的 CI 检查，以及哪些检查属于阻塞项或信息项。
+
+### 5. 报告服务
+
+> TODO: 记录外部报告服务、徽章或构件，以及它们是否影响验收。

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

@@ -11,7 +11,7 @@ description: >
 ## Boundary / Critical Rules
 
 - This skill only outputs a requirements analysis document (`analysis.md` or `analysis-r{N}.md`) and does not modify any business code
-- Base the analysis strictly on the existing requirements, context, and source information in `task.md`
+- Base the analysis strictly on the existing task input, requirements, context, and source information in `task.md`
 - After executing this skill, you **must** immediately update task status in task.md
 
 Version stamp rule: when creating or updating `task.md` frontmatter, read `.agents/rules/version-stamp.md` first and write or refresh `agent_infra_version`.
@@ -56,6 +56,7 @@ Run `agent-infra-internal task-artifact {task-id} inspect --family analysis`. Co
 ### 3. Read Task Context
 
 Read `task.md` carefully to understand:
+- sources, facts and evidence, constraints, decision states, acceptance criteria, and open questions captured under `## Task Input` (fall back compatibly when the section is absent)
 - task title, description, and requirement list
 - context information (Issue, PR, branch, alert numbers, etc.)
 - currently known affected files and constraints
@@ -89,6 +90,8 @@ Runs after Step 0 state check and Step 3 (questioning is an external-state actio
 - no answer carried → restate `pending_question` and take Scenario B early-exit below (do not increase `question_count`).
 
 **4.3 Sufficiency judgment** (objective checklist; any gap hit means insufficient):
+- first aggregate `## Task Input`, description, context, requirements, and remote sources; an analysis-owned `## Requirements` section being unpopulated is not by itself insufficient;
+- goals, scope, constraints, or acceptance criteria already recorded in task input count as provided and must not be asked again;
 - description/requirements empty, or a single sentence with no verifiable acceptance criteria;
 - missing goal or impact scope (unclear what to change / who is affected);
 - requirement items contradict each other, or key terms are undefined and block analysis.
@@ -227,9 +230,11 @@ 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). Before rendering the final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
+> Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 Output format:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill review-analysis --task-ref {task-ref}`.
+
 ```
 Analysis complete for task {task-id}.
 
@@ -242,9 +247,7 @@ Output file:
 - Analysis report: .agents/workspace/active/{task-id}/{analysis-artifact}
 
 Next step - review the analysis:
-  - Claude Code / OpenCode: /review-analysis {task-ref}
-  - Gemini CLI: /{{project}}:review-analysis {task-ref}
-  - Codex CLI: $review-analysis {task-ref}
+{next-step-commands}
 ```
 
 ## Completion Checklist
@@ -256,7 +259,7 @@ Next step - review the analysis:
 - [ ] Updated `assigned_to` in task.md
 - [ ] Appended an Activity Log entry to task.md
 - [ ] Marked requirement-analysis as complete in workflow progress
-- [ ] Informed the user of the next step (must include all TUI command formats, including any custom TUIs; do not filter)
+- [ ] Rendered the selected next-step commands through the shared helper
 - [ ] **Did not modify any business code**
 
 ## STOP

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

@@ -11,7 +11,7 @@ description: >
 ## 行为边界 / 关键规则
 
 - 本技能仅产出需求分析文档（`analysis.md` 或 `analysis-r{N}.md`）—— 不修改任何业务代码
-- 严格基于 `task.md` 中已有的需求、上下文和来源信息展开分析
+- 严格基于 `task.md` 中已有的任务输入、需求、上下文和来源信息展开分析
 - 执行本技能后，你**必须**立即更新 task.md 中的任务状态
 
 版本戳规则：创建或更新 `task.md` frontmatter 时，先读取 `.agents/rules/version-stamp.md`，并写入或刷新 `agent_infra_version`。
@@ -59,6 +59,7 @@ agent-infra-internal task-event {task-id} analyze.started --agent {agent}
 ### 3. 阅读任务上下文
 
 仔细阅读 `task.md` 以理解：
+- `## 任务输入` 中已捕获的来源、事实与证据、约束、决策状态、验收标准和未决事项（栏目不存在时兼容回退）
 - 任务标题、描述和需求列表
 - 上下文信息（Issue、PR、分支、告警编号等）
 - 当前已知的受影响文件和约束
@@ -92,6 +93,8 @@ agent-infra-internal task-event {task-id} analyze.started --agent {agent}
 - 未携带答案 → 复述 `pending_question`，按下文场景 B 提问早退（不增加 `question_count`）。
 
 **4.3 充分性判定**（客观清单，命中任一缺口即判为不足）：
+- 先聚合 `## 任务输入`、描述、上下文、需求及远端来源；分析阶段尚未填写 `## 需求` 本身不构成不足；
+- 已在任务输入中记录的目标、范围、约束或验收标准视为已提供，不得重复询问；
 - 描述/需求为空，或仅一句话且无可验证的验收标准；
 - 缺少目标或受影响范围（不知道要改什么 / 影响谁）；
 - 需求条目自相矛盾，或关键名词未定义而无法分析。
@@ -226,9 +229,11 @@ agent-infra-internal task-verify {task-id} analyze.completed --artifact {analysi
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 输出格式：
+使用 `agent-infra-internal agent-client next-steps --skill review-analysis --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务 {task-id} 分析完成。
 
@@ -241,9 +246,7 @@ agent-infra-internal task-verify {task-id} analyze.completed --artifact {analysi
 - 分析报告：.agents/workspace/active/{task-id}/{analysis-artifact}
 
 下一步 - 审查需求分析：
-  - Claude Code / OpenCode：/review-analysis {task-ref}
-  - Gemini CLI：/{{project}}:review-analysis {task-ref}
-  - Codex CLI：$review-analysis {task-ref}
+{next-step-commands}
 ```
 
 ## 完成检查清单
@@ -255,7 +258,7 @@ agent-infra-internal task-verify {task-id} analyze.completed --artifact {analysi
 - [ ] 更新了 task.md 中的 `assigned_to`
 - [ ] 追加了 Activity Log 条目到 task.md
 - [ ] 在工作流进度中标记了 requirement-analysis 为已完成
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 - [ ] **没有修改任何业务代码**
 
 ## 停止

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

@@ -95,11 +95,13 @@ 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). Before rendering the final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
+> Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 > **Optional sandbox-cleanup hint (gated)**: Render the "Optional: clean up this task's sandbox" block — placed after "Archived to" and before "To unblock" in the output below — only when BOTH (1) `.agents/.airc.json` has a `sandbox` field and (2) task.md's `branch` field exists and is not `main` / `master`; otherwise omit the whole block. `{branch}` is the `branch` value from the task.md you already loaded (the task has moved to blocked/, so read it from `.agents/workspace/blocked/{task-id}/task.md`). This block is independent of "Next step" semantics.
 
 Output format:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill check-task --task-ref {task-ref}`.
+
 ```
 Task {task-id} marked as blocked.
 
@@ -116,9 +118,7 @@ To unblock when the issue is resolved:
   agent-infra-internal task-lifecycle {task-id} activate --agent {agent} --note "{activation note}"
 
 Next step - check task status after unblocking:
-  - Claude Code / OpenCode: /check-task {task-ref}
-  - Gemini CLI: /{{project}}:check-task {task-ref}
-  - Codex CLI: $check-task {task-ref}
+{next-step-commands}
 ```
 
 

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

@@ -96,11 +96,13 @@ agent-infra-internal task-verify {task-id} block-task.completed --format text
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 > **可选沙箱清理提示（门控渲染）**：仅当同时满足 (1) `.agents/.airc.json` 存在 `sandbox` 字段、(2) task.md 的 `branch` 字段存在且不是 `main` / `master` 时，才渲染下方输出中「归档路径」之后、「解除阻塞时执行」之前的「可选：清理本任务的沙箱」块；任一不满足则整段省略。`{branch}` 取已读入的 task.md 的 `branch` 值（任务此时已移动到 blocked/，从 `.agents/workspace/blocked/{task-id}/task.md` 读取）。该块独立于「下一步」语义。
 
 输出格式：
+使用 `agent-infra-internal agent-client next-steps --skill check-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务 {task-id} 已标记为阻塞。
 
@@ -117,9 +119,7 @@ ai sandbox rm {branch}
   agent-infra-internal task-lifecycle {task-id} activate --agent {agent} --note "{恢复说明}"
 
 下一步 - 检查任务状态（解除阻塞后）：
-  - Claude Code / OpenCode：/check-task {task-ref}
-  - Gemini CLI：/{{project}}:check-task {task-ref}
-  - Codex CLI：$check-task {task-ref}
+{next-step-commands}
 ```
 
 

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

@@ -102,11 +102,13 @@ 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). Before rendering the final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
+> Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 > **Optional sandbox-cleanup hint (gated)**: Render the "Optional: clean up this task's sandbox" block — placed after "Target path" and before "Next step" in the output below — only when BOTH (1) `.agents/.airc.json` has a `sandbox` field and (2) task.md's `branch` field exists and is not `main` / `master`; otherwise omit the whole block. `{branch}` is the `branch` value from the task.md you already loaded (the task has moved to completed/, so read it from `.agents/workspace/completed/{task-id}/task.md`). This block is independent of "Next steps" semantics.
 
 Output format:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill check-task --task-ref {task-ref}`.
+
 ```
 Task {task-id} cancelled; task directory moved to completed/.
 
@@ -120,9 +122,7 @@ Optional: clean up this task's sandbox
 ai sandbox rm {branch}
 
 Next step - inspect the moved task:
-  - Claude Code / OpenCode: /check-task {task-ref}
-  - Gemini CLI: /{{project}}:check-task {task-ref}
-  - Codex CLI: $check-task {task-ref}
+{next-step-commands}
 ```
 
 

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

@@ -101,11 +101,13 @@ agent-infra-internal task-verify {task-id} cancel-task.completed --format text
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 > **可选沙箱清理提示（门控渲染）**：仅当同时满足 (1) `.agents/.airc.json` 存在 `sandbox` 字段、(2) task.md 的 `branch` 字段存在且不是 `main` / `master` 时，才渲染下方输出中「目标路径」之后、「下一步」之前的「可选：清理本任务的沙箱」块；任一不满足则整段省略。`{branch}` 取已读入的 task.md 的 `branch` 值（任务此时已移动到 completed/，从 `.agents/workspace/completed/{task-id}/task.md` 读取）。该块独立于「下一步」语义。
 
 输出格式：
+使用 `agent-infra-internal agent-client next-steps --skill check-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务 {task-id} 已取消，任务目录已转移到 completed/。
 
@@ -119,9 +121,7 @@ agent-infra-internal task-verify {task-id} cancel-task.completed --format text
 ai sandbox rm {branch}
 
 下一步 - 查看已转移任务：
-  - Claude Code / OpenCode：/check-task {task-ref}
-  - Gemini CLI：/{{project}}:check-task {task-ref}
-  - Codex CLI：$check-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -132,7 +132,7 @@ ai sandbox rm {branch}
 - [ ] 已将任务目录移动到 `.agents/workspace/completed/`
 - [ ] 已在存在 Issue 时完成 Issue 同步
 - [ ] 已运行 gate 校验并通过
-- [ ] 已向用户展示完整的下一步命令（含自定义 TUI）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 
 ## 注意事项
 

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

@@ -59,7 +59,7 @@ Workflow progress:
 
 ### 3. Recommend Next Action
 
-Recommend the appropriate next skill based on the current workflow state. You must show command formats for all TUI columns in the table below, not just 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).
+Recommend the appropriate next skill based on the current workflow state.
 
 > **⚠️ CONDITION CHECK — you must choose the single matching row in the table below based on `status`, `current_step`, the latest artifacts, and the latest review result:**
 >
@@ -77,21 +77,21 @@ Recommend the appropriate next skill based on the current workflow state. You mu
 >
 > **Important: if the latest review report contains any issue at all, do not use the corresponding review-passed row. Use the corresponding has-issues row instead.**
 >
-> Before rendering the final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the table commands below as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
-
-| Current State              | Claude Code / OpenCode                              | Gemini CLI                               | Codex CLI                                           |
-|----------------------------|-----------------------------------------------------|------------------------------------------|-----------------------------------------------------|
-| Analysis Complete          | `/review-analysis {task-ref}`                        | `/{{project}}:review-analysis {task-ref}` | `$review-analysis {task-ref}`                        |
-| Analysis Review Passed     | `/plan-task {task-ref}`                              | `/{{project}}:plan-task {task-ref}`       | `$plan-task {task-ref}`                              |
-| Analysis Review Has Issues | `/analyze-task {task-ref}`                           | `/{{project}}:analyze-task {task-ref}`    | `$analyze-task {task-ref}`                           |
-| Plan Complete              | `/review-plan {task-ref}`                            | `/{{project}}:review-plan {task-ref}`     | `$review-plan {task-ref}`                            |
-| Plan Review Passed         | `/code-task {task-ref}`                              | `/{{project}}:code-task {task-ref}`       | `$code-task {task-ref}`                              |
-| Plan Review Has Issues     | `/plan-task {task-ref}`                              | `/{{project}}:plan-task {task-ref}`       | `$plan-task {task-ref}`                              |
-| Code Complete              | `/review-code {task-ref}`                            | `/{{project}}:review-code {task-ref}`     | `$review-code {task-ref}`                            |
-| Code Review Passed         | `/commit`                                           | `/{{project}}:commit`                    | `$commit`                                           |
-| Code Review Has Issues     | `/code-task {task-ref}`                              | `/{{project}}:code-task {task-ref}`       | `$code-task {task-ref}`                              |
-| Task Blocked               | Unblock the task or provide the missing information | —                                        | Unblock the task or provide the missing information |
-| Task Completed             | No action needed                                    | —                                        | No action needed                                    |
+> Before rendering the final output, read `.agents/rules/next-step-output.md`. After selecting an actionable row, invoke `agent-infra-internal agent-client next-steps --skill {next-skill} [--task-ref {task-ref}]` exactly once and render stdout verbatim as `{next-step-commands}`. Do not invoke the helper for `Task Blocked` or `Task Completed`. Append the `Completed at` trailing line last.
+
+| Current State              | next skill        | task ref |
+|----------------------------|-------------------|----------|
+| Analysis Complete          | `review-analysis` | required |
+| Analysis Review Passed     | `plan-task`       | required |
+| Analysis Review Has Issues | `analyze-task`    | required |
+| Plan Complete              | `review-plan`     | required |
+| Plan Review Passed         | `code-task`       | required |
+| Plan Review Has Issues     | `plan-task`       | required |
+| Code Complete              | `review-code`     | required |
+| Code Review Passed         | `commit`          | omitted  |
+| Code Review Has Issues     | `code-task`       | required |
+| Task Blocked               | —                 | —        |
+| Task Completed             | —                 | —        |
 
 ## Notes
 

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

@@ -59,7 +59,7 @@ ai task status {task-id}
 
 ### 3. 建议下一步操作
 
-根据当前工作流状态，建议合适的下一个技能。必须展示下表中所有 TUI 列的命令格式，不要只展示当前 AI 代理对应的列。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）：
+根据当前工作流状态，建议合适的下一个技能：
 
 > **⚠️ 条件判断 — 你必须先根据 `status`、`current_step`、最新产物和最新审查结果，选择下表中唯一匹配的一行：**
 >
@@ -77,21 +77,21 @@ ai task status {task-id}
 >
 > **特别注意：只要最新审查报告中存在任何问题，就不能使用对应「审查通过」行。必须改用对应「审查有问题」行。**
 >
-> 渲染最终输出前先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 下方表格中命令的 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
-
-| 当前状态           | Claude Code / OpenCode       | Gemini CLI                               | Codex CLI                    |
-|--------------------|------------------------------|------------------------------------------|------------------------------|
-| 分析完成           | `/review-analysis {task-ref}` | `/{{project}}:review-analysis {task-ref}` | `$review-analysis {task-ref}` |
-| 需求分析审查通过   | `/plan-task {task-ref}`       | `/{{project}}:plan-task {task-ref}`       | `$plan-task {task-ref}`       |
-| 需求分析审查有问题 | `/analyze-task {task-ref}`    | `/{{project}}:analyze-task {task-ref}`    | `$analyze-task {task-ref}`    |
-| 计划完成           | `/review-plan {task-ref}`     | `/{{project}}:review-plan {task-ref}`     | `$review-plan {task-ref}`     |
-| 技术方案审查通过   | `/code-task {task-ref}`       | `/{{project}}:code-task {task-ref}`       | `$code-task {task-ref}`       |
-| 技术方案审查有问题 | `/plan-task {task-ref}`       | `/{{project}}:plan-task {task-ref}`       | `$plan-task {task-ref}`       |
-| 实现完成           | `/review-code {task-ref}`     | `/{{project}}:review-code {task-ref}`     | `$review-code {task-ref}`     |
-| 代码审查通过       | `/commit`                    | `/{{project}}:commit`                    | `$commit`                    |
-| 代码审查有问题     | `/code-task {task-ref}`       | `/{{project}}:code-task {task-ref}`       | `$code-task {task-ref}`       |
-| 任务被阻塞         | 解除阻塞或提供所需信息       | —                                        | 解除阻塞或提供所需信息       |
-| 任务已完成         | 无需操作                     | —                                        | 无需操作                     |
+> 渲染最终输出前先读取 `.agents/rules/next-step-output.md`。选中可执行行后只调用一次 `agent-infra-internal agent-client next-steps --skill {next-skill} [--task-ref {task-ref}]`，将 stdout 原样输出为 `{next-step-commands}`；`任务被阻塞` 与 `任务已完成` 不调用 helper。最后追加 `Completed at` 收尾行。
+
+| 当前状态           | next skill        | task ref |
+|--------------------|-------------------|----------|
+| 分析完成           | `review-analysis` | required |
+| 需求分析审查通过   | `plan-task`       | required |
+| 需求分析审查有问题 | `analyze-task`    | required |
+| 计划完成           | `review-plan`     | required |
+| 技术方案审查通过   | `code-task`       | required |
+| 技术方案审查有问题 | `plan-task`       | required |
+| 实现完成           | `review-code`     | required |
+| 代码审查通过       | `commit`          | omitted  |
+| 代码审查有问题     | `code-task`       | required |
+| 任务被阻塞         | —                 | —        |
+| 任务已完成         | —                 | —        |
 
 ## 注意事项
 

package/templates/.agents/skills/close-codescan/SKILL.en.md

@@ -89,10 +89,12 @@ Only `status=applied|no-op` means local archival completed. If the API dismissal
 
 ### 8. Inform User
 
-> **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 final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
+> Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 > **Optional sandbox-cleanup hint (gated)**: Render the "Optional: clean up this task's sandbox" block — placed after the "Note:" line and before "Next step" in the output below — only when ALL of (1) `.agents/.airc.json` has a `sandbox` field, (2) step 7 located a related task by the alert number, and (3) that related task's task.md `branch` field exists and is not `main` / `master`; otherwise omit the whole block. `{branch}` is the `branch` value from the related task.md located in step 7. This block is independent of "Next step" semantics.
 
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}`.
+
 ```
 Code Scanning alert #{alert-number} dismissed.
 
@@ -111,9 +113,7 @@ Optional: clean up this task's sandbox
 ai sandbox rm {branch}
 
 Next step - complete and archive the task if a related task exists:
-  - Claude Code / OpenCode: /complete-task {task-ref}
-  - Gemini CLI: /{{project}}:complete-task {task-ref}
-  - Codex CLI: $complete-task {task-ref}
+{next-step-commands}
 ```
 
 ## Notes

package/templates/.agents/skills/close-codescan/SKILL.zh-CN.md

@@ -89,10 +89,12 @@ agent-infra-internal task-lifecycle {task-id} close-codescan --agent {agent} \
 
 ### 8. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 > **可选沙箱清理提示（门控渲染）**：仅当同时满足 (1) `.agents/.airc.json` 存在 `sandbox` 字段、(2) 第 7 步按告警号定位到了关联任务、(3) 该关联任务 task.md 的 `branch` 字段存在且不是 `main` / `master` 时，才渲染下方输出中「注意：…」之后、「下一步」之前的「可选：清理本任务的沙箱」块；任一不满足则整段省略。`{branch}` 取第 7 步定位到的关联任务 task.md 的 `branch` 值。该块独立于「下一步」语义。
 
+使用 `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 Code Scanning 告警 #{alert-number} 已关闭。
 
@@ -111,9 +113,7 @@ Code Scanning 告警 #{alert-number} 已关闭。
 ai sandbox rm {branch}
 
 下一步 - 完成并归档任务（如有关联任务）：
-  - Claude Code / OpenCode：/complete-task {task-ref}
-  - Gemini CLI：/{{project}}:complete-task {task-ref}
-  - Codex CLI：$complete-task {task-ref}
+{next-step-commands}
 ```
 
 ## 注意事项

package/templates/.agents/skills/close-dependabot/SKILL.en.md

@@ -97,10 +97,12 @@ Only `status=applied|no-op` means local archival completed. If the API dismissal
 
 ### 8. Inform User
 
-> **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 final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
+> Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 > **Optional sandbox-cleanup hint (gated)**: Render the "Optional: clean up this task's sandbox" block — placed after the "Note:" line and before "Next step" in the output below — only when ALL of (1) `.agents/.airc.json` has a `sandbox` field, (2) step 7 located a related task by the alert number, and (3) that related task's task.md `branch` field exists and is not `main` / `master`; otherwise omit the whole block. `{branch}` is the `branch` value from the related task.md located in step 7. This block is independent of "Next step" semantics.
 
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}`.
+
 ```
 Security alert #{alert-number} dismissed.
 
@@ -119,9 +121,7 @@ Optional: clean up this task's sandbox
 ai sandbox rm {branch}
 
 Next step - complete and archive the task if a related task exists:
-  - Claude Code / OpenCode: /complete-task {task-ref}
-  - Gemini CLI: /{{project}}:complete-task {task-ref}
-  - Codex CLI: $complete-task {task-ref}
+{next-step-commands}
 ```
 
 ## Notes

package/templates/.agents/skills/close-dependabot/SKILL.zh-CN.md

@@ -97,10 +97,12 @@ agent-infra-internal task-lifecycle {task-id} close-dependabot --agent {agent} \
 
 ### 8. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 > **可选沙箱清理提示（门控渲染）**：仅当同时满足 (1) `.agents/.airc.json` 存在 `sandbox` 字段、(2) 第 7 步按告警号定位到了关联任务、(3) 该关联任务 task.md 的 `branch` 字段存在且不是 `main` / `master` 时，才渲染下方输出中「注意：…」之后、「下一步」之前的「可选：清理本任务的沙箱」块；任一不满足则整段省略。`{branch}` 取第 7 步定位到的关联任务 task.md 的 `branch` 值。该块独立于「下一步」语义。
 
+使用 `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 安全告警 #{alert-number} 已关闭。
 
@@ -119,9 +121,7 @@ agent-infra-internal task-lifecycle {task-id} close-dependabot --agent {agent} \
 ai sandbox rm {branch}
 
 下一步 - 完成并归档任务（如有关联任务）：
-  - Claude Code / OpenCode：/complete-task {task-ref}
-  - Gemini CLI：/{{project}}:complete-task {task-ref}
-  - Codex CLI：$complete-task {task-ref}
+{next-step-commands}
 ```
 
 ## 注意事项

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

@@ -122,6 +122,6 @@ agent-infra-internal task-verify {task-id} code.completed --artifact {code-artif
 
 ### 12. Tell the User
 
-Use `reference/output-template.md` (or `reference/fix-mode.md` in fix mode) and show all TUI command formats.
+Use `reference/output-template.md` (or `reference/fix-mode.md` in fix mode) and render the selected next-step commands through the shared helper.
 
 > Before rendering the final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the current task's short id `NN` (see that file for lookup and fallback), while other `{task-id}` placeholders (report titles, paths) keep the full TASK-id form; (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).

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

@@ -178,7 +178,7 @@ agent-infra-internal task-verify {task-id} code.completed --artifact {code-artif
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。输出格式见 `reference/output-template.md`；修复模式输出见 `reference/fix-mode.md`。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，并按 `reference/output-template.md` 或 `reference/fix-mode.md` 的已选场景调用统一 helper。
 
 > 渲染最终输出前先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令的 `{task-ref}` 渲染为当前任务短号 `NN`（取值与回退见该文件），其他 `{task-id}` 占位（报告标题、路径）保持完整 TASK-id 形式；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
 
@@ -188,7 +188,7 @@ agent-infra-internal task-verify {task-id} code.completed --artifact {code-artif
 - [ ] 已创建 `{code-artifact}`
 - [ ] 所有必需测试通过
 - [ ] 已更新 task.md 并追加 Activity Log
-- [ ] 已向用户展示所有 TUI 格式的下一步命令（含自定义 TUI）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 
 ## 停止
 

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

@@ -51,13 +51,11 @@ Before writing the code report, run the project's **core subset** as final verif
 
 Decision rules:
 1. always recommend re-review as the default next step, regardless of the severity of fixed issues
-2. direct commit may be offered as an additional option only when all issues are resolved and changes are clearly low risk
-3. if any `Blocker` or `Major` remains unresolved, do not offer direct commit as an option
+2. direct commit may be selected only when all issues are resolved and the changes are clearly low risk
+3. do not select direct commit while any `Blocker` or `Major` remains unresolved
+4. render only the selected branch and invoke the helper exactly once
 
-Prohibition:
-- never present direct commit as the only next step — re-review must always be the primary recommendation
-
-Required output template:
+For the default branch, populate `{next-step-commands}` by running `agent-infra-internal agent-client next-steps --skill review-code --task-ref {task-ref}`:
 
 ```text
 Task {task-id} fix completed.
@@ -71,15 +69,15 @@ Fix status:
 - Review input: {review-artifact}
 - Code artifact: {code-artifact}
 
-Next step - re-review or commit:
-- Re-review (always recommended):
-  - Claude Code / OpenCode: /review-code {task-ref}
-  - Gemini CLI: /{{project}}: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: /{{project}}:commit
-  - Codex CLI: $commit
+Next step - review again:
+{next-step-commands}
+```
+
+Only when the direct-commit branch satisfies the rules above and is selected, populate `{next-step-commands}` by running `agent-infra-internal agent-client next-steps --skill commit`, then replace the ending with:
+
+```text
+Next step - commit directly:
+{next-step-commands}
 ```
 
 ## Notes
@@ -88,5 +86,5 @@ Next step - re-review or commit:
 2. **No auto-commit**: do not run `git commit`
 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
+5. **Re-review**: 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

@@ -51,13 +51,11 @@ manual-validation 项不在修复范围。处理规则：
 
 判断规则：
 1. 始终将重新审查作为默认推荐的下一步，无论本轮修复了哪个级别的问题
-2. 直接提交仅可作为附加选项，且仅在所有问题均已解决且改动明显低风险时
-3. 如果仍有任何 `Blocker` 或 `Major` 未解决，不要提供直接提交选项
+2. 直接提交仅可作为已选分支，且仅在所有问题均已解决且改动明显低风险时
+3. 如果仍有任何 `Blocker` 或 `Major` 未解决，不要选择直接提交
+4. 只渲染已选分支，且只调用一次 helper
 
-禁止规则：
-- 绝对不要把直接提交写成唯一下一步——重新审查必须始终作为首要推荐
-
-必用输出模板：
+默认分支使用 `agent-infra-internal agent-client next-steps --skill review-code --task-ref {task-ref}` 生成 `{next-step-commands}`：
 
 ```text
 任务 {task-id} 修复完成。
@@ -71,15 +69,15 @@ manual-validation 项不在修复范围。处理规则：
 - 审查输入：{review-artifact}
 - 修复产物：{code-artifact}
 
-下一步 - 重新审查或提交：
-- 重新审查（始终推荐）：
-  - Claude Code / OpenCode：/review-code {task-ref}
-  - Gemini CLI：/{{project}}:review-code {task-ref}
-  - Codex CLI：$review-code {task-ref}
-- 直接提交（可选；仅在所有问题已解决且风险可控时）：
-  - Claude Code / OpenCode：/commit
-  - Gemini CLI：/{{project}}:commit
-  - Codex CLI：$commit
+下一步 - 重新审查：
+{next-step-commands}
+```
+
+仅当直接提交分支满足上述条件并被选中时，改用 `agent-infra-internal agent-client next-steps --skill commit` 生成 `{next-step-commands}`，并将末尾替换为：
+
+```text
+下一步 - 直接提交：
+{next-step-commands}
 ```
 
 ## 注意事项
@@ -88,5 +86,5 @@ manual-validation 项不在修复范围。处理规则：
 2. **禁止自动提交**：不要执行 `git commit`
 3. **范围约束**：逐条核实审查列出的问题，成立则修复、不成立则反驳；不扩大到审查未列出的问题
 4. **分歧处理**：如果不同意审查意见，要在报告里明确记录
-5. **重新审查**：修复后始终推荐执行 `review-code`
+5. **重新审查**：修复后默认推荐执行 `review-code`
 6. **一致性**：最新审查产物、Activity Log 记录和修复报告必须引用同一轮次