@fitlab-ai/agent-infra 0.9.1 → 0.9.3

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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # Dismiss Code Scanning Alert
+> `--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.
+
 
 Dismiss the specified Code Scanning (CodeQL) alert and record a justified reason.
 
@@ -81,7 +83,7 @@ Dismiss the alert by following the Code Scanning dismiss command in `.agents/rul
 If a related task exists (search for `codescan_alert_number: <alert-number>`):
 
 ```bash
-agent-infra-internal task-lifecycle {task-id} close-codescan --agent {agent} \
+agent-infra-internal task-lifecycle {task-id} close-codescan --agent {standard-agent-token} \
   --alert-number {alert-number} --reason "{reason}"
 ```
 
@@ -89,10 +91,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 +115,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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # 关闭 Code Scanning 告警
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
 
 关闭指定的 Code Scanning（CodeQL）告警并记录合理的关闭理由。
 
@@ -81,7 +83,7 @@ Code Scanning 告警 #{alert-number}
 如果有关联任务（搜索 `codescan_alert_number: <alert-number>`）：
 
 ```bash
-agent-infra-internal task-lifecycle {task-id} close-codescan --agent {agent} \
+agent-infra-internal task-lifecycle {task-id} close-codescan --agent {standard-agent-token} \
   --alert-number {alert-number} --reason "{reason}"
 ```
 
@@ -89,10 +91,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 +115,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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # Dismiss Dependabot Alert
+> `--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.
+
 
 Dismiss the specified Dependabot security alert and record a justified reason.
 
@@ -89,7 +91,7 @@ Dismiss the alert by following the Dependabot dismiss command in `.agents/rules/
 If a related task exists (search for `security_alert_number: <alert-number>`):
 
 ```bash
-agent-infra-internal task-lifecycle {task-id} close-dependabot --agent {agent} \
+agent-infra-internal task-lifecycle {task-id} close-dependabot --agent {standard-agent-token} \
   --alert-number {alert-number} --reason "{reason}"
 ```
 
@@ -97,10 +99,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 +123,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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # 关闭 Dependabot 告警
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
 
 关闭指定的 Dependabot 安全告警并记录合理的关闭理由。
 
@@ -89,7 +91,7 @@ CVE：{cve-id}
 如果有关联任务（搜索 `security_alert_number: <alert-number>`）：
 
 ```bash
-agent-infra-internal task-lifecycle {task-id} close-dependabot --agent {agent} \
+agent-infra-internal task-lifecycle {task-id} close-dependabot --agent {standard-agent-token} \
   --alert-number {alert-number} --reason "{reason}"
 ```
 
@@ -97,10 +99,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 +123,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

@@ -7,6 +7,9 @@ description: >
 ---
 
 # Code 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.
+
+If the entry operands contain `--orchestrated`, bind `{execution-flag}` to `--orchestrated` and forward it unchanged to the completed event; otherwise bind it to an empty value. Never infer it from `orchestration.json`, environment variables, or prior artifacts.
 
 Implement the approved plan and produce `code.md` or `code-r{N}.md`. This skill supports initial implementation, fix mode based on `review-code` feedback, and human-decision-driven implementation.
 
@@ -39,7 +42,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 ## Step Start: Write the started Marker
 
-After prerequisites and mode are confirmed and before this round's first artifact action, run `agent-infra-internal task-event {task-id} code.started --agent {agent}`. Append `--fix-for {review-artifact}` in fix mode or `--implementation-input {input-id}` in decision mode. The core derives and validates the round and input identity; record the returned `artifactContext`.
+After prerequisites and mode are confirmed and before this round's first artifact action, run `agent-infra-internal task-event {task-id} code.started --agent {standard-agent-token}`. Append `--fix-for {review-artifact}` in fix mode or `--implementation-input {input-id}` in decision mode. The core derives and validates the round and input identity; record the returned `artifactContext`.
 
 ## Steps
 
@@ -53,7 +56,7 @@ Read `reference/branch-management.md`, ensure the current branch matches the tas
 
 ### 3. Narrow the Milestone
 
-**Mandatory; do not skip.** If task.md has a valid `issue_number`, run `agent-infra-internal platform-issue sync {task-id} --agent {agent} --milestone specific`.
+**Mandatory; do not skip.** If task.md has a valid `issue_number`, run `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --milestone specific`.
 
 > If the milestone remains `X.Y.x`, step 11 `task-verify code.completed` blocks through the typed milestone check.
 
@@ -107,12 +110,12 @@ Create `.agents/workspace/active/{task-id}/{code-artifact}`.
 
 ### 10. Update Task Status
 
-After requirement checkboxes are updated, run the initial event `agent-infra-internal task-event {task-id} code.completed --agent {agent} --artifact {code-artifact} --files-modified {n} --tests-passed {n}`; in fix mode use `--fix-for {review-artifact} --blockers {n} --major {n} --minor {n} --manual-validation {n}` instead; in decision mode add `--implementation-input {input-id}` to the initial counts. The core atomically records the artifact link, stage, metadata, done log, and decision-input consumption.
+After requirement checkboxes are updated, run the initial event `agent-infra-internal task-event {task-id} code.completed --agent {standard-agent-token} --artifact {code-artifact} --files-modified {n} --tests-passed {n} {execution-flag}`; in fix mode use `--fix-for {review-artifact} --blockers {n} --major {n} --minor {n} --manual-validation {n} {execution-flag}` instead; in decision mode add `--implementation-input {input-id}` to the initial counts. The core atomically records the artifact link, stage, metadata, done log, and decision-input consumption.
 
 If task.md has a valid `issue_number`, read `.agents/rules/issue-sync.md`, then:
-- Run `agent-infra-internal platform-issue sync {task-id} --agent {agent} --status in-progress`
-- Run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
-- Run `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {code-artifact} --agent {agent}`
+- Run `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --status in-progress`
+- Run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`
+- Run `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {code-artifact} --agent {standard-agent-token}`
 
 ### 11. Run Completion Gate
 
@@ -122,6 +125,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

@@ -7,6 +7,9 @@ description: >
 ---
 
 # 编码任务
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
+若入口业务操作数包含 `--orchestrated`，绑定 `{execution-flag}` = `--orchestrated` 并原样转发给 completed 事件；否则绑定为空。不得从 `orchestration.json`、环境变量或历史产物推断该标记。
 
 根据已批准的技术方案编码任务，并产出 `code.md` 或 `code-r{N}.md`。本技能支持初次实现、基于 `review-code` 反馈的修复，以及人工裁决驱动实现三种模式。
 
@@ -53,7 +56,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 ## 步骤开始：声明 started 事件
 
-确认前置条件与模式后、本轮第一个产出动作之前执行 `agent-infra-internal task-event {task-id} code.started --agent {agent}`。修复模式追加 `--fix-for {review-artifact}`，裁决模式追加 `--implementation-input {input-id}`。核心根据 artifact context 推导并校验轮次与输入身份；以返回的 `artifactContext` 记录本轮身份。
+确认前置条件与模式后、本轮第一个产出动作之前执行 `agent-infra-internal task-event {task-id} code.started --agent {standard-agent-token}`。修复模式追加 `--fix-for {review-artifact}`，裁决模式追加 `--implementation-input {input-id}`。核心根据 artifact context 推导并校验轮次与输入身份；以返回的 `artifactContext` 记录本轮身份。
 
 ## 执行步骤
 ### 1. 验证前置条件
@@ -79,7 +82,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 ### 3. 收窄里程碑
 
-**必须执行，不得跳过。** 如果 task.md 中存在有效的 `issue_number`，调用 `agent-infra-internal platform-issue sync {task-id} --agent {agent} --milestone specific`；里程碑推断、权限降级与幂等写入由 internal core 处理。
+**必须执行，不得跳过。** 如果 task.md 中存在有效的 `issue_number`，调用 `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --milestone specific`；里程碑推断、权限降级与幂等写入由 internal core 处理。
 
 > 若跳过或收窄后仍为 `X.Y.x`，步骤 11 的 `task-verify code.completed` 会通过 typed milestone check 截停本轮。
 
@@ -150,14 +153,14 @@ echo "$result"
 - 审查 `## 需求` 段落，仅把本轮已由代码实现且有测试通过支撑的条目从 `- [ ]` 勾为 `- [x]`
 - 产物链接、阶段与完成日志由 completed 事件统一登记
 - 完成业务内容更新后声明完成事件：
-  - 初次实现：`agent-infra-internal task-event {task-id} code.completed --agent {agent} --artifact {code-artifact} --files-modified {n} --tests-passed {n}`
-  - 修复模式：`agent-infra-internal task-event {task-id} code.completed --agent {agent} --artifact {code-artifact} --fix-for {review-artifact} --blockers {n} --major {n} --minor {n} --manual-validation {n}`
-  - 裁决模式：`agent-infra-internal task-event {task-id} code.completed --agent {agent} --artifact {code-artifact} --implementation-input {input-id} --files-modified {n} --tests-passed {n}`
+  - 初次实现：`agent-infra-internal task-event {task-id} code.completed --agent {standard-agent-token} --artifact {code-artifact} --files-modified {n} --tests-passed {n} {execution-flag}`
+  - 修复模式：`agent-infra-internal task-event {task-id} code.completed --agent {standard-agent-token} --artifact {code-artifact} --fix-for {review-artifact} --blockers {n} --major {n} --minor {n} --manual-validation {n} {execution-flag}`
+  - 裁决模式：`agent-infra-internal task-event {task-id} code.completed --agent {standard-agent-token} --artifact {code-artifact} --implementation-input {input-id} --files-modified {n} --tests-passed {n} {execution-flag}`
 
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则记录 warning 并继续；Issue 元数据边界仍见 `.agents/rules/issue-sync.md`）：
-- 调用 `agent-infra-internal platform-issue sync {task-id} --agent {agent} --status in-progress`
-- 调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
-- 调用 `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {code-artifact} --agent {agent}`
+- 调用 `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --status in-progress`
+- 调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`
+- 调用 `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {code-artifact} --agent {standard-agent-token}`
 
 ### 11. 完成校验
 
@@ -178,7 +181,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 +191,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 记录和修复报告必须引用同一轮次

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

@@ -2,6 +2,8 @@
 
 When reporting that implementation is complete, use the following standard format:
 
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill review-code --task-ref {task-ref}`.
+
 ```text
 Task {task-id} code implementation complete.
 
@@ -14,7 +16,5 @@ Output files:
 - Code report: .agents/workspace/active/{task-id}/{code-artifact}
 
 Next step - code review:
-  - Claude Code / OpenCode: /review-code {task-ref}
-  - Gemini CLI: /{{project}}:review-code {task-ref}
-  - Codex CLI: $review-code {task-ref}
+{next-step-commands}
 ```

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

@@ -2,6 +2,8 @@
 
 向用户汇报实现完成时，使用以下标准格式：
 
+使用 `agent-infra-internal agent-client next-steps --skill review-code --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```text
 任务 {task-id} 实现完成。
 
@@ -14,7 +16,5 @@
 - 实现报告：.agents/workspace/active/{task-id}/{code-artifact}
 
 下一步 - 代码审查：
-  - Claude Code / OpenCode：/review-code {task-ref}
-  - Gemini CLI：/{{project}}:review-code {task-ref}
-  - Codex CLI：$review-code {task-ref}
+{next-step-commands}
 ```

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

@@ -6,11 +6,15 @@ description: >
 ---
 
 # Commit Changes
+> `--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.
+
 
 Create a Git commit without overwriting user work and update the related task state when needed.
 
 When updating related `task.md` frontmatter, read `.agents/rules/version-stamp.md` first and write or refresh `agent_infra_version`.
 
+Direct invocation still requires explicit user authorization. For an active orchestration run, only its unconsumed one-use `commitAuthorization` is equivalent authorization for this round; orchestration core must consume it after success, and every other commit gate remains unchanged.
+
 ## Common Rationalizations and Rebuttals
 
 | Rationalization | Rebuttal |
@@ -98,7 +102,7 @@ date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 
 > The full five-case status matrix, prerequisite checks, and multi-TUI next-step commands live in `reference/task-status-update.md`. Read `reference/task-status-update.md` before updating task state.
 
-> **IMPORTANT**: When showing the next step, output every TUI command format in full and directly use the standard template from `reference/task-status-update.md`. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). 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` and invoke the shared helper for the scenario selected from `reference/task-status-update.md`.
 
 Append the Commit Activity Log entry and choose exactly one next-step case:
 - open PR and successful push -> `watch-pr {task-ref}`; this takes precedence over the final-commit `prFlow` route
@@ -142,6 +146,14 @@ Handle the result as follows:
 
 Keep the gate output in your reply as fresh evidence. Do not claim completion without output from this run.
 
+After the gate passes, declare the orchestrated commit stage complete. This command is a no-op when no active orchestration run exists, so the direct commit path remains unchanged:
+
+```bash
+agent-infra-internal task-orchestration {task-id} stage-completed --agent {standard-agent-token}
+```
+
+Stop if the command fails; a run without the full receipt lifecycle must not be marked completed.
+
 ## Notes
 
 - Never commit secrets such as `.env`, credentials, or keys

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

@@ -6,11 +6,15 @@ description: >
 ---
 
 # 提交代码
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
 
 在不覆盖用户本地工作的前提下创建 Git commit，并在需要时更新关联任务状态。
 
 更新关联 `task.md` frontmatter 时，先读取 `.agents/rules/version-stamp.md`，并写入或刷新 `agent_infra_version`。
 
+直接调用仍要求用户显式授权。若存在 active orchestration run，只有未消费的一次性 `commitAuthorization` 可作为本轮等价授权；提交成功后必须由 orchestration core 消费，其他提交门禁保持不变。
+
 ## 常见违规借口与反驳
 
 | 借口 | 反驳 |
@@ -98,7 +102,7 @@ date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 
 > 完整的 5 种状态分支、前置条件检查和多 TUI 下一步命令见 `reference/task-status-update.md`。更新任务状态前，先读取 `reference/task-status-update.md`。
 
-> **重要**：向用户展示下一步时，必须完整输出所有 TUI 命令格式，并直接使用 `reference/task-status-update.md` 中对应场景的标准模板。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，并按 `reference/task-status-update.md` 的已选场景调用统一 helper。
 
 追加 Commit 的 Activity Log，并且只能选择一个下一步分支：
 - 已有开放 PR 且 push 成功 -> `watch-pr {task-ref}`；该分支优先于最终提交的 `prFlow` 路由
@@ -142,6 +146,14 @@ agent-infra-internal task-verify {task-id} commit.completed --format text
 
 将校验输出保留在回复中作为当次验证输出。没有当次校验输出，不得声明完成。
 
+校验通过后，声明编排中的 commit 阶段已完成；无 active orchestration run 时该命令为 no-op，不改变直接提交路径：
+
+```bash
+agent-infra-internal task-orchestration {task-id} stage-completed --agent {standard-agent-token}
+```
+
+命令失败时停止，不得把缺少完整 receipt 生命周期的 run 标记为完成。
+
 ## 注意事项
 
 - 不要提交 `.env`、凭据、密钥等敏感文件

package/templates/.agents/skills/commit/reference/commit-message.en.md

@@ -27,7 +27,7 @@ If the commit belongs to an active task:
 |---|---|
 | `claude` | `Co-Authored-By: Claude <noreply@anthropic.com>` |
 | `codex` | `Co-Authored-By: Codex <noreply@openai.com>` |
-| `gemini` | `Co-Authored-By: Gemini <noreply@google.com>` |
+| `antigravity` | `Co-Authored-By: Antigravity <noreply@google.com>` |
 | `opencode` | `Co-Authored-By: OpenCode <noreply@opencode.ai>` |
 
 Build the co-author block with these rules:

package/templates/.agents/skills/commit/reference/commit-message.zh-CN.md

@@ -27,7 +27,7 @@ git log --oneline -5
 |---|---|
 | `claude` | `Co-Authored-By: Claude <noreply@anthropic.com>` |
 | `codex` | `Co-Authored-By: Codex <noreply@openai.com>` |
-| `gemini` | `Co-Authored-By: Gemini <noreply@google.com>` |
+| `antigravity` | `Co-Authored-By: Antigravity <noreply@google.com>` |
 | `opencode` | `Co-Authored-By: OpenCode <noreply@opencode.ai>` |
 
 按以下规则构建 co-author 区块：

package/templates/.agents/skills/commit/reference/issue-metadata-sync.en.md

@@ -11,7 +11,7 @@ If either condition is missing, skip this step.
 Call one declarative intent. The internal core owns diff computation, repository-label filtering, capability degradation, body preservation, and idempotency:
 
 ```bash
-agent-infra-internal platform-issue sync {task-id} --agent {agent} --in-labels from-diff --base {base-branch} --requirements
+agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --in-labels from-diff --base {base-branch} --requirements
 ```
 
 ## Error Handling

package/templates/.agents/skills/commit/reference/issue-metadata-sync.zh-CN.md

@@ -11,7 +11,7 @@
 调用单一声明式 intent；diff、仓库 label 过滤、权限降级、正文保真与幂等写入由 internal core 处理：
 
 ```bash
-agent-infra-internal platform-issue sync {task-id} --agent {agent} --in-labels from-diff --base {base-branch} --requirements
+agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --in-labels from-diff --base {base-branch} --requirements
 ```
 
 ## 错误处理

package/templates/.agents/skills/commit/reference/pr-summary-sync.en.md

@@ -4,6 +4,6 @@ Run only when `{task-id}` is valid and task.md has a valid `pr_number`.
 
 1. Run `agent-infra-internal platform-pr summary-context {task-id}`.
 2. Generate the plain summary body per `.agents/rules/pr-sync.md` and write it to a temporary file.
-3. Run `agent-infra-internal platform-pr summary-sync {task-id} --agent {agent} --body-file {summary-body-file}`.
+3. Run `agent-infra-internal platform-pr summary-sync {task-id} --agent {standard-agent-token} --body-file {summary-body-file}`.
 
 Failure records a warning but never blocks or rolls back the completed commit. `no-op` maps to `summary skipped (no diff)`.