openclaw
diff --git a/‎extensions/signal/src/monitor.tool-result.pairs-uuid-only-senders-uuid-allowlist-entry.test.ts‎
Lines changed: 43 additions & 0 deletions b/‎extensions/signal/src/monitor.tool-result.pairs-uuid-only-senders-uuid-allowlist-entry.test.ts‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎extensions/signal/src/monitor.ts‎
Lines changed: 13 additions & 4 deletions b/‎extensions/signal/src/monitor.ts‎
Lines changed: 13 additions & 4 deletions
@@ -126,6 +126,49 @@ describe("monitorSignalProvider tool results", () => {
     }
   });
 
+  it("cancels a pending reply-session conflict retry when the monitor stops", async () => {
+    vi.useFakeTimers();
+    const abortController = new AbortController();
+    replyMock.mockRejectedValue(
+      new Error(
+        "reply session initialization conflicted for agent:main:signal:direct:+15550001111",
+      ),
+    );
+    streamMock.mockImplementation(async ({ onEvent, abortSignal }) => {
+      onEvent({
+        event: "receive",
+        data: JSON.stringify({
+          envelope: {
+            sourceNumber: "+15550001111",
+            sourceName: "Ada",
+            timestamp: 1,
+            dataMessage: { message: "hello after the prior turn" },
+          },
+        }),
+      });
+      await new Promise<void>((resolve) => {
+        abortSignal?.addEventListener("abort", () => resolve(), { once: true });
+      });
+    });
+
+    try {
+      const monitorPromise = monitorSignalProvider({
+        autoStart: false,
+        baseUrl: "http://127.0.0.1:8080",
+        abortSignal: abortController.signal,
+      });
+
+      await vi.waitFor(() => expect(replyMock).toHaveBeenCalledTimes(1));
+      abortController.abort(new Error("monitor stopped"));
+      await monitorPromise;
+      await vi.advanceTimersByTimeAsync(10_000);
+
+      expect(replyMock).toHaveBeenCalledTimes(1);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   it("sizes attachment RPC response caps from mediaMaxMb", async () => {
     const abortController = new AbortController();
     const maxBytes = 2 * 1024 * 1024;
 
@@ -92,10 +92,10 @@ function resolveRuntime(opts: MonitorSignalOpts): RuntimeEnv {
 function createSignalMonitorTaskRunner(runtime: RuntimeEnv) {
   const inFlight = new Set<Promise<void>>();
   return {
-    runEventTask(task: () => Promise<void>): void {
+    runTask(task: () => Promise<void>): void {
       const trackedTask = Promise.resolve()
         .then(task)
-        .catch((err: unknown) => runtime.error?.(`event handler failed: ${String(err)}`))
+        .catch((err: unknown) => runtime.error?.(`signal monitor task failed: ${String(err)}`))
         .finally(() => inFlight.delete(trackedTask));
       inFlight.add(trackedTask);
     },
@@ -155,6 +155,11 @@ function createSignalDaemonLifecycle(params: { abortSignal?: AbortSignal }) {
   const mergedAbort = mergeAbortSignals(params.abortSignal, daemonAbortController.signal);
   const stop = () => {
     daemonStopRequested = true;
+    if (!daemonAbortController.signal.aborted) {
+      daemonAbortController.abort(
+        params.abortSignal?.reason ?? new Error("Signal monitor stopped"),
+      );
+    }
     daemonHandle?.stop();
   };
   const attach = (handle: SignalDaemonHandle) => {
@@ -678,6 +683,8 @@ export async function monitorSignalProvider(opts: MonitorSignalOpts = {}): Promi
 
     const handleEvent = createSignalEventHandler({
       runtime,
+      abortSignal: daemonLifecycle.abortSignal,
+      runTrackedTask: (task) => monitorTaskRunner.runTask(task),
       cfg,
       baseUrl,
       account,
@@ -715,7 +722,7 @@ export async function monitorSignalProvider(opts: MonitorSignalOpts = {}): Promi
       apiMode: configuredApiMode,
       policy: opts.reconnectPolicy,
       onEvent: (event) => {
-        monitorTaskRunner.runEventTask(() => handleEvent(event));
+        monitorTaskRunner.runTask(() => handleEvent(event));
       },
     });
     const daemonExitError = daemonLifecycle.getExitError();
@@ -729,9 +736,11 @@ export async function monitorSignalProvider(opts: MonitorSignalOpts = {}): Promi
     }
     throw err;
   } finally {
+    // Stop first: pending retry delays observe abort, while retries that already
+    // started remain in the task runner and drain before monitor teardown.
+    daemonLifecycle.stop();
     await monitorTaskRunner.waitForIdle();
     daemonLifecycle.dispose();
     opts.abortSignal?.removeEventListener("abort", onAbort);
-    daemonLifecycle.stop();
   }
 }