better

Author: julien-c

packages/mcp-client/cli.ts

@@ -49,22 +49,22 @@ async function main() {
 
 	const rl = readline.createInterface({ input: stdin, output: stdout });
 	rl.on("SIGINT", async () => {
-		await agent.client.cleanup();
+		await agent.cleanup();
 		stdout.write("\n");
 		rl.close();
 	});
 
 	await agent.loadTools();
 
 	stdout.write(ANSI.BLUE);
-	stdout.write(`Agent loaded with ${agent.client.availableTools.length} tools:\n`);
-	stdout.write(agent.client.availableTools.map((t) => `- ${t.function.name}`).join("\n"));
+	stdout.write(`Agent loaded with ${agent.availableTools.length} tools:\n`);
+	stdout.write(agent.availableTools.map((t) => `- ${t.function.name}`).join("\n"));
 	stdout.write(ANSI.RESET);
 	stdout.write("\n");
 
 	while (true) {
-		const message = await rl.question("> ");
-		for await (const bobo of boboGenerator(message)) {
+		const input = await rl.question("> ");
+		for await (const bobo of boboGenerator(input)) {
 			console.log(bobo);
 		}
 	}

packages/mcp-client/src/Agent.ts

@@ -11,8 +11,7 @@ If you are not sure about anything pertaining to the user’s request, use your
 You MUST plan extensively before each function call, and reflect extensively on the outcomes of the previous function calls. DO NOT do this entire process by making function calls only, as this can impair your ability to solve the problem and think insightfully.
 `.trim();
 
-export class Agent {
-	readonly client: McpClient;
+export class Agent extends McpClient {
 	private readonly servers: StdioServerParameters[];
 	protected messages: ChatCompletionInputMessage[];
 
@@ -27,7 +26,7 @@ export class Agent {
 		apiKey: string;
 		servers: StdioServerParameters[];
 	}) {
-		this.client = new McpClient({ provider, model, apiKey });
+		super({ provider, model, apiKey });
 		this.servers = servers;
 		this.messages = [
 			{
@@ -38,13 +37,21 @@ export class Agent {
 	}
 
 	async loadTools(): Promise<void> {
-		return this.client.addMcpServers(this.servers);
+		return this.addMcpServers(this.servers);
 	}
 
 	async processUserMessage(query: string) {
 		this.messages.push({
 			role: "user",
 			content: query,
 		});
+
+		const stream = await this.client.chatCompletionStream({
+			provider: this.provider,
+			model: this.model,
+			messages,
+			tools: this.availableTools,
+			tool_choice: "auto",
+		});
 	}
 }