fix(clownfish): address review for ghcrawl-156876-autonomous-smoke (1)

openclaw-clownfish[bot] · Pick-cat · openclaw-clownfish[bot] · commit 5b4b09fc7886 · 2026-06-14T16:19:50.000Z
Co-authored-by: Langning Zhang &lt;145515129+Boulea7@users.noreply.github.com&gt;

Co-authored-by: Sumaia Zaman &lt;45918347+sumaiazaman@users.noreply.github.com&gt;

Co-authored-by: pick-cat &lt;266665499+Pick-cat@users.noreply.github.com&gt;
diff --git a/extensions/telegram/src/sendchataction-401-backoff.test.ts b/extensions/telegram/src/sendchataction-401-backoff.test.ts
@@ -206,9 +206,12 @@ describe("createTelegramSendChatActionHandler", () => {
     expect(fn).toHaveBeenCalledTimes(2);
   });
 
-  it("rejects transient cooldown starts before same-chat coalescing", async () => {
-    let now = 1000;
-    const fn = vi.fn().mockRejectedValueOnce(makeTelegramError("Bad Gateway", 502));
+  it("rejects transient keepalive ticks until same-chat coalescing expires", async () => {
+    let now = 0;
+    const fn = vi
+      .fn()
+      .mockRejectedValueOnce(makeTelegramError("Bad Gateway", 502))
+      .mockResolvedValue(true);
     const logger = vi.fn();
     const handler = createTelegramSendChatActionHandler({
       sendChatActionFn: fn,
@@ -218,12 +221,19 @@ describe("createTelegramSendChatActionHandler", () => {
     });
 
     await expect(handler.sendChatAction(-100, "typing")).rejects.toThrow("Bad Gateway");
+    expect(logger.mock.calls.at(-1)).toEqual([
+      "sendChatAction transient error (1). Cooling down 4000ms before retry.",
+    ]);
 
-    now = 1500;
+    now = 3000;
     await expect(handler.sendChatAction(-100, "typing")).rejects.toThrow(
       "transient cooldown active",
     );
     expect(fn).toHaveBeenCalledTimes(1);
+
+    now = 4000;
+    await handler.sendChatAction(-100, "typing");
+    expect(fn).toHaveBeenCalledTimes(2);
   });
 
   it("resets transient counters on non-transient errors", async () => {
diff --git a/extensions/telegram/src/sendchataction-401-backoff.ts b/extensions/telegram/src/sendchataction-401-backoff.ts
@@ -196,10 +196,15 @@ export function createTelegramSendChatActionHandler({
       } else if (isTransientSendChatActionError(error)) {
         consecutiveTransientFailures++;
         const cooldownMs = resolveTransientCooldownMs(error, consecutiveTransientFailures);
-        transientCooldownUntilMs = now() + cooldownMs;
+        const cooldownStartedAt = now();
+        // Keep transient failures rejected through the same-chat coalesce window;
+        // otherwise the next typing keepalive can look successful and reset its guard.
+        const coalescingUntilMs = key ? attemptedAt + minIntervalMs : 0;
+        transientCooldownUntilMs = Math.max(cooldownStartedAt + cooldownMs, coalescingUntilMs);
+        const effectiveCooldownMs = Math.max(0, transientCooldownUntilMs - cooldownStartedAt);
         logger(
           `sendChatAction transient error (${consecutiveTransientFailures}). ` +
-            `Cooling down ${cooldownMs}ms before retry.`,
+            `Cooling down ${effectiveCooldownMs}ms before retry.`,
         );
       } else {
         clearTransientCooldown();
