@fitlab-ai/agent-infra 0.9.1 → 0.9.3

package/lib/task/verification-engine.ts

@@ -7,6 +7,7 @@ import { fileURLToPath } from "node:url";
 
 import {
   extractReviewBaseline,
+  extractReviewDiffBase,
   extractReviewDiffFingerprint,
   extractReviewedSnapshotTree,
   findAuthoritativeReviewCodeArtifact,
@@ -17,9 +18,12 @@ import {
 import { check as checkPlatformSync } from "../platform/verification-sync.ts";
 import { check as checkRequiredChecks } from "../platform/verification-required.ts";
 import { inspectPlatformPullRequest } from "../platform/pull-requests.ts";
+import { resolveMaterializedReviewedHeadRelation } from "../platform/change-request-git-evidence.ts";
 import { resolveReviewedHeadRelation } from "../platform/merged-pr-equivalence.ts";
+import { resolveLocalReviewedCommitRelation } from "../git/reviewed-commit-equivalence.ts";
 import { parseTypedTaskFrontmatter } from "./frontmatter.ts";
-import { parseLedger } from "./ledger.ts";
+import { parseLedger, summarizeLedgerStage, validateLedgerRows } from "./ledger.ts";
+import { equalCounts, parseReviewSummary } from "./review-artifacts.ts";
 import { loadVerificationConfig } from "./verification-config.ts";
 import { snapshotReview } from "../git/review-snapshot.ts";
 
@@ -110,10 +114,18 @@ function runCheck(type: any, context: any, shared: any): any {
       return checkCompletionChecklist(context);
     case "review-ledger":
       return checkReviewLedger(context);
+    case "manual-validation":
+      return checkManualValidation(context);
+    case "review-summary":
+      return checkReviewSummary(context);
     case "review-fact":
       return checkReviewFact(context);
     case "post-review-commit":
       return checkPostReviewCommit(context);
+    case "orchestration-state":
+      return checkOrchestrationState(context);
+    case "orchestration-evidence":
+      return checkOrchestrationEvidence(context);
     default: {
       const adapter = PLATFORM_ADAPTERS[type];
       if (!adapter) {
@@ -129,6 +141,206 @@ function runCheck(type: any, context: any, shared: any): any {
   }
 }
 
+function isFailClosedLegacyPause(run: any): boolean {
+  if (
+    run.schemaVersion !== 1
+    || run.status !== 'paused'
+    || run.pause?.recoverable !== false
+    || !exactText(run.pause?.message)
+    || !Array.isArray(run.receipts)
+  ) {
+    return false;
+  }
+  if (run.pause.code === 'ORCHESTRATION_HISTORICAL_EFFORT_UNVERIFIED') {
+    return run.receipts.length > 0 && run.pendingDelegation === null;
+  }
+  if (run.pause.code === 'ORCHESTRATION_DELEGATION_BUSY') {
+    return run.pendingDelegation != null && run.pendingDelegation.status !== 'sealed';
+  }
+  return false;
+}
+
+function checkOrchestrationState({ taskDir }: any): any {
+  const file = path.join(taskDir, 'orchestration.json');
+  const stat = safeStat(file);
+  if (!stat?.isFile()) return failResult('orchestration-state', 'orchestration.json is missing');
+  let run: any;
+  try {
+    run = JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch (error) {
+    return failResult('orchestration-state', `Invalid orchestration.json: ${String(error)}`);
+  }
+  if (isFailClosedLegacyPause(run)) {
+    return passResult('orchestration-state', 'Legacy orchestration run is safely paused');
+  }
+  if (run.schemaVersion !== 2 || !['paused', 'completed'].includes(run.status)) {
+    return failResult('orchestration-state', `Expected paused or completed run, received '${run.status}'`);
+  }
+  if (run.status === 'paused' && (!run.pause?.code || !run.pause?.message)) {
+    return failResult('orchestration-state', 'Paused run requires a stable pause code and message');
+  }
+  if (run.status === 'completed') {
+    if (run.completionEvidence != null) {
+      const evidenceError = validateCleanCompletionEvidence(run);
+      if (evidenceError) return failResult('orchestration-state', evidenceError);
+    } else if (run.pendingDelegation !== null || !run.commitAuthorization?.consumedAt) {
+      return failResult('orchestration-state', 'Completed run must consume commit authorization and clear pending delegation');
+    }
+  } else if (run.completionEvidence != null) {
+    return failResult('orchestration-state', 'Clean completion evidence requires a completed run');
+  } else if (run.pendingDelegation?.status === 'sealed') {
+    return failResult('orchestration-state', 'Paused run has a sealed delegation that could still advance');
+  }
+  return passResult('orchestration-state', `Orchestration run is safely ${run.status}`);
+}
+
+function exactText(value: unknown): value is string {
+  return typeof value === 'string' && value.length > 0 && value.trim() === value;
+}
+
+function validateCleanCompletionEvidence(run: any): string | null {
+  const evidence = run.completionEvidence;
+  const shaPattern = /^[0-9a-f]{40}$/i;
+  if (
+    evidence?.kind !== 'reviewed-head-clean'
+    || !exactText(evidence.observedAt)
+    || Number.isNaN(Date.parse(evidence.observedAt))
+    || !shaPattern.test(evidence.head)
+    || !shaPattern.test(evidence.headTree)
+    || !shaPattern.test(evidence.worktreeTree)
+    || !shaPattern.test(evidence.lastReviewedCommit)
+    || !Number.isInteger(evidence.prNumber)
+    || evidence.prNumber <= 0
+    || !shaPattern.test(evidence.prHead)
+  ) {
+    return 'Clean completion evidence has an invalid structure';
+  }
+  if (
+    evidence.head !== evidence.lastReviewedCommit
+    || evidence.head !== evidence.prHead
+    || evidence.headTree !== evidence.worktreeTree
+  ) {
+    return 'Clean completion evidence does not bind matching commit and tree identities';
+  }
+  if (
+    run.status !== 'completed'
+    || run.pendingDelegation !== null
+    || run.commitAuthorization?.issuedAt !== null
+    || run.commitAuthorization?.consumedAt !== null
+    || !Array.isArray(run.receipts)
+    || run.receipts.some((receipt: any) => receipt.stage === 'commit')
+  ) {
+    return 'Clean completion evidence conflicts with commit delegation state';
+  }
+  return null;
+}
+
+function checkOrchestrationEvidence({ taskDir }: any): any {
+  const file = path.join(taskDir, 'orchestration.json');
+  const stat = safeStat(file);
+  if (!stat?.isFile()) return failResult('orchestration-evidence', 'orchestration.json is missing');
+  let run: any;
+  try {
+    run = JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch (error) {
+    return failResult('orchestration-evidence', `Invalid orchestration.json: ${String(error)}`);
+  }
+  if (isFailClosedLegacyPause(run)) {
+    return passResult('orchestration-evidence', 'Legacy orchestration evidence is preserved in a fail-closed pause');
+  }
+  const policy = run.modelPolicy;
+  if (
+    !policy
+    || !exactText(policy.executor?.model)
+    || !exactText(policy.executor?.reasoningEffort)
+    || !exactText(policy.reviewer?.model)
+    || !exactText(policy.reviewer?.reasoningEffort)
+  ) {
+    return failResult('orchestration-evidence', 'Run model policy requires exact executor and reviewer model and effort');
+  }
+  if (
+    !run.modelPolicySource
+    || !['explicit', 'project-config'].includes(run.modelPolicySource.kind)
+    || !exactText(run.modelPolicySource.client)
+    || !exactText(run.modelPolicySource.resolvedAt)
+    || !Array.isArray(run.recoveryHistory)
+  ) {
+    return failResult('orchestration-evidence', 'Run model policy source or recovery history is invalid');
+  }
+  for (const recovery of run.recoveryHistory) {
+    if (
+      recovery.code !== 'MODEL_POLICY_SUPPLEMENTED'
+      || recovery.previousSchemaVersion !== 1
+      || recovery.receiptCount !== 0
+      || recovery.pendingDelegation !== false
+      || !exactText(recovery.recoveredAt)
+      || !recovery.policySource
+    ) {
+      return failResult('orchestration-evidence', 'Run recovery history contains invalid provenance');
+    }
+  }
+  if (!Array.isArray(run.receipts)) {
+    return failResult('orchestration-evidence', 'Run receipts must be an array');
+  }
+  if (run.completionEvidence != null) {
+    const evidenceError = validateCleanCompletionEvidence(run);
+    if (evidenceError) return failResult('orchestration-evidence', evidenceError);
+  } else if (run.status === 'completed' && (
+      run.receipts.length === 0
+      || run.receipts.at(-1)?.stage !== 'commit'
+      || run.receipts.at(-1)?.status !== 'consumed'
+    )) {
+      return failResult('orchestration-evidence', 'Completed run requires a final consumed commit receipt');
+  }
+  if (run.pendingDelegation && !['prepared', 'activated', 'stage-completed'].includes(run.pendingDelegation.status)) {
+    return failResult('orchestration-evidence', `Pending receipt has unsafe status '${run.pendingDelegation.status}'`);
+  }
+  const receipts = [...run.receipts, ...(run.pendingDelegation ? [run.pendingDelegation] : [])];
+  for (const receipt of receipts) {
+    const expectedPolicy = policy[receipt.role];
+    if (!expectedPolicy || receipt.requestedModel !== expectedPolicy.model) {
+      return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' requested model does not match its role policy`);
+    }
+    if (receipt.requestedReasoningEffort !== expectedPolicy.reasoningEffort) {
+      return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' requested reasoning effort does not match its role policy`);
+    }
+    const activated = ['activated', 'stage-completed', 'sealed', 'consumed'].includes(receipt.status);
+    if (activated) {
+      if (!exactText(receipt.actualModel)) {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' has no host-observed actual model`);
+      }
+      if (!exactText(receipt.actualReasoningEffort)) {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' has no host-observed actual reasoning effort`);
+      }
+      if (!exactText(receipt.parentId) || !exactText(receipt.childId) || receipt.parentId === receipt.childId || receipt.spawnMode !== 'fresh') {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' has invalid fresh delegation identity`);
+      }
+      if (receipt.actualModel !== receipt.requestedModel && !exactText(receipt.modelFallbackReason)) {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' model fallback is not justified`);
+      }
+      if (receipt.actualModel === receipt.requestedModel && receipt.modelFallbackReason !== null) {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' has an unrelated model fallback reason`);
+      }
+      if (
+        receipt.actualReasoningEffort !== receipt.requestedReasoningEffort
+        && !exactText(receipt.reasoningEffortFallbackReason)
+      ) {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' reasoning-effort fallback is not justified`);
+      }
+      if (
+        receipt.actualReasoningEffort === receipt.requestedReasoningEffort
+        && receipt.reasoningEffortFallbackReason !== null
+      ) {
+        return failResult('orchestration-evidence', `Receipt '${receipt.id ?? '(unknown)'}' has an unrelated reasoning-effort fallback reason`);
+      }
+    }
+  }
+  if (run.receipts.some((receipt: any) => receipt.status !== 'consumed')) {
+    return failResult('orchestration-evidence', 'Historical receipts must be consumed');
+  }
+  return passResult('orchestration-evidence', 'Persisted orchestration model and delegation evidence is internally consistent');
+}
+
 // === Check Functions ===
 
 function checkTaskMeta({ taskDir, config }: any): any {
@@ -313,6 +525,43 @@ function checkArtifact({ taskDir, config, artifactFile }: any): any {
   );
 }
 
+function checkReviewSummary({ taskDir, config, artifactFile }: any): any {
+  const stage = String(config.stage || "");
+  if (!["analysis", "plan", "code"].includes(stage)) {
+    return failResult("review-summary", `Invalid review stage '${stage}'`);
+  }
+  const resolvedArtifact = resolveArtifactPath(taskDir, "", artifactFile);
+  if (!resolvedArtifact.ok || !safeStat(resolvedArtifact.path)?.isFile()) {
+    return failResult("review-summary", resolvedArtifact.message || "Review artifact is missing");
+  }
+  const parsed = parseReviewSummary(fs.readFileSync(resolvedArtifact.path, "utf8"));
+  if (!parsed.ok) return failResult("review-summary", `${parsed.code}: ${parsed.message}`);
+  if (!parsed.summary.counts) {
+    return failResult("review-summary", "Review summary finding counts are not finalized");
+  }
+  const task = loadTask(taskDir);
+  if (!task.ok) return failResult("review-summary", task.message);
+  let rows;
+  try {
+    rows = parseLedger(task.content);
+  } catch (error) {
+    return failResult("review-summary", `Invalid disagreement ledger: ${String(error)}`);
+  }
+  const invalid = validateLedgerRows(rows);
+  if (invalid) return failResult("review-summary", `${invalid.code}: ${invalid.message}`);
+  const expected = summarizeLedgerStage(rows, stage as "analysis" | "plan" | "code").unresolvedFindingCounts;
+  if (!equalCounts(parsed.summary.counts, expected)) {
+    return failResult(
+      "review-summary",
+      `Review summary counts ${JSON.stringify(parsed.summary.counts)} do not match ledger ${JSON.stringify(expected)}`
+    );
+  }
+  return passResult(
+    "review-summary",
+    `${path.basename(resolvedArtifact.path)} finding counts match the ${stage} ledger`
+  );
+}
+
 function checkImplementationInput({ taskDir, artifactFile }: any): any {
   const task = loadTask(taskDir);
   if (!task.ok) return failResult("implementation-input", task.message);
@@ -669,6 +918,75 @@ function checkReviewLedger({ taskDir, config }: any): any {
   return passResult("review-ledger", `Disagreement ledger clean (${inScopeCount} in-scope entries terminal${scopeLabel})`);
 }
 
+function checkManualValidation({ taskDir }: any): any {
+  // 1. Latest review-code artifact; none -> pass (no review, check not applicable).
+  const review = findAuthoritativeReviewCodeArtifact(taskDir);
+  if (!review.ok) {
+    return passResult("manual-validation", "No review-code artifact; manual validation not applicable");
+  }
+  // 2. Parse the numeric manual-validation count; unparseable/null -> fail closed
+  //    (review-code.completed already enforces a numeric count on the normal path).
+  const parsed = parseReviewSummary(fs.readFileSync(review.path!, "utf8"));
+  if (!parsed.ok || parsed.summary.manualValidation === null) {
+    return failResult("manual-validation", "Latest review-code has no numeric manual-validation count");
+  }
+  // 3. Count 0 -> pass (no pending items to cover).
+  if (parsed.summary.manualValidation === 0) {
+    return passResult("manual-validation", "No pending manual validation items");
+  }
+  // 4. Highest-round manual-validation artifact; none -> fail (items pending,
+  //    run complete-manual-validation first). A falsy artifactFile goes through
+  //    pattern parsing; resolveArtifactPath only returns { ok, path }.
+  const resolved = resolveArtifactPath(taskDir, "manual-validation.md|manual-validation-r{N}.md", "");
+  if (!resolved.ok) {
+    return failResult(
+      "manual-validation",
+      `${parsed.summary.manualValidation} manual validation item(s) pending: run /complete-manual-validation`
+    );
+  }
+  // 5. The Activity Log must record the matching completion entry; the file name
+  //    is derived with path.basename (resolveArtifactPath does not return fileName).
+  const artifactName = path.basename(resolved.path);
+  const task = loadTask(taskDir);
+  if (!task.ok) return failResult("manual-validation", task.message);
+  const log = getSectionContent(task.content, ["活动日志", "Activity Log"]);
+  const completed = new RegExp(
+    `\\*\\*Complete Manual Validation\\*\\*[\\s\\S]*?Manual validation passed → ${escapeRegExp(artifactName)};`
+  );
+  if (!completed.test(log)) {
+    return failResult(
+      "manual-validation",
+      `Manual validation artifact exists but completion is not recorded for ${artifactName}: re-run /complete-manual-validation`
+    );
+  }
+  // 6. Timing correlation (PL-3 fix, PL-4 corrected): the completion entry must
+  //    sit AFTER the latest review-code round's completion entry in the
+  //    append-only Activity Log. indexOf is a literal search, so the artifactName
+  //    must NOT be passed through escapeRegExp here (that escapes '.' to '\.',
+  //    which indexOf never matches). Not reusing completed.exec().index: exec
+  //    anchors to the first '**Complete Manual Validation**' heading, which can
+  //    belong to an earlier round's entry and misorder the standard path.
+  const reviewDoneIndex = log.indexOf(`**Review Code (Round ${review.round})** by `);
+  const completedIndex = log.indexOf(`Manual validation passed → ${artifactName};`);
+  if (reviewDoneIndex === -1) {
+    // The latest review-code round's completion entry is missing entirely (abnormal
+    // state, e.g. a restored/historical task without a review-code.completed record).
+    // Re-running complete-manual-validation cannot restore it, so the remediation
+    // targets the review record itself. Fail closed either way.
+    return failResult(
+      "manual-validation",
+      `Latest review-code (round ${review.round}) completion entry is missing from the Activity Log (abnormal state): re-run review-code or restore the completion record`
+    );
+  }
+  if (completedIndex < reviewDoneIndex) {
+    return failResult(
+      "manual-validation",
+      `Latest review-code (round ${review.round}) came after the manual validation completion recorded for ${artifactName}: re-run /complete-manual-validation to cover new pending items`
+    );
+  }
+  return passResult("manual-validation", `Manual validation completed → ${artifactName}`);
+}
+
 function checkPostReviewCommit({ taskDir, config }: any): any {
   const reviewArtifact = findAuthoritativeReviewCodeArtifact(taskDir);
   if (!reviewArtifact.ok) {
@@ -683,8 +1001,51 @@ function checkPostReviewCommit({ taskDir, config }: any): any {
   }
 
   const task = loadTask(taskDir);
-  const content = fs.readFileSync(reviewArtifact.path!, "utf8");
+  if (!task.ok) return failResult("post-review-commit", task.message);
   const lastReviewedCommit = task.ok ? (task.metadata.last_reviewed_commit || "").trim() : "";
+  const globs = resolvePostReviewGlobs(config, loadPostReviewConfig(repoRoot));
+  const hasPullRequest = Number(task.metadata.pr_number) > 0;
+  let inspected: ReturnType<typeof inspectPlatformPullRequest> | null = null;
+  if (hasPullRequest) {
+    inspected = inspectPlatformPullRequest(task.metadata.id, { cwd: gitRoot });
+    if (!inspected.pullRequest) {
+      const message = inspected.error?.message || "PR merge snapshot is unavailable";
+      const code = inspected.error?.code || "PR_INSPECTION_INVALID";
+      return inspected.status === "blocked"
+        ? blockedResult("post-review-commit", message, code)
+        : failResult("post-review-commit", message, code);
+    }
+    if (
+      inspected.pullRequest.state === "closed" &&
+      inspected.pullRequest.mergedAt &&
+      inspected.pullRequest.mergeCommitSha
+    ) {
+      const relation = resolveMaterializedReviewedHeadRelation({
+        cwd: gitRoot,
+        platformType: inspected.platform.type,
+        lastReviewedCommit,
+        pullRequest: inspected.pullRequest
+      });
+      if (relation.status === "merged-equivalent") {
+        return passResult(
+          "post-review-commit",
+          `Reviewed PR head is content-equivalent to squash merge ${relation.mergeCommit.slice(0, 8)} on target ${relation.comparisonHead.slice(0, 8)}`
+        );
+      }
+      if (relation.status === "blocked") {
+        return blockedResult("post-review-commit", relation.message, relation.code);
+      }
+      if (relation.status === "strict") {
+        return failResult(
+          "post-review-commit",
+          "Merged PR evidence did not establish squash merge equivalence",
+          "PR_MERGE_IDENTITY_INVALID"
+        );
+      }
+      return failResult("post-review-commit", relation.message, relation.code);
+    }
+  }
+
   const baselineSource = resolvePostReviewBaseline({
     gitRoot,
     lastReviewedCommit,
@@ -695,7 +1056,6 @@ function checkPostReviewCommit({ taskDir, config }: any): any {
   }
 
   const sha = baselineSource.sha;
-  const globs = resolvePostReviewGlobs(config, loadPostReviewConfig(repoRoot));
   let commits;
   try {
     const out = execFileSync("git", ["-C", gitRoot, "rev-list", `${sha}..HEAD`, "--", ...globs], { encoding: "utf8" });
@@ -708,42 +1068,50 @@ function checkPostReviewCommit({ taskDir, config }: any): any {
     return passResult("post-review-commit", `No post-review commits to code/rule paths since ${sha.slice(0, 8)}`);
   }
 
-  if (task.ok && Number(task.metadata.pr_number) > 0) {
-    const inspected = inspectPlatformPullRequest(task.metadata.id, { cwd: gitRoot });
-    if (inspected.pullRequest) {
-      let localHead = "";
-      try {
-        localHead = execFileSync("git", ["-C", gitRoot, "rev-parse", "HEAD"], { encoding: "utf8" }).trim();
-      } catch {
-        return blockedResult("post-review-commit", "Unable to resolve the local HEAD");
-      }
+  let localHead = "";
+  try {
+    localHead = execFileSync("git", ["-C", gitRoot, "rev-parse", "HEAD"], { encoding: "utf8" }).trim();
+  } catch {
+    return blockedResult("post-review-commit", "Unable to resolve the local HEAD");
+  }
+
+  if (hasPullRequest) {
+    if (inspected?.pullRequest) {
       const relation = resolveReviewedHeadRelation({
         gitRoot,
-        localHead,
+        comparisonHead: localHead,
         lastReviewedCommit: sha,
-        pullRequest: inspected.pullRequest,
-        pathspecs: globs
+        pullRequest: inspected.pullRequest
       });
       if (relation.status === "merged-equivalent") {
         return passResult("post-review-commit", `Reviewed PR head is content-equivalent to squash merge ${relation.mergeCommit.slice(0, 8)}`);
       }
       if (relation.status === "blocked") {
-        return blockedResult("post-review-commit", relation.message);
+        return blockedResult("post-review-commit", relation.message, relation.code);
       }
-    } else if (inspected.status === "blocked") {
-      return blockedResult("post-review-commit", inspected.error?.message || "PR merge snapshot is unavailable");
+    }
+  } else if (commits.length === 1) {
+    const relation = resolveLocalReviewedCommitRelation({
+      gitRoot,
+      localHead,
+      lastReviewedCommit: sha,
+      rewrittenCommit: commits[0]!,
+      pathspecs: globs
+    });
+    if (relation.status === "local-equivalent") {
+      return passResult(
+        "post-review-commit",
+        `Reviewed commit is content-equivalent to local rewrite ${relation.rewrittenCommit.slice(0, 8)}`
+      );
+    }
+    if (relation.status === "blocked") {
+      return blockedResult("post-review-commit", relation.message);
     }
   }
 
-  let exempt = false;
-  try {
-    exempt = task.ok && parseLedger(task.content).some(
-      (row) => row.stage === POST_REVIEW_COMMIT_STAGE && row.status === "human-decided"
-    );
-  } catch {
-    return failResult("post-review-commit", "Invalid disagreement ledger");
-  }
-  if (exempt) {
+  const exemption = resolvePostReviewExemption(task.content);
+  if (!exemption.ok) return failResult("post-review-commit", exemption.message);
+  if (exemption.exempt) {
     return passResult(
       "post-review-commit",
       `${commits.length} post-review commit(s) covered by a human-decided exemption`
@@ -756,6 +1124,21 @@ function checkPostReviewCommit({ taskDir, config }: any): any {
   );
 }
 
+function resolvePostReviewExemption(content: string):
+  | { ok: true; exempt: boolean }
+  | { ok: false; message: string } {
+  try {
+    return {
+      ok: true,
+      exempt: parseLedger(content).some(
+        (row) => row.stage === POST_REVIEW_COMMIT_STAGE && row.status === "human-decided"
+      )
+    };
+  } catch {
+    return { ok: false, message: "Invalid disagreement ledger" };
+  }
+}
+
 function checkReviewFact({ taskDir, artifactFile }: any): any {
   const resolvedArtifact = resolveArtifactPath(
     taskDir,
@@ -774,6 +1157,7 @@ function checkReviewFact({ taskDir, artifactFile }: any): any {
   const content = fs.readFileSync(resolvedArtifact.path, "utf8");
   const verdict = parseReviewVerdict(content);
   const reviewBaseline = extractReviewBaseline(content);
+  const reviewDiffBase = extractReviewDiffBase(content);
   const reviewedFingerprint = extractReviewDiffFingerprint(content);
   const reviewedTree = extractReviewedSnapshotTree(content);
 
@@ -784,10 +1168,16 @@ function checkReviewFact({ taskDir, artifactFile }: any): any {
   let gitRoot;
   let head;
   let baseline;
+  let diffBase;
   try {
     gitRoot = execFileSync("git", ["-C", taskDir, "rev-parse", "--show-toplevel"], { encoding: "utf8" }).trim();
     head = execFileSync("git", ["-C", gitRoot, "rev-parse", "HEAD"], { encoding: "utf8" }).trim();
     baseline = execFileSync("git", ["-C", gitRoot, "rev-parse", `${reviewBaseline}^{commit}`], { encoding: "utf8" }).trim();
+    diffBase = execFileSync(
+      "git",
+      ["-C", gitRoot, "rev-parse", `${reviewDiffBase || reviewBaseline}^{commit}`],
+      { encoding: "utf8" }
+    ).trim();
   } catch {
     return blockedResult(
       "review-fact",
@@ -804,7 +1194,13 @@ function checkReviewFact({ taskDir, artifactFile }: any): any {
 
   let actualSnapshot;
   try {
-    actualSnapshot = snapshotReview({ cwd: gitRoot, mode: "worktree", baseline, globs: resolvePostReviewGlobs({}, loadPostReviewConfig(repoRoot)) });
+    actualSnapshot = snapshotReview({
+      cwd: gitRoot,
+      mode: "worktree",
+      baseline,
+      diffBase,
+      globs: resolvePostReviewGlobs({}, loadPostReviewConfig(repoRoot))
+    });
   } catch {
     return blockedResult(
       "review-fact",

package/lib/task/verification-review.ts

@@ -1,5 +1,6 @@
 export {
   extractReviewBaseline,
+  extractReviewDiffBase,
   extractReviewDiffFingerprint,
   extractReviewedSnapshotTree,
   findAuthoritativeReviewCodeArtifact,

package/lib/task/verification.ts

@@ -16,7 +16,9 @@ type VerificationEvent =
   | 'complete-task.preflight' | 'complete-task.completed'
   | 'create-pr.completed' | 'create-task.completed'
   | 'import-codescan.completed' | 'import-dependabot.completed'
-  | 'import-issue.completed' | 'watch-pr.completed';
+  | 'import-issue.completed' | 'watch-pr.completed'
+  | 'review-pr.completed'
+  | 'run-task.paused' | 'run-task.completed';
 type VerificationSpec = {
   skill: string;
   expectedState: 'active' | 'blocked' | 'completed';
@@ -63,14 +65,17 @@ const VERIFICATION_CATALOG: Readonly<Record<VerificationEvent, VerificationSpec>
   'block-task.completed': gate('block-task', 'blocked'),
   'cancel-task.completed': gate('cancel-task', 'completed'),
   'commit.completed': gate('commit', 'active'),
-  'complete-task.preflight': { skill: 'complete-task', expectedState: 'active', mode: 'checks', checks: ['review-ledger', 'post-review-commit', 'platform-sync-preflight'] },
+  'complete-task.preflight': { skill: 'complete-task', expectedState: 'active', mode: 'checks', checks: ['review-ledger', 'manual-validation', 'post-review-commit', 'platform-sync-preflight'] },
   'complete-task.completed': gate('complete-task', 'completed'),
   'create-pr.completed': gate('create-pr', 'active'),
   'create-task.completed': gate('create-task', 'active'),
   'import-codescan.completed': gate('import-codescan', 'active'),
   'import-dependabot.completed': gate('import-dependabot', 'active'),
   'import-issue.completed': gate('import-issue', 'active'),
-  'watch-pr.completed': gate('watch-pr', 'active')
+  'watch-pr.completed': gate('watch-pr', 'active'),
+  'review-pr.completed': gate('review-pr', 'active', 'pr-review'),
+  'run-task.paused': { skill: 'run-task', expectedState: 'active', mode: 'checks', checks: ['orchestration-state', 'orchestration-evidence'] },
+  'run-task.completed': { skill: 'run-task', expectedState: 'active', mode: 'checks', checks: ['orchestration-state', 'orchestration-evidence'] }
 };
 
 function failure(request: { taskRef: string; event: string; artifact?: string }, code: string, message: string, extra: Partial<TaskVerificationResult> = {}): TaskVerificationResult {

package/lib/task/workspace-snapshot.ts

@@ -0,0 +1,57 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+
+function git(repoRoot: string, indexFile: string | null, args: string[]): string {
+  const env = indexFile ? { ...process.env, GIT_INDEX_FILE: indexFile } : process.env;
+  const result = spawnSync('git', args, { cwd: repoRoot, env, encoding: 'utf8' });
+  if (result.status !== 0) {
+    throw new Error(String(result.stderr || result.stdout || `git ${args[0]} failed`).trim());
+  }
+  return result.stdout;
+}
+
+type RepositorySnapshot = Readonly<{
+  head: string;
+  headTree: string;
+  worktreeTree: string;
+}>;
+
+function captureWorktreeTree(repoRoot: string, forcedPath: string | null): string {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-infra-orchestration-index-'));
+  const indexFile = path.join(tempDir, 'index');
+  try {
+    git(repoRoot, indexFile, ['read-tree', 'HEAD']);
+    git(repoRoot, indexFile, ['add', '-A', '--', ':/']);
+    if (forcedPath && fs.existsSync(path.join(repoRoot, forcedPath))) {
+      git(repoRoot, indexFile, ['add', '-f', '--', forcedPath]);
+    }
+    return git(repoRoot, indexFile, ['write-tree']).trim();
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+function captureWorkspaceSnapshot(repoRoot: string, taskId: string | null): string {
+  const workspaceRelative = taskId
+    ? `.agents/workspace/active/${taskId}`
+    : '.agents/workspace/active';
+  return captureWorktreeTree(repoRoot, workspaceRelative);
+}
+
+function captureRepositorySnapshot(repoRoot: string): RepositorySnapshot {
+  return {
+    head: git(repoRoot, null, ['rev-parse', 'HEAD']).trim(),
+    headTree: git(repoRoot, null, ['rev-parse', 'HEAD^{tree}']).trim(),
+    worktreeTree: captureWorktreeTree(repoRoot, null)
+  };
+}
+
+function diffWorkspaceSnapshots(repoRoot: string, before: string, after: string): string[] {
+  const output = git(repoRoot, null, ['diff', '--name-only', '-z', before, after]);
+  return output.split('\0').filter(Boolean);
+}
+
+export { captureRepositorySnapshot, captureWorkspaceSnapshot, diffWorkspaceSnapshots };
+export type { RepositorySnapshot };