@@ -376,6 +376,195 @@ describe("agent loop", () => {
376376 ]);
377377 });
378378
379+ test("emits streamed tool-call construction events before execution starts", async () => {
380+ const api = "toolcall-stream-test";
381+ const sourceId = "toolcall-stream-test-source";
382+ const model: Model<string> = {
383+ id: "toolcall-stream-model",
384+ name: "Tool Call Stream Model",
385+ api,
386+ provider: "test",
387+ baseUrl: "http://localhost:0",
388+ reasoning: false,
389+ input: ["text"],
390+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
391+ contextWindow: 128000,
392+ maxTokens: 4096,
393+ };
394+
395+ let callCount = 0;
396+ const finalToolCall = fauxToolCall(
397+ "shell",
398+ { command: "echo streamed-tool" },
399+ { id: "tool-1" },
400+ );
401+ const buildProviderStream = () => {
402+ callCount += 1;
403+ const stream = createAssistantMessageEventStream();
404+
405+ if (callCount === 1) {
406+ const finalMessage: AssistantMessage = {
407+ role: "assistant",
408+ content: [finalToolCall],
409+ api,
410+ provider: model.provider,
411+ model: model.id,
412+ usage: ZERO_USAGE,
413+ stopReason: "toolUse",
414+ timestamp: Date.now(),
415+ };
416+ const partialStart: AssistantMessage = {
417+ ...finalMessage,
418+ content: [fauxToolCall("shell", {}, { id: "tool-1" })],
419+ };
420+ const partialDelta: AssistantMessage = {
421+ ...finalMessage,
422+ content: [
423+ fauxToolCall(
424+ "shell",
425+ { command: "echo streamed" },
426+ { id: "tool-1" },
427+ ),
428+ ],
429+ };
430+
431+ queueMicrotask(() => {
432+ stream.push({
433+ type: "toolcall_start",
434+ contentIndex: 0,
435+ partial: partialStart,
436+ });
437+ stream.push({
438+ type: "toolcall_delta",
439+ contentIndex: 0,
440+ delta: '{"command":"echo streamed"}',
441+ partial: partialDelta,
442+ });
443+ stream.push({
444+ type: "toolcall_end",
445+ contentIndex: 0,
446+ toolCall: finalToolCall,
447+ partial: finalMessage,
448+ });
449+ stream.push({
450+ type: "done",
451+ reason: "toolUse",
452+ message: finalMessage,
453+ });
454+ stream.end(finalMessage);
455+ });
456+
457+ return stream;
458+ }
459+
460+ const finalMessage = fauxAssistantMessage("Done.");
461+ queueMicrotask(() => {
462+ stream.push({
463+ type: "done",
464+ reason: "stop",
465+ message: finalMessage,
466+ });
467+ stream.end(finalMessage);
468+ });
469+
470+ return stream;
471+ };
472+
473+ registerApiProvider(
474+ {
475+ api,
476+ stream: (_model, _context, _options) => buildProviderStream(),
477+ streamSimple: (_model, _context, _options) => buildProviderStream(),
478+ },
479+ sourceId,
480+ );
481+
482+ try {
483+ const events: AgentEvent[] = [];
484+ const session = createSession(db, { cwd: tmp });
485+ const userMsg = makeUser("hi");
486+ const turn = appendMessage(db, session.id, userMsg);
487+
488+ await runAgentLoop({
489+ db,
490+ sessionId: session.id,
491+ turn,
492+ model,
493+ systemPrompt: "Test",
494+ tools: [shellTool],
495+ toolHandlers: new Map<string, ToolHandler>([
496+ [
497+ "shell",
498+ () => ({
499+ content: [{ type: "text", text: "tool output" }],
500+ isError: false,
501+ }),
502+ ],
503+ ]),
504+ messages: [userMsg],
505+ cwd: tmp,
506+ onEvent: (event) => events.push(event),
507+ });
508+
509+ const toolCallStart = events.find(
510+ (event) => event.type === "toolcall_start",
511+ );
512+ const toolCallDelta = events.find(
513+ (event) => event.type === "toolcall_delta",
514+ );
515+ const toolCallEnd = events.find((event) => event.type === "toolcall_end");
516+ const assistantMessage = events.find(
517+ (event) => event.type === "assistant_message",
518+ );
519+ const toolStart = events.find((event) => event.type === "tool_start");
520+
521+ expect(toolCallStart).toBeDefined();
522+ expect(toolCallDelta).toBeDefined();
523+ expect(toolCallEnd).toBeDefined();
524+ expect(assistantMessage).toBeDefined();
525+ expect(toolStart).toBeDefined();
526+
527+ if (
528+ !toolCallStart ||
529+ toolCallStart.type !== "toolcall_start" ||
530+ !toolCallDelta ||
531+ toolCallDelta.type !== "toolcall_delta" ||
532+ !toolCallEnd ||
533+ toolCallEnd.type !== "toolcall_end" ||
534+ !assistantMessage ||
535+ assistantMessage.type !== "assistant_message" ||
536+ !toolStart ||
537+ toolStart.type !== "tool_start"
538+ ) {
539+ throw new Error(
540+ "Expected streamed tool-call, assistant-message, and tool-start events",
541+ );
542+ }
543+
544+ expect(toolCallStart.toolCallId).toBe("tool-1");
545+ expect(toolCallStart.name).toBe("shell");
546+ expect(toolCallStart.args).toEqual({});
547+ expect(toolCallDelta.args).toEqual({ command: "echo streamed" });
548+ expect(toolCallEnd.args).toEqual({ command: "echo streamed-tool" });
549+ expect(toolCallEnd.content).toEqual([finalToolCall]);
550+ expect(assistantMessage.message.stopReason).toBe("toolUse");
551+ expect(toolStart.args).toEqual({ command: "echo streamed-tool" });
552+
553+ const toolCallStartIndex = events.indexOf(toolCallStart);
554+ const toolCallDeltaIndex = events.indexOf(toolCallDelta);
555+ const toolCallEndIndex = events.indexOf(toolCallEnd);
556+ const assistantMessageIndex = events.indexOf(assistantMessage);
557+ const toolStartIndex = events.indexOf(toolStart);
558+
559+ expect(toolCallStartIndex).toBeLessThan(toolCallDeltaIndex);
560+ expect(toolCallDeltaIndex).toBeLessThan(toolCallEndIndex);
561+ expect(toolCallEndIndex).toBeLessThan(assistantMessageIndex);
562+ expect(assistantMessageIndex).toBeLessThan(toolStartIndex);
563+ } finally {
564+ unregisterApiProviders(sourceId);
565+ }
566+ });
567+
379568 test("reconstructs thinking content when the final done message omits it", async () => {
380569 const api = "reasoning-drop-test";
381570 const sourceId = "reasoning-drop-test-source";