@openclaw/bluebubbles 2026.1.29 → 2026.2.1

package/src/monitor.ts

@@ -1,5 +1,4 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
-
 import type { OpenClawConfig } from "openclaw/plugin-sdk";
 import {
   logAckFailure,
@@ -8,16 +7,20 @@ import {
   resolveAckReaction,
   resolveControlCommandGate,
 } from "openclaw/plugin-sdk";
-import { markBlueBubblesChatRead, sendBlueBubblesTyping } from "./chat.js";
-import { resolveChatGuidForTarget, sendMessageBlueBubbles } from "./send.js";
+import type { ResolvedBlueBubblesAccount } from "./accounts.js";
+import type { BlueBubblesAccountConfig, BlueBubblesAttachment } from "./types.js";
 import { downloadBlueBubblesAttachment } from "./attachments.js";
-import { formatBlueBubblesChatTarget, isAllowedBlueBubblesSender, normalizeBlueBubblesHandle } from "./targets.js";
+import { markBlueBubblesChatRead, sendBlueBubblesTyping } from "./chat.js";
 import { sendBlueBubblesMedia } from "./media-send.js";
-import type { BlueBubblesAccountConfig, BlueBubblesAttachment } from "./types.js";
-import type { ResolvedBlueBubblesAccount } from "./accounts.js";
-import { getBlueBubblesRuntime } from "./runtime.js";
-import { normalizeBlueBubblesReactionInput, sendBlueBubblesReaction } from "./reactions.js";
 import { fetchBlueBubblesServerInfo } from "./probe.js";
+import { normalizeBlueBubblesReactionInput, sendBlueBubblesReaction } from "./reactions.js";
+import { getBlueBubblesRuntime } from "./runtime.js";
+import { resolveChatGuidForTarget, sendMessageBlueBubbles } from "./send.js";
+import {
+  formatBlueBubblesChatTarget,
+  isAllowedBlueBubblesSender,
+  normalizeBlueBubblesHandle,
+} from "./targets.js";
 
 export type BlueBubblesRuntimeEnv = {
   log?: (message: string) => void;
@@ -108,7 +111,9 @@ function rememberBlueBubblesReplyCache(
   }
   while (blueBubblesReplyCacheByMessageId.size > REPLY_CACHE_MAX) {
     const oldest = blueBubblesReplyCacheByMessageId.keys().next().value as string | undefined;
-    if (!oldest) break;
+    if (!oldest) {
+      break;
+    }
     const oldEntry = blueBubblesReplyCacheByMessageId.get(oldest);
     blueBubblesReplyCacheByMessageId.delete(oldest);
     // Clean up short ID mappings for evicted entries
@@ -130,12 +135,16 @@ export function resolveBlueBubblesMessageId(
   opts?: { requireKnownShortId?: boolean },
 ): string {
   const trimmed = shortOrUuid.trim();
-  if (!trimmed) return trimmed;
+  if (!trimmed) {
+    return trimmed;
+  }
 
   // If it looks like a short ID (numeric), try to resolve it
   if (/^\d+$/.test(trimmed)) {
     const uuid = blueBubblesShortIdToUuid.get(trimmed);
-    if (uuid) return uuid;
+    if (uuid) {
+      return uuid;
+    }
     if (opts?.requireKnownShortId) {
       throw new Error(
         `BlueBubbles short message id "${trimmed}" is no longer available. Use MessageSidFull.`,
@@ -173,11 +182,17 @@ function resolveReplyContextFromCache(params: {
   chatId?: number;
 }): BlueBubblesReplyCacheEntry | null {
   const replyToId = params.replyToId.trim();
-  if (!replyToId) return null;
+  if (!replyToId) {
+    return null;
+  }
 
   const cached = blueBubblesReplyCacheByMessageId.get(replyToId);
-  if (!cached) return null;
-  if (cached.accountId !== params.accountId) return null;
+  if (!cached) {
+    return null;
+  }
+  if (cached.accountId !== params.accountId) {
+    return null;
+  }
 
   const cutoff = Date.now() - REPLY_CACHE_TTL_MS;
   if (cached.timestamp < cutoff) {
@@ -193,8 +208,15 @@ function resolveReplyContextFromCache(params: {
   const cachedChatId = typeof cached.chatId === "number" ? cached.chatId : undefined;
 
   // Avoid cross-chat collisions if we have identifiers.
-  if (chatGuid && cachedChatGuid && chatGuid !== cachedChatGuid) return null;
-  if (!chatGuid && chatIdentifier && cachedChatIdentifier && chatIdentifier !== cachedChatIdentifier) {
+  if (chatGuid && cachedChatGuid && chatGuid !== cachedChatGuid) {
+    return null;
+  }
+  if (
+    !chatGuid &&
+    chatIdentifier &&
+    cachedChatIdentifier &&
+    chatIdentifier !== cachedChatIdentifier
+  ) {
     return null;
   }
   if (!chatGuid && !chatIdentifier && chatId && cachedChatId && chatId !== cachedChatId) {
@@ -206,7 +228,11 @@ function resolveReplyContextFromCache(params: {
 
 type BlueBubblesCoreRuntime = ReturnType<typeof getBlueBubblesRuntime>;
 
-function logVerbose(core: BlueBubblesCoreRuntime, runtime: BlueBubblesRuntimeEnv, message: string): void {
+function logVerbose(
+  core: BlueBubblesCoreRuntime,
+  runtime: BlueBubblesRuntimeEnv,
+  message: string,
+): void {
   if (core.logging.shouldLogVerbose()) {
     runtime.log?.(`[bluebubbles] ${message}`);
   }
@@ -264,7 +290,7 @@ type BlueBubblesDebounceEntry = {
  * This helps combine URL text + link preview balloon messages that BlueBubbles
  * sends as separate webhook events when no explicit inbound debounce config exists.
  */
-const DEFAULT_INBOUND_DEBOUNCE_MS = 350;
+const DEFAULT_INBOUND_DEBOUNCE_MS = 500;
 
 /**
  * Combines multiple debounced messages into a single message for processing.
@@ -284,13 +310,17 @@ function combineDebounceEntries(entries: BlueBubblesDebounceEntry[]): Normalized
   // Combine text from all entries, filtering out duplicates and empty strings
   const seenTexts = new Set<string>();
   const textParts: string[] = [];
-  
+
   for (const entry of entries) {
     const text = entry.message.text.trim();
-    if (!text) continue;
+    if (!text) {
+      continue;
+    }
     // Skip duplicate text (URL might be in both text message and balloon)
     const normalizedText = text.toLowerCase();
-    if (seenTexts.has(normalizedText)) continue;
+    if (seenTexts.has(normalizedText)) {
+      continue;
+    }
     seenTexts.add(normalizedText);
     textParts.push(text);
   }
@@ -346,7 +376,9 @@ function resolveBlueBubblesDebounceMs(
   const inbound = config.messages?.inbound;
   const hasExplicitDebounce =
     typeof inbound?.debounceMs === "number" || typeof inbound?.byChannel?.bluebubbles === "number";
-  if (!hasExplicitDebounce) return DEFAULT_INBOUND_DEBOUNCE_MS;
+  if (!hasExplicitDebounce) {
+    return DEFAULT_INBOUND_DEBOUNCE_MS;
+  }
   return core.channel.debounce.resolveInboundDebounceMs({ cfg: config, channel: "bluebubbles" });
 }
 
@@ -355,7 +387,9 @@ function resolveBlueBubblesDebounceMs(
  */
 function getOrCreateDebouncer(target: WebhookTarget) {
   const existing = targetDebouncers.get(target);
-  if (existing) return existing;
+  if (existing) {
+    return existing;
+  }
 
   const { account, config, runtime, core } = target;
 
@@ -363,7 +397,23 @@ function getOrCreateDebouncer(target: WebhookTarget) {
     debounceMs: resolveBlueBubblesDebounceMs(config, core),
     buildKey: (entry) => {
       const msg = entry.message;
-      // Build key from account + chat + sender to coalesce messages from same source
+      // Prefer stable, shared identifiers to coalesce rapid-fire webhook events for the
+      // same message (e.g., text-only then text+attachment).
+      //
+      // For balloons (URL previews, stickers, etc), BlueBubbles often uses a different
+      // messageId than the originating text. When present, key by associatedMessageGuid
+      // to keep text + balloon coalescing working.
+      const balloonBundleId = msg.balloonBundleId?.trim();
+      const associatedMessageGuid = msg.associatedMessageGuid?.trim();
+      if (balloonBundleId && associatedMessageGuid) {
+        return `bluebubbles:${account.accountId}:balloon:${associatedMessageGuid}`;
+      }
+
+      const messageId = msg.messageId?.trim();
+      if (messageId) {
+        return `bluebubbles:${account.accountId}:msg:${messageId}`;
+      }
+
       const chatKey =
         msg.chatGuid?.trim() ??
         msg.chatIdentifier?.trim() ??
@@ -372,21 +422,26 @@ function getOrCreateDebouncer(target: WebhookTarget) {
     },
     shouldDebounce: (entry) => {
       const msg = entry.message;
-      // Skip debouncing for messages with attachments - process immediately
-      if (msg.attachments && msg.attachments.length > 0) return false;
       // Skip debouncing for from-me messages (they're just cached, not processed)
-      if (msg.fromMe) return false;
+      if (msg.fromMe) {
+        return false;
+      }
       // Skip debouncing for control commands - process immediately
-      if (core.channel.text.hasControlCommand(msg.text, config)) return false;
-      // Debounce normal text messages and URL balloon messages
+      if (core.channel.text.hasControlCommand(msg.text, config)) {
+        return false;
+      }
+      // Debounce all other messages to coalesce rapid-fire webhook events
+      // (e.g., text+image arriving as separate webhooks for the same messageId)
       return true;
     },
     onFlush: async (entries) => {
-      if (entries.length === 0) return;
-      
+      if (entries.length === 0) {
+        return;
+      }
+
       // Use target from first entry (all entries have same target due to key structure)
       const flushTarget = entries[0].target;
-      
+
       if (entries.length === 1) {
         // Single message - process normally
         await processMessage(entries[0].message, flushTarget);
@@ -395,7 +450,7 @@ function getOrCreateDebouncer(target: WebhookTarget) {
 
       // Multiple messages - combine and process
       const combined = combineDebounceEntries(entries);
-      
+
       if (core.logging.shouldLogVerbose()) {
         const count = entries.length;
         const preview = combined.text.slice(0, 50);
@@ -403,7 +458,7 @@ function getOrCreateDebouncer(target: WebhookTarget) {
           `[bluebubbles] coalesced ${count} messages: "${preview}${combined.text.length > 50 ? "..." : ""}"`,
         );
       }
-      
+
       await processMessage(combined, flushTarget);
     },
     onError: (err) => {
@@ -424,7 +479,9 @@ function removeDebouncer(target: WebhookTarget): void {
 
 function normalizeWebhookPath(raw: string): string {
   const trimmed = raw.trim();
-  if (!trimmed) return "/";
+  if (!trimmed) {
+    return "/";
+  }
   const withSlash = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
   if (withSlash.length > 1 && withSlash.endsWith("/")) {
     return withSlash.slice(0, -1);
@@ -499,30 +556,40 @@ function asRecord(value: unknown): Record<string, unknown> | null {
 }
 
 function readString(record: Record<string, unknown> | null, key: string): string | undefined {
-  if (!record) return undefined;
+  if (!record) {
+    return undefined;
+  }
   const value = record[key];
   return typeof value === "string" ? value : undefined;
 }
 
 function readNumber(record: Record<string, unknown> | null, key: string): number | undefined {
-  if (!record) return undefined;
+  if (!record) {
+    return undefined;
+  }
   const value = record[key];
   return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
 
 function readBoolean(record: Record<string, unknown> | null, key: string): boolean | undefined {
-  if (!record) return undefined;
+  if (!record) {
+    return undefined;
+  }
   const value = record[key];
   return typeof value === "boolean" ? value : undefined;
 }
 
 function extractAttachments(message: Record<string, unknown>): BlueBubblesAttachment[] {
   const raw = message["attachments"];
-  if (!Array.isArray(raw)) return [];
+  if (!Array.isArray(raw)) {
+    return [];
+  }
   const out: BlueBubblesAttachment[] = [];
   for (const entry of raw) {
     const record = asRecord(entry);
-    if (!record) continue;
+    if (!record) {
+      continue;
+    }
     out.push({
       guid: readString(record, "guid"),
       uti: readString(record, "uti"),
@@ -538,7 +605,9 @@ function extractAttachments(message: Record<string, unknown>): BlueBubblesAttach
 }
 
 function buildAttachmentPlaceholder(attachments: BlueBubblesAttachment[]): string {
-  if (attachments.length === 0) return "";
+  if (attachments.length === 0) {
+    return "";
+  }
   const mimeTypes = attachments.map((entry) => entry.mimeType ?? "");
   const allImages = mimeTypes.every((entry) => entry.startsWith("image/"));
   const allVideos = mimeTypes.every((entry) => entry.startsWith("video/"));
@@ -557,29 +626,38 @@ function buildAttachmentPlaceholder(attachments: BlueBubblesAttachment[]): strin
 
 function buildMessagePlaceholder(message: NormalizedWebhookMessage): string {
   const attachmentPlaceholder = buildAttachmentPlaceholder(message.attachments ?? []);
-  if (attachmentPlaceholder) return attachmentPlaceholder;
-  if (message.balloonBundleId) return "<media:sticker>";
+  if (attachmentPlaceholder) {
+    return attachmentPlaceholder;
+  }
+  if (message.balloonBundleId) {
+    return "<media:sticker>";
+  }
   return "";
 }
 
 // Returns inline reply tag like "[[reply_to:4]]" for prepending to message body
-function formatReplyTag(message: {
-  replyToId?: string;
-  replyToShortId?: string;
-}): string | null {
+function formatReplyTag(message: { replyToId?: string; replyToShortId?: string }): string | null {
   // Prefer short ID
   const rawId = message.replyToShortId || message.replyToId;
-  if (!rawId) return null;
+  if (!rawId) {
+    return null;
+  }
   return `[[reply_to:${rawId}]]`;
 }
 
 function readNumberLike(record: Record<string, unknown> | null, key: string): number | undefined {
-  if (!record) return undefined;
+  if (!record) {
+    return undefined;
+  }
   const value = record[key];
-  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
   if (typeof value === "string") {
     const parsed = Number.parseFloat(value);
-    if (Number.isFinite(parsed)) return parsed;
+    if (Number.isFinite(parsed)) {
+      return parsed;
+    }
   }
   return undefined;
 }
@@ -599,7 +677,8 @@ function extractReplyMetadata(message: Record<string, unknown>): {
     message["associatedMessage"] ??
     message["reply"];
   const replyRecord = asRecord(replyRaw);
-  const replyHandle = asRecord(replyRecord?.["handle"]) ?? asRecord(replyRecord?.["sender"]) ?? null;
+  const replyHandle =
+    asRecord(replyRecord?.["handle"]) ?? asRecord(replyRecord?.["sender"]) ?? null;
   const replySenderRaw =
     readString(replyHandle, "address") ??
     readString(replyHandle, "handle") ??
@@ -657,7 +736,9 @@ function extractReplyMetadata(message: Record<string, unknown>): {
 
 function readFirstChatRecord(message: Record<string, unknown>): Record<string, unknown> | null {
   const chats = message["chats"];
-  if (!Array.isArray(chats) || chats.length === 0) return null;
+  if (!Array.isArray(chats) || chats.length === 0) {
+    return null;
+  }
   const first = chats[0];
   return asRecord(first);
 }
@@ -665,12 +746,16 @@ function readFirstChatRecord(message: Record<string, unknown>): Record<string, u
 function normalizeParticipantEntry(entry: unknown): BlueBubblesParticipant | null {
   if (typeof entry === "string" || typeof entry === "number") {
     const raw = String(entry).trim();
-    if (!raw) return null;
+    if (!raw) {
+      return null;
+    }
     const normalized = normalizeBlueBubblesHandle(raw) || raw;
     return normalized ? { id: normalized } : null;
   }
   const record = asRecord(entry);
-  if (!record) return null;
+  if (!record) {
+    return null;
+  }
   const nestedHandle =
     asRecord(record["handle"]) ?? asRecord(record["sender"]) ?? asRecord(record["contact"]) ?? null;
   const idRaw =
@@ -690,20 +775,28 @@ function normalizeParticipantEntry(entry: unknown): BlueBubblesParticipant | nul
     readString(nestedHandle, "displayName") ??
     readString(nestedHandle, "name");
   const normalizedId = idRaw ? normalizeBlueBubblesHandle(idRaw) || idRaw.trim() : "";
-  if (!normalizedId) return null;
+  if (!normalizedId) {
+    return null;
+  }
   const name = nameRaw?.trim() || undefined;
   return { id: normalizedId, name };
 }
 
 function normalizeParticipantList(raw: unknown): BlueBubblesParticipant[] {
-  if (!Array.isArray(raw) || raw.length === 0) return [];
+  if (!Array.isArray(raw) || raw.length === 0) {
+    return [];
+  }
   const seen = new Set<string>();
   const output: BlueBubblesParticipant[] = [];
   for (const entry of raw) {
     const normalized = normalizeParticipantEntry(entry);
-    if (!normalized?.id) continue;
+    if (!normalized?.id) {
+      continue;
+    }
     const key = normalized.id.toLowerCase();
-    if (seen.has(key)) continue;
+    if (seen.has(key)) {
+      continue;
+    }
     seen.add(key);
     output.push(normalized);
   }
@@ -717,39 +810,57 @@ function formatGroupMembers(params: {
   const seen = new Set<string>();
   const ordered: BlueBubblesParticipant[] = [];
   for (const entry of params.participants ?? []) {
-    if (!entry?.id) continue;
+    if (!entry?.id) {
+      continue;
+    }
     const key = entry.id.toLowerCase();
-    if (seen.has(key)) continue;
+    if (seen.has(key)) {
+      continue;
+    }
     seen.add(key);
     ordered.push(entry);
   }
   if (ordered.length === 0 && params.fallback?.id) {
     ordered.push(params.fallback);
   }
-  if (ordered.length === 0) return undefined;
-  return ordered
-    .map((entry) => (entry.name ? `${entry.name} (${entry.id})` : entry.id))
-    .join(", ");
+  if (ordered.length === 0) {
+    return undefined;
+  }
+  return ordered.map((entry) => (entry.name ? `${entry.name} (${entry.id})` : entry.id)).join(", ");
 }
 
 function resolveGroupFlagFromChatGuid(chatGuid?: string | null): boolean | undefined {
   const guid = chatGuid?.trim();
-  if (!guid) return undefined;
+  if (!guid) {
+    return undefined;
+  }
   const parts = guid.split(";");
   if (parts.length >= 3) {
-    if (parts[1] === "+") return true;
-    if (parts[1] === "-") return false;
+    if (parts[1] === "+") {
+      return true;
+    }
+    if (parts[1] === "-") {
+      return false;
+    }
+  }
+  if (guid.includes(";+;")) {
+    return true;
+  }
+  if (guid.includes(";-;")) {
+    return false;
   }
-  if (guid.includes(";+;")) return true;
-  if (guid.includes(";-;")) return false;
   return undefined;
 }
 
 function extractChatIdentifierFromChatGuid(chatGuid?: string | null): string | undefined {
   const guid = chatGuid?.trim();
-  if (!guid) return undefined;
+  if (!guid) {
+    return undefined;
+  }
   const parts = guid.split(";");
-  if (parts.length < 3) return undefined;
+  if (parts.length < 3) {
+    return undefined;
+  }
   const identifier = parts[2]?.trim();
   return identifier || undefined;
 }
@@ -760,11 +871,17 @@ function formatGroupAllowlistEntry(params: {
   chatIdentifier?: string;
 }): string | null {
   const guid = params.chatGuid?.trim();
-  if (guid) return `chat_guid:${guid}`;
+  if (guid) {
+    return `chat_guid:${guid}`;
+  }
   const chatId = params.chatId;
-  if (typeof chatId === "number" && Number.isFinite(chatId)) return `chat_id:${chatId}`;
+  if (typeof chatId === "number" && Number.isFinite(chatId)) {
+    return `chat_id:${chatId}`;
+  }
   const identifier = params.chatIdentifier?.trim();
-  if (identifier) return `chat_identifier:${identifier}`;
+  if (identifier) {
+    return `chat_identifier:${identifier}`;
+  }
   return null;
 }
 
@@ -862,9 +979,15 @@ function isTapbackAssociatedType(type: number | undefined): boolean {
 }
 
 function resolveTapbackActionHint(type: number | undefined): "added" | "removed" | undefined {
-  if (typeof type !== "number" || !Number.isFinite(type)) return undefined;
-  if (type >= 3000 && type < 4000) return "removed";
-  if (type >= 2000 && type < 3000) return "added";
+  if (typeof type !== "number" || !Number.isFinite(type)) {
+    return undefined;
+  }
+  if (type >= 3000 && type < 4000) {
+    return "removed";
+  }
+  if (type >= 2000 && type < 3000) {
+    return "added";
+  }
   return undefined;
 }
 
@@ -876,7 +999,9 @@ function resolveTapbackContext(message: NormalizedWebhookMessage): {
   const associatedType = message.associatedMessageType;
   const hasTapbackType = isTapbackAssociatedType(associatedType);
   const hasTapbackMarker = Boolean(message.associatedMessageEmoji) || Boolean(message.isTapback);
-  if (!hasTapbackType && !hasTapbackMarker) return null;
+  if (!hasTapbackType && !hasTapbackMarker) {
+    return null;
+  }
   const replyToId = message.associatedMessageGuid?.trim() || message.replyToId?.trim() || undefined;
   const actionHint = resolveTapbackActionHint(associatedType);
   const emojiHint =
@@ -897,7 +1022,9 @@ function parseTapbackText(params: {
 } | null {
   const trimmed = params.text.trim();
   const lower = trimmed.toLowerCase();
-  if (!trimmed) return null;
+  if (!trimmed) {
+    return null;
+  }
 
   for (const [pattern, { emoji, action }] of TAPBACK_TEXT_MAP) {
     if (lower.startsWith(pattern)) {
@@ -905,7 +1032,9 @@ function parseTapbackText(params: {
       const afterPattern = trimmed.slice(pattern.length).trim();
       if (params.requireQuoted) {
         const strictMatch = afterPattern.match(/^[“"](.+)[”"]$/s);
-        if (!strictMatch) return null;
+        if (!strictMatch) {
+          return null;
+        }
         return { emoji, action, quotedText: strictMatch[1] };
       }
       const quotedText =
@@ -916,18 +1045,26 @@ function parseTapbackText(params: {
 
   if (lower.startsWith("reacted")) {
     const emoji = extractFirstEmoji(trimmed) ?? params.emojiHint;
-    if (!emoji) return null;
+    if (!emoji) {
+      return null;
+    }
     const quotedText = extractQuotedTapbackText(trimmed);
-    if (params.requireQuoted && !quotedText) return null;
+    if (params.requireQuoted && !quotedText) {
+      return null;
+    }
     const fallback = trimmed.slice("reacted".length).trim();
     return { emoji, action: params.actionHint ?? "added", quotedText: quotedText ?? fallback };
   }
 
   if (lower.startsWith("removed")) {
     const emoji = extractFirstEmoji(trimmed) ?? params.emojiHint;
-    if (!emoji) return null;
+    if (!emoji) {
+      return null;
+    }
     const quotedText = extractQuotedTapbackText(trimmed);
-    if (params.requireQuoted && !quotedText) return null;
+    if (params.requireQuoted && !quotedText) {
+      return null;
+    }
     const fallback = trimmed.slice("removed".length).trim();
     return { emoji, action: params.actionHint ?? "removed", quotedText: quotedText ?? fallback };
   }
@@ -935,7 +1072,9 @@ function parseTapbackText(params: {
 }
 
 function maskSecret(value: string): string {
-  if (value.length <= 6) return "***";
+  if (value.length <= 6) {
+    return "***";
+  }
   return `${value.slice(0, 2)}***${value.slice(-2)}`;
 }
 
@@ -946,7 +1085,9 @@ function resolveBlueBubblesAckReaction(params: {
   runtime: BlueBubblesRuntimeEnv;
 }): string | null {
   const raw = resolveAckReaction(params.cfg, params.agentId).trim();
-  if (!raw) return null;
+  if (!raw) {
+    return null;
+  }
   try {
     normalizeBlueBubblesReactionInput(raw);
     return raw;
@@ -973,13 +1114,19 @@ function extractMessagePayload(payload: Record<string, unknown>): Record<string,
   const message =
     asRecord(messageRaw) ??
     (typeof messageRaw === "string" ? (asRecord(JSON.parse(messageRaw)) ?? null) : null);
-  if (!message) return null;
+  if (!message) {
+    return null;
+  }
   return message;
 }
 
-function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWebhookMessage | null {
+function normalizeWebhookMessage(
+  payload: Record<string, unknown>,
+): NormalizedWebhookMessage | null {
   const message = extractMessagePayload(payload);
-  if (!message) return null;
+  if (!message) {
+    return null;
+  }
 
   const text =
     readString(message, "text") ??
@@ -989,8 +1136,7 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
 
   const handleValue = message.handle ?? message.sender;
   const handle =
-    asRecord(handleValue) ??
-    (typeof handleValue === "string" ? { address: handleValue } : null);
+    asRecord(handleValue) ?? (typeof handleValue === "string" ? { address: handleValue } : null);
   const senderId =
     readString(handle, "address") ??
     readString(handle, "handle") ??
@@ -1065,7 +1211,7 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
   const isGroup =
     typeof groupFromChatGuid === "boolean"
       ? groupFromChatGuid
-      : explicitIsGroup ?? (participantsCount > 2 ? true : false);
+      : (explicitIsGroup ?? participantsCount > 2);
 
   const fromMe = readBoolean(message, "isFromMe") ?? readBoolean(message, "is_from_me");
   const messageId =
@@ -1106,7 +1252,9 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
       : undefined;
 
   const normalizedSender = normalizeBlueBubblesHandle(senderId);
-  if (!normalizedSender) return null;
+  if (!normalizedSender) {
+    return null;
+  }
   const replyMetadata = extractReplyMetadata(message);
 
   return {
@@ -1134,9 +1282,13 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
   };
 }
 
-function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedWebhookReaction | null {
+function normalizeWebhookReaction(
+  payload: Record<string, unknown>,
+): NormalizedWebhookReaction | null {
   const message = extractMessagePayload(payload);
-  if (!message) return null;
+  if (!message) {
+    return null;
+  }
 
   const associatedGuid =
     readString(message, "associatedMessageGuid") ??
@@ -1145,7 +1297,9 @@ function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedW
   const associatedType =
     readNumberLike(message, "associatedMessageType") ??
     readNumberLike(message, "associated_message_type");
-  if (!associatedGuid || associatedType === undefined) return null;
+  if (!associatedGuid || associatedType === undefined) {
+    return null;
+  }
 
   const mapping = REACTION_TYPE_MAP.get(associatedType);
   const associatedEmoji =
@@ -1158,8 +1312,7 @@ function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedW
 
   const handleValue = message.handle ?? message.sender;
   const handle =
-    asRecord(handleValue) ??
-    (typeof handleValue === "string" ? { address: handleValue } : null);
+    asRecord(handleValue) ?? (typeof handleValue === "string" ? { address: handleValue } : null);
   const senderId =
     readString(handle, "address") ??
     readString(handle, "handle") ??
@@ -1232,7 +1385,7 @@ function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedW
   const isGroup =
     typeof groupFromChatGuid === "boolean"
       ? groupFromChatGuid
-      : explicitIsGroup ?? (participantsCount > 2 ? true : false);
+      : (explicitIsGroup ?? participantsCount > 2);
 
   const fromMe = readBoolean(message, "isFromMe") ?? readBoolean(message, "is_from_me");
   const timestampRaw =
@@ -1247,7 +1400,9 @@ function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedW
       : undefined;
 
   const normalizedSender = normalizeBlueBubblesHandle(senderId);
-  if (!normalizedSender) return null;
+  if (!normalizedSender) {
+    return null;
+  }
 
   return {
     action,
@@ -1272,7 +1427,9 @@ export async function handleBlueBubblesWebhookRequest(
   const url = new URL(req.url ?? "/", "http://localhost");
   const path = normalizeWebhookPath(url.pathname);
   const targets = webhookTargets.get(path);
-  if (!targets || targets.length === 0) return false;
+  if (!targets || targets.length === 0) {
+    return false;
+  }
 
   if (req.method !== "POST") {
     res.statusCode = 405;
@@ -1342,16 +1499,19 @@ export async function handleBlueBubblesWebhookRequest(
 
   const matching = targets.filter((target) => {
     const token = target.account.config.password?.trim();
-    if (!token) return true;
+    if (!token) {
+      return true;
+    }
     const guidParam = url.searchParams.get("guid") ?? url.searchParams.get("password");
     const headerToken =
       req.headers["x-guid"] ??
       req.headers["x-password"] ??
       req.headers["x-bluebubbles-guid"] ??
       req.headers["authorization"];
-    const guid =
-      (Array.isArray(headerToken) ? headerToken[0] : headerToken) ?? guidParam ?? "";
-    if (guid && guid.trim() === token) return true;
+    const guid = (Array.isArray(headerToken) ? headerToken[0] : headerToken) ?? guidParam ?? "";
+    if (guid && guid.trim() === token) {
+      return true;
+    }
     const remote = req.socket?.remoteAddress ?? "";
     if (remote === "127.0.0.1" || remote === "::1" || remote === "::ffff:127.0.0.1") {
       return true;
@@ -1441,7 +1601,9 @@ async function processMessage(
   const cacheMessageId = message.messageId?.trim();
   let messageShortId: string | undefined;
   const cacheInboundMessage = () => {
-    if (!cacheMessageId) return;
+    if (!cacheMessageId) {
+      return;
+    }
     const cacheEntry = rememberBlueBubblesReplyCache({
       accountId: account.accountId,
       messageId: cacheMessageId,
@@ -1615,7 +1777,7 @@ async function processMessage(
   const chatGuid = message.chatGuid ?? undefined;
   const chatIdentifier = message.chatIdentifier ?? undefined;
   const peerId = isGroup
-    ? chatGuid ?? chatIdentifier ?? (chatId ? String(chatId) : "group")
+    ? (chatGuid ?? chatIdentifier ?? (chatId ? String(chatId) : "group"))
     : message.senderId;
 
   const route = core.channel.routing.resolveAgentRoute({
@@ -1690,11 +1852,7 @@ async function processMessage(
 
   // Allow control commands to bypass mention gating when authorized (parity with iMessage)
   const shouldBypassMention =
-    isGroup &&
-    requireMention &&
-    !wasMentioned &&
-    commandAuthorized &&
-    hasControlCmd;
+    isGroup && requireMention && !wasMentioned && commandAuthorized && hasControlCmd;
   const effectiveWasMentioned = wasMentioned || shouldBypassMention;
 
   // Skip group messages that require mention but weren't mentioned
@@ -1722,7 +1880,9 @@ async function processMessage(
       logVerbose(core, runtime, "attachment download skipped (missing serverUrl/password)");
     } else {
       for (const attachment of attachments) {
-        if (!attachment.guid) continue;
+        if (!attachment.guid) {
+          continue;
+        }
         if (attachment.totalBytes && attachment.totalBytes > maxBytes) {
           logVerbose(
             core,
@@ -1776,8 +1936,12 @@ async function processMessage(
       chatId: message.chatId,
     });
     if (cached) {
-      if (!replyToBody && cached.body) replyToBody = cached.body;
-      if (!replyToSender && cached.senderLabel) replyToSender = cached.senderLabel;
+      if (!replyToBody && cached.body) {
+        replyToBody = cached.body;
+      }
+      if (!replyToSender && cached.senderLabel) {
+        replyToSender = cached.senderLabel;
+      }
       replyToShortId = cached.shortId;
       if (core.logging.shouldLogVerbose()) {
         const preview = (cached.body ?? "").replace(/\s+/g, " ").slice(0, 120);
@@ -1857,16 +2021,16 @@ async function processMessage(
   const shouldAckReaction = () =>
     Boolean(
       ackReactionValue &&
-        core.channel.reactions.shouldAckReaction({
-          scope: ackReactionScope,
-          isDirect: !isGroup,
-          isGroup,
-          isMentionableGroup: isGroup,
-          requireMention: Boolean(requireMention),
-          canDetectMention,
-          effectiveWasMentioned,
-          shouldBypassMention,
-        }),
+      core.channel.reactions.shouldAckReaction({
+        scope: ackReactionScope,
+        isDirect: !isGroup,
+        isGroup,
+        isMentionableGroup: isGroup,
+        requireMention: Boolean(requireMention),
+        canDetectMention,
+        effectiveWasMentioned,
+        shouldBypassMention,
+      }),
     );
   const ackMessageId = message.messageId?.trim() || "";
   const ackReactionPromise =
@@ -1919,7 +2083,9 @@ async function processMessage(
 
   const maybeEnqueueOutboundMessageId = (messageId?: string, snippet?: string) => {
     const trimmed = messageId?.trim();
-    if (!trimmed || trimmed === "ok" || trimmed === "unknown") return;
+    if (!trimmed || trimmed === "ok" || trimmed === "unknown") {
+      return;
+    }
     // Cache outbound message to get short ID
     const cacheEntry = rememberBlueBubblesReplyCache({
       accountId: account.accountId,
@@ -1979,13 +2145,41 @@ async function processMessage(
   };
 
   let sentMessage = false;
+  let streamingActive = false;
+  let typingRestartTimer: NodeJS.Timeout | undefined;
+  const typingRestartDelayMs = 150;
+  const clearTypingRestartTimer = () => {
+    if (typingRestartTimer) {
+      clearTimeout(typingRestartTimer);
+      typingRestartTimer = undefined;
+    }
+  };
+  const restartTypingSoon = () => {
+    if (!streamingActive || !chatGuidForActions || !baseUrl || !password) {
+      return;
+    }
+    clearTypingRestartTimer();
+    typingRestartTimer = setTimeout(() => {
+      typingRestartTimer = undefined;
+      if (!streamingActive) {
+        return;
+      }
+      sendBlueBubblesTyping(chatGuidForActions, true, {
+        cfg: config,
+        accountId: account.accountId,
+      }).catch((err) => {
+        runtime.error?.(`[bluebubbles] typing restart failed: ${String(err)}`);
+      });
+    }, typingRestartDelayMs);
+  };
   try {
     await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
       ctx: ctxPayload,
       cfg: config,
       dispatcherOptions: {
-        deliver: async (payload) => {
-          const rawReplyToId = typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
+        deliver: async (payload, info) => {
+          const rawReplyToId =
+            typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
           // Resolve short ID (e.g., "5") to full UUID
           const replyToMessageGuid = rawReplyToId
             ? resolveBlueBubblesMessageId(rawReplyToId, { requireKnownShortId: true })
@@ -2018,6 +2212,9 @@ async function processMessage(
               maybeEnqueueOutboundMessageId(result.messageId, cachedBody);
               sentMessage = true;
               statusSink?.({ lastOutboundAt: Date.now() });
+              if (info.kind === "block") {
+                restartTypingSoon();
+              }
             }
             return;
           }
@@ -2037,8 +2234,12 @@ async function processMessage(
             chunkMode === "newline"
               ? core.channel.text.chunkTextWithMode(text, textLimit, chunkMode)
               : core.channel.text.chunkMarkdownText(text, textLimit);
-          if (!chunks.length && text) chunks.push(text);
-          if (!chunks.length) return;
+          if (!chunks.length && text) {
+            chunks.push(text);
+          }
+          if (!chunks.length) {
+            return;
+          }
           for (let i = 0; i < chunks.length; i++) {
             const chunk = chunks[i];
             const result = await sendMessageBlueBubbles(outboundTarget, chunk, {
@@ -2049,23 +2250,20 @@ async function processMessage(
             maybeEnqueueOutboundMessageId(result.messageId, chunk);
             sentMessage = true;
             statusSink?.({ lastOutboundAt: Date.now() });
-            // In newline mode, restart typing after each chunk if more chunks remain
-            // Small delay allows the Apple API to finish clearing the typing state from message send
-            if (chunkMode === "newline" && i < chunks.length - 1 && chatGuidForActions) {
-              await new Promise((r) => setTimeout(r, 150));
-              sendBlueBubblesTyping(chatGuidForActions, true, {
-                cfg: config,
-                accountId: account.accountId,
-              }).catch(() => {
-                // Ignore typing errors
-              });
+            if (info.kind === "block") {
+              restartTypingSoon();
             }
           }
         },
         onReplyStart: async () => {
-          if (!chatGuidForActions) return;
-          if (!baseUrl || !password) return;
-          logVerbose(core, runtime, `typing start chatGuid=${chatGuidForActions}`);
+          if (!chatGuidForActions) {
+            return;
+          }
+          if (!baseUrl || !password) {
+            return;
+          }
+          streamingActive = true;
+          clearTypingRestartTimer();
           try {
             await sendBlueBubblesTyping(chatGuidForActions, true, {
               cfg: config,
@@ -2076,16 +2274,14 @@ async function processMessage(
           }
         },
         onIdle: async () => {
-          if (!chatGuidForActions) return;
-          if (!baseUrl || !password) return;
-          try {
-            await sendBlueBubblesTyping(chatGuidForActions, false, {
-              cfg: config,
-              accountId: account.accountId,
-            });
-          } catch (err) {
-            logVerbose(core, runtime, `typing stop failed: ${String(err)}`);
+          if (!chatGuidForActions) {
+            return;
+          }
+          if (!baseUrl || !password) {
+            return;
           }
+          // Intentionally no-op for block streaming. We stop typing in finally
+          // after the run completes to avoid flicker between paragraph blocks.
         },
         onError: (err, info) => {
           runtime.error?.(`BlueBubbles ${info.kind} reply failed: ${String(err)}`);
@@ -2099,6 +2295,10 @@ async function processMessage(
       },
     });
   } finally {
+    const shouldStopTyping =
+      Boolean(chatGuidForActions && baseUrl && password) && (streamingActive || !sentMessage);
+    streamingActive = false;
+    clearTypingRestartTimer();
     if (sentMessage && chatGuidForActions && ackMessageId) {
       core.channel.reactions.removeAckReactionAfterReply({
         removeAfterReply: removeAckAfterReply,
@@ -2122,8 +2322,8 @@ async function processMessage(
         },
       });
     }
-    if (chatGuidForActions && baseUrl && password && !sentMessage) {
-      // Stop typing indicator when no message was sent (e.g., NO_REPLY)
+    if (shouldStopTyping) {
+      // Stop typing after streaming completes to avoid a stuck indicator.
       sendBlueBubblesTyping(chatGuidForActions, false, {
         cfg: config,
         accountId: account.accountId,
@@ -2145,7 +2345,9 @@ async function processReaction(
   target: WebhookTarget,
 ): Promise<void> {
   const { account, config, runtime, core } = target;
-  if (reaction.fromMe) return;
+  if (reaction.fromMe) {
+    return;
+  }
 
   const dmPolicy = account.config.dmPolicy ?? "pairing";
   const groupPolicy = account.config.groupPolicy ?? "allowlist";
@@ -2165,9 +2367,13 @@ async function processReaction(
     .filter(Boolean);
 
   if (reaction.isGroup) {
-    if (groupPolicy === "disabled") return;
+    if (groupPolicy === "disabled") {
+      return;
+    }
     if (groupPolicy === "allowlist") {
-      if (effectiveGroupAllowFrom.length === 0) return;
+      if (effectiveGroupAllowFrom.length === 0) {
+        return;
+      }
       const allowed = isAllowedBlueBubblesSender({
         allowFrom: effectiveGroupAllowFrom,
         sender: reaction.senderId,
@@ -2175,10 +2381,14 @@ async function processReaction(
         chatGuid: reaction.chatGuid ?? undefined,
         chatIdentifier: reaction.chatIdentifier ?? undefined,
       });
-      if (!allowed) return;
+      if (!allowed) {
+        return;
+      }
     }
   } else {
-    if (dmPolicy === "disabled") return;
+    if (dmPolicy === "disabled") {
+      return;
+    }
     if (dmPolicy !== "open") {
       const allowed = isAllowedBlueBubblesSender({
         allowFrom: effectiveAllowFrom,
@@ -2187,7 +2397,9 @@ async function processReaction(
         chatGuid: reaction.chatGuid ?? undefined,
         chatIdentifier: reaction.chatIdentifier ?? undefined,
       });
-      if (!allowed) return;
+      if (!allowed) {
+        return;
+      }
     }
   }
 
@@ -2195,7 +2407,7 @@ async function processReaction(
   const chatGuid = reaction.chatGuid ?? undefined;
   const chatIdentifier = reaction.chatIdentifier ?? undefined;
   const peerId = reaction.isGroup
-    ? chatGuid ?? chatIdentifier ?? (chatId ? String(chatId) : "group")
+    ? (chatGuid ?? chatIdentifier ?? (chatId ? String(chatId) : "group"))
     : reaction.senderId;
 
   const route = core.channel.routing.resolveAgentRoute({
@@ -2271,6 +2483,8 @@ export async function monitorBlueBubblesProvider(
 
 export function resolveWebhookPathFromConfig(config?: BlueBubblesAccountConfig): string {
   const raw = config?.webhookPath?.trim();
-  if (raw) return normalizeWebhookPath(raw);
+  if (raw) {
+    return normalizeWebhookPath(raw);
+  }
   return DEFAULT_WEBHOOK_PATH;
 }