@fitlab-ai/agent-infra 0.7.4 → 0.7.5

package/templates/.agents/skills/code-task/scripts/detect-mode.js

@@ -2,6 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
 
+import { artifactName, maxRound, parseVerdict } from "../../../scripts/lib/review-artifacts.js";
+
 function main() {
   const taskDir = process.argv[2];
   if (!taskDir) {
@@ -170,26 +172,6 @@ function main() {
   }
 }
 
-function maxRound(entries, stem) {
-  let max = 0;
-  for (const entry of entries) {
-    if (entry === `${stem}.md`) {
-      max = Math.max(max, 1);
-      continue;
-    }
-
-    const match = entry.match(new RegExp(`^${escapeRegExp(stem)}-r(\\d+)\\.md$`));
-    if (match) {
-      max = Math.max(max, Number(match[1]));
-    }
-  }
-  return max;
-}
-
-function artifactName(stem, round) {
-  return round === 1 ? `${stem}.md` : `${stem}-r${round}.md`;
-}
-
 function checkPlanAheadOfCode({ resolvedTaskDir, codeMax, planMax, reviewPlanMax }) {
   if (planMax === 0 || reviewPlanMax === 0) {
     return { replan: false };
@@ -275,96 +257,9 @@ function safeStat(filePath) {
   }
 }
 
-function parseVerdict(reviewPath) {
-  if (!fs.existsSync(reviewPath)) {
-    return { ok: false, verdict: null, message: `Review artifact not found: ${path.basename(reviewPath)}` };
-  }
-
-  const content = fs.readFileSync(reviewPath, "utf8");
-  const summary = extractSection(content, ["审查摘要", "Review Summary"]);
-  const fileName = path.basename(reviewPath);
-  if (!summary) {
-    return { ok: false, verdict: null, message: `cannot locate review summary section in ${fileName}` };
-  }
-
-  const verdictMatch = summary.match(/^[-*]?\s*\*\*(?:总体结论|Overall Verdict)\*\*[:：]\s*(.+?)\s*$/im);
-  if (!verdictMatch) {
-    return { ok: false, verdict: null, message: `cannot parse verdict in ${fileName}` };
-  }
-
-  const verdict = normalizeVerdict(verdictMatch[1]);
-  if (!verdict) {
-    return {
-      ok: false,
-      verdict: null,
-      message: `unrecognized verdict '${verdictMatch[1].trim()}' in ${fileName}`
-    };
-  }
-
-  if (verdict !== "Approved") {
-    return { ok: true, verdict };
-  }
-
-  const findingsMatch = summary.match(/^[-*]?\s*\*\*(?:发现（AI 可处理）|Findings \(AI-actionable\))\*\*[:：]\s*(.+?)\s*$/im);
-  if (!findingsMatch) {
-    return { ok: false, verdict, message: `cannot parse findings count in ${fileName}` };
-  }
-
-  const counts = findingsMatch[1].match(/(\d+)\s*(?:阻塞项|blockers?).*?(\d+)\s*(?:主要|majors?).*?(\d+)\s*(?:次要|minors?)/i);
-  if (!counts) {
-    return { ok: false, verdict, message: `cannot parse findings count in ${fileName}` };
-  }
-
-  const [, blockers, majors, minors] = counts.map(Number);
-  return {
-    ok: true,
-    verdict: blockers === 0 && majors === 0 && minors === 0 ? "Approved" : "Approved-with-issues"
-  };
-}
-
-function normalizeVerdict(raw) {
-  const value = String(raw).trim().toLowerCase();
-  if (value === "通过" || value === "approved") {
-    return "Approved";
-  }
-  if (value === "需要修改" || value === "changes requested") {
-    return "Changes Requested";
-  }
-  if (value === "拒绝" || value === "rejected") {
-    return "Rejected";
-  }
-  return "";
-}
-
-function extractSection(content, names) {
-  const lines = content.split(/\r?\n/);
-  const nameSet = new Set(names);
-  const start = lines.findIndex((line) => {
-    const match = line.trim().match(/^##\s+(.+?)\s*$/);
-    return match ? nameSet.has(match[1]) : false;
-  });
-
-  if (start === -1) {
-    return "";
-  }
-
-  const sectionLines = [];
-  for (let index = start + 1; index < lines.length; index += 1) {
-    if (/^##\s+/.test(lines[index])) {
-      break;
-    }
-    sectionLines.push(lines[index]);
-  }
-  return sectionLines.join("\n");
-}
-
 function writeResult(result, code) {
   process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
   process.exitCode = code;
 }
 
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
 main();

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

@@ -48,6 +48,12 @@ Review status, diff, and recent history, then prepare a Conventional Commit with
 
 Stage specific files only and run `git commit` with the prepared message.
 
+If this commit is associated with a task and a `review-code` artifact exists, read the highest-round `review-code` artifact before committing:
+- If that artifact's `Overall Verdict` / `总体结论` is Approved, parse `Review Baseline Commit` / `审查基线提交` as `R`, and `Reviewed Diff Fingerprint` / `审查差异指纹` as `F`
+- After staging the explicit files, run `node .agents/scripts/review-diff-fingerprint.js staged <R>` to get `S`, and record `pre_head=$(git rev-parse HEAD)`
+- After committing, write `last_reviewed_commit: <new_head>` to task.md frontmatter only when `pre_head == R` and `S == F`; otherwise do not advance that field
+- Do not scan backward to earlier Approved artifacts; the highest-round `review-code` artifact is the only authoritative source
+
 ## 5. Update Task Status When Applicable
 
 Get the current time:

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

@@ -48,6 +48,12 @@ git diff
 
 只暂存明确列出的文件，然后执行 `git commit`。
 
+如果本次提交关联任务且存在 `review-code` 产物，在提交前读取最高轮 `review-code` 产物：
+- 若该产物 `总体结论` / `Overall Verdict` 为 Approved，解析 `审查基线提交` / `Review Baseline Commit` 为 `R`，解析 `审查差异指纹` / `Reviewed Diff Fingerprint` 为 `F`
+- 暂存明确文件后运行 `node .agents/scripts/review-diff-fingerprint.js staged <R>` 得到 `S`，并记录 `pre_head=$(git rev-parse HEAD)`
+- 提交后仅当 `pre_head == R` 且 `S == F` 时，在 task.md frontmatter 写入 `last_reviewed_commit: <new_head>`；否则不推进该字段
+- 不向后扫描更早的 Approved 产物；最高轮 `review-code` 产物是唯一权威来源
+
 ## 5. 按需更新任务状态
 
 获取当前时间：

package/templates/.agents/skills/commit/reference/task-status-update.en.md

@@ -18,6 +18,14 @@ For every task-related commit, append this Activity Log entry in `task.md`:
 - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Commit** by {agent} — {commit hash short} {commit subject}
 ```
 
+If the commit stage confirmed that the highest-round `review-code` artifact is Approved, `pre_head` equals its review baseline commit `R`, and the staged diff fingerprint `S` equals its reviewed diff fingerprint `F`, also write or refresh:
+
+```yaml
+last_reviewed_commit: {new_head}
+```
+
+This field is the preferred baseline for the `complete-task` `post-review-commit` gate. When any condition is not met, do not write or advance it.
+
 Before selecting the next step, verify:
 - `current_step` and the latest workflow progress in `task.md`
 - whether the latest `review-code.md` / `review-code-r{N}.md` passed without findings

package/templates/.agents/skills/commit/reference/task-status-update.zh-CN.md

@@ -18,6 +18,14 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Commit** by {agent} — {commit hash short} {commit subject}
 ```
 
+如果提交阶段已确认最高轮 `review-code` 产物 Approved、`pre_head` 等于其审查基线提交 `R`、且 staged 差异指纹 `S` 等于其审查差异指纹 `F`，同时写入或刷新：
+
+```yaml
+last_reviewed_commit: {new_head}
+```
+
+该字段是 `complete-task` 的 `post-review-commit` gate 优先 baseline。条件不满足时不要写入或推进该字段。
+
 在决定下一步之前，先确认：
 - `task.md` 中的 `current_step` 和最新工作流进度
 - 最新的 `review-code.md` / `review-code-r{N}.md` 是否无问题通过

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

@@ -77,6 +77,16 @@ Before marking complete, verify ALL of these:
 - [ ] Code has been reviewed (`review-code.md` or `review-code-r{N}.md` exists, and the latest review verdict is Approved; or review was done externally)
 - [ ] Code has been committed (no uncommitted changes related to this task)
 - [ ] Tests are passing
+- [ ] The disagreement ledger has no unclosed disagreements and there are no un-re-reviewed post-review commits (mechanically checked by the "Pre-completion hard gate" below)
+
+**Pre-completion hard gate (run BEFORE moving the directory or releasing the short id)**: the Step 7 `gate complete-task` runs only after the directory has been `mv`-ed to `completed/` and the short id released; to avoid a gate failure occurring after those irreversible operations, run the two new completion gates on the **active directory** first:
+
+```bash
+node .agents/scripts/validate-artifact.js check review-ledger .agents/workspace/active/{task-id} --skill complete-task --format text
+node .agents/scripts/validate-artifact.js check post-review-commit .agents/workspace/active/{task-id} --skill complete-task --format text
+```
+
+A non-zero exit from either (fail/blocked) -> treat as an unmet prerequisite and **stop**, do not run Steps 3-7. `--force` does **NOT** lift this hard gate: unclosed disagreements must first be closed in the ledger (`confirmed`/`closed`/`human-decided`), and un-re-reviewed post-review commits must be re-reviewed via `review-code` or covered by a `post-review-commit` / `human-decided` exemption row in the ledger.
 
 > **⚠️ Prerequisite Branch Check — you must decide whether to continue or stop before proceeding:**
 >

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

@@ -76,6 +76,16 @@ tail .agents/workspace/active/{task-id}/task.md
 - [ ] 代码已审查（`review-code.md` 或 `review-code-r{N}.md` 存在，且最新审查结论为 Approved；或已在外部完成审查）
 - [ ] 代码已提交（没有与此任务相关的未提交变更）
 - [ ] 测试通过
+- [ ] 审查分歧账本无未关闭分歧，且无未复审的 post-review 提交（由下方「预完成硬门禁」机械校验）
+
+**预完成硬门禁（在移动目录、释放短号之前运行）**：步骤 7 的 `gate complete-task` 在目录已 `mv` 到 `completed/`、短号已释放之后才运行；为避免门禁失败发生在不可逆操作之后，必须在 **active 目录**上预先运行新增的两项完成门禁：
+
+```bash
+node .agents/scripts/validate-artifact.js check review-ledger .agents/workspace/active/{task-id} --skill complete-task --format text
+node .agents/scripts/validate-artifact.js check post-review-commit .agents/workspace/active/{task-id} --skill complete-task --format text
+```
+
+任一退出码非 0（fail/blocked）→ 按前置条件未满足处理，**停止**，不执行步骤 3-7。`--force` **不解除**本硬门禁：未关闭分歧必须先在账本闭合（`confirmed`/`closed`/`human-decided`），未复审 post-review 提交必须重新 `review-code` 或在账本追加 `post-review-commit` / `human-decided` 豁免行。
 
 > **⚠️ 前置条件分支判断 — 你必须先判断“继续”还是“停止”：**
 >

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

@@ -24,6 +24,8 @@
     "completion-checklist": {
       "require_all_checked": true
     },
+    "review-ledger": {},
+    "post-review-commit": {},
     "platform-sync": {
       "when": "issue_number_exists",
       "expected_comment_marker": "<!-- sync-issue:{task-id}:summary -->",

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

@@ -24,6 +24,8 @@
     "completion-checklist": {
       "require_all_checked": true
     },
+    "review-ledger": {},
+    "post-review-commit": {},
     "platform-sync": {
       "when": "issue_number_exists",
       "expected_comment_marker": "<!-- sync-issue:{task-id}:summary -->",

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

@@ -9,7 +9,7 @@ Read this file before creating or updating the single reviewer-facing PR summary
 - Generate or update the `<!-- sync-pr:{task-id}:summary -->` comment with the canonical template from `.agents/rules/pr-sync.md`
 - When a matching summary comment already exists, PATCH only when the body changed; otherwise skip the write
 - In this skill, summary sync failures follow the existing `create-pr` error handling and must not roll back an already-created PR
-- Populate the "Manual Verification Required" section per the aggregation rules in `.agents/rules/pr-sync.md` (sources: plan assumptions/open questions, review-code "Environment-Blocked Findings"/"Self-Doubt"); write the explicit placeholder when there are none
+- Populate `{manual-verify-section}` per the aggregation rules in `.agents/rules/pr-sync.md`: include only post-code-stage checks that the AI cannot close on its own and that require a human to execute or judge; sources are `review-code*` "Environment-Blocked Findings" plus `code*` items that satisfy the admission boundary; each item must state "what to verify + location + why only a human can verify it". Render in two branches: **with retained items** → `### ⚠️ Manual Verification Required` heading + item list; **with none** → `### ✅ No Manual Verification Needed` heading + a single line (no ⚠️, no old list placeholder)
 
 ## Result Reporting
 

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

@@ -9,7 +9,7 @@
 - 按 `.agents/rules/pr-sync.md` 中的唯一权威模板生成或更新 `<!-- sync-pr:{task-id}:summary -->` 评论
 - PR 已存在同标记评论时，只在正文变化时 PATCH；否则跳过写入
 - 本 skill 中，摘要同步失败沿用 `create-pr` 的现有错误处理，不回滚已经创建的 PR
-- 按 `.agents/rules/pr-sync.md` 的聚合规则填充「需人工校验」段落（来源：plan 假设/未决问题、review-code 环境性遗留/自我质疑）；无事项时写显式占位
+- 按 `.agents/rules/pr-sync.md` 的聚合规则填充 `{manual-verify-section}`：只收进入 code 阶段后 AI 无法自行关闭、需要人实际执行或判断的校验点；来源为 `review-code*` 的「环境性遗留」以及 `code*` 中满足准入边界的校验点；每条写明「校验什么 + 定位 + 为什么只能由人校验」。按两分支渲染：**有保留项** → `### ⚠️ 需人工校验` 标题 + 条目列表；**无保留项** → `### ✅ 无需人工校验` 标题 + 单行说明（不带 ⚠️、不写旧的列表占位）
 
 ## 结果回传
 

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

@@ -66,7 +66,7 @@ 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.
+**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, then dispose of it with one of the four states in `.agents/rules/review-handshake.md` (`accepted` / `adjusted` / `refuted` / `cannot-judge`) — every state needs commensurate evidence, never defaulting to compliance; write the disposition back to the matching row in the task.md disagreement ledger (stage=plan, round +1). Record any open disagreement under `## Open Questions`. Round 1 has no review, so skip this section.
 
 ### 4. Understand the Problem
 

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

@@ -65,7 +65,7 @@ tail .agents/workspace/active/{task-id}/task.md
 - 已识别的技术风险
 - 工作量和复杂度评估
 
-**Round ≥ 2：响应上一轮审查（仅当存在审查产物时）**：若任务目录存在 `review-plan.md` / `review-plan-r{N}.md`，读取最高轮次的审查报告；在本轮方案产物中新增 `## 对上一轮审查的响应` 段，对每条发现先 Read/Grep 核实再处置（成立 → 接受并修正；判定为幻觉/不成立 → 附反证反驳，不默认顺从），未决分歧写入 `## 未决问题`。Round 1 无审查，跳过本段。
+**Round ≥ 2：响应上一轮审查（仅当存在审查产物时）**：若任务目录存在 `review-plan.md` / `review-plan-r{N}.md`，读取最高轮次的审查报告；在本轮方案产物中新增 `## 对上一轮审查的响应` 段，对每条发现先 Read/Grep 核实，再按 `.agents/rules/review-handshake.md` 的四态（`accepted` / `adjusted` / `refuted` / `cannot-judge`）处置——每态都要附相称证据，不默认顺从；并把处置回写 task.md `## 审查分歧账本` 对应行（stage=plan，round +1）。未决分歧写入 `## 未决问题`。Round 1 无审查，跳过本段。
 
 ### 4. 理解问题
 

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

@@ -36,6 +36,9 @@
       "expected_action_pattern": "(Plan Task|Technical Design) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
+    "review-ledger": {
+      "stage_scope": ["analysis"]
+    },
     "platform-sync": {
       "when": "issue_number_exists",
       "expected_status_label": "status: pending-design-work",

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

@@ -36,6 +36,9 @@
       "expected_action_pattern": "(Plan Task|Technical Design) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
+    "review-ledger": {
+      "stage_scope": ["analysis"]
+    },
     "platform-sync": {
       "when": "issue_number_exists",
       "expected_status_label": "status: pending-design-work",

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

@@ -24,7 +24,8 @@
         "Conclusion and Recommendations",
         "State Check",
         "Evidence",
-        "Self-Doubt"
+        "Self-Doubt",
+        "Review Disagreement Ledger Writeback"
       ],
       "required_patterns": [
         "^### Approval Decision$",

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

@@ -24,7 +24,8 @@
         "结论与建议",
         "状态核对",
         "证据原文",
-        "自我质疑"
+        "自我质疑",
+        "审查分歧账本回写"
       ],
       "required_patterns": [
         "^### 审查决定$",

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

@@ -16,12 +16,13 @@ Rules:
 - If `Blocker > 0`, never use an approved template
 - Never count env-blocked items as blocker / major / minor or use them to trigger Scenario B/C/D
 - The selected scenario must include all TUI command formats
+- The count line always shows 4 numbers: the first three (Blockers / Major / Minor) must be 0 to proceed; the fourth, `Human-decision` (`{h}`), is the number of rows in task.md `## 审查分歧账本` with `stage=analysis` and `status=needs-human-decision` — a "pending human ruling" item that need not be zero and does not participate in scenario selection
 
 ### Scenario A: Approved with no findings
 
 ```text
 Task {task-id} requirement analysis review completed. Verdict: approved.
-- Blockers: 0 | Major issues: 0 | Minor issues: 0[ | Environment-blocked: {n} (outside AI fix scope)]
+- Blockers: 0 | Major issues: 0 | Minor issues: 0 | Human-decision: {h}
 [- Review report: .agents/workspace/active/{task-id}/{review-artifact}]
 
 Next step - write the technical plan:
@@ -37,7 +38,7 @@ Reminder: env-blocked items belong in the PR description manual verification che
 
 ```text
 Task {task-id} requirement analysis review completed. Verdict: approved.
-- Blockers: 0 | Major issues: {n} | Minor issues: {n}[ | Environment-blocked: {n} (outside AI fix scope)]
+- Blockers: 0 | Major issues: {n} | Minor issues: {n} | Human-decision: {h}
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - revise analysis before continuing (recommended):
@@ -58,7 +59,7 @@ Reminder: env-blocked items belong in the PR description manual verification che
 
 ```text
 Task {task-id} requirement analysis review completed. Verdict: changes requested.
-- Blockers: {n} | Major issues: {n} | Minor issues: {n}[ | Environment-blocked: {n} (outside AI fix scope)]
+- Blockers: {n} | Major issues: {n} | Minor issues: {n} | Human-decision: {h}
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - revise requirement analysis:
@@ -74,7 +75,7 @@ Reminder: env-blocked items belong in the PR description manual verification che
 
 ```text
 Task {task-id} requirement analysis review completed. Verdict: rejected, fresh analysis or requirement clarification required.
-- Blockers: {n} | Major issues: {n} | Minor issues: {n}[ | Environment-blocked: {n} (outside AI fix scope)]
+- Blockers: {n} | Major issues: {n} | Minor issues: {n} | Human-decision: {h}
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - re-analyze:

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

@@ -16,12 +16,13 @@
 - 只要 `Blocker > 0`，就绝对不能输出通过模板
 - env-blocked 项绝对不能被计入 blocker / major / minor 计数，也不能用作触发场景 B/C/D 的依据
 - 所选场景中必须包含所有 TUI 命令格式
+- 计数行固定显示 4 个数字：前三项（阻塞 / 主要 / 次要）必须为 0 才进下一步；第四项 `人工裁决`（`{h}`）= task.md `## 审查分歧账本` 中 `stage=analysis` 且 `status=needs-human-decision` 的行数，是「待人裁」项、不要求归零，也不参与场景判断
 
 ### 场景 A：通过且无问题
 
 ```text
 任务 {task-id} 需求分析审查完成。结论：通过。
-- 阻塞项：0 | 主要问题：0 | 次要问题：0[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：0 | 主要问题：0 | 次要问题：0 | 人工裁决：{h}
 [- 审查报告：.agents/workspace/active/{task-id}/{review-artifact}]
 
 下一步 - 编写技术方案：
@@ -37,7 +38,7 @@
 
 ```text
 任务 {task-id} 需求分析审查完成。结论：通过。
-- 阻塞项：0 | 主要问题：{n} | 次要问题：{n}[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：0 | 主要问题：{n} | 次要问题：{n} | 人工裁决：{h}
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 修订分析后继续（推荐）：
@@ -58,7 +59,7 @@
 
 ```text
 任务 {task-id} 需求分析审查完成。结论：需要修改。
-- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n}[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n} | 人工裁决：{h}
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 修订需求分析：
@@ -74,7 +75,7 @@
 
 ```text
 任务 {task-id} 需求分析审查完成。结论：拒绝，需要重新分析或补充需求澄清。
-- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n}[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n} | 人工裁决：{h}
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 重新分析：

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

@@ -59,6 +59,10 @@ Use this template when writing `review-analysis.md` or `review-analysis-r{N}.md`
 > If this round has no env-blocked findings, keep the section heading and write "None".
 
 
+## Review Disagreement Ledger Writeback
+
+> Upsert each finding this round into the task.md disagreement ledger: append an `open` row for new findings (id prefix `AN-`, stage=analysis); per the hand-back duty set the executor's prior-round responses to `confirmed` / back to `open` / `needs-human-decision`. State machine and evidence rules: `.agents/rules/review-handshake.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. 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.

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

@@ -60,6 +60,10 @@
 > 如本轮无 env-blocked 项，保留段落标题并写「（无）」。
 
 
+## 审查分歧账本回写
+
+> 把本轮每条 finding upsert 到 task.md `## 审查分歧账本`：新 finding 追加 `open` 行（id 前缀 `AN-`，stage=analysis），对执行方上一轮响应按回交义务改 `confirmed` / 置回 `open` / `needs-human-decision`。状态机与证据规则见 `.agents/rules/review-handshake.md`。
+
 ## 证据原文
 
 > 每条“我验证了 X”断言都要配对对应 tool output 原文；gate 仅校验本段存在和至少一行 `$ `。每条 Blocker 必须配可复现命令（rg/grep/sed/nl）及其原文；无法复现的判断须降级或移入「自我质疑」。

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

@@ -61,7 +61,10 @@ Read the highest-round code artifact and, if present, the highest-round fix arti
 
 ### 4. Perform the Review
 
-Follow `.agents/workflows/feature-development.yaml` and inspect `git diff` for the full change context.
+Follow `.agents/workflows/feature-development.yaml` and inspect the full change context:
+- `git diff --binary HEAD -- <post-review-globs>` for tracked changes
+- `git ls-files -o --exclude-standard -z -- <post-review-globs>` for untracked new files
+- `node .agents/scripts/review-diff-fingerprint.js worktree HEAD` for the reviewed diff fingerprint; write it into the report
 
 > Detailed review criteria, severity rules, and reviewer expectations live in `reference/review-criteria.md`. Read `reference/review-criteria.md` before reviewing.
 > Test review gate: when `git diff` touches test files, read `.agents/rules/testing-discipline.md` first and check it item by item, especially "do not add negative assertions when a positive assertion already covers the behavior".

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

@@ -60,7 +60,10 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ### 4. 执行审查
 
-遵循 `.agents/workflows/feature-development.yaml`，并同时检查 `git diff` 获取完整变更上下文。
+遵循 `.agents/workflows/feature-development.yaml`，并同时检查完整变更上下文：
+- `git diff --binary HEAD -- <post-review-globs>` 覆盖已跟踪变更
+- `git ls-files -o --exclude-standard -z -- <post-review-globs>` 覆盖未跟踪新文件
+- `node .agents/scripts/review-diff-fingerprint.js worktree HEAD` 生成审查差异指纹，并写入报告
 
 > 详细审查标准、严重程度划分和 reviewer 关注点见 `reference/review-criteria.md`。执行此步骤前先读取 `reference/review-criteria.md`。
 > 测试审查硬门禁：当 `git diff` 触及测试文件时，必须先读取 `.agents/rules/testing-discipline.md` 并逐条核对（尤其"正向已覆盖时不应再加反向断言"）。

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

@@ -24,12 +24,15 @@
         "Conclusion and Recommendations",
         "State Check",
         "Evidence",
-        "Self-Doubt"
+        "Self-Doubt",
+        "Review Disagreement Ledger Writeback"
       ],
       "required_patterns": [
         "^### Approval Decision$",
         "^\\$ ",
-        "^- \\*\\*Overall Verdict\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$"
+        "^- \\*\\*Overall Verdict\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$",
+        "^- \\*\\*Review Baseline Commit\\*\\*[:：]\\s*\\S",
+        "^- \\*\\*Reviewed Diff Fingerprint\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$"
       ],
       "freshness_minutes": 30
     },

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

@@ -24,12 +24,15 @@
         "结论与建议",
         "状态核对",
         "证据原文",
-        "自我质疑"
+        "自我质疑",
+        "审查分歧账本回写"
       ],
       "required_patterns": [
         "^### 审查决定$",
         "^\\$ ",
-        "^- \\*\\*总体结论\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$"
+        "^- \\*\\*总体结论\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$",
+        "^- \\*\\*审查基线提交\\*\\*[:：]\\s*\\S",
+        "^- \\*\\*审查差异指纹\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$"
       ],
       "freshness_minutes": 30
     },

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

@@ -18,12 +18,13 @@ Prohibitions:
 - if `Blocker > 0`, never output an approval template
 - never count env-blocked findings as blockers / major issues / minor issues, and never use them to trigger Branch B/C/D
 - always include every TUI command format in the selected branch
+- the count line always shows 5 numbers: the first three (Blockers / Major / Minor) must be 0 to proceed; the last two are "pending human" items and need not be zero — `Manual-verify` (`{e}`) = this round's env-blocked count, `Human-decision` (`{h}`) = the number of rows in task.md `## 审查分歧账本` with `stage=code` and `status=needs-human-decision`; neither participates in branch selection
 
 ### Branch A: Approved with No Findings
 
 ```text
 Task {task-id} review completed. Verdict: approved.
-- Blockers: 0 | Major: 0 | Minor: 0[ | env-blocked: {n} (outside AI repair scope)]
+- Blockers: 0 | Major: 0 | Minor: 0 | Manual-verify: {e} | Human-decision: {h}
 [- Review report: .agents/workspace/active/{task-id}/{review-artifact}]
 
 Next step - commit the code:
@@ -39,7 +40,7 @@ Reminder: env-blocked findings must be carried in the PR description as a "manua
 
 ```text
 Task {task-id} review completed. Verdict: approved.
-- Blockers: 0 | Major: {n} | Minor: {n}[ | env-blocked: {n} (outside AI repair scope)]
+- Blockers: 0 | Major: {n} | Minor: {n} | Manual-verify: {e} | Human-decision: {h}
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - fix before commit (recommended):
@@ -60,7 +61,7 @@ Reminder: env-blocked findings must be carried in the PR description as a "manua
 
 ```text
 Task {task-id} review completed. Verdict: changes requested.
-- Blockers: {n} | Major: {n} | Minor: {n}[ | env-blocked: {n} (outside AI repair scope)]
+- Blockers: {n} | Major: {n} | Minor: {n} | Manual-verify: {e} | Human-decision: {h}
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - fix the findings:
@@ -76,7 +77,7 @@ Reminder: env-blocked findings must be carried in the PR description as a "manua
 
 ```text
 Task {task-id} review completed. Verdict: rejected, re-design the technical plan.
-- Blockers: {n} | Major: {n} | Minor: {n}[ | env-blocked: {n} (outside AI repair scope)]
+- Blockers: {n} | Major: {n} | Minor: {n} | Manual-verify: {e} | Human-decision: {h}
 - Review report: .agents/workspace/active/{task-id}/{review-artifact}
 
 Next step - re-design the technical plan:

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

@@ -18,12 +18,13 @@
 - 只要 `Blocker > 0`，就绝对不能输出通过模板
 - env-blocked 项绝对不能被计入 blocker / major / minor 计数，也不能用作触发场景 B/C/D 的依据
 - 所选场景中必须包含所有 TUI 命令格式
+- 计数行固定显示 5 个数字：前三项（阻塞 / 主要 / 次要）必须为 0 才进下一步；后两项是「待人处理」项、不要求归零——`人工校验点`（`{e}`）= 本轮 env-blocked 计数，`人工裁决`（`{h}`）= task.md `## 审查分歧账本` 中 `stage=code` 且 `status=needs-human-decision` 的行数；二者均不参与场景判断
 
 ### 场景 A：通过且无问题
 
 ```text
 任务 {task-id} 代码审查完成。结论：通过。
-- 阻塞项：0 | 主要问题：0 | 次要问题：0[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：0 | 主要问题：0 | 次要问题：0 | 人工校验点：{e} | 人工裁决：{h}
 [- 审查报告：.agents/workspace/active/{task-id}/{review-artifact}]
 
 下一步 - 提交代码：
@@ -39,7 +40,7 @@
 
 ```text
 任务 {task-id} 代码审查完成。结论：通过。
-- 阻塞项：0 | 主要问题：{n} | 次要问题：{n}[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：0 | 主要问题：{n} | 次要问题：{n} | 人工校验点：{e} | 人工裁决：{h}
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 修复问题后提交（推荐）：
@@ -60,7 +61,7 @@
 
 ```text
 任务 {task-id} 代码审查完成。结论：需要修改。
-- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n}[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n} | 人工校验点：{e} | 人工裁决：{h}
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 修复问题：
@@ -76,7 +77,7 @@
 
 ```text
 任务 {task-id} 代码审查完成。结论：拒绝，需要重新设计方案。
-- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n}[ | 环境性遗留：{n}（不在 AI 修复范围）]
+- 阻塞项：{n} | 主要问题：{n} | 次要问题：{n} | 人工校验点：{e} | 人工裁决：{h}
 - 审查报告：.agents/workspace/active/{task-id}/{review-artifact}
 
 下一步 - 重新设计技术方案：

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

@@ -21,6 +21,8 @@ Use this template when writing `review-code.md` or `review-code-r{N}.md`.
 - **Reviewer**: {reviewer-name}
 - **Review Time**: {timestamp}
 - **Scope**: {file-count and major modules}
+- **Review Baseline Commit**: {raw git rev-parse HEAD} (baseline for the complete-task post-review commit gate; see `.agents/rules/review-handshake.md`)
+- **Reviewed Diff Fingerprint**: {raw node .agents/scripts/review-diff-fingerprint.js worktree HEAD}
 - **Overall Verdict**: {Approved / Changes Requested / Rejected} (pick exactly one; combined phrases will fail the verify gate)
 - **Findings (AI-actionable)**: 0 blockers, 0 majors, 0 minors / **env-blocked**: 0
 
@@ -59,6 +61,10 @@ Use this template when writing `review-code.md` or `review-code-r{N}.md`.
 > If this round has no env-blocked findings, keep the section heading and write "None".
 
 
+## Review Disagreement Ledger Writeback
+
+> Upsert each finding this round into the task.md disagreement ledger: append an `open` row for new findings (id prefix `CD-`, stage=code); per the hand-back duty set the executor's prior-round responses to `confirmed` / back to `open` / `needs-human-decision`. State machine and evidence rules: `.agents/rules/review-handshake.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. 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.