@fitlab-ai/agent-infra 0.9.0 → 0.9.2

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

@@ -35,12 +35,14 @@ git rev-parse v<prev-version>
 
 ### 3. 参考历史发布说明格式与分类
 
-获取最近多条已发布的 Release Note 作为格式参考，并参考预定义的完整分类清单：
+读取一次 typed 发布说明上下文，并参考预定义的完整分类清单：
 
 执行前先读取 `.agents/rules/release-commands.md`。
 
 ```bash
-# Part A：按 `.agents/rules/release-commands.md` 的 release 查询命令逐条获取最近 3 条 Release 的 body
+agent-infra-internal platform-release-notes context \
+  --from-tag "v<prev-version>" --to-tag "v<version>" \
+  --branch "<base-branch>" --history-limit 3
 ```
 
 **Part B：完整分类清单**
@@ -58,38 +60,11 @@ git rev-parse v<prev-version>
 
 ### 4. 收集已合并的 PR 与贡献者
 
-获取标签之间的日期范围，然后查询已合并的 PR：
-
-```bash
-# 获取标签日期
-git log v<prev-version> --format=%aI -1
-git log v<version> --format=%aI -1
-
-# 获取范围内已合并的 PR（按 `.agents/rules/release-commands.md` 的 merged PR 查询命令执行）
-```
-
-同时收集没有 PR 的直接提交：
-```bash
-git log v<prev-version>..v<version> --format="%H %s" --no-merges
-```
-
-从 commit `Co-authored-by` trailer 中收集协作贡献者：
-
-```bash
-git log v<prev-version>..v<version> \
-  --no-merges \
-  --format='%(trailers:key=Co-authored-by,valueonly,unfold)' \
-  | grep -v '^$' | sort | uniq -c | sort -rn
-```
-
-输出每行一个 `Name <email>`（`uniq -c` 给出该身份在范围内作为 co-author 的 commit 数）。
+使用步骤 3 返回的 `pullRequests` 与 `commits`。每个 commit 的 `authors` 已按平台事实规范化并包含 git author 与 co-author；技能不读取平台原始字段或邮箱规则。
 
 ### 5. 收集关联 Issue
 
-从每个 PR body 中提取关联的 Issue：
-- 匹配模式：`Closes #N`、`Fixes #N`、`Resolves #N`（不区分大小写）
-
-按 `.agents/rules/release-commands.md` 的关联 Issue 查询命令读取。
+使用步骤 3 中每个 PR 的 `closingIssues`，不在通用技能中解析平台专有引用语法。
 
 ### 6. 分类变更
 
@@ -131,13 +106,12 @@ git log v<prev-version>..v<version> \
 4. **贡献者搜集**：
    - **数据源**：
      - PR author：来自 `.agents/rules/release-commands.md` 中已合并 PR 查询规则
-     - Commit co-authors：来自步骤 4 的 `git log ... --format='%(trailers:key=Co-authored-by,valueonly,unfold)'`
-     - Issue reporters：来自步骤 5 收集的关联 Issue author（由 `.agents/rules/release-commands.md` 返回）
+     - Commit co-authors：来自步骤 3 typed context 的 commit `authors`
+     - Issue reporters：来自步骤 3 typed context 的 `closingIssues[].author`
    - **贡献数定义**：`该人的 PR 数 + 该人作为 co-author 的 commit 数`（同一身份跨来源合并计数）
    - **Name → `@login` 映射**：
-     - `Co-authored-by` 原始格式为 `Name <email>`，需要推断对应的 platform `@login`
-     - 优先从 email 提取：匹配 `.agents/rules/release-commands.md` 中的平台 no-reply 邮箱规则时，按该规则推导小写 login
-     - 否则按 Name 启发式：取首个空格前的 token 并转为小写（例如 `Claude Opus 4.6 (1M context)` → `@claude`、`Codex` → `@codex`、`Gemini` → `@gemini`）
+     - `resolution` 为 `platform-user` 或 `platform-noreply` 时直接采用小写 `login`
+     - 仅当 `resolution` 为 `unresolved` 时按 Name 启发式：取首个空格前的 token 并转为小写
      - 已出现在 PR author 列表中的 login，必须按该 login 合并计数，避免把 `Claude` 和 `@claude` 拆成两个条目
      - 同一 login 的所有 Name 变体都必须归并后再计数与排序；例如 `Claude` 与 `Claude Opus 4.6 (1M context)` 都映射到 `@claude` 时，应先合并为同一个贡献者
      - Bot 身份保留原样（如 `dependabot[bot]`）
@@ -170,7 +144,12 @@ NOTES_FILE="$(mktemp "${TMPDIR:-/tmp}/agent-infra-release-notes.XXXXXX")"
 
 把 notes 内容写入 `$NOTES_FILE`。
 
-9.2 按 `.agents/rules/release-commands.md` 的「发布 Release notes」命令执行（命令中的 `{notes-file}` 用 `$NOTES_FILE`；写入已由 release 工作流自动创建/发布的 Release，不存在时兜底创建）。
+9.2 调用 typed publish intent（命令中的 `{notes-file}` 用 `$NOTES_FILE`）；它会更新已存在的 Release，不存在时创建：
+
+```bash
+agent-infra-internal platform-release-notes publish \
+  --tag "v<version>" --title "v<version>" --notes-file "$NOTES_FILE"
+```
 
 9.3 无论发布成功或失败，都删除临时文件：
 

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

@@ -53,6 +53,8 @@ Extract from the natural-language description:
   - `<slug>` is a kebab-case slug built from 3-6 English keywords extracted from the task title
 - **Detailed description**: the cleaned-up original user request
 
+Before this step, read `reference/context-capture.md`. Classify the information already present in the current request and necessary prior discussion by source and state, ready to write under task.md `## Task Input`; leave missing categories empty and do not infer or analyze them.
+
 If the description is unclear, **ask the user to clarify first**.
 
 **Type inference**: choose the best matching type from the following candidates based on the semantics of the task description:
@@ -78,6 +80,7 @@ date +%Y%m%d-%H%M%S
 
 - Create the task directory: `.agents/workspace/active/TASK-{yyyyMMdd-HHmmss}/`
 - Use the `.agents/templates/task.md` template to create the task file: `task.md`
+- Write the structured context captured in step 1 under `## Task Input` so the task remains understandable outside the original conversation
 
 **Important**:
 - Directory naming: `TASK-{yyyyMMdd-HHmmss}` (**must** include the `TASK-` prefix)
@@ -165,9 +168,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}`.
 
 Scenario A: when an Issue was created, output:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}`.
+
 ```
 Task created and Issue creation cascaded successfully.
 
@@ -182,12 +187,12 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-ref}
-  - Gemini CLI: /{{project}}:analyze-task {task-ref}
-  - Codex CLI: $analyze-task {task-ref}
+{next-step-commands}
 ```
 
 Scenario B: when no Issue was created, output:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}`.
+
 ```
 Task created.
 
@@ -201,12 +206,12 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-ref}
-  - Gemini CLI: /{{project}}:analyze-task {task-ref}
-  - Codex CLI: $analyze-task {task-ref}
+{next-step-commands}
 ```
 
 Scenario C: when Issue creation failed, output:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}`.
+
 ```
 Task created, but cascade Issue creation failed.
 
@@ -225,9 +230,7 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-ref}
-  - Gemini CLI: /{{project}}:analyze-task {task-ref}
-  - Codex CLI: $analyze-task {task-ref}
+{next-step-commands}
 
 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.
 
@@ -240,12 +243,13 @@ For later platform sync: after fixing auth / network / template issues, manually
 ## Completion Checklist
 
 - [ ] Created the task file `.agents/workspace/active/{task-id}/task.md`
+- [ ] Wrote and checked `## Task Input` source and state semantics according to `reference/context-capture.md`
 - [ ] Updated `current_step` to requirement-analysis in task.md
 - [ ] Updated `updated_at` to the current time in task.md
 - [ ] Updated `assigned_to` in task.md
 - [ ] Appended an Activity Log entry to task.md
 - [ ] Tried cascading Issue creation through `.agents/rules/create-issue.md`; if it failed, kept task.md and recorded the reason
-- [ ] 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 or configuration files**
 
 ## STOP

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

@@ -52,6 +52,8 @@ description: >
   - `<slug>` 从任务标题提取 3-6 个英文关键词并转为 kebab-case
 - **详细描述**：整理后的用户原始描述
 
+执行本步骤前，先读取 `reference/context-capture.md`。把当前请求及必要前序讨论中已有的信息按来源与状态分类，准备写入 task.md 的 `## 任务输入`；缺失类别保持为空，不执行推导或分析。
+
 如果描述不清晰，**先向用户确认**再继续。
 
 **类型推断**：根据任务描述的语义，从以下候选值中选择最匹配的类型：
@@ -77,6 +79,7 @@ date +%Y%m%d-%H%M%S
 
 - 创建任务目录：`.agents/workspace/active/TASK-{yyyyMMdd-HHmmss}/`
 - 使用 `.agents/templates/task.md` 模板创建任务文件：`task.md`
+- 将步骤 1 捕获的结构化上下文写入 `## 任务输入`，确保任务文件脱离原会话后仍可理解
 
 **重要**：
 - 目录命名：`TASK-{yyyyMMdd-HHmmss}`（**必须**包含 `TASK-` 前缀）
@@ -164,9 +167,11 @@ agent-infra-internal task-verify {task-id} create-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}`。
 
 场景 A：已创建 Issue 时输出：
+使用 `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务已创建，并已级联创建 Issue。
 
@@ -181,12 +186,12 @@ agent-infra-internal task-verify {task-id} create-task.completed --format text
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-ref}
-  - Gemini CLI：/{{project}}:analyze-task {task-ref}
-  - Codex CLI：$analyze-task {task-ref}
+{next-step-commands}
 ```
 
 场景 B：未创建 Issue 时输出：
+使用 `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务已创建。
 
@@ -200,12 +205,12 @@ agent-infra-internal task-verify {task-id} create-task.completed --format text
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-ref}
-  - Gemini CLI：/{{project}}:analyze-task {task-ref}
-  - Codex CLI：$analyze-task {task-ref}
+{next-step-commands}
 ```
 
 场景 C：Issue 创建失败时输出：
+使用 `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务已创建，但 Issue 级联创建失败。
 
@@ -224,9 +229,7 @@ Issue 创建失败：
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-ref}
-  - Gemini CLI：/{{project}}:analyze-task {task-ref}
-  - Codex CLI：$analyze-task {task-ref}
+{next-step-commands}
 
 后续如需平台同步：修复认证/网络/模板问题后，可按 `.agents/rules/create-issue.md` 对当前任务手动执行一次 Issue 创建；或手动创建/查找 Issue，并把 `issue_number` 写入 task.md，后续技能会接管级联同步。
 
@@ -239,12 +242,13 @@ Issue 创建失败：
 ## 完成检查清单
 
 - [ ] 创建了任务文件 `.agents/workspace/active/{task-id}/task.md`
+- [ ] 已按 `reference/context-capture.md` 写入并复核 `## 任务输入` 的来源与状态语义
 - [ ] 更新了 task.md 中的 `current_step` 为 requirement-analysis
 - [ ] 更新了 task.md 中的 `updated_at` 为当前时间
 - [ ] 更新了 task.md 中的 `assigned_to`
 - [ ] 追加了 Activity Log 条目到 task.md
 - [ ] 已按 `.agents/rules/create-issue.md` 尝试级联创建 Issue；失败时保留 task.md 并记录原因
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 - [ ] **没有修改任何业务代码或配置文件**
 
 ## 停止

package/templates/.agents/skills/create-task/reference/context-capture.en.md

@@ -0,0 +1,29 @@
+# Context Capture Protocol
+
+## Scope
+
+Capture only the current natural-language request and the necessary prior discussion that is visible in the current context and directly relevant to the task. Do not read outside the available context, preserve a full transcript, perform requirements analysis, analyze code impact, or design a solution.
+
+## Classification
+
+Faithfully condense existing information into task.md under `## Task Input`:
+
+- `### Sources`: identify the current user request, an earlier user statement, user confirmation, or an agent suggestion.
+- `### Confirmed Facts and Evidence`: include only user-provided or verified facts, reproduction steps, errors, and observations.
+- `### Constraints`: preserve explicit user limits, security boundaries, and compatibility requirements.
+- `### Confirmed Decisions`: include only directions explicitly confirmed by the user; never promote an agent suggestion to an approved decision.
+- `### Candidate and Rejected Options`: label each item as a candidate, agent suggestion, tentative assumption, or rejected option and preserve its source.
+- `### Acceptance Criteria`: retain user-provided observable inputs, actions, and expected results.
+- `### Open Questions`: retain unanswered questions and choices that still require a decision.
+
+Leave missing categories empty rather than inferring content. Deduplicate repeated information without losing its source or state.
+
+## Safety and Compression
+
+- Exclude secrets, tokens, credentials, and unrelated personal information.
+- Write a self-contained summary instead of copying the full transcript.
+- Preserve commands, error text, paths, or identifiers only when necessary for reproduction or acceptance.
+
+## Completion Check
+
+A reader with only the generated task.md must be able to distinguish confirmed information, candidates or assumptions, rejected content, and open questions, and understand the task goal and existing acceptance criteria.

package/templates/.agents/skills/create-task/reference/context-capture.zh-CN.md

@@ -0,0 +1,29 @@
+# 上下文捕获协议
+
+## 范围
+
+只捕获当前自然语言请求及当前上下文中可见、与任务直接相关的必要前序讨论。不读取上下文之外的信息，不保存完整聊天记录，也不执行需求分析、代码影响分析或技术设计。
+
+## 分类
+
+将已有信息忠实压缩并写入 task.md 的 `## 任务输入`：
+
+- `### 来源`：注明用户当次请求、用户前序陈述、用户确认或 Agent 建议等来源。
+- `### 已确认事实与证据`：只写用户提供或已核实的事实、复现步骤、错误和观察结果。
+- `### 约束`：保留用户明确限制、安全边界和兼容要求。
+- `### 已确认决策`：只写用户明确确认的方向；不得把 Agent 建议升级为已批准决策。
+- `### 候选与否决方案`：注明每项是候选、Agent 建议、暂定假设或已否决方案，并保留来源。
+- `### 验收标准`：保存用户已给出的可观察输入、动作和预期结果。
+- `### 未决事项`：保存尚未回答的问题或仍需裁定的选择。
+
+缺失类别保持为空，不推导补齐。相同信息去重，但不得丢失来源或状态语义。
+
+## 安全与压缩
+
+- 排除密钥、Token、凭据和与任务无关的个人信息。
+- 使用自足摘要，不逐字复制完整 transcript。
+- 保留命令、错误文本、路径或标识符时，只保留复现和验收所必需的部分。
+
+## 完成检查
+
+仅阅读生成的 task.md 时，应能区分已确认内容、候选或假设、否决内容和未决事项，并能理解任务目标与已有验收标准。

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

@@ -97,7 +97,9 @@ 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}`.
+
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}`.
 
 ```
 Code Scanning alert #{alert-number} imported.
@@ -111,9 +113,7 @@ Task information:
 - Task ID: {task-id} (short id {task-ref})
 
 Next step:
-  - Claude Code / OpenCode: /analyze-task {task-ref}
-  - Gemini CLI: /{{project}}:analyze-task {task-ref}
-  - Codex CLI: $analyze-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -125,7 +125,7 @@ Next step:
 - [ ] Updated `current_step` to requirement-analysis in task.md
 - [ ] Updated `updated_at` to the current time in task.md
 - [ ] Appended an Activity Log entry to task.md
-- [ ] 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
 
 ## Error Handling
 

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

@@ -97,7 +97,9 @@ agent-infra-internal task-verify {task-id} import-codescan.completed --format te
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 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 analyze-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
 
 ```
 Code Scanning 告警 #{alert-number} 已导入。
@@ -111,9 +113,7 @@ Code Scanning 告警 #{alert-number} 已导入。
 - 任务 ID：{task-id}（短号 {task-ref}）
 
 下一步：
-  - Claude Code / OpenCode：/analyze-task {task-ref}
-  - Gemini CLI：/{{project}}:analyze-task {task-ref}
-  - Codex CLI：$analyze-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -125,7 +125,7 @@ Code Scanning 告警 #{alert-number} 已导入。
 - [ ] 更新了 task.md 中的 `current_step` 为 requirement-analysis
 - [ ] 更新了 task.md 中的 `updated_at` 为当前时间
 - [ ] 追加了 Activity Log 条目到 task.md
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 
 ## 错误处理
 

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

@@ -100,7 +100,9 @@ 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}`.
+
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}`.
 
 ```
 Security alert #{alert-number} imported.
@@ -117,9 +119,7 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step:
-  - Claude Code / OpenCode: /analyze-task {task-ref}
-  - Gemini CLI: /{{project}}:analyze-task {task-ref}
-  - Codex CLI: $analyze-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -131,7 +131,7 @@ Next step:
 - [ ] Updated `current_step` to requirement-analysis in task.md
 - [ ] Updated `updated_at` to the current time in task.md
 - [ ] Appended an Activity Log entry to task.md
-- [ ] 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
 
 ## Error Handling
 

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

@@ -100,7 +100,9 @@ agent-infra-internal task-verify {task-id} import-dependabot.completed --format
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 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 analyze-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
 
 ```
 安全告警 #{alert-number} 已导入。
@@ -117,9 +119,7 @@ agent-infra-internal task-verify {task-id} import-dependabot.completed --format
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步：
-  - Claude Code / OpenCode：/analyze-task {task-ref}
-  - Gemini CLI：/{{project}}:analyze-task {task-ref}
-  - Codex CLI：$analyze-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -131,7 +131,7 @@ agent-infra-internal task-verify {task-id} import-dependabot.completed --format
 - [ ] 更新了 task.md 中的 `current_step` 为 requirement-analysis
 - [ ] 更新了 task.md 中的 `updated_at` 为当前时间
 - [ ] 追加了 Activity Log 条目到 task.md
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 
 ## 错误处理
 

package/templates/.agents/skills/import-issue/SKILL.en.md

@@ -176,7 +176,9 @@ 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}`.
+
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}`.
 
 ```
 Issue #{number} imported.
@@ -190,9 +192,7 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-ref}
-  - Gemini CLI: /{{project}}:analyze-task {task-ref}
-  - Codex CLI: $analyze-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -205,7 +205,7 @@ Next step - run requirements analysis:
 - [ ] Updated `updated_at` to the current time
 - [ ] Appended an Activity Log entry to task.md
 - [ ] Synced the task comment to the Issue, with remote content matching local task.md
-- [ ] 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/import-issue/SKILL.zh-CN.md

@@ -176,7 +176,9 @@ agent-infra-internal task-verify {task-id} import-issue.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}`。
+
+使用 `agent-infra-internal agent-client next-steps --skill analyze-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
 
 ```
 Issue #{number} 已导入。
@@ -190,9 +192,7 @@ Issue #{number} 已导入。
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-ref}
-  - Gemini CLI：/{{project}}:analyze-task {task-ref}
-  - Codex CLI：$analyze-task {task-ref}
+{next-step-commands}
 ```
 
 
@@ -205,7 +205,7 @@ Issue #{number} 已导入。
 - [ ] 更新了 `updated_at` 为当前时间
 - [ ] 追加了 Activity Log 条目到 task.md
 - [ ] 同步了 task 评论到 Issue，且远端内容与本地 task.md 一致
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 - [ ] **没有修改任何业务代码**
 
 ## 停止

package/templates/.agents/skills/init-labels/SKILL.en.md

@@ -87,15 +87,15 @@ Operational notes:
 
 ### 6. 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 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}`.
 
 After summarizing the label initialization, show:
 
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill init-milestones`.
+
 ```
 Next step - initialize milestones (optional):
-  - Claude Code / OpenCode: /init-milestones
-  - Gemini CLI: /{{project}}:init-milestones
-  - Codex CLI: $init-milestones
+{next-step-commands}
 ```
 
 ## Error Handling

package/templates/.agents/skills/init-labels/SKILL.zh-CN.md

@@ -87,15 +87,15 @@ bash .agents/skills/init-labels/scripts/init-labels.sh
 
 ### 6. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 输出 labels 初始化摘要后，提示：
 
+使用 `agent-infra-internal agent-client next-steps --skill init-milestones` 生成本场景的 `{next-step-commands}`。
+
 ```
 下一步 - 初始化 Milestones（可选）：
-  - Claude Code / OpenCode：/init-milestones
-  - Gemini CLI：/{{project}}:init-milestones
-  - Codex CLI：$init-milestones
+{next-step-commands}
 ```
 
 ## 错误处理

package/templates/.agents/skills/init-milestones/SKILL.en.md

@@ -65,15 +65,15 @@ Operational notes:
 
 ### 5. 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 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}`.
 
 After summarizing the milestone initialization, show:
 
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill init-labels`.
+
 ```
 Next step - initialize labels (optional):
-  - Claude Code / OpenCode: /init-labels
-  - Gemini CLI: /{{project}}:init-labels
-  - Codex CLI: $init-labels
+{next-step-commands}
 ```
 
 ## Error Handling

package/templates/.agents/skills/init-milestones/SKILL.zh-CN.md

@@ -65,15 +65,15 @@ bash .agents/skills/init-milestones/scripts/init-milestones.sh "$ARGUMENTS"
 
 ### 5. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 输出 milestones 初始化摘要后，提示：
 
+使用 `agent-infra-internal agent-client next-steps --skill init-labels` 生成本场景的 `{next-step-commands}`。
+
 ```
 下一步 - 初始化 Labels（可选）：
-  - Claude Code / OpenCode：/init-labels
-  - Gemini CLI：/{{project}}:init-labels
-  - Codex CLI：$init-labels
+{next-step-commands}
 ```
 
 ## 错误处理