@fitlab-ai/agent-infra 0.7.1 → 0.7.3

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

@@ -29,7 +29,7 @@ Before the state check is complete, do not make external-state assertions such a
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -66,6 +66,8 @@ Use it to understand:
 - identified technical risks
 - effort and complexity assessment
 
+**Round ≥ 2: respond to the prior review (only when a review artifact exists)**: if the task directory contains `review-plan.md` / `review-plan-r{N}.md`, read the highest-round review report; add a `## Response to Prior Review` section to this round's plan artifact, and for each finding verify it via Read/Grep before acting (holds → accept and fix; judged hallucinated/unfounded → rebut with counter-evidence rather than defaulting to compliance); record any open disagreement under `## Open Questions`. Round 1 has no review, so skip this section.
+
 ### 4. Understand the Problem
 
 - Read the relevant source files identified in the analysis
@@ -115,15 +117,11 @@ Update `.agents/workspace/active/{task-id}/task.md`:
 - Mark technical-design as complete in workflow progress and include the actual round when the task template supports it
 - Before appending the workflow Activity Log entry, re-estimate `effort` based on the technical plan (number of implementation steps, files touched, test matrix scope, integration surface). If the re-estimated value differs from the current value in `task.md`:
   - Overwrite the `effort` field in frontmatter with the new value
-  - Prepend an Activity Log entry recording the transition (placed before the `Technical Design (Round N)` entry):
-    ```
-    - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Re-estimate** by {agent} — effort {old} → {new} (rationale: {short basis grounded in this plan})
-    ```
-  Both entries may share the same timestamp; ordering is conveyed by list position only.
-  If the re-estimated value matches the current value, skip the Re-estimate entry. The Flow A sync that follows reads the possibly updated frontmatter and propagates the new value to the Issue automatically.
+  - 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.
 - **Append** to `## Activity Log` (do NOT overwrite previous entries):
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Technical Design (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
+  - {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):
@@ -152,7 +150,7 @@ 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).
+> **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).
 
 Output format:
 ```
@@ -172,9 +170,9 @@ 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-id}
-  - Gemini CLI: /{{project}}:review-plan {task-id}
-  - Codex CLI: $review-plan {task-id}
+  - Claude Code / OpenCode: /review-plan {task-ref}
+  - Gemini CLI: /{{project}}:review-plan {task-ref}
+  - Codex CLI: $review-plan {task-ref}
 ```
 
 ## Completion Checklist

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

@@ -29,7 +29,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证前置条件
@@ -65,6 +65,8 @@ tail .agents/workspace/active/{task-id}/task.md
 - 已识别的技术风险
 - 工作量和复杂度评估
 
+**Round ≥ 2：响应上一轮审查（仅当存在审查产物时）**：若任务目录存在 `review-plan.md` / `review-plan-r{N}.md`，读取最高轮次的审查报告；在本轮方案产物中新增 `## 对上一轮审查的响应` 段，对每条发现先 Read/Grep 核实再处置（成立 → 接受并修正；判定为幻觉/不成立 → 附反证反驳，不默认顺从），未决分歧写入 `## 未决问题`。Round 1 无审查，跳过本段。
+
 ### 4. 理解问题
 
 - 阅读分析中识别的相关源码文件
@@ -114,15 +116,11 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - 在工作流进度中标记 technical-design 为已完成，并注明实际轮次（如果任务模板支持）
 - 在追加工作流 Activity Log 条目之前，基于技术方案（实施步骤数、涉及文件、测试矩阵范围、集成面）重估 `effort`。若重估值与 `task.md` 当前值不一致：
   - 用新值覆盖 frontmatter 的 `effort` 字段
-  - 在 `Technical Design (Round N)` 条目之前追加一条转移记录：
-    ```
-    - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Re-estimate** by {agent} — effort {old} → {new} (rationale: {基于本轮方案的简短依据})
-    ```
-  两条条目可共用同一时间戳，顺序仅通过列表位置表达。
-  若重估值与当前值一致，跳过 Re-estimate 条目。后续 Flow A 同步会读取可能更新过的 frontmatter，并自动把新值同步到 Issue。
+  - 在本轮方案产物 `{plan-artifact}` 中追加 `## 工作量重估` 段，记录一条：`effort {old} → {new} (rationale: {基于本轮方案的简短依据})`
+  若重估值与当前值一致，跳过：不写入 `## 工作量重估` 段。后续 Flow A 同步会读取可能更新过的 frontmatter，并自动把新值同步到 Issue。
 - **追加**到 `## Activity Log`（不要覆盖之前的记录）：
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Technical Design (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Task (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
   ```
 
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则跳过并继续）：
@@ -151,7 +149,7 @@ node .agents/scripts/validate-artifact.js gate plan-task .agents/workspace/activ
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 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` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
 
 输出格式：
 ```
@@ -171,9 +169,9 @@ node .agents/scripts/validate-artifact.js gate plan-task .agents/workspace/activ
 请在继续实现之前审查技术方案。
 
 下一步 - 审查技术方案：
-  - Claude Code / OpenCode：/review-plan {task-id}
-  - Gemini CLI：/{{project}}:review-plan {task-id}
-  - Codex CLI：$review-plan {task-id}
+  - Claude Code / OpenCode：/review-plan {task-ref}
+  - Gemini CLI：/agent-infra:review-plan {task-ref}
+  - Codex CLI：$review-plan {task-ref}
 ```
 
 ## 完成检查清单

package/templates/.agents/skills/plan-task/config/verify.en.json

@@ -33,7 +33,7 @@
       ]
     },
     "activity-log": {
-      "expected_action_pattern": "Technical Design \\(Round \\d+\\)",
+      "expected_action_pattern": "(Plan Task|Technical Design) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/plan-task/config/verify.zh-CN.json

@@ -33,7 +33,7 @@
       ]
     },
     "activity-log": {
-      "expected_action_pattern": "Technical Design \\(Round \\d+\\)",
+      "expected_action_pattern": "(Plan Task|Technical Design) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

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

@@ -18,7 +18,7 @@ Version stamp rule: when creating or updating `task.md` frontmatter, read `.agen
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 

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

@@ -18,7 +18,7 @@ description: "从平台 Issue 评论还原本地任务文件"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证输入与环境

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

@@ -28,7 +28,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -65,7 +65,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 ```
 
 Set `current_step` to `requirement-analysis-review`, refresh task metadata, and append:
-`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Analysis Review (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {review-artifact}`
+`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Review Analysis (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {review-artifact}`
 
 If task.md has a valid `issue_number`, read `.agents/rules/issue-sync.md`, sync the task comment, and publish the `{review-artifact}` comment.
 
@@ -78,3 +78,5 @@ node .agents/scripts/validate-artifact.js gate review-analysis .agents/workspace
 ### 8. Tell the User
 
 Use the conclusion branch in `reference/output-templates.md` and show all TUI command formats.
+
+> 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

@@ -30,7 +30,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证前置条件
@@ -76,7 +76,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - `updated_at`：{当前时间}
 - `agent_infra_version`：按 `.agents/rules/version-stamp.md` 取值
 - 追加：
-  `- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Analysis Review (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {review-artifact}`
+  `- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Review Analysis (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {review-artifact}`
 
 如果 task.md 中存在有效的 `issue_number`，执行前先读取 `.agents/rules/issue-sync.md`，完成 upstream 仓库检测和权限检测，然后同步 task 评论并发布 `{review-artifact}` 评论。
 
@@ -92,6 +92,8 @@ node .agents/scripts/validate-artifact.js gate review-analysis .agents/workspace
 
 按 `reference/output-templates.md` 的结论分支输出，并展示所有 TUI 的下一步命令。
 
+> 渲染最终输出前先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令的 `{task-ref}` 渲染为当前任务短号 `#NN`（取值与回退见该文件），其他 `{task-id}` 占位（报告标题、路径）保持完整 TASK-id 形式；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+
 ## 完成检查清单
 
 - [ ] 已审查最新分析上下文

package/templates/.agents/skills/review-analysis/config/verify.en.json

@@ -23,7 +23,8 @@
         "Environment-Blocked Findings",
         "Conclusion and Recommendations",
         "State Check",
-        "Evidence"
+        "Evidence",
+        "Self-Doubt"
       ],
       "required_patterns": [
         "^### Approval Decision$",
@@ -32,7 +33,7 @@
       "freshness_minutes": 30
     },
     "activity-log": {
-      "expected_action_pattern": "Analysis Review \\(Round \\d+\\)",
+      "expected_action_pattern": "(Review Analysis|Analysis Review) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/review-analysis/config/verify.zh-CN.json

@@ -23,7 +23,8 @@
         "环境性遗留",
         "结论与建议",
         "状态核对",
-        "证据原文"
+        "证据原文",
+        "自我质疑"
       ],
       "required_patterns": [
         "^### 审查决定$",
@@ -32,7 +33,7 @@
       "freshness_minutes": 30
     },
     "activity-log": {
-      "expected_action_pattern": "Analysis Review \\(Round \\d+\\)",
+      "expected_action_pattern": "(Review Analysis|Analysis Review) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/review-analysis/reference/output-templates.en.md

@@ -25,9 +25,9 @@ Task {task-id} requirement analysis review completed. Verdict: approved.
 [- Review report: .agents/workspace/active/{task-id}/{review-artifact}]
 
 Next step - write the technical plan:
-  - Claude Code / OpenCode: /plan-task {task-id}
-  - Gemini CLI: /agent-infra:plan-task {task-id}
-  - Codex CLI: $plan-task {task-id}
+  - Claude Code / OpenCode: /plan-task {task-ref}
+  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Codex CLI: $plan-task {task-ref}
 
 [When env-blocked > 0, append:]
 Reminder: env-blocked items belong in the PR description manual verification checklist and should not trigger /analyze-task.
@@ -41,14 +41,14 @@ Task {task-id} requirement analysis review completed. Verdict: approved.
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - revise analysis before continuing (recommended):
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /agent-infra:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /agent-infra:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 
 Or proceed directly to planning:
-  - Claude Code / OpenCode: /plan-task {task-id}
-  - Gemini CLI: /agent-infra:plan-task {task-id}
-  - Codex CLI: $plan-task {task-id}
+  - Claude Code / OpenCode: /plan-task {task-ref}
+  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Codex CLI: $plan-task {task-ref}
 
 [When env-blocked > 0, append:]
 Reminder: env-blocked items belong in the PR description manual verification checklist and should not trigger /analyze-task.
@@ -62,9 +62,9 @@ Task {task-id} requirement analysis review completed. Verdict: changes requested
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - revise requirement analysis:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /agent-infra:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /agent-infra:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 
 [When env-blocked > 0, append:]
 Reminder: env-blocked items belong in the PR description manual verification checklist and should not trigger /analyze-task.
@@ -78,9 +78,9 @@ Task {task-id} requirement analysis review completed. Verdict: rejected, fresh a
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - re-analyze:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /agent-infra:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /agent-infra:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 
 [When env-blocked > 0, append:]
 Reminder: env-blocked items belong in the PR description manual verification checklist and should not trigger /analyze-task.

package/templates/.agents/skills/review-analysis/reference/output-templates.zh-CN.md

@@ -25,9 +25,9 @@
 [- 审查报告：.agents/workspace/active/{task-id}/{review-artifact}]
 
 下一步 - 编写技术方案：
-  - Claude Code / OpenCode：/plan-task {task-id}
-  - Gemini CLI：/agent-infra:plan-task {task-id}
-  - Codex CLI：$plan-task {task-id}
+  - Claude Code / OpenCode：/plan-task {task-ref}
+  - Gemini CLI：/agent-infra:plan-task {task-ref}
+  - Codex CLI：$plan-task {task-ref}
 
 [当 env-blocked > 0 时，在最后附加一行：]
 提醒：env-blocked 项需在 PR description 的「待人工验证」清单中承接，不应触发 /analyze-task。
@@ -41,14 +41,14 @@
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 修订分析后继续（推荐）：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/agent-infra:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/agent-infra:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 
 或直接进入方案设计：
-  - Claude Code / OpenCode：/plan-task {task-id}
-  - Gemini CLI：/agent-infra:plan-task {task-id}
-  - Codex CLI：$plan-task {task-id}
+  - Claude Code / OpenCode：/plan-task {task-ref}
+  - Gemini CLI：/agent-infra:plan-task {task-ref}
+  - Codex CLI：$plan-task {task-ref}
 
 [当 env-blocked > 0 时，在最后附加一行：]
 提醒：env-blocked 项需在 PR description 的「待人工验证」清单中承接，不应触发 /analyze-task。
@@ -62,9 +62,9 @@
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 修订需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/agent-infra:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/agent-infra:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 
 [当 env-blocked > 0 时，在最后附加一行：]
 提醒：env-blocked 项需在 PR description 的「待人工验证」清单中承接，不应触发 /analyze-task。
@@ -78,9 +78,9 @@
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 重新分析：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/agent-infra:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/agent-infra:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 
 [当 env-blocked > 0 时，在最后附加一行：]
 提醒：env-blocked 项需在 PR description 的「待人工验证」清单中承接，不应触发 /analyze-task。

package/templates/.agents/skills/review-analysis/reference/report-template.en.md

@@ -61,7 +61,7 @@ Use this template when writing `review-analysis.md` or `review-analysis-r{N}.md`
 
 ## Evidence
 
-> Pair each "I verified X" claim with the corresponding raw tool output; the gate only checks that this section exists and at least one `$ ` line is present.
+> Pair each "I verified X" claim with the corresponding raw tool output; the gate only checks that this section exists and at least one `$ ` line is present. Every Blocker must be backed by a reproducible command (rg/grep/sed/nl) and its raw output; a judgment that cannot be reproduced must be downgraded or moved to Self-Doubt.
 
 - Claim: {verified claim}
 ```text
@@ -69,6 +69,12 @@ $ {command}
 {raw output}
 ```
 
+## Self-Doubt
+
+> Explicitly declare conclusions, inferences, and assumptions in this review that were **not directly verified**; downstream can rebut them on this basis. Write "None" if there are none.
+
+- {an unverified conclusion or inference; note why it was not verified and the impact if it is overturned}
+
 ## Highlights
 
 - {what went well}

package/templates/.agents/skills/review-analysis/reference/report-template.zh-CN.md

@@ -62,7 +62,7 @@
 
 ## 证据原文
 
-> 每条“我验证了 X”断言都要配对对应 tool output 原文；gate 仅校验本段存在和至少一行 `$ `。
+> 每条“我验证了 X”断言都要配对对应 tool output 原文；gate 仅校验本段存在和至少一行 `$ `。每条 Blocker 必须配可复现命令（rg/grep/sed/nl）及其原文；无法复现的判断须降级或移入「自我质疑」。
 
 - 断言：{verified claim}
 ```text
@@ -70,6 +70,12 @@ $ {command}
 {raw output}
 ```
 
+## 自我质疑
+
+> 显式声明本轮审查中**未直接验证**的结论、推断项与所作假设；下游据此可反驳。无则写「（无）」。
+
+- {未直接验证的结论或推断；说明为何未验证、若被推翻的影响}
+
 ## 亮点
 
 - {what went well}

package/templates/.agents/skills/review-analysis/reference/review-criteria.en.md

@@ -13,11 +13,13 @@ Follow the `analysis-review` step in `.agents/workflows/feature-development.yaml
 - [ ] Risks, edge cases, and open questions are recorded
 - [ ] The design stage has enough input to proceed
 - [ ] The analysis matches the original Issue or user request
+- [ ] Every blocker is backed by reproducible grep/sed/nl evidence; conclusions not directly verified are declared under Self-Doubt
 
 **Common anti-examples**:
 - Treating implementation design as requirement analysis and locking in technical details too early
 - Restating the Issue without adding impact scope, risks, or acceptance criteria
 - Presenting uncertain information as fact without marking assumptions or open questions
+- Asserting a `file:line` or behavior from memory or impression without verifying via rg/nl
 
 ## Common Review Principles
 

package/templates/.agents/skills/review-analysis/reference/review-criteria.zh-CN.md

@@ -13,11 +13,13 @@
 - [ ] 风险、边界情况和开放问题是否记录
 - [ ] 后续设计阶段是否有足够输入
 - [ ] 与原始 Issue / 用户需求是否一致
+- [ ] 每条 blocker 都配可复现的 grep/sed/nl 证据，未直接验证的结论已在「自我质疑」声明
 
 **常见反例**：
 - 把实现方案当作需求分析，提前锁定技术细节
 - 只复述 Issue 文案，没有补充影响范围、风险和验收标准
 - 对无法确认的信息直接下结论，没有标记假设或开放问题
+- 凭印象或记忆断言 `file:line`/行为，没有用 rg/nl 复核就下结论
 
 ## 通用审查原则
 

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

@@ -21,6 +21,7 @@ Version stamp rule: when creating or updating `task.md` frontmatter, read `.agen
 | "It was only one line, so it cannot affect behavior." | Line count is not impact; read the full `git diff` and trace the downstream effect of each change. |
 | "It looks mostly fine, so approve it." | The verdict must be backed by blocker/major/minor counts, and every finding must cite file:line; do not approve from impression. |
 | "The test change looks reasonable, so I can skim it." | Before reviewing test changes, check `.agents/rules/testing-discipline.md` item by item (see the step 4 gate). |
+| "I'm sure it's that line, no need to check." | Line numbers drift; verify `file:line` via rg/nl before concluding, and do not file a blocker you cannot reproduce. |
 
 ## Step 0: State Check (pre-execution hard gate)
 
@@ -38,7 +39,7 @@ Before the state check is complete, do not make external-state assertions such a
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -80,7 +81,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 ```
 
 Update task.md and append:
-`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Code Review (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {artifact-filename}`
+`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Review Code (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {artifact-filename}`
 
 Omit the bracketed segment when env-blocked = 0; append ` (+ {n} env-blocked)` when env-blocked > 0.
 
@@ -121,6 +122,8 @@ env-blocked counts do not influence branch selection; they are appended to the s
 
 > The full four-branch output templates, selection rules, and prohibition clauses live in `reference/output-templates.md`. Read `reference/output-templates.md` before reporting the review result.
 
+> 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).
+
 Include all TUI command formats in the next-step output. 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).
 
 ## Completion Checklist

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

@@ -21,6 +21,7 @@ description: "审查代码实现并输出代码审查报告"
 | 「只改了一行，不影响功能」 | 行数不等于影响面；必须读完整 `git diff` 并定位每处改动的下游效果。 |
 | 「大体没问题，给个 Approved」 | 结论必须由 blocker/major/minor 计数支撑，每个问题引用文件:行号，不能凭印象放行。 |
 | 「测试改动看着合理，跳过细看」 | 审查测试变更前必须逐条核对 `.agents/rules/testing-discipline.md`（见步骤 4 门禁）。 |
+| 「记得就是这一行，不用查」 | 行号会漂移；下结论前必须用 rg/nl 复核 `file:line`，不能复现的判断不要写成 blocker。 |
 
 ## 第 0 步：状态核对（执行前硬约束）
 
@@ -38,7 +39,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证前置条件
@@ -83,7 +84,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - `updated_at`：{当前时间}
 - `agent_infra_version`：按 `.agents/rules/version-stamp.md` 取值
 - 追加：
-`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Code Review (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {artifact-filename}`
+`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Review Code (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {artifact-filename}`
 
 env-blocked = 0 时省略括号部分；env-blocked > 0 时附加 ` (+ {n} env-blocked)`。
 
@@ -124,6 +125,8 @@ env-blocked 的数量不参与分支选择，仅在数字摘要末尾附带显
 
 > 完整的 4 分支输出模板、判断规则和禁止条款见 `reference/output-templates.md`。向用户汇报审查结论前先读取 `reference/output-templates.md`。
 
+> 渲染最终输出前先读取 `.agents/rules/next-step-output.md` 并落实其两类规则：(1) 「下一步」命令的 `{task-ref}` 渲染为当前任务短号 `#NN`（取值与回退见该文件），其他 `{task-id}` 占位（报告标题、路径）保持完整 TASK-id 形式；(2) 在面向用户输出的绝对最后一行追加 `Completed at` 收尾行（成功、错误、早退等任何面向用户输出都适用，不限于校验通过的成功态）。
+
 向用户展示下一步时，必须包含所有 TUI 命令格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
 
 ## 完成检查清单

package/templates/.agents/skills/review-code/config/verify.en.json

@@ -23,7 +23,8 @@
         "Environment-Blocked Findings",
         "Conclusion and Recommendations",
         "State Check",
-        "Evidence"
+        "Evidence",
+        "Self-Doubt"
       ],
       "required_patterns": [
         "^### Approval Decision$",
@@ -33,7 +34,7 @@
       "freshness_minutes": 30
     },
     "activity-log": {
-      "expected_action_pattern": "Code Review \\(Round \\d+\\)",
+      "expected_action_pattern": "(Review Code|Code Review) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/review-code/config/verify.zh-CN.json

@@ -23,7 +23,8 @@
         "环境性遗留",
         "结论与建议",
         "状态核对",
-        "证据原文"
+        "证据原文",
+        "自我质疑"
       ],
       "required_patterns": [
         "^### 审查决定$",
@@ -33,7 +34,7 @@
       "freshness_minutes": 30
     },
     "activity-log": {
-      "expected_action_pattern": "Code Review \\(Round \\d+\\)",
+      "expected_action_pattern": "(Review Code|Code Review) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

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

@@ -43,9 +43,9 @@ Task {task-id} review completed. Verdict: approved.
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - fix before commit (recommended):
-  - Claude Code / OpenCode: /code-task {task-id}
-  - Gemini CLI: /agent-infra:code-task {task-id}
-  - Codex CLI: $code-task {task-id}
+  - Claude Code / OpenCode: /code-task {task-ref}
+  - Gemini CLI: /agent-infra:code-task {task-ref}
+  - Codex CLI: $code-task {task-ref}
 
 Or commit directly (skip fix):
   - Claude Code / OpenCode: /commit
@@ -64,9 +64,9 @@ Task {task-id} review completed. Verdict: changes requested.
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - fix the findings:
-  - Claude Code / OpenCode: /code-task {task-id}
-  - Gemini CLI: /agent-infra:code-task {task-id}
-  - Codex CLI: $code-task {task-id}
+  - Claude Code / OpenCode: /code-task {task-ref}
+  - Gemini CLI: /agent-infra:code-task {task-ref}
+  - Codex CLI: $code-task {task-ref}
 
 [When env-blocked > 0, append this final line:]
 Reminder: env-blocked findings must be carried in the PR description as a "manual verification required" checklist and should not trigger /code-task.
@@ -80,9 +80,9 @@ Task {task-id} review completed. Verdict: rejected, re-design the technical plan
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - re-design the technical plan:
-  - Claude Code / OpenCode: /plan-task {task-id}
-  - Gemini CLI: /agent-infra:plan-task {task-id}
-  - Codex CLI: $plan-task {task-id}
+  - Claude Code / OpenCode: /plan-task {task-ref}
+  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Codex CLI: $plan-task {task-ref}
 
 > Note: Rejected means the implementation direction needs to be reworked end-to-end, not patched locally. `code-task/scripts/detect-mode.js` branch #7 refuses a direct `/code-task` and requires a fresh plan first.