From 14bb0b4e526d77eacfe26340fee7635c902f0a3e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <peter@steipete.me>
Date: Thu, 16 Jul 2026 09:08:00 -0700
Subject: [PATCH] refactor(discord): deprecate abort signal helper (#109166)

---
 extensions/discord/src/monitor/timeouts.test.ts | 4 +++-
 extensions/discord/src/monitor/timeouts.ts      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/discord/src/monitor/timeouts.test.ts b/extensions/discord/src/monitor/timeouts.test.ts
index c7ca6309474a..c51d320c108b 100644
--- a/extensions/discord/src/monitor/timeouts.test.ts
+++ b/extensions/discord/src/monitor/timeouts.test.ts
@@ -1,6 +1,7 @@
 // Discord tests cover timeouts plugin behavior.
 import { MAX_TIMER_TIMEOUT_MS } from "openclaw/plugin-sdk/number-runtime";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { mergeAbortSignals as publicApiMergeAbortSignals } from "../../api.js";
 import {
   isAbortError as runtimeApiIsAbortError,
   mergeAbortSignals as runtimeApiMergeAbortSignals,
@@ -26,7 +27,8 @@ afterEach(() => {
 });
 
 describe("discord monitor timeouts", () => {
-  it("keeps deprecated timeout helpers on the runtime api compatibility surface", () => {
+  it("keeps deprecated timeout helpers on shipped compatibility surfaces", () => {
+    expect(publicApiMergeAbortSignals).toBe(mergeAbortSignals);
     expect(runtimeApiIsAbortError).toBe(isAbortError);
     expect(runtimeApiMergeAbortSignals).toBe(mergeAbortSignals);
     expect(runtimeApiNormalizeDiscordInboundWorkerTimeoutMs).toBe(
diff --git a/extensions/discord/src/monitor/timeouts.ts b/extensions/discord/src/monitor/timeouts.ts
index b826a868200b..e50610e199d8 100644
--- a/extensions/discord/src/monitor/timeouts.ts
+++ b/extensions/discord/src/monitor/timeouts.ts
@@ -38,6 +38,7 @@ export function isAbortError(error: unknown): boolean {
   return "name" in error && String((error as { name?: unknown }).name) === "AbortError";
 }
 
+/** @deprecated Use native `AbortSignal.any` after filtering optional signals at the call site. */
 export function mergeAbortSignals(
   signals: Array<AbortSignal | undefined>,
 ): AbortSignal | undefined {