fix(agent-core): start aborted terminal turns before messages

vincentkoc · vincentkoc · commit d25ab29d3a3b · 2026-06-22T16:12:41.000+08:00
diff --git a/packages/agent-core/src/agent-loop.test.ts b/packages/agent-core/src/agent-loop.test.ts
@@ -836,9 +836,9 @@ describe("agentLoop tool termination", () => {
       "message_start",
       "message_end",
       "turn_end",
+      "turn_start",
       "message_start",
       "message_end",
-      "turn_start",
       "turn_end",
       "agent_end",
     ]);
@@ -907,9 +907,9 @@ describe("agentLoop tool termination", () => {
       "message_start",
       "message_end",
       "turn_end",
+      "turn_start",
       "message_start",
       "message_end",
-      "turn_start",
       "turn_end",
       "agent_end",
     ]);
diff --git a/packages/agent-core/src/agent-loop.ts b/packages/agent-core/src/agent-loop.ts
@@ -282,12 +282,12 @@ async function runLoop(
       true,
     );
     newMessages.push(abortedMessage);
-    await emit({ type: "message_start", message: abortedMessage });
-    await emit({ type: "message_end", message: abortedMessage });
     if (!turnOpen) {
       await emit({ type: "turn_start" });
       turnOpen = true;
     }
+    await emit({ type: "message_start", message: abortedMessage });
+    await emit({ type: "message_end", message: abortedMessage });
     await emit({ type: "turn_end", message: abortedMessage, toolResults: [] });
     turnOpen = false;
     await emit({ type: "agent_end", messages: newMessages });
