xonecas.io
64875
Mc

mini-coder / commit 4d8d166

fix: better tool execution loop

Sean2026-04-27 4d8d1665f257394b72282886619c395205bdc1d0 parent 6238d03

1 file changed

src/agent.ts+41−13
@@ -364,21 +364,21 @@ type AgentContex = {
364364
365365 type AgentEvent =
366366 | {
367- type: "message_start" | "message_update";
368- partial: AssistantMessage;
369- }
367+ type: "message_start" | "message_update";
368+ partial: AssistantMessage;
369+ }
370370 | {
371- type: "message_end";
372- message: AssistantMessage;
373- }
371+ type: "message_end";
372+ message: AssistantMessage;
373+ }
374374 | {
375- type: "tool_message_start" | "tool_message_update";
376- partial: ToolResultMessage;
377- }
375+ type: "tool_message_start" | "tool_message_update";
376+ partial: ToolResultMessage;
377+ }
378378 | {
379- type: "tool_message_end";
380- message: ToolResultMessage;
381- };
379+ type: "tool_message_end";
380+ message: ToolResultMessage;
381+ };
382382
383383 export async function* _streamAgent(
384384 agentCtx: AgentContex,
@@ -459,8 +459,34 @@ export async function* _streamAgent(
459459 break;
460460 }
461461
462+ const toolMessagesMap = new Map<string, ToolResultMessage>()
462463 if (toolCalls.length > 0) {
464+ const ts = toolRunner(toolCalls, agentCtx.tools)
465+
463466 // Append toolResultMessges
467+ for await (const toolMsg of ts) {
468+ if (toolMessagesMap.has(toolMsg.toolCallId)) {
469+ // Already seen, just update
470+ toolMessagesMap.set(toolMsg.toolCallId, toolMsg);
471+ llmCtx.messages = llmCtx.messages.map(m => {
472+ if (m.role === 'toolResult' && m.toolCallId === toolMsg.toolCallId) {
473+ return toolMsg
474+ }
475+ return m
476+ })
477+ yield { type: "tool_message_update", partial: toolMsg }
478+ } else {
479+ // New, add to context and map.
480+ toolMessagesMap.set(toolMsg.toolCallId, toolMsg);
481+ llmCtx.messages.push(toolMsg)
482+ yield { type: "tool_message_start", partial: toolMsg }
483+ }
484+ }
485+
486+ // Updates done, yield final tool results
487+ for (const item of toolMessagesMap.values()) {
488+ yield { type: "tool_message_end", message: item }
489+ }
464490 }
465491 }
466492 }
@@ -468,4 +494,6 @@ export async function* _streamAgent(
468494 async function* toolRunner(
469495 toolCall: ToolCall[],
470496 tools: ToolAndRunner[],
471-): AsyncGenerator<ToolResultMessage> {}
497+): AsyncGenerator<ToolResultMessage> {
498+ return;
499+}