better var names...

Author: julien-c

packages/mcp-client/src/Agent.ts

@@ -79,11 +79,11 @@ export class Agent extends McpClient {
 		});
 
 		let numOfTurns = 0;
-		let nextShouldCallTools = true;
+		let nextTurnShouldCallTools = true;
 		while (true) {
 			yield* this.processSingleTurnWithTools(this.messages, {
 				exitLoopTools,
-				exitIfNoTool: numOfTurns > 0 && nextShouldCallTools,
+				exitIfFirstChunkNoTool: numOfTurns > 0 && nextTurnShouldCallTools,
 			});
 			numOfTurns++;
 			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -99,10 +99,14 @@ export class Agent extends McpClient {
 			if (currentLast.role !== "tool" && numOfTurns > MAX_NUM_TURNS) {
 				return;
 			}
-			if (currentLast.role !== "tool" && nextShouldCallTools) {
+			if (currentLast.role !== "tool" && nextTurnShouldCallTools) {
 				return;
 			}
-			nextShouldCallTools = currentLast.role !== "tool";
+			if (currentLast.role === "tool") {
+				nextTurnShouldCallTools = false;
+			} else {
+				nextTurnShouldCallTools = true;
+			}
 		}
 	}
 }

packages/mcp-client/src/McpClient.ts

@@ -72,7 +72,7 @@ export class McpClient {
 
 	async *processSingleTurnWithTools(
 		messages: ChatCompletionInputMessage[],
-		opts: { exitLoopTools?: ChatCompletionInputTool[]; exitIfNoTool?: boolean } = {}
+		opts: { exitLoopTools?: ChatCompletionInputTool[]; exitIfFirstChunkNoTool?: boolean } = {}
 	): AsyncGenerator<ChatCompletionStreamOutput | ChatCompletionInputMessageTool> {
 		debug("start of single turn");
 
@@ -90,7 +90,7 @@ export class McpClient {
 		}
 		const firstChunk = firstChunkResult.value;
 		const firstToolCalls = firstChunk.choices[0]?.delta.tool_calls;
-		if ((!firstToolCalls || firstToolCalls.length === 0) && opts.exitIfNoTool) {
+		if ((!firstToolCalls || firstToolCalls.length === 0) && opts.exitIfFirstChunkNoTool) {
 			return;
 		}
 		yield firstChunk;
@@ -120,7 +120,9 @@ export class McpClient {
 				if (finalToolCalls[toolCall.index].function.arguments === undefined) {
 					finalToolCalls[toolCall.index].function.arguments = "";
 				}
-				finalToolCalls[toolCall.index].function.arguments += toolCall.function.arguments;
+				if (toolCall.function.arguments) {
+					finalToolCalls[toolCall.index].function.arguments += toolCall.function.arguments;
+				}
 			}
 		}