oh-my-opencode 5.0.0-beta.4 → 5.0.0-beta.40

package/packages/omo-codex/plugin/components/ulw-loop/src/quality-gate-artifacts.ts

@@ -0,0 +1,123 @@
+import { resolve } from "node:path";
+import { isWithinAttemptDir } from "./paths.js";
+import type { ValidateQualityGateOptions } from "./quality-gate.js";
+import {
+	invalid,
+	isPoisoned,
+	markPoisonedArtifactKind,
+	section,
+	stringArray,
+	textField,
+} from "./quality-gate-fields.js";
+import type { UlwLoopManualQaArtifactKind, UlwLoopManualQaArtifactRef, UlwLoopManualQaSurface } from "./types.js";
+
+export const SUPPORTED_SURFACES: readonly UlwLoopManualQaSurface[] = ["cli", "http", "tmux", "browser", "gui", "data"];
+export const SUPPORTED_KINDS: readonly UlwLoopManualQaArtifactKind[] = [
+	"cli-transcript",
+	"log",
+	"screenshot",
+	"image",
+	"http-dump",
+	"data-diff",
+];
+const COMPATIBLE_KINDS: Readonly<Record<UlwLoopManualQaSurface, readonly UlwLoopManualQaArtifactKind[]>> = {
+	cli: ["cli-transcript", "log"],
+	tmux: ["cli-transcript", "log"],
+	http: ["http-dump"],
+	browser: ["screenshot", "image"],
+	gui: ["screenshot", "image"],
+	data: ["data-diff"],
+};
+
+function isSupportedSurface(value: unknown): value is UlwLoopManualQaSurface {
+	return SUPPORTED_SURFACES.some((surface) => surface === value);
+}
+function isSupportedKind(value: unknown): value is UlwLoopManualQaArtifactKind {
+	return SUPPORTED_KINDS.some((kind) => kind === value);
+}
+
+export function surfaceField(value: unknown, field: string): UlwLoopManualQaSurface {
+	if (isSupportedSurface(value)) return value;
+	invalid(`${field} must be a supported manual QA surface (${SUPPORTED_SURFACES.join(", ")}).`, field);
+	return "cli";
+}
+export function kindField(value: unknown, field: string): UlwLoopManualQaArtifactKind {
+	if (isSupportedKind(value)) return value;
+	invalid(
+		`${field} must be a supported artifact kind (${SUPPORTED_KINDS.join(", ")}); review/QA reports belong in codeReview.reportPath or gateReview.reportPath, not artifactRefs.`,
+		field,
+	);
+	return "log";
+}
+export function compatibleKindsFor(surface: UlwLoopManualQaSurface): readonly UlwLoopManualQaArtifactKind[] {
+	return COMPATIBLE_KINDS[surface];
+}
+export function artifactCompatible(surface: UlwLoopManualQaSurface, kind: UlwLoopManualQaArtifactKind): boolean {
+	return compatibleKindsFor(surface).includes(kind);
+}
+export function checkFile(path: string, field: string, opts?: ValidateQualityGateOptions): void {
+	if (opts?.repoRoot === undefined || opts.fs === undefined || isPoisoned(field)) return;
+	const absolute = resolve(opts.repoRoot, path);
+	if (!opts.fs.existsSync(absolute)) {
+		invalid(`${field} must point to an existing artifact.`, field);
+		return;
+	}
+	if (opts.fs.statSync(absolute).size <= 0) invalid(`${field} must point to a non-empty artifact.`, field);
+	if (
+		opts.currentAttemptDir !== undefined &&
+		!isWithinAttemptDir(absolute, resolve(opts.repoRoot, opts.currentAttemptDir))
+	)
+		invalid(
+			`${field} (${path}) must point to an artifact from the current attempt (${opts.currentAttemptDir}).`,
+			field,
+		);
+}
+export function artifactMap(refs: readonly UlwLoopManualQaArtifactRef[]): Map<string, UlwLoopManualQaArtifactRef> {
+	const byId = new Map<string, UlwLoopManualQaArtifactRef>();
+	for (const ref of refs) {
+		if (byId.has(ref.id)) invalid(`manualQa.artifactRefs contains duplicate ${ref.id}.`, "manualQa.artifactRefs");
+		byId.set(ref.id, ref);
+	}
+	return byId;
+}
+export function parseArtifactRefs(
+	value: unknown,
+	opts?: ValidateQualityGateOptions,
+): readonly UlwLoopManualQaArtifactRef[] {
+	if (!Array.isArray(value) || value.length === 0) {
+		invalid("manualQa.artifactRefs must not be empty.", "manualQa.artifactRefs");
+		return [];
+	}
+	return value.flatMap((item, index) => {
+		const prefix = `manualQa.artifactRefs[${index}]`;
+		const ref = section(item, prefix);
+		if (isPoisoned(prefix)) return [];
+		const pathField = `${prefix}.path`;
+		const idField = `${prefix}.id`;
+		const kindFieldName = `${prefix}.kind`;
+		const descriptionField = `${prefix}.description`;
+		const path = textField(ref["path"], pathField);
+		const id = textField(ref["id"], idField);
+		const kind = kindField(ref["kind"], kindFieldName);
+		if (isPoisoned(kindFieldName)) markPoisonedArtifactKind(id);
+		const description = textField(ref["description"], descriptionField);
+		checkFile(path, pathField, opts);
+		return [{ id, kind, description, path }];
+	});
+}
+export function referencedArtifacts(
+	value: unknown,
+	field: string,
+	byId: ReadonlyMap<string, UlwLoopManualQaArtifactRef>,
+): readonly UlwLoopManualQaArtifactRef[] {
+	const ids = stringArray(value, field);
+	if (isPoisoned(field)) return [];
+	return ids.flatMap((id) => {
+		const artifact = byId.get(id);
+		if (artifact === undefined) {
+			invalid(`${field} references unknown artifact ${id}.`, field);
+			return [];
+		}
+		return [artifact];
+	});
+}

package/packages/omo-codex/plugin/components/ulw-loop/src/quality-gate-fields.ts

@@ -1,44 +1,97 @@
 import { UlwLoopError } from "./types.js";
 
-const PLACEHOLDER_PATTERN = /^(?:placeholder|todo|tbd|n\/a|stub)$/i;
+const PLACEHOLDER_PATTERN = /^(?:<replace:[^>]+>|placeholder|todo|tbd|n\/a|stub)$/i;
+type QualityGateDefect = { readonly field: string; readonly message: string };
+type QualityGateCollector = {
+	readonly defects: QualityGateDefect[];
+	readonly poisonedFields: Set<string>;
+	readonly poisonedArtifactKinds: Set<string>;
+};
+let activeCollector: QualityGateCollector | undefined;
 
-export function invalid(message: string, field: string): never {
-	throw new UlwLoopError(message, "ULW_LOOP_QUALITY_GATE_INVALID", { details: { field } });
+/** A recorded defect poisons only its field; consumers skip dependent checks while preserving valid siblings and entry identity. */
+export function withQualityGateCollector<T>(operation: () => T): T {
+	const previous = activeCollector;
+	const collector: QualityGateCollector = { defects: [], poisonedFields: new Set(), poisonedArtifactKinds: new Set() };
+	activeCollector = collector;
+	try {
+		const result = operation();
+		if (collector.defects.length === 0) return result;
+		throwQualityGateDefects(collector.defects);
+	} finally {
+		activeCollector = previous;
+	}
 }
 
+export function throwQualityGateDefects(defects: readonly QualityGateDefect[]): never {
+	const uniqueDefects = [
+		...new Map(defects.map((defect) => [`${defect.field}\u0000${defect.message}`, defect])).values(),
+	];
+	const fields = uniqueDefects.slice(0, 25);
+	const truncated = uniqueDefects.length > fields.length;
+	const message = [
+		`Final quality gate has ${fields.length}${truncated ? "+" : ""} validation defects:`,
+		...fields.map((item) => `- ${item.field}: ${item.message}`),
+	].join("\n");
+	throw new UlwLoopError(message, "ULW_LOOP_QUALITY_GATE_INVALID", {
+		details: { field: fields[0]?.field, fields, ...(truncated ? { truncated: true } : {}) },
+	});
+}
+export function invalid(message: string, field: string): undefined {
+	if (activeCollector === undefined)
+		throw new UlwLoopError(message, "ULW_LOOP_QUALITY_GATE_INVALID", { details: { field } });
+	activeCollector.defects.push({ field, message });
+	activeCollector.poisonedFields.add(field);
+	return undefined;
+}
+export function isPoisoned(field: string): boolean {
+	return activeCollector?.poisonedFields.has(field) ?? false;
+}
+export function poisonField(field: string): void {
+	activeCollector?.poisonedFields.add(field);
+}
+export function markPoisonedArtifactKind(id: string): void {
+	activeCollector?.poisonedArtifactKinds.add(id);
+}
+export function isPoisonedArtifactKind(id: string): boolean {
+	return activeCollector?.poisonedArtifactKinds.has(id) ?? false;
+}
 export function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-
 export function section(value: unknown, field: string): Record<string, unknown> {
-	return isRecord(value) ? value : invalid(`Final quality gate is missing ${field} evidence.`, field);
+	if (isRecord(value)) return value;
+	invalid(`Final quality gate is missing ${field} evidence.`, field);
+	return {};
 }
-
 export function textField(value: unknown, field: string): string {
-	if (typeof value !== "string" || value.trim() === "")
+	if (typeof value !== "string" || value.trim() === "") {
 		invalid(`Final quality gate requires non-empty ${field}.`, field);
+		return "";
+	}
 	const trimmed = value.trim();
 	if (PLACEHOLDER_PATTERN.test(trimmed)) invalid(`Final quality gate rejects placeholder ${field}.`, field);
 	return trimmed;
 }
-
 export function numberField(value: unknown, field: string): number {
-	return typeof value === "number" && Number.isFinite(value)
-		? value
-		: invalid(`Final quality gate requires numeric ${field}.`, field);
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	invalid(`Final quality gate requires numeric ${field}.`, field);
+	return 0;
 }
-
 export function stringArray(value: unknown, field: string): readonly string[] {
-	if (!Array.isArray(value) || value.length === 0) return invalid(`Final quality gate requires ${field}.`, field);
+	if (!Array.isArray(value) || value.length === 0) {
+		invalid(`Final quality gate requires ${field}.`, field);
+		return [];
+	}
 	return value.map((item) => textField(item, field));
 }
-
 export function emptyBlockers(value: unknown, field: string): readonly [] {
 	if (Array.isArray(value) && value.length === 0) return [];
 	invalid(`${field} must be empty.`, field);
+	return [];
 }
-
 export function literal<T extends string | boolean>(value: unknown, expected: T, field: string): T {
 	if (value === expected) return expected;
 	invalid(`${field} must be ${String(expected)}.`, field);
+	return expected;
 }

package/packages/omo-codex/plugin/components/ulw-loop/src/quality-gate-verdicts.ts

@@ -1,13 +1,17 @@
 import { invalid, literal, textField } from "./quality-gate-fields.js";
 
 export function passedVerdict(value: unknown, field: string): "passed" {
-	if (value === "not_applicable") invalid(`${field} must not be not_applicable.`, field);
+	if (value === "not_applicable") {
+		invalid(`${field} must not be not_applicable.`, field);
+		return "passed";
+	}
 	return literal(value, "passed", field);
 }
 
 export function codeQualityStatusField(value: unknown, field: string): "CLEAR" | "WATCH" {
 	if (value === "CLEAR" || value === "WATCH") return value;
 	invalid(`${field} must be CLEAR or WATCH.`, field);
+	return "CLEAR";
 }
 
 export function adversarialVerdict(
@@ -20,4 +24,5 @@ export function adversarialVerdict(
 		return { verdict: "not_applicable", reason: textField(row["reason"], `${field}.reason`) };
 	}
 	invalid(`${field} must be passed or not_applicable with a reason.`, field);
+	return { verdict: "passed" };
 }

package/packages/omo-codex/plugin/components/ulw-loop/src/quality-gate.ts

@@ -1,27 +1,27 @@
-import { resolve } from "node:path";
-import { isWithinAttemptDir } from "./paths.js";
+import {
+	artifactCompatible,
+	artifactMap,
+	checkFile,
+	compatibleKindsFor,
+	parseArtifactRefs,
+	referencedArtifacts,
+	surfaceField,
+} from "./quality-gate-artifacts.js";
 import {
 	emptyBlockers,
 	invalid,
+	isPoisoned,
+	isPoisonedArtifactKind,
 	literal,
 	numberField,
 	section,
 	stringArray,
 	textField,
+	withQualityGateCollector,
 } from "./quality-gate-fields.js";
 import { adversarialVerdict, codeQualityStatusField, passedVerdict } from "./quality-gate-verdicts.js";
-import type {
-	UlwLoopManualQaArtifactKind,
-	UlwLoopManualQaArtifactRef,
-	UlwLoopManualQaSurface,
-	UlwLoopQualityGate,
-} from "./types.js";
-
-const REVIEWER_ROLES = {
-	codeReview: "lazycodex-code-reviewer",
-	manualQa: "lazycodex-qa-executor",
-	gateReview: "lazycodex-gate-reviewer",
-} as const;
+import { GATE_SECTION_BY_ACCEPTOR, type UlwLoopToolkitSurface } from "./surface.js";
+import type { UlwLoopManualQaArtifactRef, UlwLoopQualityGate } from "./types.js";
 
 export {
 	classifyExternalAuthorizationBlocker,
@@ -36,153 +36,82 @@ export interface QualityGateFs {
 }
 
 export interface ValidateQualityGateOptions {
-	readonly repoRoot: string;
-	readonly fs: QualityGateFs;
+	readonly repoRoot?: string;
+	readonly fs?: QualityGateFs;
 	readonly currentAttemptDir?: string;
+	readonly reviewerSurface?: UlwLoopToolkitSurface;
 }
 
-function reviewerRoleField<T extends string>(value: unknown, expected: T, field: string): T {
+function reviewerRoleField(value: unknown, expected: string, field: string): string {
+	if (typeof value !== "string" || value.trim() === "") {
+		textField(value, field);
+		return expected;
+	}
 	const actual = textField(value, field);
 	if (actual !== expected) invalid(`${field} must be ${expected}.`, field);
 	return expected;
 }
 
-function surfaceField(value: unknown, field: string): UlwLoopManualQaSurface {
-	if (
-		value === "cli" ||
-		value === "http" ||
-		value === "tmux" ||
-		value === "browser" ||
-		value === "gui" ||
-		value === "data"
-	)
-		return value;
-	invalid(`${field} must be a supported manual QA surface.`, field);
-}
-
-function kindField(value: unknown, field: string): UlwLoopManualQaArtifactKind {
-	if (
-		value === "cli-transcript" ||
-		value === "log" ||
-		value === "screenshot" ||
-		value === "image" ||
-		value === "http-dump" ||
-		value === "data-diff"
-	)
-		return value;
-	invalid(`${field} must be a supported artifact kind.`, field);
-}
-
-function artifactCompatible(surface: UlwLoopManualQaSurface, kind: UlwLoopManualQaArtifactKind): boolean {
-	switch (surface) {
-		case "cli":
-		case "tmux":
-			return kind === "cli-transcript" || kind === "log";
-		case "http":
-			return kind === "http-dump";
-		case "browser":
-		case "gui":
-			return kind === "screenshot" || kind === "image";
-		case "data":
-			return kind === "data-diff";
-		default:
-			invalid("manualQa.surfaceEvidence has an unsupported surface.", "manualQa.surfaceEvidence.surface");
-	}
-}
-
-function checkFile(path: string, field: string, opts?: ValidateQualityGateOptions): void {
-	if (opts === undefined) return;
-	const absolute = resolve(opts.repoRoot, path);
-	if (!opts.fs.existsSync(absolute)) invalid(`${field} must point to an existing artifact.`, field);
-	if (opts.fs.statSync(absolute).size <= 0) invalid(`${field} must point to a non-empty artifact.`, field);
-	if (opts.currentAttemptDir !== undefined) {
-		const attemptRoot = resolve(opts.repoRoot, opts.currentAttemptDir);
-		if (!isWithinAttemptDir(absolute, attemptRoot))
-			invalid(
-				`${field} (${path}) must point to an artifact from the current attempt (${opts.currentAttemptDir}).`,
-				field,
-			);
-	}
-}
-
-function artifactMap(refs: readonly UlwLoopManualQaArtifactRef[]): Map<string, UlwLoopManualQaArtifactRef> {
-	const byId = new Map<string, UlwLoopManualQaArtifactRef>();
-	for (const ref of refs) {
-		if (byId.has(ref.id)) invalid(`manualQa.artifactRefs contains duplicate ${ref.id}.`, "manualQa.artifactRefs");
-		byId.set(ref.id, ref);
+function reviewerAcceptorField(
+	value: unknown,
+	surface: UlwLoopToolkitSurface,
+	sectionName: "manualQa" | "gateReview",
+): string {
+	const field = `${sectionName}.by`;
+	const accepted = GATE_SECTION_BY_ACCEPTOR[surface][sectionName];
+	if (typeof value !== "string" || value.trim() === "") {
+		textField(value, field);
+		return accepted?.[0] ?? "";
 	}
-	return byId;
-}
-
-function parseArtifactRefs(value: unknown, opts?: ValidateQualityGateOptions): readonly UlwLoopManualQaArtifactRef[] {
-	if (!Array.isArray(value) || value.length === 0)
-		invalid("manualQa.artifactRefs must not be empty.", "manualQa.artifactRefs");
-	return value.map((item, index) => {
-		const ref = section(item, `manualQa.artifactRefs[${index}]`);
-		const path = textField(ref["path"], `manualQa.artifactRefs[${index}].path`);
-		checkFile(path, `manualQa.artifactRefs[${index}].path`, opts);
-		return {
-			id: textField(ref["id"], `manualQa.artifactRefs[${index}].id`),
-			kind: kindField(ref["kind"], `manualQa.artifactRefs[${index}].kind`),
-			description: textField(ref["description"], `manualQa.artifactRefs[${index}].description`),
-			path,
-		};
-	});
+	const actual = textField(value, field);
+	if (accepted === undefined || !accepted.includes(actual))
+		invalid(`${field} must be one of ${accepted?.join(", ") ?? "the configured reviewers"}.`, field);
+	return actual;
 }
 
-function referencedArtifacts(
-	value: unknown,
-	field: string,
-	byId: ReadonlyMap<string, UlwLoopManualQaArtifactRef>,
-): readonly UlwLoopManualQaArtifactRef[] {
-	return stringArray(value, field).map((id) => {
-		const artifact = byId.get(id);
-		if (artifact === undefined) invalid(`${field} references unknown artifact ${id}.`, field);
-		return artifact;
-	});
+export function validateQualityGate(input: unknown, opts?: ValidateQualityGateOptions): UlwLoopQualityGate {
+	return withQualityGateCollector(() => validateQualityGateUncollected(input, opts));
 }
 
-export function validateQualityGate(input: unknown, opts?: ValidateQualityGateOptions): UlwLoopQualityGate {
+function validateQualityGateUncollected(input: unknown, opts?: ValidateQualityGateOptions): UlwLoopQualityGate {
+	const surface = opts?.reviewerSurface ?? "lazycodex";
 	const gate = section(input, "qualityGate");
-	const codeReview = section(gate["codeReview"], "codeReview");
+	if (surface === "omo-senpi" && gate["codeReview"] !== undefined)
+		invalid("omo-senpi gate has no codeReview lane.", "codeReview");
 	const manualQa = section(gate["manualQa"], "manualQa");
 	const gateReview = section(gate["gateReview"], "gateReview");
 	const iteration = section(gate["iteration"], "iteration");
 	const coverage = section(gate["criteriaCoverage"], "criteriaCoverage");
+	const codeReview = surface === "lazycodex" ? section(gate["codeReview"], "codeReview") : {};
+	const manualQaBy = reviewerAcceptorField(manualQa["by"], surface, "manualQa");
+	const gateReviewBy = reviewerAcceptorField(gateReview["by"], surface, "gateReview");
+	const manualQaEvidence = textField(manualQa["evidence"], "manualQa.evidence");
+	const gateReviewEvidence = textField(gateReview["evidence"], "gateReview.evidence");
+	if (surface === "lazycodex") reviewerRoleField(codeReview?.["by"], "lazycodex-code-reviewer", "codeReview.by");
 	const totalCriteria = numberField(coverage["totalCriteria"], "criteriaCoverage.totalCriteria");
 	const passCount = numberField(coverage["passCount"], "criteriaCoverage.passCount");
-	if (passCount < totalCriteria)
+	if (!isPoisoned("criteriaCoverage.passCount") && passCount < totalCriteria)
 		invalid("criteriaCoverage.passCount must cover totalCriteria.", "criteriaCoverage.passCount");
 	const artifactRefs = parseArtifactRefs(manualQa["artifactRefs"], opts);
 	const byId = artifactMap(artifactRefs);
 	const surfaceEvidence = parseSurfaceEvidence(manualQa["surfaceEvidence"], byId);
 	const adversarialCases = parseAdversarialCases(manualQa["adversarialCases"], byId);
-	const codeReportPath = textField(codeReview["reportPath"], "codeReview.reportPath");
 	const gateReportPath = textField(gateReview["reportPath"], "gateReview.reportPath");
-	checkFile(codeReportPath, "codeReview.reportPath", opts);
-	checkFile(gateReportPath, "gateReview.reportPath", opts);
-	return {
-		codeReview: {
-			by: reviewerRoleField(codeReview["by"], REVIEWER_ROLES.codeReview, "codeReview.by"),
-			recommendation: literal(codeReview["recommendation"], "APPROVE", "codeReview.recommendation"),
-			codeQualityStatus: codeQualityStatusField(codeReview["codeQualityStatus"], "codeReview.codeQualityStatus"),
-			reportPath: codeReportPath,
-			evidence: textField(codeReview["evidence"], "codeReview.evidence"),
-			blockers: emptyBlockers(codeReview["blockers"], "codeReview.blockers"),
-		},
+	if (!isPoisoned("gateReview.reportPath")) checkFile(gateReportPath, "gateReview.reportPath", opts);
+	const common = {
 		manualQa: {
-			by: reviewerRoleField(manualQa["by"], REVIEWER_ROLES.manualQa, "manualQa.by"),
+			by: manualQaBy,
 			status: literal(manualQa["status"], "passed", "manualQa.status"),
-			evidence: textField(manualQa["evidence"], "manualQa.evidence"),
+			evidence: manualQaEvidence,
 			surfaceEvidence,
 			adversarialCases,
 			artifactRefs,
 		},
 		gateReview: {
-			by: reviewerRoleField(gateReview["by"], REVIEWER_ROLES.gateReview, "gateReview.by"),
+			by: gateReviewBy,
 			recommendation: literal(gateReview["recommendation"], "APPROVE", "gateReview.recommendation"),
 			reportPath: gateReportPath,
-			evidence: textField(gateReview["evidence"], "gateReview.evidence"),
+			evidence: gateReviewEvidence,
 			blockers: emptyBlockers(gateReview["blockers"], "gateReview.blockers"),
 		},
 		iteration: {
@@ -203,16 +132,34 @@ export function validateQualityGate(input: unknown, opts?: ValidateQualityGateOp
 			),
 		},
 	};
+	if (surface === "omo-senpi") return { surface, ...common };
+	const codeReportPath = textField(codeReview["reportPath"], "codeReview.reportPath");
+	checkFile(codeReportPath, "codeReview.reportPath", opts);
+	return {
+		surface,
+		...common,
+		codeReview: {
+			by: "lazycodex-code-reviewer",
+			recommendation: literal(codeReview["recommendation"], "APPROVE", "codeReview.recommendation"),
+			codeQualityStatus: codeQualityStatusField(codeReview["codeQualityStatus"], "codeReview.codeQualityStatus"),
+			reportPath: codeReportPath,
+			evidence: textField(codeReview["evidence"], "codeReview.evidence"),
+			blockers: emptyBlockers(codeReview["blockers"], "codeReview.blockers"),
+		},
+	};
 }
 
 function parseSurfaceEvidence(
 	value: unknown,
 	byId: ReadonlyMap<string, UlwLoopManualQaArtifactRef>,
 ): UlwLoopQualityGate["manualQa"]["surfaceEvidence"] {
-	if (!Array.isArray(value) || value.length === 0)
+	if (!Array.isArray(value) || value.length === 0) {
 		invalid("manualQa.surfaceEvidence must not be empty.", "manualQa.surfaceEvidence");
-	return value.map((item, index) => {
+		return [];
+	}
+	return value.flatMap((item, index) => {
 		const row = section(item, `manualQa.surfaceEvidence[${index}]`);
+		if (isPoisoned(`manualQa.surfaceEvidence[${index}]`)) return [];
 		const surface = surfaceField(row["surface"], `manualQa.surfaceEvidence[${index}].surface`);
 		const artifacts = referencedArtifacts(
 			row["artifactRefs"],
@@ -220,9 +167,10 @@ function parseSurfaceEvidence(
 			byId,
 		);
 		for (const artifact of artifacts) {
+			if (isPoisoned(`manualQa.surfaceEvidence[${index}].surface`) || isPoisonedArtifactKind(artifact.id)) continue;
 			if (!artifactCompatible(surface, artifact.kind)) {
 				invalid(
-					`manualQa.surfaceEvidence ${surface} artifact ${artifact.kind} is incompatible.`,
+					`manualQa.surfaceEvidence ${surface} artifact ${artifact.kind} is incompatible; surface "${surface}" accepts artifact kinds: ${compatibleKindsFor(surface).join(", ")}.`,
 					"manualQa.surfaceEvidence",
 				);
 			}
@@ -242,10 +190,13 @@ function parseAdversarialCases(
 	value: unknown,
 	byId: ReadonlyMap<string, UlwLoopManualQaArtifactRef>,
 ): UlwLoopQualityGate["manualQa"]["adversarialCases"] {
-	if (!Array.isArray(value) || value.length === 0)
+	if (!Array.isArray(value) || value.length === 0) {
 		invalid("manualQa.adversarialCases must not be empty.", "manualQa.adversarialCases");
-	return value.map((item, index) => {
+		return [];
+	}
+	return value.flatMap((item, index) => {
 		const row = section(item, `manualQa.adversarialCases[${index}]`);
+		if (isPoisoned(`manualQa.adversarialCases[${index}]`)) return [];
 		const artifacts = referencedArtifacts(
 			row["artifactRefs"],
 			`manualQa.adversarialCases[${index}].artifactRefs`,

package/packages/omo-codex/plugin/components/ulw-loop/src/review-blockers.ts

@@ -1,5 +1,6 @@
 // biome-ignore-all format: compact port must stay within the requested pure LOC budget.
 
+import { codexSnapshotMismatchError } from "./checkpoint-reconciliation.js";
 import { readCodexGoalSnapshotInput, reconcileCodexGoalSnapshot } from "./codex-goal-snapshot.js";
 import { codexGoalMode, compatibleCodexObjectives, expectedCodexObjective, isFinalRunCompletionCandidate } from "./goal-status.js";
 import type { UlwLoopScope } from "./paths.js";
@@ -55,8 +56,9 @@ export async function recordFinalReviewBlockers(
 
 		const snapshot = await readCodexGoalSnapshotInput(args.codexGoalJson, repoRoot);
 		const aggregate = codexGoalMode(plan) === "aggregate";
-		const reconciliation = reconcileCodexGoalSnapshot(snapshot, { expectedObjective: expectedCodexObjective(plan, goal), ...(aggregate ? { acceptedObjectives: compatibleCodexObjectives(plan) } : {}), allowedStatuses: ["active"], requireSnapshot: true, requireComplete: false });
-		if (!reconciliation.ok) ulwLoopError(reconciliation.errors.join(" "), "ulw_loop_codex_snapshot_mismatch");
+		const expected = expectedCodexObjective(plan, goal);
+		const reconciliation = reconcileCodexGoalSnapshot(snapshot, { expectedObjective: expected, ...(aggregate ? { acceptedObjectives: compatibleCodexObjectives(plan) } : {}), allowedStatuses: ["active"], requireSnapshot: true, requireComplete: false });
+		if (!reconciliation.ok) throw codexSnapshotMismatchError({ reconciliation, snapshot, expectedObjective: expected });
 
 		const now = iso();
 		for (const field of BLOCKER_FIELDS) Reflect.deleteProperty(goal, field);