@kungfu-tech/buildchain 2.4.7-alpha.1 → 2.4.8-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kungfu-tech/buildchain",
-  "version": "2.4.7-alpha.1",
+  "version": "2.4.8-alpha.0",
   "private": false,
   "description": "Buildchain Release Passport, release governance, CLI toolkit, and site facts.",
   "repository": "https://github.com/kungfu-systems/buildchain",

package/packages/core/release-candidate.js

@@ -18,6 +18,21 @@ function nonEmptyString(value, label) {
   return normalized;
 }
 
+function normalizeTargetChannel(value) {
+  const normalized = optionalString(value).trim();
+  if (!normalized || normalized === "none") {
+    return "";
+  }
+  const refMatch = normalized.match(/^(alpha|release)\/v\d+\/v\d+\.\d+$/);
+  if (refMatch) {
+    return refMatch[1];
+  }
+  if (normalized === "publish-gate/major" || normalized === "major-gate") {
+    return "major";
+  }
+  return normalized;
+}
+
 function stableJson(value) {
   if (Array.isArray(value)) {
     return `[${value.map(stableJson).join(",")}]`;
@@ -81,7 +96,10 @@ export function createReleaseCandidatePassport({
 } = {}) {
   const normalizedSummary = buildSummary && typeof buildSummary === "object" ? buildSummary : {};
   const sourceSha = sourceHeadSha || normalizedSummary.publishSource?.sha || normalizedSummary.git?.sha || "";
-  const channel = targetChannel || normalizedSummary.publishSource?.channel || normalizedSummary.publishGate?.channel || "";
+  const channel = normalizeTargetChannel(targetChannel)
+    || normalizeTargetChannel(normalizedSummary.publishSource?.channel)
+    || normalizeTargetChannel(normalizedSummary.publishGate?.channel)
+    || normalizeTargetChannel(pullRequest.baseRef);
   const candidate = {
     schemaVersion: 1,
     contract: RELEASE_CANDIDATE_PASSPORT_CONTRACT,
@@ -158,7 +176,11 @@ export function validateReleaseCandidatePassport({
     check(passport.repository === repository, `repository mismatch: expected ${repository}, got ${passport.repository || "<empty>"}`);
   }
   if (targetChannel) {
-    check(passport.target?.channel === targetChannel, `target channel mismatch: expected ${targetChannel}, got ${passport.target?.channel || "<empty>"}`);
+    const expectedChannel = normalizeTargetChannel(targetChannel);
+    const actualChannel = normalizeTargetChannel(passport.target?.channel);
+    if (actualChannel) {
+      check(actualChannel === expectedChannel, `target channel mismatch: expected ${expectedChannel}, got ${actualChannel}`);
+    }
   }
   if (version) {
     check(passport.target?.version === version, `version mismatch: expected ${version}, got ${passport.target?.version || "<empty>"}`);

package/scripts/release-candidate-resolver.mjs

@@ -90,18 +90,34 @@ export function selectMergedChannelPullRequest({ pullRequests = [], targetRef, r
   return candidates[0];
 }
 
-export function selectReleaseCandidateRun({ runs = [], pullRequest, workflowName = "Build Surface Fixture" }) {
+export function selectReleaseCandidateRun({ runs = [], pullRequest, workflowName = "" }) {
   const prNumber = Number(pullRequest?.number || 0);
+  const prHeadSha = String(pullRequest?.head?.sha || pullRequest?.headRefOid || "").trim();
+  const prHeadBranch = normalizeBranch(pullRequest?.head?.ref || pullRequest?.headRefName || "");
+  const prHeadRepository = pullRequest?.head?.repo?.full_name || pullRequest?.headRepository?.nameWithOwner || "";
   const candidates = runs.filter((run) => {
     const runPrs = Array.isArray(run.pull_requests) ? run.pull_requests : [];
-    const matchesPr = runPrs.some((pr) => Number(pr.number || 0) === prNumber);
-    const matchesWorkflow = !workflowName || run.name === workflowName || run.display_title === workflowName;
+    const runHeadBranch = normalizeBranch(run.head_branch || "");
+    const runHeadSha = String(run.head_sha || "").trim();
+    const runHeadRepository = run.head_repository?.full_name || run.headRepository?.nameWithOwner || "";
+    const matchesPrNumber = runPrs.some((pr) => Number(pr.number || 0) === prNumber);
+    const matchesHeadSha = prHeadSha && runHeadSha === prHeadSha;
+    const matchesHeadBranch = prHeadBranch
+      && runHeadBranch === prHeadBranch
+      && (!prHeadRepository || !runHeadRepository || runHeadRepository === prHeadRepository);
+    const matchesPr = matchesPrNumber || matchesHeadSha || matchesHeadBranch;
+    const matchesWorkflow = !workflowName || run.name === workflowName || run.workflow_name === workflowName;
     return matchesPr && matchesWorkflow && run.event === "pull_request" && run.status === "completed" && run.conclusion === "success";
   });
   candidates.sort((left, right) => Date.parse(right.updated_at || right.created_at || "") - Date.parse(left.updated_at || left.created_at || ""));
   return candidates[0];
 }
 
+function outputPath(filePath) {
+  const relative = path.relative(process.cwd(), filePath).split(path.sep).join("/");
+  return relative.startsWith("../") || relative === ".." ? filePath : relative;
+}
+
 export function selectReleaseCandidateArtifacts({ artifacts = [] }) {
   const active = artifacts.filter((artifact) => !artifact.expired);
   const passports = active.filter((artifact) => /-release-candidate-[0-9a-f]{40}$/i.test(artifact.name || ""));
@@ -256,8 +272,8 @@ export async function resolveReleaseCandidateArtifacts({
   return {
     ...result,
     paths: {
-      passport: path.relative(process.cwd(), passportPath).split(path.sep).join("/"),
-      buildSummary: path.relative(process.cwd(), buildSummaryPath).split(path.sep).join("/"),
+      passport: outputPath(passportPath),
+      buildSummary: outputPath(buildSummaryPath),
     },
     version: passport.target?.version || "",
     candidateHash: passport.candidateHash || "",
@@ -270,7 +286,7 @@ export async function resolveReleaseCandidateArtifactsCli() {
     targetRef: env("BUILDCHAIN_TARGET_REF"),
     targetSha: env("BUILDCHAIN_TARGET_SHA"),
     workflowFile: env("BUILDCHAIN_RC_WORKFLOW_FILE", DEFAULT_WORKFLOW_FILE),
-    workflowName: env("BUILDCHAIN_RC_WORKFLOW_NAME", "Build Surface Fixture"),
+    workflowName: env("BUILDCHAIN_RC_WORKFLOW_NAME", ""),
     outputDir: env("BUILDCHAIN_RC_OUTPUT_DIR", ".buildchain/release-candidate"),
   });
   writeGitHubOutputs({