fix(scripts): pass MCP callTool timeouts as request options (#2387)
@modelcontextprotocol/client 2.3.1 declares callTool(params, options).
Three verifiers still used the v1 shape callTool(params, undefined,
{ timeout }), so the third argument was dropped and those calls ran
under the SDK's 60 s default instead of the 150-180 s they request.
Pass the options second.
This commit is contained in:
@@ -124,9 +124,7 @@ async function verifyFixture(byteOrder, kernelModule) {
|
|||||||
});
|
});
|
||||||
const call = async (name, args = {}) =>
|
const call = async (name, args = {}) =>
|
||||||
requireMcpOperationResult(
|
requireMcpOperationResult(
|
||||||
await client.callTool({ name, arguments: args }, undefined, {
|
await client.callTool({ name, arguments: args }, { timeout: 180000 }),
|
||||||
timeout: 180000,
|
|
||||||
}),
|
|
||||||
name,
|
name,
|
||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -171,7 +171,6 @@ try {
|
|||||||
const call = async (name, args = {}) => {
|
const call = async (name, args = {}) => {
|
||||||
const reply = await client.callTool(
|
const reply = await client.callTool(
|
||||||
{ name, arguments: args },
|
{ name, arguments: args },
|
||||||
undefined,
|
|
||||||
{ timeout: 180000 },
|
{ timeout: 180000 },
|
||||||
);
|
);
|
||||||
return requireMcpOperationResult(reply, name);
|
return requireMcpOperationResult(reply, name);
|
||||||
@@ -184,7 +183,6 @@ try {
|
|||||||
name: "open_binary",
|
name: "open_binary",
|
||||||
arguments: { path: fixture.path, provider_id: "ghidra" },
|
arguments: { path: fixture.path, provider_id: "ghidra" },
|
||||||
},
|
},
|
||||||
undefined,
|
|
||||||
{ timeout: 60000 },
|
{ timeout: 60000 },
|
||||||
);
|
);
|
||||||
const error = requireMcpToolError(rejected);
|
const error = requireMcpToolError(rejected);
|
||||||
@@ -423,7 +421,6 @@ try {
|
|||||||
snapshot_path: snapshotPath,
|
snapshot_path: snapshotPath,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
undefined,
|
|
||||||
{ timeout: 180000 },
|
{ timeout: 180000 },
|
||||||
);
|
);
|
||||||
requireMcpToolError(wrongSnapshot);
|
requireMcpToolError(wrongSnapshot);
|
||||||
|
|||||||
@@ -41,9 +41,10 @@ const cli = async (...args) => {
|
|||||||
return parseEvidence(JSON.parse(stdout));
|
return parseEvidence(JSON.parse(stdout));
|
||||||
};
|
};
|
||||||
const call = async (name, args) => {
|
const call = async (name, args) => {
|
||||||
const result = await client.callTool({ name, arguments: args }, undefined, {
|
const result = await client.callTool(
|
||||||
timeout: 150000,
|
{ name, arguments: args },
|
||||||
});
|
{ timeout: 150000 },
|
||||||
|
);
|
||||||
assert.notEqual(result.isError, true, mcpTextValue(result));
|
assert.notEqual(result.isError, true, mcpTextValue(result));
|
||||||
return parseEvidence(JSON.parse(mcpTextValue(result)));
|
return parseEvidence(JSON.parse(mcpTextValue(result)));
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user