@kungfu-tech/buildchain 3.0.9-alpha.9 → 4.0.0-alpha.0

package/packages/core/buildchain-kfd-claims.js

@@ -138,7 +138,7 @@ function immediateReadmes(root, dir) {
 
 function publicDocumentationFiles(root) {
   return uniquePaths([
-    ...(readJson(root, "dist/site/manual-registry.json").manuals || BUILDCHAIN_AGENT_MANUALS).map((entry) => entry.path),
+    ...BUILDCHAIN_AGENT_MANUALS.map((entry) => entry.path),
     "README.md",
     "packages/core/README.md",
     ...immediateReadmes(root, "actions"),

package/packages/core/channel-candidate.js

@@ -97,14 +97,6 @@ export function decideChannelCandidate(input) {
   const sourceSha = sha(input.sourceSha, "sourceSha");
   const targetSha = sha(input.targetSha, "targetSha");
   const selection = normalizeChannelCandidateSelection(input.selection);
-  if (
-    selection?.versionReservation &&
-    selection.versionReservation.candidateSha !== sourceSha
-  ) {
-    throw new Error(
-      "selection version reservation must bind the selected source SHA",
-    );
-  }
   const now = required(input.now || new Date().toISOString(), "now");
   const maxAgeSeconds = Number(input.maxAgeSeconds ?? 7 * 24 * 60 * 60);
   if (!Number.isSafeInteger(maxAgeSeconds) || maxAgeSeconds <= 0) {

package/packages/core/channel-promotion-baseline.js

@@ -1,10 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-  nextDevelopmentPatrolContext,
-  normalizeNextDevelopmentVersionReservation,
-} from "./next-development-candidate-reservation.js";
-
 const SHA = /^[0-9a-f]{40}$/;
 
 function text(value = "") {
@@ -64,18 +59,6 @@ export function normalizeChannelCandidateSelection(input) {
           ),
         }
       : {}),
-    ...(input.versionReservation
-      ? {
-          versionReservation: normalizeNextDevelopmentVersionReservation(
-            input.versionReservation,
-            {
-              reservationSha: input.versionReservation.reservationSha,
-              candidateSha: input.versionReservation.candidateSha,
-              targetVersion: input.versionReservation.targetVersion,
-            },
-          ),
-        }
-      : {}),
   };
 }
 
@@ -134,7 +117,6 @@ export async function resolvePatrolSourceInputs({
   let comparison = headComparison;
   let workflowEvidence = [];
   let skippedNewerCommitCount = 0;
-  let versionReservation;
   let qualificationError;
   if (
     headComparison.status === "ahead" &&
@@ -148,8 +130,6 @@ export async function resolvePatrolSourceInputs({
       ),
     ]);
     try {
-      const { preparations, ignoredSourceShas } =
-        nextDevelopmentPatrolContext(sourceHistory);
       const selected = selectQualifiedSource({
         sourceHistory,
         workflowRunsByPath: new Map(
@@ -161,39 +141,8 @@ export async function resolvePatrolSourceInputs({
         requiredWorkflowPaths,
         now: options.now,
         maxAgeSeconds: options.maxAgeSeconds,
-        ignoredSourceShas,
       });
       ({ sourceSha, skippedNewerCommitCount, workflowEvidence } = selected);
-      const selectedIndex = sourceHistory.findIndex((entry) =>
-        (typeof entry === "string" ? entry : entry?.sha) === sourceSha,
-      );
-      const reservation = preparations.find(
-        ({ index }) => index > selectedIndex,
-      )?.preparation;
-      if (reservation) {
-        if (typeof client.readNextDevelopmentVersionReservation !== "function") {
-          throw new Error(
-            "candidate follows next-development preparation but reservation readback is unavailable",
-          );
-        }
-        versionReservation = normalizeNextDevelopmentVersionReservation(
-          await client.readNextDevelopmentVersionReservation({
-            reservationSha: reservation.sha,
-            candidateSha: sourceSha,
-            targetVersion: reservation.targetVersion,
-          }),
-          {
-            reservationSha: reservation.sha,
-            candidateSha: sourceSha,
-            targetVersion: reservation.targetVersion,
-          },
-        );
-        if (versionReservation.status !== "current") {
-          throw new Error(
-            `next-development version reservation is ${versionReservation.status} for candidate ${sourceSha}`,
-          );
-        }
-      }
       if (sourceSha !== observedSourceHeadSha)
         comparison = await client.compare(boundarySha, sourceSha);
     } catch (error) {
@@ -209,7 +158,6 @@ export async function resolvePatrolSourceInputs({
     comparison,
     workflowEvidence,
     skippedNewerCommitCount,
-    versionReservation,
     qualificationError,
   };
 }

package/packages/core/controller-evidence.js

@@ -34,14 +34,13 @@ const CONTROLLER_SPECS = [
       "resolve-runtime",
       "resolve-source",
       "anchored-release-preflight",
-      "pre-build-contracts",
       "build",
       "signing-finalization",
       "credential-island",
       "verify",
       "aggregate",
     ],
-    optionalStages: ["anchored-release-preflight", "pre-build-contracts", "credential-island"],
+    optionalStages: ["anchored-release-preflight", "credential-island"],
     evidence: [
       "platform-manifests",
       "build-summary",
@@ -53,8 +52,8 @@ const CONTROLLER_SPECS = [
     workflowId: "build",
     version: 1,
     capabilities: ["channel-selection", "runtime-selection", "build-delegation"],
-    stages: ["resolve-channel", "alpha", "stable", "aggregate"],
-    optionalStages: ["alpha", "stable"],
+    stages: ["resolve-channel", "override", "alpha", "stable", "aggregate"],
+    optionalStages: ["override", "alpha", "stable"],
     evidence: ["nested-controller-receipt", "controller-receipt"],
   },
   {

package/packages/core/dev-alpha-candidate-selection.js

@@ -82,9 +82,7 @@ export function selectLatestQualifiedSource({
   requiredWorkflowPaths,
   now,
   maxAgeSeconds,
-  ignoredSourceShas = [],
 }) {
-  const ignored = new Set(ignoredSourceShas);
   const latestByPath = new Map(
     requiredWorkflowPaths.map((workflow) => [
       workflow,
@@ -92,11 +90,7 @@ export function selectLatestQualifiedSource({
     ]),
   );
   for (let index = 0; index < sourceHistory.length; index += 1) {
-    const sourceSha =
-      typeof sourceHistory[index] === "string"
-        ? sourceHistory[index]
-        : sourceHistory[index]?.sha;
-    if (ignored.has(sourceSha)) continue;
+    const sourceSha = sourceHistory[index];
     const rows = requiredWorkflowPaths.map((workflow) =>
       latestByPath.get(workflow).get(sourceSha),
     );
@@ -121,9 +115,7 @@ export function selectLatestQualifiedSource({
       };
     }
   }
-  const staleSuccessfulPair = sourceHistory.some((entry) => {
-    const sourceSha = typeof entry === "string" ? entry : entry?.sha;
-    if (ignored.has(sourceSha)) return false;
+  const staleSuccessfulPair = sourceHistory.some((sourceSha) => {
     const rows = requiredWorkflowPaths.map((workflow) =>
       latestByPath.get(workflow).get(sourceSha),
     );

package/packages/core/dev-delivery-warrant-cancellation.js

@@ -6,7 +6,6 @@ const TERMINAL_STATES = new Set(["merged", "terminal-failure", "dequeued", "canc
 const QUEUED_CANCELLATION_EVENTS = new Map([
   ["closed", "cancelled"],
   ["cancelled", "cancelled"],
-  ["synchronize", "cancelled"],
   ["dequeued", "dequeued"],
 ]);
 

package/packages/core/dev-delivery-warrant-settlement.js

@@ -2,7 +2,7 @@ import { devDeliveryContentRoot, devDeliveryExactRoot as exactRoot, devDeliveryE
 
 export const DEV_DELIVERY_SETTLEMENT_RECEIPT_SCHEMA = "kungfu.buildchain.dev-delivery-settlement-receipt/v1";
 
-function noopReceipt(queue, identity, candidate, action, details = {}) {
+function noopReceipt(queue, identity, candidate, action) {
   return {
     schema: DEV_DELIVERY_SETTLEMENT_RECEIPT_SCHEMA,
     action,
@@ -17,36 +17,9 @@ function noopReceipt(queue, identity, candidate, action, details = {}) {
     expectedOldStateRoot: queue.stateRoot,
     nextStateRoot: queue.stateRoot,
     nextAction: "No fenced delivery state remains for this terminal event.",
-    ...details,
   };
 }
 
-function settleTerminalCandidate(queue, identity, candidate) {
-  if (candidate.status !== identity.outcome) {
-    if (identity.outcome !== "dequeued") throw new Error("terminal candidate outcome does not match the terminal event");
-    const receipt = noopReceipt(queue, identity, candidate, "stale-transient-dequeue-noop", {
-      terminalClass: "transient-dequeue",
-      authoritativeOutcome: candidate.status,
-      nextAction: "Retain the authoritative terminal settlement; the stale dequeue cannot rewrite it.",
-    });
-    return { queue, receipt, receiptRoot: devDeliveryContentRoot(receipt) };
-  }
-  const receipt = noopReceipt(queue, identity, candidate, "duplicate-terminal-event-noop");
-  return { queue, receipt, receiptRoot: devDeliveryContentRoot(receipt) };
-}
-
-function retainDequeuedWarrant(queue, identity, candidate, fencingToken, leaseGeneration, now) {
-  const leaseFresh = Date.parse(queue.activeWarrant.expiresAt) > Date.parse(now);
-  const receipt = noopReceipt(queue, identity, candidate, leaseFresh ? "transient-dequeue-retained-active-warrant" : "expired-active-warrant-awaits-fenced-settlement", {
-    terminalClass: "transient-dequeue",
-    fencingToken,
-    leaseGeneration,
-    warrantExpiresAt: queue.activeWarrant.expiresAt,
-    nextAction: leaseFresh ? "Continue the exact active native execution and heartbeat; later candidates remain queued." : "Prove the stale native worker stopped, then close this exact fenced generation before selecting a successor.",
-  });
-  return { queue, receipt, receiptRoot: devDeliveryContentRoot(receipt) };
-}
-
 export function createDevDeliveryTerminalSettler({ normalizeQueue, closeWarrant, cancelQueued, terminalStates }) {
   return function settleDevDeliveryTerminalEvent(queueInput, input, { now = new Date().toISOString() } = {}) {
     const queue = normalizeQueue(queueInput);
@@ -60,39 +33,23 @@ export function createDevDeliveryTerminalSettler({ normalizeQueue, closeWarrant,
     };
     if (!terminalStates.has(identity.outcome)) throw new Error(`outcome must be one of ${[...terminalStates].join(", ")}`);
     const samePullRequest = queue.candidates.filter((entry) => entry.pullRequestNumber === identity.pullRequestNumber);
-    const matchingHead = samePullRequest.filter((entry) => entry.sourceHead === identity.sourceHead);
-    const activeCandidate = queue.activeWarrant ? matchingHead.find((entry) => entry.candidateId === queue.activeWarrant.candidateId) : null;
-    const candidate = activeCandidate || matchingHead.at(-1) || null;
+    const candidate = samePullRequest.find((entry) => entry.sourceHead === identity.sourceHead) || null;
     if (!candidate && samePullRequest.length > 0) throw new Error("terminal event sourceHead does not match the recorded candidate");
 
     if (candidate && terminalStates.has(candidate.status)) {
-      return settleTerminalCandidate(queue, identity, candidate);
+      if (candidate.status !== identity.outcome) throw new Error("terminal candidate outcome does not match the terminal event");
+      const receipt = noopReceipt(queue, identity, candidate, "duplicate-terminal-event-noop");
+      return { queue, receipt, receiptRoot: devDeliveryContentRoot(receipt) };
     }
 
     if (queue.activeWarrant) {
       if (!candidate || queue.activeWarrant.candidateId !== candidate.candidateId) throw new Error("terminal event does not match the active Delivery Warrant");
       if (!identity.evidenceRoot) throw new Error("active terminal settlement requires evidenceRoot");
-      const fencingToken = exactRoot(input?.fencingToken, "fencingToken");
-      const leaseGeneration = positiveInteger(input?.leaseGeneration, "leaseGeneration");
-      if (fencingToken !== queue.activeWarrant.fencingToken) throw new Error("stale fencing token");
-      if (leaseGeneration !== queue.activeWarrant.generation) throw new Error("stale lease generation");
-      if (identity.outcome === "dequeued") {
-        return retainDequeuedWarrant(queue, identity, candidate, fencingToken, leaseGeneration, now);
-      }
-      return closeWarrant(
-        queue,
-        {
-          candidateId: candidate.candidateId,
-          fencingToken,
-          generation: leaseGeneration,
-        },
-        {
-          outcome: identity.outcome,
-          evidenceRoot: identity.evidenceRoot,
-          reason: identity.reason,
-          now,
-        },
-      );
+      return closeWarrant(queue, {
+        candidateId: candidate.candidateId,
+        fencingToken: exactRoot(input?.fencingToken, "fencingToken"),
+        generation: positiveInteger(input?.leaseGeneration, "leaseGeneration"),
+      }, { outcome: identity.outcome, evidenceRoot: identity.evidenceRoot, reason: identity.reason, now });
     }
 
     if (!candidate) {
@@ -102,19 +59,15 @@ export function createDevDeliveryTerminalSettler({ normalizeQueue, closeWarrant,
     if (candidate.status !== "queued") throw new Error(`candidate status ${candidate.status} requires an active Delivery Warrant`);
     if (!["cancelled", "dequeued"].includes(identity.outcome)) throw new Error("queued candidate cannot settle as merged or terminal-failure");
     if (!identity.evidenceRoot) throw new Error("queued terminal settlement requires evidenceRoot");
-    return cancelQueued(
-      queue,
-      {
-        candidateId: candidate.candidateId,
-        pullRequestNumber: identity.pullRequestNumber,
-        expectedSourceHead: identity.sourceHead,
-        observedSourceHead: identity.sourceHead,
-        eventAction: identity.eventAction || (identity.outcome === "dequeued" ? "dequeued" : "closed"),
-        outcome: identity.outcome,
-        evidenceRoot: identity.evidenceRoot,
-        reason: identity.reason,
-      },
-      { now },
-    );
+    return cancelQueued(queue, {
+      candidateId: candidate.candidateId,
+      pullRequestNumber: identity.pullRequestNumber,
+      expectedSourceHead: identity.sourceHead,
+      observedSourceHead: identity.sourceHead,
+      eventAction: identity.eventAction || (identity.outcome === "dequeued" ? "dequeued" : "closed"),
+      outcome: identity.outcome,
+      evidenceRoot: identity.evidenceRoot,
+      reason: identity.reason,
+    }, { now });
   };
 }