fix(coding-agent): sync tool hooks with agent event processing closes #2113

packages/agent/test/agent-loop.test.ts

@@ -307,6 +307,87 @@ describe("agentLoop with AgentMessage", () => {
 		}
 	});
 
+	it("should execute tool calls in parallel and emit tool results in source order", async () => {
+		const toolSchema = Type.Object({ value: Type.String() });
+		let firstResolved = false;
+		let parallelObserved = false;
+		let releaseFirst: (() => void) | undefined;
+		const firstDone = new Promise<void>((resolve) => {
+			releaseFirst = resolve;
+		});
+
+		const tool: AgentTool<typeof toolSchema, { value: string }> = {
+			name: "echo",
+			label: "Echo",
+			description: "Echo tool",
+			parameters: toolSchema,
+			async execute(_toolCallId, params) {
+				if (params.value === "first") {
+					await firstDone;
+					firstResolved = true;
+				}
+				if (params.value === "second" && !firstResolved) {
+					parallelObserved = true;
+				}
+				return {
+					content: [{ type: "text", text: `echoed: ${params.value}` }],
+					details: { value: params.value },
+				};
+			},
+		};
+
+		const context: AgentContext = {
+			systemPrompt: "",
+			messages: [],
+			tools: [tool],
+		};
+
+		const userPrompt: AgentMessage = createUserMessage("echo both");
+		const config: AgentLoopConfig = {
+			model: createModel(),
+			convertToLlm: identityConverter,
+			toolExecution: "parallel",
+		};
+
+		let callIndex = 0;
+		const stream = agentLoop([userPrompt], context, config, undefined, () => {
+			const mockStream = new MockAssistantStream();
+			queueMicrotask(() => {
+				if (callIndex === 0) {
+					const message = createAssistantMessage(
+						[
+							{ type: "toolCall", id: "tool-1", name: "echo", arguments: { value: "first" } },
+							{ type: "toolCall", id: "tool-2", name: "echo", arguments: { value: "second" } },
+						],
+						"toolUse",
+					);
+					mockStream.push({ type: "done", reason: "toolUse", message });
+					setTimeout(() => releaseFirst?.(), 20);
+				} else {
+					const message = createAssistantMessage([{ type: "text", text: "done" }]);
+					mockStream.push({ type: "done", reason: "stop", message });
+				}
+				callIndex++;
+			});
+			return mockStream;
+		});
+
+		const events: AgentEvent[] = [];
+		for await (const event of stream) {
+			events.push(event);
+		}
+
+		const toolResultIds = events.flatMap((event) => {
+			if (event.type !== "message_end" || event.message.role !== "toolResult") {
+				return [];
+			}
+			return [event.message.toolCallId];
+		});
+
+		expect(parallelObserved).toBe(true);
+		expect(toolResultIds).toEqual(["tool-1", "tool-2"]);
+	});
+
 	it("should inject queued messages and skip remaining tool calls", async () => {
 		const toolSchema = Type.Object({ value: Type.String() });
 		const executed: string[] = [];
@@ -340,6 +421,7 @@ describe("agentLoop with AgentMessage", () => {
 		const config: AgentLoopConfig = {
 			model: createModel(),
 			convertToLlm: identityConverter,
+			toolExecution: "sequential",
 			getSteeringMessages: async () => {
 				// Return steering message after first tool executes
 				if (executed.length === 1 && !queuedDelivered) {

packages/agent/test/e2e.test.ts

@@ -5,6 +5,8 @@ import { Agent } from "../src/index.js";
 import { hasBedrockCredentials } from "./bedrock-utils.js";
 import { calculateTool } from "./utils/calculate.js";
 
+delete process.env.ANTHROPIC_OAUTH_TOKEN;
+
 async function basicPrompt(model: Model<any>) {
 	const agent = new Agent({
 		initialState: {
@@ -278,7 +280,7 @@ describe("Agent E2E Tests", () => {
 		});
 	});
 
-	describe.skipIf(!process.env.CEREBRAS_API_KEY)("Cerebras Provider (gpt-oss-120b)", () => {
+	/*describe.skipIf(!process.env.CEREBRAS_API_KEY)("Cerebras Provider (gpt-oss-120b)", () => {
 		const model = getModel("cerebras", "gpt-oss-120b");
 
 		it("should handle basic text prompt", async () => {
@@ -300,7 +302,7 @@ describe("Agent E2E Tests", () => {
 		it("should maintain context across multiple turns", async () => {
 			await multiTurnConversation(model);
 		});
-	});
+	});*/
 
 	describe.skipIf(!process.env.ZAI_API_KEY)("zAI Provider (glm-4.5-air)", () => {
 		const model = getModel("zai", "glm-4.5-air");
@@ -357,7 +359,7 @@ describe("Agent.continue()", () => {
 			const agent = new Agent({
 				initialState: {
 					systemPrompt: "Test",
-					model: getModel("anthropic", "claude-haiku-4-5"),
+					model: getModel("openai", "gpt-5.4"),
 				},
 			});
 
@@ -368,16 +370,16 @@ describe("Agent.continue()", () => {
 			const agent = new Agent({
 				initialState: {
 					systemPrompt: "Test",
-					model: getModel("anthropic", "claude-haiku-4-5"),
+					model: getModel("openai", "gpt-5.4"),
 				},
 			});
 
 			const assistantMessage: AssistantMessage = {
 				role: "assistant",
 				content: [{ type: "text", text: "Hello" }],
-				api: "anthropic-messages",
-				provider: "anthropic",
-				model: "claude-haiku-4-5",
+				api: "openai-responses",
+				provider: "openai",
+				model: "gpt-5.4",
 				usage: {
 					input: 0,
 					output: 0,
@@ -395,8 +397,8 @@ describe("Agent.continue()", () => {
 		});
 	});
 
-	describe.skipIf(!process.env.ANTHROPIC_API_KEY)("continue from user message", () => {
-		const model = getModel("anthropic", "claude-haiku-4-5");
+	describe.skipIf(!process.env.OPENAI_API_KEY)("continue from user message", () => {
+		const model = getModel("openai", "gpt-5.4");
 
 		it("should continue and get response when last message is user", async () => {
 			const agent = new Agent({
@@ -433,8 +435,8 @@ describe("Agent.continue()", () => {
 		});
 	});
 
-	describe.skipIf(!process.env.ANTHROPIC_API_KEY)("continue from tool result", () => {
-		const model = getModel("anthropic", "claude-haiku-4-5");
+	describe.skipIf(!process.env.OPENAI_API_KEY)("continue from tool result", () => {
+		const model = getModel("openai", "gpt-5.4");
 
 		it("should continue and process tool results", async () => {
 			const agent = new Agent({