From 4bebd9a5e1a129fff6b2d90e921e587fa1c341a6 Mon Sep 17 00:00:00 2001 From: ShuaixinHuang <1836656514@qq.com> Date: Fri, 20 Nov 2026 07:00:37 +0800 Subject: [PATCH] fix(release): validate the exact MCP registry package at checkpoints (#12550) Co-authored-by: ShuaixinHuang --- scripts/lib/release-checkpoint.mjs | 16 ++++---- .../filesystem/releaseCheckpoint.test.ts | 39 ++++++++++++++++++- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/scripts/lib/release-checkpoint.mjs b/scripts/lib/release-checkpoint.mjs index 3bfcdcb968..488c4832e2 100644 --- a/scripts/lib/release-checkpoint.mjs +++ b/scripts/lib/release-checkpoint.mjs @@ -224,16 +224,16 @@ async function validateCandidate(git, sha, version, commits) { sha, "server.json", versionSchema.extend({ - packages: z.array( - z.object({ identifier: z.string(), version: z.string() }), - ), + packages: z.tuple([ + z.object({ + registryType: z.literal("npm"), + identifier: z.literal("rea-agents"), + version: z.string(), + }), + ]), }), ); - const npmPackage = server.packages.find( - (entry) => entry.identifier === "rea-agents", - ); - if (npmPackage === undefined) - throw new Error("server.json is missing the rea-agents package."); + const [npmPackage] = server.packages; versions.push( ["server.json", server.version], ["server.json rea-agents package", npmPackage.version], diff --git a/tests/boundary/filesystem/releaseCheckpoint.test.ts b/tests/boundary/filesystem/releaseCheckpoint.test.ts index 7e07a03db6..fc63356155 100644 --- a/tests/boundary/filesystem/releaseCheckpoint.test.ts +++ b/tests/boundary/filesystem/releaseCheckpoint.test.ts @@ -76,7 +76,7 @@ async function metadata( ".release-please-manifest.json": { ".": version }, "server.json": { version, - packages: [{ identifier: "rea-agents", version }], + packages: [{ registryType: "npm", identifier: "rea-agents", version }], }, "release-please-config.json": { ...(versioning === undefined ? {} : { versioning }), @@ -891,7 +891,13 @@ it.each([ : path === "server.json" ? { version: "6.0.0", - packages: [{ identifier: "rea-agents", version: "5.1.0" }], + packages: [ + { + registryType: "npm", + identifier: "rea-agents", + version: "5.1.0", + }, + ], } : { package: { version: "5.1.0" } }, ), @@ -906,6 +912,35 @@ it.each([ }); }); +it.each([ + { + label: "non-npm", + packages: [ + { registryType: "oci", identifier: "rea-agents", version: "6.0.0" }, + ], + }, + { + label: "ambiguous", + packages: [ + { registryType: "npm", identifier: "rea-agents", version: "6.0.0" }, + { registryType: "npm", identifier: "rea-agents", version: "5.1.0" }, + ], + }, +])("refuses invalid MCP package entries: $label", async ({ packages }) => { + const f = await fixture(); + await candidate(f, "6.0.0"); + await writeFile( + join(f.directory, "server.json"), + JSON.stringify({ version: "6.0.0", packages }), + ); + await git(f.directory, ["add", "server.json"]); + await git(f.directory, ["commit", "-m", "chore: inconsistent MCP package"]); + await expect(verify(f)).rejects.toMatchObject({ + code: 1, + stderr: expect.stringContaining("server.json"), + }); +}); + it.each( pluginManifestPaths.map((path) => ({ path,