fix(ui): scope tool-error success to empty agent turns

qingminglong · qingminglong · commit 868e83a03f92 · 2026-07-02T11:42:22.000+08:00
diff --git a/ui/src/ui/chat/build-chat-items.test.ts b/ui/src/ui/chat/build-chat-items.test.ts
@@ -1243,6 +1243,31 @@ describe("tool turn outcome annotation (#89683)", () => {
     expect(tools[0].turnSucceeded).toBe(false);
   });
 
+  it("keeps adjacent agent-initiated failed turns scoped without a user boundary", () => {
+    const tools = toolGroups([
+      failedTool(1),
+      { role: "assistant", content: [], senderLabel: "cron-turn-1", timestamp: 2 },
+      failedTool(3),
+      assistantReply("Recovered on the next autonomous turn.", 4),
+    ]);
+    expect(tools.map((group) => group.turnSucceeded)).toEqual([false, true]);
+  });
+
+  it("does not treat non-text assistant content as a turn boundary", () => {
+    const tools = toolGroups([
+      userMsg("make a preview", 1),
+      failedTool(2),
+      {
+        role: "assistant",
+        content: [createAssistantCanvasBlock({ suffix: "tool_turn_outcome" })],
+        timestamp: 3,
+      },
+      failedTool(4),
+      assistantReply("Done.", 5),
+    ]);
+    expect(tools.map((group) => group.turnSucceeded)).toEqual([true, true]);
+  });
+
   it("scopes the outcome per turn at user boundaries", () => {
     const tools = toolGroups([
       userMsg("first", 1),
diff --git a/ui/src/ui/chat/build-chat-items.ts b/ui/src/ui/chat/build-chat-items.ts
@@ -348,13 +348,25 @@ function assistantGroupHasReplyText(group: MessageGroup): boolean {
   return group.messages.some(({ message }) => Boolean(extractTextCached(message)?.trim()));
 }
 
+function assistantGroupIsEmptyBoundary(group: MessageGroup): boolean {
+  if (!group.senderLabel?.trim()) {
+    return false;
+  }
+  return group.messages.every(({ message }) => {
+    const normalized = safeNormalizeMessage(message);
+    return Boolean(normalized && normalized.content.length === 0 && !normalized.replyTarget);
+  });
+}
+
 // Stamp each tool group with whether its turn ended in a successful assistant
 // reply. Codex marks any non-zero exec exit as failed, so a benign internal tool
 // failure (e.g. a no-match search) must not render as a primary error banner
 // once a clean reply exists. Backward pass: a user group ends the turn
 // downstream; an assistant reply marks success for earlier tool groups in the
-// same turn. turnSucceeded stays undefined for terminal or in-progress failures,
-// preserving the existing error banner.
+// same turn. Empty retained agent groups also end the scan so adjacent
+// autonomous turns cannot inherit a later turn's reply. turnSucceeded stays
+// undefined for terminal or in-progress failures, preserving the existing error
+// banner.
 function annotateToolTurnOutcome(
   items: Array<ChatItem | MessageGroup>,
 ): Array<ChatItem | MessageGroup> {
@@ -370,6 +382,8 @@ function annotateToolTurnOutcome(
     } else if (role === "assistant") {
       if (assistantGroupHasReplyText(item)) {
         sawAssistantReply = true;
+      } else if (assistantGroupIsEmptyBoundary(item)) {
+        sawAssistantReply = false;
       }
     } else if (role === "tool") {
       item.turnSucceeded = sawAssistantReply;
