fix(outbound): track best-effort failures when onError is absent (#29148)

nohat · nohat · commit 2c379683c40f · 2026-02-27T16:40:37.000-08:00
diff --git a/src/infra/outbound/deliver.test.ts b/src/infra/outbound/deliver.test.ts
@@ -667,6 +667,31 @@ describe("deliverOutboundPayloads", () => {
     );
   });
 
+  it("calls failDelivery on bestEffort partial failure when onError is absent", async () => {
+    const sendWhatsApp = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("fail"))
+      .mockResolvedValueOnce({ messageId: "w2", toJid: "jid" });
+    const cfg: OpenClawConfig = {};
+
+    const results = await deliverOutboundPayloads({
+      cfg,
+      channel: "whatsapp",
+      to: "+1555",
+      payloads: [{ text: "a" }, { text: "b" }],
+      deps: { sendWhatsApp },
+      bestEffort: true,
+    });
+
+    expect(sendWhatsApp).toHaveBeenCalledTimes(2);
+    expect(results).toEqual([{ channel: "whatsapp", messageId: "w2", toJid: "jid" }]);
+    expect(queueMocks.ackDelivery).not.toHaveBeenCalled();
+    expect(queueMocks.failDelivery).toHaveBeenCalledWith(
+      "mock-queue-id",
+      "partial delivery failure (bestEffort)",
+    );
+  });
+
   it("acks the queue entry when delivery is aborted", async () => {
     const sendWhatsApp = vi.fn().mockResolvedValue({ messageId: "w1", toJid: "jid" });
     const abortController = new AbortController();
diff --git a/src/infra/outbound/deliver.ts b/src/infra/outbound/deliver.ts
@@ -264,16 +264,18 @@ export async function deliverOutboundPayloads(
   // When bestEffort is true, per-payload errors are caught and passed to onError
   // without throwing — so the outer try/catch never fires. We track whether any
   // payload failed so we can call failDelivery instead of ackDelivery.
+  // When bestEffort is true but onError is absent, we still wrap so hadPartialFailure is set.
   let hadPartialFailure = false;
-  const wrappedParams = params.onError
-    ? {
-        ...params,
-        onError: (err: unknown, payload: NormalizedOutboundPayload) => {
-          hadPartialFailure = true;
-          params.onError!(err, payload);
-        },
-      }
-    : params;
+  const wrappedParams =
+    params.bestEffort || params.onError
+      ? {
+          ...params,
+          onError: (err: unknown, payload: NormalizedOutboundPayload) => {
+            hadPartialFailure = true;
+            params.onError?.(err, payload);
+          },
+        }
+      : params;
 
   try {
     const results = await deliverOutboundPayloadsCore(wrappedParams);
