Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(mcp): flatten root union input schemas (#1062)
cevieiras6a7650e93cba
diff --git a/src/contracts/toolSchemaMetadata.ts b/src/contracts/toolSchemaMetadata.tsindex 90762695b..bed9526ba 100644--- a/src/contracts/toolSchemaMetadata.ts+++ b/src/contracts/toolSchemaMetadata.ts@@ -56,10 +56,11 @@ export const toolInputSchemaWithMetadata = <Contract extends ToolContract>(withAdvertisedJsonSchema(contract.inputSchema,"input",- (project) => (options) => ({- ...describeProperties(project(options)),- examples: contract.examples.map(({ input }) => input),- }),+ (project) => (options) =>+ flattenRootUnion({+ ...describeProperties(project(options)),+ examples: contract.examples.map(({ input }) => input),+ }),);/** Advertise a canonical output schema without reconverting it per listing. */@@ -113,6 +114,57 @@ const memoizeByTarget = (};};+/** Keep MCP tool roots object-shaped for clients that reject root unions. */+const flattenRootUnion = (+ value: Record<string, unknown>,+): Record<string, unknown> => {+ if (!Array.isArray(value.anyOf)) return value;+ const branches = value.anyOf.filter(isObject);+ if (branches.length === 0 || branches.length !== value.anyOf.length)+ return value;++ const properties: Record<string, unknown> = {};+ for (const branch of branches) {+ if (!isObject(branch.properties)) return value;+ for (const [name, schema] of Object.entries(branch.properties)) {+ const previous = properties[name];+ if (previous === undefined) properties[name] = schema;+ else if (JSON.stringify(previous) !== JSON.stringify(schema))+ properties[name] = {+ anyOf: [previous, schema],+ description: fallbackPropertyDescription(name),+ };+ }+ }++ // The canonical Zod parser still enforces branch validation at invocation.+ const { anyOf: _anyOf, required: _required, ...root } = value;+ const requiredByBranch = branches.map((branch) =>+ Array.isArray(branch.required)+ ? branch.required.filter(+ (item): item is string => typeof item === "string",+ )+ : [],+ );+ const required = requiredByBranch.reduce((common, current) =>+ common.filter((name) => current.includes(name)),+ );+ const minProperties = Math.max(+ typeof root.minProperties === "number" ? root.minProperties : 0,+ Math.min(...requiredByBranch.map((names) => names.length)),+ );+ return {+ ...root,+ type: "object",+ properties,+ ...(minProperties > 0 ? { minProperties } : {}),+ ...(required.length > 0 ? { required } : {}),+ ...(branches.every((branch) => branch.additionalProperties === false)+ ? { additionalProperties: false }+ : {}),+ };+};+const describeProperties = (value: Readonly<Record<string, unknown>>,): Record<string, unknown> =>diff --git a/tests/boundary/mcp/toolSchemaValidity.test.ts b/tests/boundary/mcp/toolSchemaValidity.test.tsindex 708f8d40d..d2ac26ddf 100644--- a/tests/boundary/mcp/toolSchemaValidity.test.ts+++ b/tests/boundary/mcp/toolSchemaValidity.test.ts@@ -328,8 +328,10 @@ describe("MCP JSON Schema validity", () => {await Promise.allSettled([client.close(), server.close()]);}});+});- it("advertises the structural request requirements enforced at runtime", async () => {+describe("MCP root input schemas", () => {+ it("advertises object roots while enforcing union requirements at runtime", async () => {const server = new McpServer({ name: "schema-constraints", version: "0" });const client = new Client({ name: "schema-constraints", version: "0" });const [clientTransport, serverTransport] =@@ -353,12 +355,18 @@ describe("MCP JSON Schema validity", () => {if (graphContract === undefined || graphTool === undefined)throw new Error("Managed application graph tool was not advertised");expect(graphContract.inputSchema.safeParse({}).success).toBe(false);+ expect(graphTool.inputSchema).toMatchObject({ type: "object" });expect(ajv.compile(graphTool.inputSchema)({})).toBe(false);+ expect(ajv.compile(graphTool.inputSchema)({ unrelated: true })).toBe(+ false,+ );for (const contract of TOOL_CONTRACTS) {- const validate = ajv.compile(- advertised.get(contract.name)!.inputSchema,- );+ const inputSchema = advertised.get(contract.name)!.inputSchema;+ expect(inputSchema.type, contract.name).toBe("object");+ expect(inputSchema.properties, contract.name).toBeDefined();+ expect(inputSchema.anyOf, contract.name).toBeUndefined();+ const validate = ajv.compile(inputSchema);for (const example of contract.examples)expect(validate(example.input),