fix(gateway): preserve delivered error replay messages

zhangguiping-xydt · claude · zhangguiping-xydt · commit c26ee4098bbf · 2026-05-22T04:14:15.000+08:00
Co-Authored-By: Claude Opus 4.7 &lt;noreply@anthropic.com&gt;
diff --git a/src/gateway/server-methods/chat.directive-tags.test.ts b/src/gateway/server-methods/chat.directive-tags.test.ts
@@ -796,6 +796,27 @@ describe("chat directive tag stripping for non-streaming final payloads", () =>
     });
     expect(findUserUpdate()).toBeDefined();
     expect(mockState.eventOrder).toEqual(["user-transcript", "chat-error"]);
+
+    (context.broadcast as unknown as ReturnType<typeof vi.fn>).mockClear();
+    respond.mockClear();
+    await runNonStreamingChatSend({
+      context,
+      respond,
+      idempotencyKey: "idem-agent-error-payload",
+      waitFor: "none",
+    });
+
+    const replay = lastRespondCall(respond);
+    expect(replay?.[0]).toBe(false);
+    expect(replay?.[1]).toMatchObject({
+      runId: "idem-agent-error-payload",
+      status: "error",
+      summary: "LLM idle timeout (120s): no response from model",
+    });
+    expect(responseErrorMessage(replay?.[2])).toBe(
+      "LLM idle timeout (120s): no response from model",
+    );
+    expect(context.broadcast).not.toHaveBeenCalled();
   });
 
   it("joins multiple agent-run error payloads before broadcasting", async () => {
diff --git a/src/gateway/server-methods/chat.ts b/src/gateway/server-methods/chat.ts
@@ -2931,6 +2931,9 @@ export const chatHandlers: GatewayRequestHandlers = {
                           summary: deliveredReplyErrorMessage,
                         }
                       : { runId: clientRunId, status: "ok" as const },
+                    ...(deliveredReplyErrorMessage
+                      ? { error: errorShape(ErrorCodes.UNAVAILABLE, deliveredReplyErrorMessage) }
+                      : {}),
                   },
                 });
               }

Original file line number	Diff line number	Diff line change
`@@ -2931,6 +2931,9 @@ export const chatHandlers: GatewayRequestHandlers = {`
`2931`	`2931`	`summary: deliveredReplyErrorMessage,`
`2932`	`2932`	`}`
`2933`	`2933`	`: { runId: clientRunId, status: "ok" as const },`
	`2934`	`+ ...(deliveredReplyErrorMessage`
	`2935`	`+ ? { error: errorShape(ErrorCodes.UNAVAILABLE, deliveredReplyErrorMessage) }`
	`2936`	`+ : {}),`
`2934`	`2937`	`},`
`2935`	`2938`	`});`
`2936`	`2939`	`}`