fix(package): verify the complete MCP catalog

Author: morluto

scripts/lib/verify-package-core.mjs

@@ -28,8 +28,8 @@ export const runWithStatus = async (command, args, env) => {
 /** Parse JSON from a command output string. */
 export const json = (text) => JSON.parse(text);
 
-/** Verify that the advertised MCP catalog matches the session's available tools. */
-export const verifyAvailableToolCatalog = async (client, options) => {
+/** Verify that the complete advertised MCP catalog matches session metadata. */
+export const verifyCompleteToolCatalog = async (client, options) => {
   const listed = await client.listTools(undefined, options);
   const status = await client.callTool(
     { name: "binary_session", arguments: { detail: "full" } },
@@ -38,14 +38,11 @@ export const verifyAvailableToolCatalog = async (client, options) => {
   const availability = status.structuredContent?.result?.tool_availability;
   if (!Array.isArray(availability))
     throw new Error("packaged MCP omitted tool availability");
-  const expected = availability
-    .filter(({ available }) => available === true)
-    .map(({ name }) => name)
-    .sort();
+  const expected = availability.map(({ name }) => name).sort();
   const observed = listed.tools.map(({ name }) => name).sort();
   if (JSON.stringify(observed) !== JSON.stringify(expected))
     throw new Error(
-      "packaged MCP tool inventory diverged from session availability",
+      "packaged MCP tool inventory diverged from session metadata",
     );
   return observed;
 };

scripts/verify-package-mcp.mjs

@@ -7,15 +7,12 @@ import { Client } from "@modelcontextprotocol/client";
 import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
 import { MCP_STARTUP_POLICY } from "../dist/mcpStartupPolicy.js";
 import * as prompts from "./verify-package-prompts.mjs";
-import {
-  json,
-  verifyAvailableToolCatalog,
-} from "./lib/verify-package-core.mjs";
+import { json, verifyCompleteToolCatalog } from "./lib/verify-package-core.mjs";
 
 const execute = promisify(execFile);
 
 const verifyMcpToolsAndPrompts = async (client, mcpOptions) => {
-  await verifyAvailableToolCatalog(client, mcpOptions);
+  await verifyCompleteToolCatalog(client, mcpOptions);
   await prompts.verifyPromptCatalog(client, mcpOptions, prompts.names);
   await prompts.verifyPromptCompletion(client, mcpOptions, false);
 };
@@ -43,11 +40,21 @@ const verifyMcpReplay = async (client, mcpOptions, investigationReplay) => {
 };
 
 const verifyMcpTargetFree = async (client, mcpOptions) => {
-  const names = (await client.listTools(undefined, mcpOptions)).tools.map(
-    ({ name }) => name,
+  const status = await client.callTool(
+    { name: "binary_session", arguments: { detail: "full" } },
+    mcpOptions,
   );
-  if (names.includes("current_document"))
-    throw new Error("packaged target-free MCP advertised a target-bound tool");
+  const currentDocument =
+    status.structuredContent?.result?.tool_availability?.find(
+      ({ name }) => name === "current_document",
+    );
+  if (
+    currentDocument?.available !== false ||
+    currentDocument.reason !== "target_required"
+  )
+    throw new Error(
+      "packaged target-free MCP omitted target-bound availability metadata",
+    );
 };
 
 const verifyMcpUnknownProvider = async (client, mcpOptions) => {
@@ -96,11 +103,12 @@ const verifyMcpOpenAndBind = async (client, mcpOptions) => {
 };
 
 const verifyMcpLinuxToolAvailability = async (client, mcpOptions) => {
-  const names = (await client.listTools(undefined, mcpOptions)).tools.map(
-    ({ name }) => name,
+  const current = await client.callTool(
+    { name: "current_document", arguments: {} },
+    mcpOptions,
   );
-  if (names.includes("current_document"))
-    throw new Error("packaged Linux MCP advertised unavailable Hopper tools");
+  if (current.isError !== true)
+    throw new Error("packaged Linux MCP executed an unavailable Hopper tool");
 };
 
 const verifyMcpNonLinuxCurrentDocument = async (

scripts/verify-windows-package.mjs

@@ -9,7 +9,7 @@ import { promisify } from "node:util";
 import { Client } from "@modelcontextprotocol/client";
 import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
 
-import { verifyAvailableToolCatalog } from "./lib/verify-package-core.mjs";
+import { verifyCompleteToolCatalog } from "./lib/verify-package-core.mjs";
 import { completeVerifierRun, createVerifierRun } from "./lib/verifier-run.mjs";
 
 const exec = promisify(execFile);
@@ -84,7 +84,7 @@ try {
   let toolCount = 0;
   try {
     await client.connect(server);
-    toolCount = (await verifyAvailableToolCatalog(client)).length;
+    toolCount = (await verifyCompleteToolCatalog(client)).length;
   } finally {
     await client.close();
   }

tests/boundary/mcp/mainReload.test.ts

@@ -19,6 +19,7 @@ import {
 type RuntimeDependencies = NonNullable<Parameters<typeof run>[0]>;
 
 const directories: string[] = [];
+const RELOAD_ASSERTION_TIMEOUT_MS = 5_000;
 
 afterEach(async () => {
   await Promise.all(
@@ -64,7 +65,9 @@ describe("runtime permission reload", () => {
 
     releaseValidRead.resolve();
     await expect
-      .poll(() => canRead(runtime.authority, fixture.newRoot))
+      .poll(() => canRead(runtime.authority, fixture.newRoot), {
+        timeout: RELOAD_ASSERTION_TIMEOUT_MS,
+      })
       .toBe(true);
 
     expect(runtime.options.processPolicy?.().status).toBe("enabled");
@@ -109,7 +112,9 @@ describe("runtime permission reload", () => {
     releaseFirstRead.resolve();
     await secondReadStarted.promise;
     await expect
-      .poll(() => canRead(runtime.authority, fixture.latestRoot))
+      .poll(() => canRead(runtime.authority, fixture.latestRoot), {
+        timeout: RELOAD_ASSERTION_TIMEOUT_MS,
+      })
       .toBe(true);
 
     expect(runtime.options.processPolicy?.().status).toBe("disabled");
@@ -134,9 +139,13 @@ describe("runtime permission reload", () => {
     configure(fixture.env, fixture.newRoot, true);
     runtime.reload();
     runtime.reload();
-    await expect.poll(() => reads).toBe(2);
     await expect
-      .poll(() => canRead(runtime.authority, fixture.newRoot))
+      .poll(() => reads, { timeout: RELOAD_ASSERTION_TIMEOUT_MS })
+      .toBe(2);
+    await expect
+      .poll(() => canRead(runtime.authority, fixture.newRoot), {
+        timeout: RELOAD_ASSERTION_TIMEOUT_MS,
+      })
       .toBe(true);
 
     expect(reads).toBe(2);

tests/composition/analysis-sessions/identity.test.ts

@@ -48,7 +48,7 @@ describe("package identity", () => {
       "node scripts/generate-package-metadata.mjs --check",
     );
     expect(packageJson.scripts.prebuild).toBe(
-      "npm run deps:check && npm run metadata:check",
+      "npm run deps:check && npm run metadata:check && node scripts/clean-build-output.mjs",
     );
     expect(packageJson.scripts["precheck:fast"]).toBe("npm run deps:check");
     expect(packageJson.scripts["check:fast"]).toBe("turbo run typecheck lint");