fix(issue-5): close the phase 2b gate holes found by all three reviewers

Seven blocking items across three reviews, every one reproduced here before
being accepted. Two themes run through them: a gate whose strictness depended on
what the caller remembered to pass, and a boundary that trusted its only current
caller instead of enforcing its own rule.

Independent verification is no longer optional. Omitting the report directory
skipped the disk check entirely and handed the decision back to the collector's
own flags -- the self-certification this design exists to prevent. It is now a
refusal, as is an empty directory or a job with no recorded dispatch.

Evidence is now bound to its target. The policy compares a scenario against the
dispatch context carried inside that same scenario, which is self-consistent by
construction, so one job's evidence could complete another. The gate now checks
the job, attempt, session and pane generation against the recorded dispatch.

A reviewer with no verdict token is no longer completed. Phase 0 made this a
safety contract and run_loop reads a missing token as NOT PASS, so inferring
completion first would start a correction round against a review that was never
finished. The requirement applies to reviewers only.

Bookkeeping may write one field. A status-free request was an unrestricted merge
on a terminal record: it could rewrite the prompt and the session. Settling is
also conditional now on the exact intent that was sent, because publishing
happens outside the lock and a newer intent can legitimately land mid-flight;
clearing unconditionally dropped a notification nobody had sent. The intent's
own identity travels in the payload, since the transport sequence cannot
identify a retry of the same intent.

Side-effect evidence must be evidence. A kind with no reference names something
without evidencing it, and the CLI parser could not be the only check because
the API and hand-written manifests bypass it.

Also honours MAM_ENGINE_CAS=0, which the operations note already promised
disables auto-completion, matches backend keys exactly rather than by prefix so
a future name cannot inherit evidence never collected for it, records an
absolute report path, and imports the notifier at module scope.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UrDNJkHmm18uu7n7JwV5Qd
This commit is contained in:
GodopuandClaude Opus 5 committed 2026-09-06 22:25:50 +09:00
1 parent 12cba25c18
commit cb7ed1aa38
5 files changed
+444 -26

No files matched your search

+95 -13
View File
@@ -17,6 +17,8 @@ from __future__ import annotations
import logging
import os
import re
from pathlib import Path
from typing import Any, Dict, List, Optional
from lib_py.delegation import finalize
@@ -33,6 +35,16 @@ BACKENDS_FLAG = "MAM_AUTO_COMPLETE_BACKENDS"
# working; hermes and opencode have no observations at all.
EVIDENCE_BACKED_BACKENDS = ("claude", "grok", "codex")
# The `agent` recorded on a job is a delegate key. Matching these exactly rather
# than by prefix keeps a future `claude-something-unverified` from inheriting
# evidence that was never collected for it.
EVIDENCE_BACKED_AGENT_KEYS = (
"claude", "claude-code", "grok", "grok-build", "codex", "codex-cli",
)
# A reviewer's verdict token, matched the way run_loop.sh matches it.
VERDICT_LINE = re.compile(r"^\[VERDICT: (PASS|NOT PASS)\][ \t]*\r?$")
SOURCE = "auto_complete"
@@ -67,21 +79,74 @@ class GateResult(object):
self.committed, self.decision, self.reason)
def _allowed_agent_keys() -> tuple:
allowed = allowed_backends()
return tuple(k for k in EVIDENCE_BACKED_AGENT_KEYS
if any(k == b or k.startswith(b + "-") for b in allowed))
def _gates_open(record: Dict[str, Any]) -> Optional[str]:
"""None when all three gates pass, else why they did not."""
"""None when every gate passes, else why one did not."""
from lib_py.delegation import engine
if not enabled():
return "auto-completion is disabled ({}=0)".format(FLAG)
if not engine.cas_enabled():
# The operations note promises this switch disables auto-completion too,
# and it must: inferred completion is built on the CAS boundary, so
# committing while that boundary is rolled back would bypass it.
return "the CAS engine is rolled back (MAM_ENGINE_CAS=0)"
backend = record.get("agent") or ""
# `agent` may be a delegate key such as `claude-code`; match on the prefix.
if not any(backend == b or backend.startswith(b) for b in allowed_backends()):
if backend not in _allowed_agent_keys():
return "backend {!r} has no observed quiescent-state evidence".format(backend)
if not record.get("auto_complete"):
return "job did not opt in to auto-completion"
return None
def _verdict_present(report_path) -> bool:
"""A reviewer's report must end with its verdict token.
Phase 0 made this a safety contract: without a verdict, a reviewer job may
never be promoted to completed. run_loop.sh reads a missing token as NOT
PASS, so auto-completing before the token exists would start a correction
round against a review that was never finished.
"""
try:
lines = Path(report_path).read_text(encoding="utf-8").splitlines()
except OSError:
return False
for line in reversed(lines):
if line.strip():
return bool(VERDICT_LINE.match(line))
return False
def _scenario_matches(job_id, scenario, dispatch) -> Optional[str]:
"""The evidence must be about this job and this dispatch.
Without this the gate will happily complete one job using another job's
evidence: the policy only checks a scenario against the dispatch context
carried inside that same scenario, which is self-consistent by construction.
"""
context = scenario.get("dispatch_context") or {}
if context.get("job_id") != job_id:
return "evidence is for job {!r}, not {!r}".format(context.get("job_id"), job_id)
for field in ("attempt_id", "agent_session_uuid", "pane_process_generation"):
expected = dispatch.get(field)
if expected is None:
return "no recorded dispatch {} to compare the evidence against".format(field)
if context.get(field) != expected:
return "evidence {} {!r} does not match the recorded dispatch {!r}".format(
field, context.get(field), expected)
return None
def evaluate(job_id, scenario, registry_dir=None, workspace=None,
report_dir=None) -> GateResult:
# `report_dir` keeps a default only so the signature stays callable from a
# supervisor that has not resolved it yet; omitting it is a refusal, not a
# shortcut. See the check at the top of the body.
"""Decide, and commit only if every gate agrees.
`scenario` is the composite evidence the watcher assembled, in the same shape
@@ -100,16 +165,33 @@ def evaluate(job_id, scenario, registry_dir=None, workspace=None,
if closed:
return GateResult(False, "hold", closed)
# The manifest is verified against the file on disk, not against itself, and
# against any side effects this job declared it would perform.
dispatch = store.load_dispatch(job_id, workspace) or {}
attempt = dispatch.get("attempt_id")
if report_dir is not None:
verdict = finalize.verify_manifest(
report_dir, job_id, expected_attempt=attempt,
expected_artifacts=record.get("expected_artifacts") or [])
if not verdict.ok:
return GateResult(False, "hold", verdict.reason)
# Independent verification is mandatory, never conditional on the caller
# remembering an argument. Skipping it would put the collector's own flags
# back in charge of the decision, which is the self-certification this whole
# design exists to avoid.
if report_dir is None:
return GateResult(False, "hold",
"no report directory to independently verify the manifest against")
dispatch = store.load_dispatch(job_id, workspace)
if not dispatch:
return GateResult(False, "hold", "no recorded dispatch to attribute this completion to")
mismatch = _scenario_matches(job_id, scenario, dispatch)
if mismatch:
return GateResult(False, "hold", mismatch)
verdict = finalize.verify_manifest(
report_dir, job_id, expected_attempt=dispatch.get("attempt_id"),
expected_artifacts=record.get("expected_artifacts") or [])
if not verdict.ok:
return GateResult(False, "hold", verdict.reason)
# A reviewer that has not written its verdict has not finished reviewing.
if str(record.get("role") or "").lower() == "reviewer":
if not _verdict_present(verdict.manifest["report_path"]):
return GateResult(False, "hold",
"reviewer report carries no verdict token on its last line")
try:
decision = policy.decide(scenario)