Some checks failed
Smoke Tests / test (push) Has been cancelled
* Fix the tool-use loop in the Go, Rust, and Ruby clients and add a tool-loop smoke test ## Motivation and Context Only the Python and TypeScript clients implemented a correct tool-use loop. The other three had bugs that break ordinary multi-step requests: - **Go, Rust, Ruby** did a single tool round and then called Claude once more *without* `tools`, so any request that needs a second tool call stalled. Go silently dropped `tool_use` blocks from that final response. - **Ruby** called Claude once per `tool_use` block, each time with a single `tool_result`. Parallel tool calls produced a malformed message sequence and an API 400. - **max_tokens** was 1000 in TypeScript and Ruby, 1024 in Go, and unset in Rust. Sonnet 5 thinks adaptively, so 1000 tokens is regularly exhausted mid-thought. Python already used 10000 with a comment explaining why. - **Ruby** never forwarded MCP `isError` as `is_error`, so the model could not tell a failed tool call from a successful one. Rust cannot set the flag either (see below). - **TypeScript** forwarded raw MCP content blocks to Anthropic. The two block shapes differ, so a non-text result would have failed. The existing smoke test never noticed because it only checks that each client calls `tools/list`. None of these bugs was reachable without an API key. ### What changed All five clients now run the same loop: call tools until Claude answers without one, send every `tool_result` of a turn in one user message, pass `tools` on every call, and stop after `MAX_TOOL_TURNS = 10`. `max_tokens` is 10000 everywhere, with the same comment. Python and TypeScript also keep the last response's text when the turn cap is hit; it used to be dropped. Rust keeps the `genai` crate. Its tool-response type has no `is_error` field, so an error result is marked with an `Error:` prefix in the text and the limitation is commented. ### New smoke test `tests/helpers/tool-loop-test.ts` starts a fake Anthropic Messages API on a loopback port, points a client at it through `ANTHROPIC_BASE_URL`, pipes in one query, and checks every request the client sends. It scripts two parallel tool calls, then a call to a tool the mock server lacks (an `isError` result), then a final answer, and asserts that tools are passed each time, `max_tokens` is 10000, all `tool_result`s arrive in one message with matching ids, and the error is forwarded. `smoke-test.sh` runs it for Python, TypeScript, Go, and Ruby. The Rust client is excluded for now: `genai` reads no endpoint variable, and the client negotiates protocol `2025-11-25`, under which the mock's array-rooted tool is refused at call time. Both will be addressed in a follow-up that brings all examples to current SDK versions. ## How Has This Been Tested? - `./tests/smoke-test.sh` passes for every example. - The new tool-loop test passes all 19 checks for Python, TypeScript, Go, and Ruby. - The Rust client was driven through the same scripted conversation with a temporary endpoint resolver (not committed) and passes. - As a negative check, the Ruby client from `main` was run through the new test. It fails 10 of 19 checks, on exactly the bugs listed above. - Go and Ruby were built and run in `golang:1.25` and `ruby:3.4` containers. ## Breaking Changes None. The clients' command lines, output format, and no-key behavior are unchanged. ## Types of changes - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [x] Documentation update ## Checklist - [x] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [x] My code follows the repository's style guidelines - [x] New and existing tests pass locally - [x] I have added appropriate error handling - [x] I have added or updated documentation as needed ## Additional context Two pre-existing issues surfaced while testing and are left for a follow-up: - The Rust client (rmcp 3.1.2) negotiates `2025-11-25`. The TypeScript mock server and the Python weather server both reject its calls to array-rooted tools under that revision. Even current rmcp defaults to `2025-11-25`, so the client must request `2026-07-28` explicitly. - The Go SDK's tool-result helper sends content as a list of text blocks rather than a string. The API accepts both, so it is unchanged. AI assistance: the analysis, code changes, test helper, and this description were prepared partially manually, partially with Claude Code and reviewed by me. * Improvements * Address comments
264 lines
7.5 KiB
TypeScript
264 lines
7.5 KiB
TypeScript
import Anthropic from "@anthropic-ai/sdk";
|
|
|
|
import { Client } from "@modelcontextprotocol/client";
|
|
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
|
|
import readline from "readline/promises";
|
|
|
|
import dotenv from "dotenv";
|
|
|
|
dotenv.config({ quiet: true }); // load environment variables from .env
|
|
|
|
const ANTHROPIC_MODEL = "claude-sonnet-5";
|
|
// Sonnet 5 thinks adaptively unless told otherwise, and max_tokens caps thinking
|
|
// plus the reply, so leave room for both.
|
|
const MAX_TOKENS = 10000;
|
|
const MAX_TOOL_TURNS = 10;
|
|
|
|
class MCPClient {
|
|
private mcp: Client;
|
|
private _anthropic: Anthropic | null = null;
|
|
private transport: StdioClientTransport | null = null;
|
|
private tools: Anthropic.Tool[] = [];
|
|
|
|
constructor() {
|
|
// 'auto' probes server/discover, falling back to the 2025-11-25 handshake.
|
|
// The SDK's default is 'legacy'.
|
|
this.mcp = new Client(
|
|
{ name: "mcp-client-cli", version: "1.0.0" },
|
|
{ versionNegotiation: { mode: "auto" } },
|
|
);
|
|
}
|
|
|
|
private get anthropic(): Anthropic {
|
|
// Lazy-initialize Anthropic client when needed
|
|
return this._anthropic ??= new Anthropic({ apiKey: process.env.ANTHROPIC_API_KEY });
|
|
}
|
|
|
|
async connectToServer(serverScriptPath: string) {
|
|
/**
|
|
* Connect to an MCP server
|
|
*
|
|
* @param serverScriptPath - Path to the server script (.py or .js)
|
|
*/
|
|
try {
|
|
// Determine script type and appropriate command
|
|
const isJs = serverScriptPath.endsWith(".js");
|
|
const isPy = serverScriptPath.endsWith(".py");
|
|
if (!isJs && !isPy) {
|
|
throw new Error("Server script must be a .js or .py file");
|
|
}
|
|
const command = isPy
|
|
? process.platform === "win32"
|
|
? "python"
|
|
: "python3"
|
|
: process.execPath;
|
|
|
|
// Initialize transport and connect to server
|
|
this.transport = new StdioClientTransport({
|
|
command,
|
|
args: [serverScriptPath],
|
|
});
|
|
await this.mcp.connect(this.transport);
|
|
|
|
// List available tools
|
|
const toolsResult = await this.mcp.listTools();
|
|
this.tools = toolsResult.tools.map((tool) => {
|
|
return {
|
|
name: tool.name,
|
|
description: tool.description,
|
|
input_schema: tool.inputSchema,
|
|
};
|
|
});
|
|
console.log(
|
|
"Connected to server with tools:",
|
|
this.tools.map(({ name }) => name),
|
|
);
|
|
} catch (e) {
|
|
console.log("Failed to connect to MCP server: ", e);
|
|
throw e;
|
|
}
|
|
}
|
|
|
|
async processQuery(query: string) {
|
|
/**
|
|
* Process a query using Claude and available tools
|
|
*
|
|
* @param query - The user's input query
|
|
* @returns Processed response as a string
|
|
*/
|
|
const messages: Anthropic.MessageParam[] = [
|
|
{
|
|
role: "user",
|
|
content: query,
|
|
},
|
|
];
|
|
|
|
let response = await this.anthropic.messages.create({
|
|
model: ANTHROPIC_MODEL,
|
|
max_tokens: MAX_TOKENS,
|
|
messages,
|
|
tools: this.tools,
|
|
});
|
|
|
|
const finalText: string[] = [];
|
|
|
|
for (let turn = 0; turn < MAX_TOOL_TURNS; turn++) {
|
|
const toolUses: Anthropic.ToolUseBlock[] = [];
|
|
|
|
for (const block of response.content) {
|
|
if (block.type === "text") {
|
|
finalText.push(block.text);
|
|
} else if (block.type === "tool_use") {
|
|
toolUses.push(block);
|
|
}
|
|
}
|
|
|
|
if (toolUses.length === 0) {
|
|
return finalText.join("\n");
|
|
}
|
|
|
|
const toolResults: Anthropic.ToolResultBlockParam[] = [];
|
|
for (const toolUse of toolUses) {
|
|
const toolArgs = toolUse.input as { [x: string]: unknown } | undefined;
|
|
finalText.push(
|
|
`[Calling tool ${toolUse.name} with args ${JSON.stringify(toolArgs)}]`,
|
|
);
|
|
// callTool validates the result against the declared schema.
|
|
const result = await this.mcp.callTool({
|
|
name: toolUse.name,
|
|
arguments: toolArgs,
|
|
});
|
|
|
|
// structuredContent is data the application can use directly.
|
|
if (Array.isArray(result.structuredContent)) {
|
|
finalText.push(
|
|
`[${toolUse.name} returned ${result.structuredContent.length} items]`,
|
|
);
|
|
}
|
|
|
|
// content is a list of block types; forward only the text ones. MCP
|
|
// and Anthropic block shapes differ, so other kinds need converting.
|
|
toolResults.push({
|
|
type: "tool_result",
|
|
tool_use_id: toolUse.id,
|
|
content: result.content
|
|
.filter((block) => block.type === "text")
|
|
.map((block) => block.text)
|
|
.join("\n"),
|
|
is_error: result.isError === true,
|
|
});
|
|
}
|
|
|
|
messages.push({
|
|
role: "assistant",
|
|
content: response.content as unknown as Anthropic.ContentBlockParam[],
|
|
});
|
|
messages.push({ role: "user", content: toolResults });
|
|
|
|
response = await this.anthropic.messages.create({
|
|
model: ANTHROPIC_MODEL,
|
|
max_tokens: MAX_TOKENS,
|
|
messages,
|
|
tools: this.tools,
|
|
});
|
|
}
|
|
|
|
// The turn cap was hit. Keep the last response's text. If it asked for
|
|
// more tools, say they were not run.
|
|
let wantsTools = false;
|
|
for (const block of response.content) {
|
|
if (block.type === "text") {
|
|
finalText.push(block.text);
|
|
} else if (block.type === "tool_use") {
|
|
wantsTools = true;
|
|
}
|
|
}
|
|
if (wantsTools) {
|
|
finalText.push(`[Stopped after ${MAX_TOOL_TURNS} tool-use turns]`);
|
|
}
|
|
return finalText.join("\n");
|
|
}
|
|
|
|
async chatLoop() {
|
|
/**
|
|
* Run an interactive chat loop
|
|
*/
|
|
const rl = readline.createInterface({
|
|
input: process.stdin,
|
|
output: process.stdout,
|
|
});
|
|
// rl.question() doesn't reject on stdin EOF on its own; wire its close
|
|
// event to an AbortSignal so EOF (Ctrl-D) and SIGINT both unblock it.
|
|
const ac = new AbortController();
|
|
const onClose = () => ac.abort();
|
|
rl.on("close", onClose);
|
|
const onSigint = () => rl.close();
|
|
process.once("SIGINT", onSigint);
|
|
|
|
try {
|
|
console.log("\nMCP Client Started!");
|
|
console.log("Type your queries or 'quit' to exit.");
|
|
|
|
while (true) {
|
|
let message: string;
|
|
try {
|
|
message = await rl.question("\nQuery: ", { signal: ac.signal });
|
|
} catch {
|
|
break;
|
|
}
|
|
|
|
if (message.toLowerCase() === "quit") break;
|
|
|
|
try {
|
|
const response = await this.processQuery(message);
|
|
console.log("\n" + response);
|
|
} catch (e) {
|
|
console.log(`\nError: ${e instanceof Error ? e.message : String(e)}`);
|
|
}
|
|
}
|
|
} finally {
|
|
process.off("SIGINT", onSigint);
|
|
rl.off("close", onClose);
|
|
rl.close();
|
|
}
|
|
}
|
|
|
|
async cleanup() {
|
|
/**
|
|
* Clean up resources
|
|
*/
|
|
await this.mcp.close();
|
|
}
|
|
}
|
|
|
|
async function main() {
|
|
if (process.argv.length < 3) {
|
|
console.log("Usage: node build/index.js <path_to_server_script>");
|
|
return;
|
|
}
|
|
const mcpClient = new MCPClient();
|
|
try {
|
|
await mcpClient.connectToServer(process.argv[2]);
|
|
|
|
// Check if we have a valid API key to continue
|
|
const apiKey = process.env.ANTHROPIC_API_KEY;
|
|
if (!apiKey) {
|
|
console.log(
|
|
"\nNo ANTHROPIC_API_KEY found. To query these tools with Claude, set your API key:"
|
|
);
|
|
console.log(" export ANTHROPIC_API_KEY=your-api-key-here");
|
|
return;
|
|
}
|
|
|
|
await mcpClient.chatLoop();
|
|
} catch (e) {
|
|
console.error("Error:", e);
|
|
await mcpClient.cleanup();
|
|
process.exit(1);
|
|
} finally {
|
|
await mcpClient.cleanup();
|
|
process.exit(0);
|
|
}
|
|
}
|
|
|
|
main();
|