@fitlab-ai/agent-infra 0.9.1 → 0.9.3

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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # 创建 Pull Request
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
 
 创建 Pull Request，并在与任务关联时立即补齐核心元数据和 reviewer 摘要。
 
@@ -31,12 +33,12 @@ description: >
 - 缺省 / `"required"` → 继续到下方第 1 步
 - `"disabled"` → 输出以下消息后**立即停止**，不要执行任何后续编号步骤、不要触发任何 PR 创建命令、不要修改 `task.md` 的 `pr_number` / `pr_status`、不要发布 PR 摘要评论：
 
+使用 `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 当前项目未启用 PR 流程（`.agents/.airc.json` 中 `prFlow: "disabled"`）。
 无需创建 Pull Request，请直接运行：
-  - Claude Code / OpenCode：/complete-task {task-ref}
-  - Gemini CLI：/{{project}}:complete-task {task-ref}
-  - Codex CLI：$complete-task {task-ref}
+{next-step-commands}
 ```
 
 ### 1. 解析命令参数
@@ -72,7 +74,7 @@ description: >
 
 ### 6. 同步 PR 元数据
 
-调用 `agent-infra-internal platform-pr sync {task-id} --agent {agent} --metadata --closing-issue`。core 从 Issue 复制 type / `in:` labels、assignee 和具体 milestone，并维护 Development 关联；逐项权限不足返回 degraded，不反向更新 Issue。
+调用 `agent-infra-internal platform-pr sync {task-id} --agent {standard-agent-token} --metadata --closing-issue`。core 从 Issue 复制 type / `in:` labels、assignee 和具体 milestone，并维护 Development 关联；逐项权限不足返回 degraded，不反向更新 Issue。
 
 ### 7. 发布审查摘要
 
@@ -105,24 +107,24 @@ agent-infra-internal task-verify {task-id} create-pr.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}`。
 
 说明 PR URL、元数据同步结果、摘要评论结果，并推荐下一步进入 PR 监控（按 `.agents/rules/next-step-output.md` 把 `{task-ref}` 渲染为短号 `NN`）：
 
+使用 `agent-infra-internal agent-client next-steps --skill watch-pr --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 下一步 - 监控 PR 检查（required checks 全绿前自动自愈）：
-  - Claude Code / OpenCode：/watch-pr {task-ref}
-  - Gemini CLI：/{{project}}:watch-pr {task-ref}
-  - Codex CLI：$watch-pr {task-ref}
+{next-step-commands}
 ```
 
 或者，若想跳过主动监控并立即尝试完成，改用 `complete-task`；其 required-checks 硬门禁仍会对 pending/failed/head mismatch fail-closed：
 
+使用 `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 下一步（备选）- 跳过主动监控并尝试完成：
-  - Claude Code / OpenCode：/complete-task {task-ref}
-  - Gemini CLI：/{{project}}:complete-task {task-ref}
-  - Codex CLI：$complete-task {task-ref}
+{next-step-commands}
 ```
 
 `watch-pr` 为主路径；上面的 `complete-task` 备选块只跳过主动轮询，不跳过 required checks，也不保证立即归档。

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

@@ -6,7 +6,7 @@ Write the plain summary body to a temporary file, then run:
 
 ```bash
 agent-infra-internal platform-pr summary-sync {task-id} \
-  --agent {agent} --body-file {summary-body-file}
+  --agent {standard-agent-token} --body-file {summary-body-file}
 ```
 
 The caller does not add markers, HEAD metadata, or comment API parameters. A summary failure records the existing `create-pr` warning and does not roll back the PR.

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

@@ -6,7 +6,7 @@
 
 ```bash
 agent-infra-internal platform-pr summary-sync {task-id} \
-  --agent {agent} --body-file {summary-body-file}
+  --agent {standard-agent-token} --body-file {summary-body-file}
 ```
 
 调用方不添加 marker、HEAD 或评论 API 参数。摘要失败沿用 `create-pr` 错误处理并记录 warning，不回滚已创建 PR。结果映射沿用 `.agents/rules/pr-sync.md`。

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

@@ -66,10 +66,10 @@ Create the PR with the create-PR command template in `.agents/rules/issue-pr-com
 
 Final user output should include this follow-up path:
 
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}`.
+
 ```text
 Next steps:
   - complete the task after the workflow truly finishes:
-    - 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/create-pr/reference/pr-body-template.zh-CN.md

@@ -66,10 +66,10 @@ Milestone 规则：
 
 最终用户输出应包含以下后续路径：
 
+使用 `agent-infra-internal agent-client next-steps --skill complete-task --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```text
 Next steps:
   - complete the task after the workflow truly finishes:
-    - 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/create-release-note/SKILL.en.md

@@ -126,35 +126,36 @@ If no historical release notes exist, use the following default Markdown format:
      - Sort reporters by reported Issue count descending, then lexicographically by login for ties
 5. Empty sections: Omit sections with no entries
 
-### 8. Present and Confirm
+### 8. Stage, Present, and Confirm
 
-Show the generated release notes to the user.
-
-Ask:
-1. Need any adjustments?
-2. Write these notes onto the Release for this version?
-
-### 9. Publish the Release Notes (If Confirmed)
-
-9.1 Write the generated notes to a temp file **outside the working tree** so no uncommitted artifact is left behind in the repo (do not write into `.agents/workspace/` or any version-controlled directory):
+Write the candidate notes to a temporary file outside the working tree, then call typed stage to normalize the file and retain its structured `sha256`:
 
 ```bash
 NOTES_FILE="$(mktemp "${TMPDIR:-/tmp}/agent-infra-release-notes.XXXXXX")"
+agent-infra-internal platform-release-notes stage \
+  --notes-file "$NOTES_FILE"
 ```
 
-Write the notes content to `$NOTES_FILE`.
+Present the exact staged file and delete it before asking. Adjustments invalidate the digest. Only an unambiguous affirmative reply for this preview in the current session authorizes publishing; denial, questions, ambiguity, or interruption stop without publish.
+
+### 9. Recheck and Publish Release Notes
 
-9.2 Call the typed publish intent (use `$NOTES_FILE` for `{notes-file}`); it updates an existing Release or creates a missing one:
+After confirmation, write the confirmed normalized text to a new external temporary file and stage it again. Delete and return to preview if its digest differs. On a match, call:
 
 ```bash
 agent-infra-internal platform-release-notes publish \
-  --tag "v<version>" --title "v<version>" --notes-file "$NOTES_FILE"
+  --tag "v<version>" \
+  --title "v<version>" \
+  --notes-file "$NOTES_FILE" \
+  --expected-sha256 "{preview-sha256}"
 ```
 
-9.3 Remove the temp file whether publishing succeeds or fails:
+Delete the temporary file on every exit path. After success, render:
 
 ```bash
-rm -f "$NOTES_FILE"
+agent-infra-internal agent-client next-steps \
+  --skill post-release \
+  --version <version>
 ```
 
 Output:
@@ -174,7 +175,7 @@ The notes have been written to the Release. Edit further at the URL above if nee
 2. **Tags must exist**: Run the release skill first to create tags
 3. **Release auto-published**: the `v{version}` Release is created and published by the release workflow (the upload target for Homebrew bottles); this skill writes/refreshes the notes on that Release
 4. **Classification accuracy**: Auto-classification is based on title/scope/files; complex PRs may need manual adjustment
-5. **No leftover artifacts**: Always write notes to a temp file outside the working tree (`mktemp`) and delete it after publishing; never write into the repo directory
+5. **No leftover artifacts**: Delete preview files before asking and publish files on every exit path; interruption invalidates session-only notes and authorization
 
 ## Error Handling
 

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

@@ -126,35 +126,36 @@ agent-infra-internal platform-release-notes context \
      - Reporter 之间按报告的 Issue 数量降序排列，数量相同时按 login 字典序
 5. 空部分：省略没有条目的部分
 
-### 8. 展示并确认
+### 8. Stage、展示并确认
 
-向用户展示生成的发布说明。
-
-询问：
-1. 需要调整吗？
-2. 是否把 notes 写入该版本的 Release？
-
-### 9. 发布 Release notes（如确认）
-
-9.1 把生成的 notes 写入**工作树之外**的临时文件，避免在仓库残留未提交产物（不要写入 `.agents/workspace/` 或任何受版本控制的目录）：
+把候选 notes 写入工作树外临时文件，调用 typed stage 规范化并保存结构化 `sha256`：
 
 ```bash
 NOTES_FILE="$(mktemp "${TMPDIR:-/tmp}/agent-infra-release-notes.XXXXXX")"
+agent-infra-internal platform-release-notes stage \
+  --notes-file "$NOTES_FILE"
 ```
 
-把 notes 内容写入 `$NOTES_FILE`。
+只展示 stage 后同一文件的精确内容，在询问前删除文件。调整会使旧 digest 失效。只有当前会话中针对当前预览的无歧义明确肯定答复才授权发布；否定、疑问、歧义或中断均停止。
+
+### 9. 复核并发布 Release notes
 
-9.2 调用 typed publish intent（命令中的 `{notes-file}` 用 `$NOTES_FILE`）；它会更新已存在的 Release，不存在时创建：
+确认后把已确认文本写入新的工作树外临时文件并再次 stage。digest 不一致时删除并回到预览；一致时调用：
 
 ```bash
 agent-infra-internal platform-release-notes publish \
-  --tag "v<version>" --title "v<version>" --notes-file "$NOTES_FILE"
+  --tag "v<version>" \
+  --title "v<version>" \
+  --notes-file "$NOTES_FILE" \
+  --expected-sha256 "{preview-sha256}"
 ```
 
-9.3 无论发布成功或失败，都删除临时文件：
+所有退出路径删除临时文件。成功后渲染：
 
 ```bash
-rm -f "$NOTES_FILE"
+agent-infra-internal agent-client next-steps \
+  --skill post-release \
+  --version <version>
 ```
 
 输出：
@@ -174,7 +175,7 @@ Release notes 已更新。
 2. **标签必须存在**：先执行 release 技能创建标签
 3. **Release 已自动发布**：`v{version}` 的 Release 由 release 工作流自动创建并发布（给 Homebrew bottle 提供上传落点）；本技能往该 Release 写入/刷新 notes
 4. **分类准确性**：自动分类基于标题/scope/文件；复杂的 PR 可能需要手动调整
-5. **不留残留产物**：notes 一律写入工作树之外的临时文件（`mktemp`）并在发布后删除，禁止写入仓库目录
+5. **不留残留产物**：预览文件在询问前删除，发布文件在所有退出路径删除；会话中断时授权和草稿失效
 
 ## 错误处理
 

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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # Create Task
+> `--agent` values follow the "Collaborator Token Specification" in `.agents/rules/task-management.md`: standard AI short tokens (`claude`/`codex`/`antigravity`/`opencode`/`cursor`), long-name normalization (`claude-code`->`claude`, `antigravity-cli`->`antigravity`), or the `human` manual exception.
+
 
 ## Boundary / Critical Rules
 
@@ -131,12 +133,12 @@ Update `.agents/workspace/active/{task-id}/task.md`:
 After task.md is written, call the declarative intents; the internal core owns templates, body rendering, identity validation, capability degradation, idempotency, and task binding:
 
 ```bash
-agent-infra-internal platform-issue create {task-id} --agent {agent}
-agent-infra-internal platform-issue sync {task-id} --agent {agent} --status waiting-for-triage --assignees current --milestone initial --issue-type --fields
+agent-infra-internal platform-issue create {task-id} --agent {standard-agent-token}
+agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --status waiting-for-triage --assignees current --milestone initial --issue-type --fields
 ```
 
 Handle the result:
-- Intent created the Issue: `issue_number` was written through the task writer; run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
+- Intent created the Issue: `issue_number` was written through the task writer; run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`
 - Rule failed (auth / network / template parse / etc.): do not roll back task.md or append an extra Activity Log entry; run `agent-infra-internal task-warning {task-id} add --step create-task --severity ACTION_REQUIRED --code ISSUE_CREATE_FAILED --target issue --message "{error_code}: {error_message}" --action "Fix auth/network/template issues and manually retry Issue creation, or create/find an Issue and write issue_number"` to submit a structured warning intent (callers do not allocate ids or edit rows), then follow Scenario C
 - Intent returned no-op/degraded: continue applicable operations without blocking the workflow
 - task.md already has a valid `issue_number`: create validates the binding and returns no-op without creating a duplicate
@@ -168,9 +170,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.
 
@@ -185,12 +189,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.
 
@@ -204,12 +208,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.
 
@@ -228,9 +232,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.
 
@@ -249,7 +251,7 @@ For later platform sync: after fixing auth / network / template issues, manually
 - [ ] 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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # 创建任务
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
 
 ## 行为边界 / 关键规则
 
@@ -130,12 +132,12 @@ date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 在 task.md 落盘并记录 `Create Task` 后调用声明式 Issue intent；标题、正文、模板、身份校验、权限降级、幂等创建和 task.md 绑定均由 internal core 处理：
 
 ```bash
-agent-infra-internal platform-issue create {task-id} --agent {agent}
-agent-infra-internal platform-issue sync {task-id} --agent {agent} --status waiting-for-triage --assignees current --milestone initial --issue-type --fields
+agent-infra-internal platform-issue create {task-id} --agent {standard-agent-token}
+agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --status waiting-for-triage --assignees current --milestone initial --issue-type --fields
 ```
 
 处理结果：
-- intent 成功创建 Issue：`issue_number` 已由任务写入内核回写；调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
+- intent 成功创建 Issue：`issue_number` 已由任务写入内核回写；调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`
 - 规则失败（认证 / 网络 / 模板解析等）：不回滚 task.md；不追加额外 Activity Log；先调用 `agent-infra-internal task-warning {task-id} add --step create-task --severity ACTION_REQUIRED --code ISSUE_CREATE_FAILED --target issue --message "{error_code}: {error_message}" --action "修复认证/网络/模板问题后手动重试 Issue 创建，或手动创建/找到 Issue 后写入 issue_number"` 提交结构化 warning 意图（调用方不分配编号或写表格）；再按"场景 C：Issue 创建失败"输出
 - intent 为 no-op/degraded：按结构化 operations 继续可执行部分；自定义或空平台不创建评论且不阻塞工作流
 - task.md 已存在有效 `issue_number`：create intent 校验绑定后返回 no-op，不重复创建
@@ -167,9 +169,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。
 
@@ -184,12 +188,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}`。
+
 ```
 任务已创建。
 
@@ -203,12 +207,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 级联创建失败。
 
@@ -227,9 +231,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，后续技能会接管级联同步。
 
@@ -248,7 +250,7 @@ Issue 创建失败：
 - [ ] 更新了 task.md 中的 `assigned_to`
 - [ ] 追加了 Activity Log 条目到 task.md
 - [ ] 已按 `.agents/rules/create-issue.md` 尝试级联创建 Issue；失败时保留 task.md 并记录原因
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 - [ ] **没有修改任何业务代码或配置文件**
 
 ## 停止

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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # Import Issue
+> `--agent` values follow the "Collaborator Token Specification" in `.agents/rules/task-management.md`: standard AI short tokens (`claude`/`codex`/`antigravity`/`opencode`/`cursor`), long-name normalization (`claude-code`->`claude`, `antigravity-cli`->`antigravity`), or the `human` manual exception.
+
 
 Import the specified Issue and create a task. Argument: issue number.
 
@@ -145,9 +147,9 @@ Update `.agents/workspace/active/{task-id}/task.md`:
 ### 5. Bind and Sync the Issue
 
 If task.md contains a valid `issue_number`, perform these sync actions (skip and continue on any failure):
-- Run `agent-infra-internal platform-issue bind {task-id} --issue {issue-number} --agent {agent}`
-- Run `agent-infra-internal platform-issue sync {task-id} --agent {agent} --assignees current --milestone initial`
-- After every scenario, run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
+- Run `agent-infra-internal platform-issue bind {task-id} --issue {issue-number} --agent {standard-agent-token}`
+- Run `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --assignees current --milestone initial`
+- After every scenario, run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`
 
 ### 6. Verification Gate
 
@@ -176,7 +178,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 +194,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 +207,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