@fitlab-ai/agent-infra 0.9.1 → 0.9.3

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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # 导入 Issue
+> `--agent` 取值见 `.agents/rules/task-management.md`「合作者 token 规范」：标准 AI 短名（`claude`/`codex`/`antigravity`/`opencode`/`cursor`）、长名归一化（`claude-code`→`claude`、`antigravity-cli`→`antigravity`）或人工例外 `human`。
+
 
 导入指定的 Issue 并创建任务。参数：issue 编号。
 
@@ -145,9 +147,9 @@ date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 ### 5. 绑定并同步 Issue
 
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则跳过并继续）：
-- 调用 `agent-infra-internal platform-issue bind {task-id} --issue {issue-number} --agent {agent}` 校验并原子绑定
-- 调用 `agent-infra-internal platform-issue sync {task-id} --agent {agent} --assignees current --milestone initial`
-- 所有场景结束后，必须调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
+- 调用 `agent-infra-internal platform-issue bind {task-id} --issue {issue-number} --agent {standard-agent-token}` 校验并原子绑定
+- 调用 `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --assignees current --milestone initial`
+- 所有场景结束后，必须调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`
 
 ### 6. 完成校验
 
@@ -176,7 +178,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 +194,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 +207,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}
 ```
 
 ## 错误处理

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

@@ -7,6 +7,9 @@ description: >
 ---
 
 # Design Technical Plan
+> `--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.
 
 ## Boundary / Critical Rules
 
@@ -36,7 +39,7 @@ Before the state check is complete, do not make external-state assertions such a
 
 ## Step Start: Write the started Marker
 
-After resolving the artifact context and before this round's first artifact action, run `agent-infra-internal task-event {task-id} plan.started --agent {agent}` and verify the returned `artifactContext`.
+After resolving the artifact context and before this round's first artifact action, run `agent-infra-internal task-event {task-id} plan.started --agent {standard-agent-token}` and verify the returned `artifactContext`.
 
 ## Steps
 
@@ -110,14 +113,14 @@ Update `.agents/workspace/active/{task-id}/task.md`:
   - Overwrite the `effort` field in frontmatter with the new value
   - Append a `## Effort Re-estimate` section to this round's plan artifact `{plan-artifact}`, recording: `effort {old} → {new} (rationale: {short basis grounded in this plan})`
   If the re-estimated value matches the current value, skip it: do not write the `## Effort Re-estimate` section. The Flow A sync that follows reads the possibly updated frontmatter and propagates the new value to the Issue automatically.
-After the business fields are updated, run `agent-infra-internal task-event {task-id} plan.completed --agent {agent} --artifact {plan-artifact}` so the core atomically records the link, stage, agent, metadata, and Activity Log.
+After the business fields are updated, run `agent-infra-internal task-event {task-id} plan.completed --agent {standard-agent-token} --artifact {plan-artifact} {execution-flag}` so the core atomically records the link, stage, agent, metadata, and Activity Log.
   - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Task (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
   ```
 
 If task.md contains a valid `issue_number`, perform these sync actions (skip and continue on any failure):
-- Run `agent-infra-internal platform-issue sync {task-id} --agent {agent} --status pending-design-work --fields`
-- 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 {plan-artifact} --agent {agent}`
+- Run `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --status pending-design-work --fields`
+- 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 {plan-artifact} --agent {standard-agent-token}`
 
 ### 8. Verification Gate
 
@@ -138,9 +141,11 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the final output, read `.agents/rules/next-step-output.md` and apply both of its rules: (1) render `{task-ref}` in the "Next steps" commands as the short id `NN` (falling back to the full TASK-id when unallocated or released); (2) append the `Completed at` line as the very last line of the user-facing output (this applies to every user-facing output — success, error, and early-return paths alike, not only the success path).
+> Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 Output format:
+Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill review-plan --task-ref {task-ref}`.
+
 ```
 Technical plan complete for task {task-id}.
 
@@ -158,9 +163,7 @@ Important: human review checkpoint.
 Please review the technical plan before continuing to implementation.
 
 Next step - review the technical plan:
-  - Claude Code / OpenCode: /review-plan {task-ref}
-  - Gemini CLI: /{{project}}:review-plan {task-ref}
-  - Codex CLI: $review-plan {task-ref}
+{next-step-commands}
 ```
 
 ## Completion Checklist
@@ -174,7 +177,7 @@ Next step - review the technical plan:
 - [ ] Marked technical-design as complete in workflow progress
 - [ ] Appended an Activity Log entry to task.md
 - [ ] Informed the user that this is a human review checkpoint
-- [ ] 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
 
 ## STOP
 

package/templates/.agents/skills/plan-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`、环境变量或历史产物推断该标记。
 
 ## 行为边界 / 关键规则
 
@@ -39,7 +42,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 确认前置条件和轮次后、本轮第一个产出动作之前执行：
 
 ```bash
-agent-infra-internal task-event {task-id} plan.started --agent {agent}
+agent-infra-internal task-event {task-id} plan.started --agent {standard-agent-token}
 ```
 
 ## 执行步骤
@@ -109,12 +112,12 @@ agent-infra-internal task-event {task-id} plan.started --agent {agent}
   - 用新值覆盖 frontmatter 的 `effort` 字段
   - 在本轮方案产物 `{plan-artifact}` 中追加 `## 工作量重估` 段，记录一条：`effort {old} → {new} (rationale: {基于本轮方案的简短依据})`
   若重估值与当前值一致，跳过：不写入 `## 工作量重估` 段。后续 Flow A 同步会读取可能更新过的 frontmatter，并自动把新值同步到 Issue。
-- 完成业务内容更新后执行 `agent-infra-internal task-event {task-id} plan.completed --agent {agent} --artifact {plan-artifact}`，由核心原子登记链接、阶段、代理、时间、版本和 Activity Log。
+- 完成业务内容更新后执行 `agent-infra-internal task-event {task-id} plan.completed --agent {standard-agent-token} --artifact {plan-artifact} {execution-flag}`，由核心原子登记链接、阶段、代理、时间、版本和 Activity Log。
 
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则跳过并继续）：
-- 调用 `agent-infra-internal platform-issue sync {task-id} --agent {agent} --status pending-design-work --fields`
-- 调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`
-- 调用 `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {plan-artifact} --agent {agent}`
+- 调用 `agent-infra-internal platform-issue sync {task-id} --agent {standard-agent-token} --status pending-design-work --fields`
+- 调用 `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 {plan-artifact} --agent {standard-agent-token}`
 
 ### 8. 完成校验
 
@@ -135,9 +138,11 @@ agent-infra-internal task-verify {task-id} plan.completed --artifact {plan-artif
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染最终输出前，先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令把 `{task-ref}` 渲染为短号 `NN`（未分配/已释放时回退完整 TASK-id）；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 输出格式：
+使用 `agent-infra-internal agent-client next-steps --skill review-plan --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+
 ```
 任务 {task-id} 技术方案完成。
 
@@ -155,9 +160,7 @@ agent-infra-internal task-verify {task-id} plan.completed --artifact {plan-artif
 请在继续实现之前审查技术方案。
 
 下一步 - 审查技术方案：
-  - Claude Code / OpenCode：/review-plan {task-ref}
-  - Gemini CLI：/{{project}}:review-plan {task-ref}
-  - Codex CLI：$review-plan {task-ref}
+{next-step-commands}
 ```
 
 ## 完成检查清单
@@ -171,7 +174,7 @@ agent-infra-internal task-verify {task-id} plan.completed --artifact {plan-artif
 - [ ] 在工作流进度中标记了 technical-design 为已完成
 - [ ] 追加了 Activity Log 条目到 task.md
 - [ ] 告知了用户这是人工审查检查点
-- [ ] 告知了用户下一步（必须展示所有 TUI 的命令格式，含自定义 TUI，不要筛选）
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 
 ## 停止
 

package/templates/.agents/skills/post-release/SKILL.en.md

@@ -7,6 +7,8 @@ description: >
 
 # Post-release
 
+Require one explicit canonical SemVer `{version}`. Do not fall back to the latest tag.
+
 ## 1. Inspect Channel Facts
 
 ```bash

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

@@ -7,6 +7,8 @@ description: >
 
 # 发布后处理
 
+要求用户显式提供唯一规范 SemVer `{version}`，不得回退到最新 tag。
+
 ## 1. 检查渠道事实
 
 ```bash

package/templates/.agents/skills/refine-title/SKILL.en.md

@@ -64,7 +64,7 @@ Before changing a title, run `agent-infra-internal platform-context resolve` for
 
 ### 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`; when a next-step client command is needed, invoke the shared helper for the task's current stage.
 
 If the skill updated an Issue title, explain that no extra sync command is required; continue with the workflow skill that matches the task's current stage.
 

package/templates/.agents/skills/refine-title/SKILL.zh-CN.md

@@ -64,7 +64,7 @@ Issue/PR #{id} 分析结果：
 
 ### 5. 告知用户
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> 渲染下一步前先读取 `.agents/rules/next-step-output.md`；如需展示下一步客户端命令，按当前任务阶段调用统一 helper。
 
 如果修改了 Issue 标题，提示无需额外同步命令；后续按任务当前阶段继续执行对应工作流技能。
 

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

@@ -7,36 +7,42 @@ description: >
 
 # Release
 
-Release state is derived from external facts and prepare/publish require separate authorization.
+Prepare, present the latest fact snapshot, and request one remote-publish authorization in a single invocation. External facts remain the source of truth.
 
-## 1. Validate Input and Entropy Report
+## 1. Validate Input and Entropy Checkpoint
 
-Confirm SemVer and the human release checkpoint.
+Require one canonical SemVer `{version}` and a satisfied entropy checkpoint.
 
-## 2. Inspect Facts
+## 2. Prepare and Inspect Facts
 
 ```bash
 agent-infra-internal release-workflow inspect {version}
 ```
 
-## 3. Prepare
+Run prepare and inspect again only when the snapshot is not prepared. Reuse prepared or partially published facts. Unknown state is blocked.
 
 ```bash
 agent-infra-internal release-workflow prepare {version} --entropy-report {path}
 ```
 
-Stop after prepare; never publish implicitly.
+## 3. Present and Confirm
 
-## 4. Publish Separately
+Present the latest snapshot. Only an unambiguous affirmative reply for that snapshot in the current session authorizes publishing. A denial, adjustment, question, ambiguity, interruption, or changed snapshot stops the write and requires a new preview.
 
-Only after explicit user authorization:
+## 4. Publish and Reinspect
 
 ```bash
 agent-infra-internal release-workflow publish {version}
 ```
 
-Push refs normally, preserve partial success for replay, and never force push.
+Push refs normally, preserve partial success for replay, never force push, and inspect again after the operation.
 
 ## 5. Report Facts
 
-Show the snapshot and every TUI command. Treat unknown external state as blocked.
+After a complete publish, render the versioned next step without exposing internal actions or skipping directly to post-release:
+
+```bash
+agent-infra-internal agent-client next-steps \
+  --skill create-release-note \
+  --version {version}
+```

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

@@ -7,36 +7,42 @@ description: >
 
 # 版本发布
 
-发布由事实驱动，并拆为独立授权的 prepare 与 publish。
+在单次调用中准备发布、展示最新事实快照并请求一次远端发布授权。状态由外部事实重建。
 
-## 1. 检查输入与 entropy 报告
+## 1. 验证输入与人工检查点
 
-确认 SemVer 和人工发布检查点已满足。
+验证唯一参数 `{version}` 是规范 SemVer，并确认 entropy 人工检查点已满足。
 
-## 2. 检查事实
+## 2. 准备并检查发布事实
 
 ```bash
 agent-infra-internal release-workflow inspect {version}
 ```
 
-## 3. 准备发布
+未 prepared 时执行 prepare 并重新 inspect；已准备或部分发布时复用当前事实。unknown 必须 blocked。
 
 ```bash
 agent-infra-internal release-workflow prepare {version} --entropy-report {path}
 ```
 
-prepare 后停止，不得隐式 publish。
+## 3. 展示快照并确认
 
-## 4. 独立发布
+展示最新 snapshot。只有当前会话中针对该快照的无歧义明确肯定答复才授权发布；否定、调整、疑问、歧义或中断均停止。快照变化后重新确认。
 
-仅在用户明确授权后执行：
+## 4. 发布并复核
 
 ```bash
 agent-infra-internal release-workflow publish {version}
 ```
 
-逐 ref 普通 push；部分成功可重放，禁止 force push。
+逐 ref 普通 push；部分成功可重放，禁止 force push。操作后重新 inspect。
 
 ## 5. 输出事实摘要
 
-完整展示 snapshot 和后续 TUI 命令；unknown 必须视为 blocked。
+完整发布后渲染携带版本的下一步，不显示内部 action，也不直接跳到 post-release：
+
+```bash
+agent-infra-internal agent-client next-steps \
+  --skill create-release-note \
+  --version {version}
+```

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

@@ -6,6 +6,8 @@ description: >
 ---
 
 # Restore 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.
+
 
 Restore local task workspace files from platform Issue comments that contain sync markers.
 
@@ -58,6 +60,7 @@ Rules:
   - `review-plan` / `review-plan-r{N}` -> matching `.md`
   - `code` / `code-r{N}` -> matching `.md`
   - `review-code` / `review-code-r{N}` -> matching `.md`
+  - `pr-review` / `pr-review-r{N}` -> matching `.md`
 
 ### 4. Process Chunks and Check the Local Directory
 
@@ -88,7 +91,7 @@ Write only files that were actually recovered from Issue comments. Do not invent
 ### 6. Apply the Restore Lifecycle Intent
 
 ```bash
-agent-infra-internal task-lifecycle {task-id} restore --agent {agent} \
+agent-infra-internal task-lifecycle {task-id} restore --agent {standard-agent-token} \
   --staging-dir "{staging-dir}" --issue-number {issue-number}
 ```
 

package/templates/.agents/skills/restore-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`。
+
 
 从带有 sync 标记的平台 Issue 评论中恢复本地任务工作区文件。
 
@@ -57,6 +59,7 @@ description: >
   - `review-plan` / `review-plan-r{N}` -> 对应 `.md`
   - `code` / `code-r{N}` -> 对应 `.md`
   - `review-code` / `review-code-r{N}` -> 对应 `.md`
+  - `pr-review` / `pr-review-r{N}` -> 对应 `.md`
 
 ### 4. 处理分片并检查本地目录
 
@@ -87,7 +90,7 @@ description: >
 ### 6. 执行 restore 生命周期意图
 
 ```bash
-agent-infra-internal task-lifecycle {task-id} restore --agent {agent} \
+agent-infra-internal task-lifecycle {task-id} restore --agent {standard-agent-token} \
   --staging-dir "{staging-dir}" --issue-number {issue-number}
 ```
 

package/templates/.agents/skills/review-analysis/SKILL.en.md

@@ -7,6 +7,9 @@ description: >
 ---
 
 # Requirement Analysis Review
+> `--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 both the summary finalizer and completed event; otherwise bind it to an empty value. Never infer it from `orchestration.json`, environment variables, or prior artifacts.
 
 Review the latest analysis artifact and produce `review-analysis.md` or `review-analysis-r{N}.md`.
 
@@ -35,7 +38,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 ## Step Start: Declare the started Event
 
-After resolving the artifact context and before this round's first artifact action, run `agent-infra-internal task-event {task-id} review-analysis.started --agent {agent}`.
+After resolving the artifact context and before this round's first artifact action, run `agent-infra-internal task-event {task-id} review-analysis.started --agent {standard-agent-token}`.
 
 ## Steps
 
@@ -55,6 +58,7 @@ Read `{analysis-artifact}`, `task.md`, and Issue context when available. After r
 
 Check requirement completeness, risks, affected scope, open questions, and effort estimates.
 
+> Read `.agents/rules/review-method.md` before this step and follow its five-pass protocol for coverage, risk-lens decisions, traceability, and counterevidence.
 > Read `reference/review-criteria.md` before this step.
 
 ### 5. Write Review Report
@@ -65,11 +69,21 @@ Create `.agents/workspace/active/{task-id}/{review-artifact}`.
 
 ### 6. Update Task Status
 
-After the report, submit each new finding with `agent-infra-internal task-ledger {task-id} finding-upsert --stage analysis --review-artifact {review-artifact} --ordinal {n} --severity {blocker|major|minor} --evidence {review-artifact}#{anchor}`; submit prior-response dispositions with `finding-review --id {ledger-id} --status {confirmed|closed|open|needs-human-decision} --evidence {evidence}`. Do not scan ids or edit ledger rows. After all ledger writes, call `agent-infra-internal task-ledger {task-id} stage-status --stage analysis` exactly once. Derive the verdict and next-step branch from `stageStatus.canAdvance`, and blocker/major/minor event counts from `unresolvedFindingCounts`: only `canAdvance=true` permits `approved`; otherwise use `changes-requested` or `rejected`. Then run `agent-infra-internal task-event {task-id} review-analysis.completed --agent {agent} --artifact {review-artifact} --verdict {approved|changes-requested|rejected} --blockers {n} --major {n} --minor {n} --manual-validation {n}`.
+After the report, submit each new finding with `agent-infra-internal task-ledger {task-id} finding-upsert --stage analysis --review-artifact {review-artifact} --ordinal {n} --severity {blocker|major|minor} --evidence {review-artifact}#{anchor}`; submit prior-response dispositions with `finding-review --id {ledger-id} --status {confirmed|closed|open|needs-human-decision} --evidence {evidence}`. Do not scan ids or edit ledger rows. After all ledger writes, call `agent-infra-internal task-review {task-id} finalize-summary --stage analysis --artifact {review-artifact} {execution-flag}` exactly once.
+
+Bind and reuse this structured mapping from that one response:
+
+```text
+{unresolved-blockers} = stageStatus.unresolvedFindingCounts.blocker
+{unresolved-major} = stageStatus.unresolvedFindingCounts.major
+{unresolved-minor} = stageStatus.unresolvedFindingCounts.minor
+```
+
+The intent atomically finalizes the report summary and returns the same ledger snapshot. Do not call `stage-status`, replace placeholders manually, or rescan the finding list. If finalization fails or a response field is missing, stop before the completion event. Derive the verdict and next-step branch from the same response's `stageStatus.canAdvance`: only `canAdvance=true` permits `approved`; otherwise use `changes-requested` or `rejected`. Then run `agent-infra-internal task-event {task-id} review-analysis.completed --agent {standard-agent-token} --artifact {review-artifact} --verdict {approved|changes-requested|rejected} --blockers {unresolved-blockers} --major {unresolved-major} --minor {unresolved-minor} --manual-validation {n} {execution-flag}`.
 
 `manual-validation` is the data source for the `Manual-validation` count folded into review rows in `ai task log`; do not add a parallel manual-verification field.
 
-If task.md has a valid `issue_number`, run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`, then `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {review-artifact} --agent {agent}`.
+If task.md has a valid `issue_number`, run `agent-infra-internal platform-comment sync {task-id} --kind task --agent {standard-agent-token}`, then `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {review-artifact} --agent {standard-agent-token}`.
 
 ### 7. Run Completion Gate
 
@@ -79,6 +93,6 @@ agent-infra-internal task-verify {task-id} review-analysis.completed --artifact
 
 ### 8. Tell the User
 
-Use the conclusion branch in `reference/output-templates.md` and show all TUI command formats.
+Use the conclusion branch in `reference/output-templates.md` 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/review-analysis/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` 并原样转发给 summary finalizer 与 completed 事件；否则绑定为空。不得从 `orchestration.json`、环境变量或历史产物推断该标记。
 
 审查最新需求分析产物，并产出 `review-analysis.md` 或 `review-analysis-r{N}.md`。
 
@@ -37,7 +40,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 ## 步骤开始：声明 started 事件
 
-确认前置条件和产物上下文后、本轮第一个产出动作之前执行 `agent-infra-internal task-event {task-id} review-analysis.started --agent {agent}`。
+确认前置条件和产物上下文后、本轮第一个产出动作之前执行 `agent-infra-internal task-event {task-id} review-analysis.started --agent {standard-agent-token}`。
 
 ## 执行步骤
 ### 1. 验证前置条件
@@ -58,6 +61,7 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 重点检查需求完整性、风险识别、影响范围、开放问题和工作量评估。
 
+> 共享检视方法见 `.agents/rules/review-method.md`。执行此步骤前先读取该规则，并按五遍协议完成覆盖声明、风险镜头判断、追踪矩阵和反证检视。
 > 详细审查标准见 `reference/review-criteria.md`。执行此步骤前先读取 `reference/review-criteria.md`。
 
 ### 5. 编写审查报告
@@ -68,11 +72,21 @@ agent-infra-internal task-snapshot {task-id} --format text
 
 ### 6. 更新任务状态
 
-报告完成后，新 finding 逐条调用 `agent-infra-internal task-ledger {task-id} finding-upsert --stage analysis --review-artifact {review-artifact} --ordinal {n} --severity {blocker|major|minor} --evidence {review-artifact}#{anchor}`；复核上一轮响应时调用 `finding-review --id {ledger-id} --status {confirmed|closed|open|needs-human-decision} --evidence {相称证据}`。不得扫描编号或手写账本行。全部账本写入完成后只调用一次 `agent-infra-internal task-ledger {task-id} stage-status --stage analysis`，以 `stageStatus.canAdvance` 决定 verdict 和下一步，并以 `unresolvedFindingCounts` 填写 blocker/major/minor：仅 `canAdvance=true` 可用 `approved`，否则必须用 `changes-requested` 或 `rejected`。随后执行 `agent-infra-internal task-event {task-id} review-analysis.completed --agent {agent} --artifact {review-artifact} --verdict {approved|changes-requested|rejected} --blockers {n} --major {n} --minor {n} --manual-validation {n}`。
+报告完成后，新 finding 逐条调用 `agent-infra-internal task-ledger {task-id} finding-upsert --stage analysis --review-artifact {review-artifact} --ordinal {n} --severity {blocker|major|minor} --evidence {review-artifact}#{anchor}`；复核上一轮响应时调用 `finding-review --id {ledger-id} --status {confirmed|closed|open|needs-human-decision} --evidence {相称证据}`。不得扫描编号或手写账本行。全部账本写入完成后只调用一次 `agent-infra-internal task-review {task-id} finalize-summary --stage analysis --artifact {review-artifact} {execution-flag}`。
+
+从该次返回值绑定并复用以下结构化映射：
+
+```text
+{unresolved-blockers} = stageStatus.unresolvedFindingCounts.blocker
+{unresolved-major} = stageStatus.unresolvedFindingCounts.major
+{unresolved-minor} = stageStatus.unresolvedFindingCounts.minor
+```
+
+该 intent 原子最终化报告摘要并返回同一次账本快照；不得再调用 `stage-status`、手工替换占位符或扫描问题清单。最终化失败或返回字段缺失时，停止在完成事件之前。以同一次返回的 `stageStatus.canAdvance` 决定 verdict 和下一步：仅 `canAdvance=true` 可用 `approved`，否则必须用 `changes-requested` 或 `rejected`。随后执行 `agent-infra-internal task-event {task-id} review-analysis.completed --agent {standard-agent-token} --artifact {review-artifact} --verdict {approved|changes-requested|rejected} --blockers {unresolved-blockers} --major {unresolved-major} --minor {unresolved-minor} --manual-validation {n} {execution-flag}`。
 
 `manual-validation` 是 `ai task log` 中 review 行「人工校验点」（EN `Manual-validation`）计数的数据源；不要新增并行人工验证字段。
 
-如果 task.md 中存在有效的 `issue_number`，调用 `agent-infra-internal platform-comment sync {task-id} --kind task --agent {agent}`，再调用 `agent-infra-internal platform-comment sync {task-id} --kind artifact --artifact {review-artifact} --agent {agent}`；失败按 `.agents/rules/issue-sync.md` 记录 warning。
+如果 task.md 中存在有效的 `issue_number`，调用 `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 {review-artifact} --agent {standard-agent-token}`；失败按 `.agents/rules/issue-sync.md` 记录 warning。
 
 ### 7. 完成校验
 
@@ -84,7 +98,7 @@ agent-infra-internal task-verify {task-id} review-analysis.completed --artifact
 
 ### 8. 告知用户
 
-按 `reference/output-templates.md` 的结论分支输出，并展示所有 TUI 的下一步命令。
+按 `reference/output-templates.md` 的结论分支输出，并通过统一 helper 渲染已选场景的下一步命令。
 
 > 渲染最终输出前先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令的 `{task-ref}` 渲染为当前任务短号 `NN`（取值与回退见该文件），其他 `{task-id}` 占位（报告标题、路径）保持完整 TASK-id 形式；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
 
@@ -93,7 +107,7 @@ agent-infra-internal task-verify {task-id} review-analysis.completed --artifact
 - [ ] 已审查最新分析上下文
 - [ ] 已创建 `{review-artifact}`
 - [ ] 已更新 task.md 并追加 Activity Log
-- [ ] 已展示所有 TUI 的下一步命令
+- [ ] 已通过统一 helper 渲染已选场景的下一步命令
 
 ## 注意事项