@bridge_gpt/mcp-server 0.2.69 → 0.2.70

package/build/executor/reconcile-overlap-job.js

@@ -40,6 +40,7 @@ import { guardedFastForwardPush, PUSH_AUTH_FAILURE_RE } from "./guarded-fast-for
  * refuses the push is reported as `ReconcileOverlapPushUnauthorized`.
  */
 import path from "node:path";
+import { readRequiredVerification } from "./completion-supervision.js";
 import { normalizeRepoRelativePath } from "../conductor/file-scope-guard.js";
 // BAPI-1311: the read-only poller and predicates moved to `provider-checks.ts` so
 // the focused rebase wait shares them; re-exported here for existing importers.
@@ -169,16 +170,24 @@ function verificationCommands(value, field) {
         return { name: name.slice(0, RECONCILE_CHECK_NAME_MAX_CHARS), argv: argv, timeoutSeconds: timeout };
     });
 }
-function ticketContext(value, field) {
+function ticketContext(value, field, policyVersion = false) {
     const entry = asRecord(value, field);
     const ticketKey = typeof entry.ticket_key === "string" ? entry.ticket_key.trim() : "";
     if (!ticketKey)
         throw new PayloadError(`${field}.ticket_key is missing or blank`);
+    const required = readRequiredVerification(entry);
+    if (policyVersion && (required.kind !== "ok" || required.declaration.policyVersion !== 2))
+        throw new PayloadError(`${field}.required_verification is invalid`);
+    if (!policyVersion && required.kind !== "none")
+        throw new PayloadError(`${field}.required_verification requires schema 2`);
+    if (policyVersion && entry.required_verification.ticket_key !== ticketKey)
+        throw new PayloadError(`${field}.coverage ticket mismatch`);
     return {
         ticketKey,
         changedFiles: pathList(entry.changed_files, `${field}.changed_files`, MAX_CHANGED_FILES),
         declaredTouchedFiles: pathList(entry.declared_touched_files ?? [], `${field}.declared_touched_files`, MAX_CHANGED_FILES),
         verificationCommands: verificationCommands(entry.verification_commands, `${field}.verification_commands`),
+        ...(required.kind === "ok" ? { requiredVerification: required.declaration } : {}),
     };
 }
 /**
@@ -188,7 +197,7 @@ function ticketContext(value, field) {
 export function validateReconcileOverlapPayload(job) {
     try {
         const payload = asRecord(job.payload, "payload");
-        if (payload.schema_version !== RECONCILE_OVERLAP_PAYLOAD_SCHEMA_VERSION) {
+        if (payload.schema_version !== RECONCILE_OVERLAP_PAYLOAD_SCHEMA_VERSION && payload.schema_version !== 2) {
             throw new PayloadError(`payload.schema_version must be ${RECONCILE_OVERLAP_PAYLOAD_SCHEMA_VERSION}`);
         }
         const childHead = requiredSha(payload.child_head, "payload.child_head");
@@ -207,8 +216,15 @@ export function validateReconcileOverlapPayload(job) {
         const requiredChecks = requiredChecksRaw
             .filter((c) => typeof c === "string" && c.trim().length > 0)
             .map((c) => c.trim());
-        const child = ticketContext(payload.child, "payload.child");
-        const peer = payload.peer === null || payload.peer === undefined ? null : ticketContext(payload.peer, "payload.peer");
+        const child = ticketContext(payload.child, "payload.child", payload.schema_version === 2);
+        const peer = payload.peer === null || payload.peer === undefined ? null : ticketContext(payload.peer, "payload.peer", payload.schema_version === 2);
+        verificationCommandUnion(child, peer); // reject conflicting typed metadata before any effects
+        if (payload.schema_version === 2) {
+            const covering = [...new Set([child, ...(peer ? [peer] : [])].flatMap(s => s.requiredVerification?.obligations?.filter(o => o.classification === "ci_deferred").flatMap(o => o.covering_checks) ?? []))].sort();
+            if (!Array.isArray(payload.approved_covering_checks) || JSON.stringify(payload.approved_covering_checks) !== JSON.stringify(covering) || covering.length > 64 ||
+                !covering.every(c => requiredChecks.includes(c)) || requiredChecks.length !== requiredChecksRaw.length)
+                throw new PayloadError("approved covering check union is inconsistent");
+        }
         // BAPI-1215 — `payload.governance` is retired. A server that predates the
         // retirement still sends it: it is accepted when present and never read, so
         // this executor consumes both payload shapes at schema version 1.
@@ -227,7 +243,7 @@ export function validateReconcileOverlapPayload(job) {
         return {
             ok: true,
             value: {
-                schemaVersion: RECONCILE_OVERLAP_PAYLOAD_SCHEMA_VERSION,
+                schemaVersion: payload.schema_version,
                 childHead,
                 requiredEpicSha,
                 epicBranch,
@@ -277,10 +293,16 @@ const OVERLAP_CONCLUSIONS = {
 export function verificationCommandUnion(child, peer) {
     const seen = new Set();
     const out = [];
-    for (const command of [...child.verificationCommands, ...(peer?.verificationCommands ?? [])]) {
+    const commands = (side) => side.requiredVerification
+        ? side.requiredVerification.checks.map(c => ({ name: `${side.ticketKey}:${c.identity}`, originalName: c.name, argv: c.argv, timeoutSeconds: c.timeoutSeconds })) : side.verificationCommands;
+    for (const command of [...commands(child), ...(peer ? commands(peer) : [])]) {
         const key = JSON.stringify(command.argv);
-        if (seen.has(key))
+        if (seen.has(key)) {
+            const previous = out.find(c => JSON.stringify(c.argv) === key);
+            if ((child.requiredVerification || peer?.requiredVerification) && (previous?.timeoutSeconds !== command.timeoutSeconds || previous?.originalName !== command.originalName))
+                throw new PayloadError("conflicting local command metadata");
             continue;
+        }
         seen.add(key);
         out.push(command);
     }
@@ -310,6 +332,12 @@ export function buildReconcileEnvelope(payload, facts, extra = {}) {
         if (value !== undefined)
             envelope[key] = value;
     }
+    if (payload.schemaVersion === 2 && payload.child) {
+        const sides = [payload.child, ...(payload.peer ? [payload.peer] : [])];
+        envelope.verification_policy = { version: 2, declaration_digests: sides.map(s => s.requiredVerification.digest),
+            deferred_obligation_identities: sides.flatMap(s => s.requiredVerification.deferredIdentities ?? []),
+            tested_head_sha: extra.resulting_head ?? null };
+    }
     return envelope;
 }
 // ---------------------------------------------------------------------------