@openclaw/whatsapp 2026.5.2-beta.2 → 2026.5.3-beta.1

package/src/auto-reply/monitor/inbound-dispatch.ts

@@ -1,422 +0,0 @@
-import { hasVisibleInboundReplyDispatch } from "openclaw/plugin-sdk/inbound-reply-dispatch";
-import {
-  type DeliverableWhatsAppOutboundPayload,
-  normalizeWhatsAppOutboundPayload,
-  normalizeWhatsAppPayloadTextPreservingIndentation,
-} from "../../outbound-media-contract.js";
-import type { WhatsAppReplyDeliveryResult } from "../deliver-reply.js";
-import type { WebInboundMsg } from "../types.js";
-import { formatGroupMembers } from "./group-members.js";
-import type { GroupHistoryEntry } from "./inbound-context.js";
-import {
-  createChannelReplyPipeline,
-  dispatchReplyWithBufferedBlockDispatcher,
-  finalizeInboundContext,
-  getAgentScopedMediaLocalRoots,
-  jidToE164,
-  logVerbose,
-  resolveChunkMode,
-  resolveIdentityNamePrefix,
-  resolveInboundLastRouteSessionKey,
-  resolveMarkdownTableMode,
-  resolveSendableOutboundReplyParts,
-  resolveTextChunkLimit,
-  shouldLogVerbose,
-  toLocationContext,
-  type getChildLogger,
-  type getReplyFromConfig,
-  type LoadConfigFn,
-  type ReplyPayload,
-  type resolveAgentRoute,
-} from "./inbound-dispatch.runtime.js";
-
-type ReplyLifecycleKind = "tool" | "block" | "final";
-type ChannelReplyOnModelSelected = NonNullable<
-  ReturnType<typeof createChannelReplyPipeline>["onModelSelected"]
->;
-
-type WhatsAppDispatchPipeline = {
-  responsePrefix?: string;
-} & Record<string, unknown>;
-
-type VisibleReplyTarget = {
-  id?: string;
-  body?: string;
-  sender?: {
-    label?: string | null;
-  } | null;
-};
-
-type ReplyThreadingContext = {
-  implicitCurrentMessage?: "default" | "allow" | "deny";
-};
-
-type SenderContext = {
-  id?: string;
-  name?: string;
-  e164?: string;
-};
-
-function logWhatsAppReplyDeliveryError(params: {
-  err: unknown;
-  info: { kind: ReplyLifecycleKind };
-  connectionId: string;
-  conversationId: string;
-  msg: WebInboundMsg;
-  replyLogger: ReturnType<typeof getChildLogger>;
-}) {
-  params.replyLogger.error(
-    {
-      err: params.err,
-      replyKind: params.info.kind,
-      correlationId: params.msg.id ?? null,
-      connectionId: params.connectionId,
-      conversationId: params.conversationId,
-      chatId: params.msg.chatId ?? null,
-      to: params.msg.from ?? null,
-      from: params.msg.to ?? null,
-    },
-    "auto-reply delivery failed",
-  );
-}
-
-function resolveWhatsAppDisableBlockStreaming(cfg: ReturnType<LoadConfigFn>): boolean | undefined {
-  if (typeof cfg.channels?.whatsapp?.blockStreaming !== "boolean") {
-    return undefined;
-  }
-  return !cfg.channels.whatsapp.blockStreaming;
-}
-
-function resolveWhatsAppDeliverablePayload(
-  payload: ReplyPayload,
-  info: { kind: ReplyLifecycleKind },
-): ReplyPayload | null {
-  if (payload.isReasoning === true || payload.isCompactionNotice === true) {
-    return null;
-  }
-  if (payload.isError === true) {
-    return null;
-  }
-  if (info.kind === "tool") {
-    if (!resolveSendableOutboundReplyParts(payload).hasMedia) {
-      return null;
-    }
-    return { ...payload, text: undefined };
-  }
-  return payload;
-}
-
-export function resolveWhatsAppResponsePrefix(params: {
-  cfg: ReturnType<LoadConfigFn>;
-  agentId: string;
-  isSelfChat: boolean;
-  pipelineResponsePrefix?: string;
-}): string | undefined {
-  const configuredResponsePrefix = params.cfg.messages?.responsePrefix;
-  return (
-    params.pipelineResponsePrefix ??
-    (configuredResponsePrefix === undefined && params.isSelfChat
-      ? resolveIdentityNamePrefix(params.cfg, params.agentId)
-      : undefined)
-  );
-}
-
-export function buildWhatsAppInboundContext(params: {
-  bodyForAgent?: string;
-  combinedBody: string;
-  commandBody?: string;
-  commandAuthorized?: boolean;
-  conversationId: string;
-  groupHistory?: GroupHistoryEntry[];
-  groupMemberRoster?: Map<string, string>;
-  groupSystemPrompt?: string;
-  msg: WebInboundMsg;
-  rawBody?: string;
-  route: ReturnType<typeof resolveAgentRoute>;
-  sender: SenderContext;
-  transcript?: string;
-  mediaTranscribedIndexes?: number[];
-  replyThreading?: ReplyThreadingContext;
-  visibleReplyTo?: VisibleReplyTarget;
-}) {
-  const inboundHistory =
-    params.msg.chatType === "group"
-      ? (params.groupHistory ?? []).map((entry) => ({
-          sender: entry.sender,
-          body: entry.body,
-          timestamp: entry.timestamp,
-        }))
-      : undefined;
-
-  const result = finalizeInboundContext({
-    Body: params.combinedBody,
-    BodyForAgent: params.bodyForAgent ?? params.msg.body,
-    InboundHistory: inboundHistory,
-    RawBody: params.rawBody ?? params.msg.body,
-    CommandBody: params.commandBody ?? params.msg.body,
-    Transcript: params.transcript,
-    From: params.msg.from,
-    To: params.msg.to,
-    SessionKey: params.route.sessionKey,
-    AccountId: params.route.accountId,
-    MessageSid: params.msg.id,
-    ReplyToId: params.visibleReplyTo?.id,
-    ReplyToBody: params.visibleReplyTo?.body,
-    ReplyToSender: params.visibleReplyTo?.sender?.label,
-    MediaPath: params.msg.mediaPath,
-    MediaUrl: params.msg.mediaUrl,
-    MediaType: params.msg.mediaType,
-    MediaTranscribedIndexes: params.mediaTranscribedIndexes,
-    ChatType: params.msg.chatType,
-    Timestamp: params.msg.timestamp,
-    ConversationLabel: params.msg.chatType === "group" ? params.conversationId : params.msg.from,
-    GroupSubject: params.msg.groupSubject,
-    GroupMembers: formatGroupMembers({
-      participants: params.msg.groupParticipants,
-      roster: params.groupMemberRoster,
-      fallbackE164: params.sender.e164,
-    }),
-    SenderName: params.sender.name,
-    SenderId: params.sender.id ?? params.sender.e164,
-    SenderE164: params.sender.e164,
-    CommandAuthorized: params.commandAuthorized,
-    ReplyThreading: params.replyThreading,
-    WasMentioned: params.msg.wasMentioned,
-    GroupSystemPrompt: params.groupSystemPrompt,
-    UntrustedStructuredContext: params.msg.untrustedStructuredContext,
-    ...(params.msg.location ? toLocationContext(params.msg.location) : {}),
-    Provider: "whatsapp",
-    Surface: "whatsapp",
-    OriginatingChannel: "whatsapp",
-    OriginatingTo: params.msg.from,
-  });
-  return result;
-}
-
-export function resolveWhatsAppDmRouteTarget(params: {
-  msg: WebInboundMsg;
-  senderE164?: string;
-  normalizeE164: (value: string) => string | null;
-}): string | undefined {
-  if (params.msg.chatType === "group") {
-    return undefined;
-  }
-  if (params.senderE164) {
-    return params.normalizeE164(params.senderE164) ?? undefined;
-  }
-  if (params.msg.from.includes("@")) {
-    return jidToE164(params.msg.from) ?? undefined;
-  }
-  return params.normalizeE164(params.msg.from) ?? undefined;
-}
-
-export function updateWhatsAppMainLastRoute(params: {
-  backgroundTasks: Set<Promise<unknown>>;
-  cfg: ReturnType<LoadConfigFn>;
-  ctx: Record<string, unknown>;
-  dmRouteTarget?: string;
-  pinnedMainDmRecipient: string | null;
-  route: ReturnType<typeof resolveAgentRoute>;
-  updateLastRoute: (params: {
-    cfg: ReturnType<LoadConfigFn>;
-    backgroundTasks: Set<Promise<unknown>>;
-    storeAgentId: string;
-    sessionKey: string;
-    channel: "whatsapp";
-    to: string;
-    accountId?: string;
-    ctx: Record<string, unknown>;
-    warn: ReturnType<typeof getChildLogger>["warn"];
-  }) => void;
-  warn: ReturnType<typeof getChildLogger>["warn"];
-}) {
-  const shouldUpdateMainLastRoute =
-    !params.pinnedMainDmRecipient || params.pinnedMainDmRecipient === params.dmRouteTarget;
-  const inboundLastRouteSessionKey = resolveInboundLastRouteSessionKey({
-    route: params.route,
-    sessionKey: params.route.sessionKey,
-  });
-
-  if (
-    params.dmRouteTarget &&
-    inboundLastRouteSessionKey === params.route.mainSessionKey &&
-    shouldUpdateMainLastRoute
-  ) {
-    params.updateLastRoute({
-      cfg: params.cfg,
-      backgroundTasks: params.backgroundTasks,
-      storeAgentId: params.route.agentId,
-      sessionKey: params.route.mainSessionKey,
-      channel: "whatsapp",
-      to: params.dmRouteTarget,
-      accountId: params.route.accountId,
-      ctx: params.ctx,
-      warn: params.warn,
-    });
-    return;
-  }
-
-  if (
-    params.dmRouteTarget &&
-    inboundLastRouteSessionKey === params.route.mainSessionKey &&
-    params.pinnedMainDmRecipient
-  ) {
-    logVerbose(
-      `Skipping main-session last route update for ${params.dmRouteTarget} (pinned owner ${params.pinnedMainDmRecipient})`,
-    );
-  }
-}
-
-export async function dispatchWhatsAppBufferedReply(params: {
-  cfg: ReturnType<LoadConfigFn>;
-  connectionId: string;
-  context: Record<string, unknown>;
-  conversationId: string;
-  deliverReply: (params: {
-    replyResult: ReplyPayload;
-    normalizedReplyResult?: DeliverableWhatsAppOutboundPayload<ReplyPayload>;
-    msg: WebInboundMsg;
-    mediaLocalRoots: readonly string[];
-    maxMediaBytes: number;
-    textLimit: number;
-    chunkMode?: ReturnType<typeof resolveChunkMode>;
-    replyLogger: ReturnType<typeof getChildLogger>;
-    connectionId?: string;
-    skipLog?: boolean;
-    tableMode?: ReturnType<typeof resolveMarkdownTableMode>;
-  }) => Promise<WhatsAppReplyDeliveryResult>;
-  groupHistories: Map<string, GroupHistoryEntry[]>;
-  groupHistoryKey: string;
-  maxMediaBytes: number;
-  maxMediaTextChunkLimit?: number;
-  msg: WebInboundMsg;
-  onModelSelected?: ChannelReplyOnModelSelected;
-  rememberSentText: (
-    text: string | undefined,
-    opts: {
-      combinedBody?: string;
-      combinedBodySessionKey?: string;
-      logVerboseMessage?: boolean;
-    },
-  ) => void;
-  replyLogger: ReturnType<typeof getChildLogger>;
-  replyPipeline: WhatsAppDispatchPipeline;
-  replyResolver: typeof getReplyFromConfig;
-  route: ReturnType<typeof resolveAgentRoute>;
-  shouldClearGroupHistory: boolean;
-}) {
-  const textLimit = params.maxMediaTextChunkLimit ?? resolveTextChunkLimit(params.cfg, "whatsapp");
-  const chunkMode = resolveChunkMode(params.cfg, "whatsapp", params.route.accountId);
-  const tableMode = resolveMarkdownTableMode({
-    cfg: params.cfg,
-    channel: "whatsapp",
-    accountId: params.route.accountId,
-  });
-  const mediaLocalRoots = getAgentScopedMediaLocalRoots(params.cfg, params.route.agentId);
-  const disableBlockStreaming = resolveWhatsAppDisableBlockStreaming(params.cfg);
-  let didSendReply = false;
-  let didLogHeartbeatStrip = false;
-
-  const { queuedFinal, counts } = await dispatchReplyWithBufferedBlockDispatcher({
-    ctx: params.context,
-    cfg: params.cfg,
-    replyResolver: params.replyResolver,
-    dispatcherOptions: {
-      ...params.replyPipeline,
-      onHeartbeatStrip: () => {
-        if (!didLogHeartbeatStrip) {
-          didLogHeartbeatStrip = true;
-          logVerbose("Stripped stray HEARTBEAT_OK token from web reply");
-        }
-      },
-      deliver: async (payload: ReplyPayload, info: { kind: ReplyLifecycleKind }) => {
-        const deliveryPayload = resolveWhatsAppDeliverablePayload(payload, info);
-        if (!deliveryPayload) {
-          return;
-        }
-        const normalizedOutboundPayload = normalizeWhatsAppOutboundPayload(deliveryPayload, {
-          normalizeText: normalizeWhatsAppPayloadTextPreservingIndentation,
-        });
-        const normalizedDeliveryPayload =
-          deliveryPayload.text === undefined
-            ? { ...normalizedOutboundPayload, text: undefined }
-            : normalizedOutboundPayload;
-        const reply = resolveSendableOutboundReplyParts(normalizedDeliveryPayload);
-        if (!reply.hasMedia && !reply.text.trim()) {
-          return;
-        }
-        const delivery = await params.deliverReply({
-          replyResult: normalizedDeliveryPayload,
-          normalizedReplyResult: normalizedDeliveryPayload,
-          msg: params.msg,
-          mediaLocalRoots,
-          maxMediaBytes: params.maxMediaBytes,
-          textLimit,
-          chunkMode,
-          replyLogger: params.replyLogger,
-          connectionId: params.connectionId,
-          skipLog: false,
-          tableMode,
-        });
-        if (!delivery.providerAccepted) {
-          params.replyLogger.warn(
-            {
-              correlationId: params.msg.id ?? null,
-              connectionId: params.connectionId,
-              conversationId: params.conversationId,
-              chatId: params.msg.chatId,
-              to: params.msg.from,
-              from: params.msg.to,
-              replyKind: info.kind,
-            },
-            "auto-reply was not accepted by WhatsApp provider",
-          );
-          return;
-        }
-        didSendReply = true;
-        const shouldLog = normalizedDeliveryPayload.text ? true : undefined;
-        params.rememberSentText(normalizedDeliveryPayload.text, {
-          combinedBody: params.context.Body as string | undefined,
-          combinedBodySessionKey: params.route.sessionKey,
-          logVerboseMessage: shouldLog,
-        });
-        const fromDisplay =
-          params.msg.chatType === "group" ? params.conversationId : (params.msg.from ?? "unknown");
-        if (shouldLogVerbose()) {
-          const preview = normalizedDeliveryPayload.text != null ? reply.text : "<media>";
-          logVerbose(`Reply body: ${preview}${reply.hasMedia ? " (media)" : ""} -> ${fromDisplay}`);
-        }
-      },
-      onReplyStart: params.msg.sendComposing,
-      onError: (err, info) => {
-        logWhatsAppReplyDeliveryError({
-          err,
-          info,
-          connectionId: params.connectionId,
-          conversationId: params.conversationId,
-          msg: params.msg,
-          replyLogger: params.replyLogger,
-        });
-      },
-    },
-    replyOptions: {
-      disableBlockStreaming,
-      onModelSelected: params.onModelSelected,
-    },
-  });
-
-  const didQueueVisibleReply = hasVisibleInboundReplyDispatch({ queuedFinal, counts });
-  if (!didQueueVisibleReply) {
-    if (params.shouldClearGroupHistory) {
-      params.groupHistories.set(params.groupHistoryKey, []);
-    }
-    logVerbose("Skipping auto-reply: silent token or no text/media returned from resolver");
-    return false;
-  }
-
-  if (params.shouldClearGroupHistory) {
-    params.groupHistories.set(params.groupHistoryKey, []);
-  }
-
-  return didSendReply;
-}

package/src/auto-reply/monitor/last-route.test.ts

@@ -1,37 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-import { trackBackgroundTask } from "./last-route.js";
-
-const waitForAsyncCallbacks = async () => {
-  await Promise.resolve();
-  await new Promise((resolve) => setTimeout(resolve, 0));
-};
-
-describe("trackBackgroundTask", () => {
-  const unhandledRejections: unknown[] = [];
-  const onUnhandledRejection = (reason: unknown) => {
-    unhandledRejections.push(reason);
-  };
-
-  afterEach(() => {
-    process.off("unhandledRejection", onUnhandledRejection);
-    unhandledRejections.length = 0;
-  });
-
-  it("does not leak unhandled rejections when a tracked task fails", async () => {
-    process.on("unhandledRejection", onUnhandledRejection);
-    const backgroundTasks = new Set<Promise<unknown>>();
-    let rejectTask!: (reason?: unknown) => void;
-    const task = new Promise<void>((_resolve, reject) => {
-      rejectTask = reject;
-    });
-
-    trackBackgroundTask(backgroundTasks, task);
-    expect(backgroundTasks.size).toBe(1);
-
-    rejectTask(new Error("boom"));
-    await waitForAsyncCallbacks();
-
-    expect(backgroundTasks.size).toBe(0);
-    expect(unhandledRejections).toEqual([]);
-  });
-});

package/src/auto-reply/monitor/last-route.ts

@@ -1,61 +0,0 @@
-import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
-import type { MsgContext } from "openclaw/plugin-sdk/reply-runtime";
-import { formatError } from "../../session.js";
-import { resolveStorePath, updateLastRoute } from "../config.runtime.js";
-
-export function trackBackgroundTask(
-  backgroundTasks: Set<Promise<unknown>>,
-  task: Promise<unknown>,
-) {
-  backgroundTasks.add(task);
-  const cleanup = () => {
-    backgroundTasks.delete(task);
-  };
-  task.then(cleanup, cleanup);
-}
-
-export function updateLastRouteInBackground(params: {
-  cfg: OpenClawConfig;
-  backgroundTasks: Set<Promise<unknown>>;
-  storeAgentId: string;
-  sessionKey: string;
-  channel: "whatsapp";
-  to: string;
-  accountId?: string;
-  ctx?: MsgContext;
-  warn: (obj: unknown, msg: string) => void;
-}) {
-  const storePath = resolveStorePath(params.cfg.session?.store, {
-    agentId: params.storeAgentId,
-  });
-  const task = updateLastRoute({
-    storePath,
-    sessionKey: params.sessionKey,
-    deliveryContext: {
-      channel: params.channel,
-      to: params.to,
-      accountId: params.accountId,
-    },
-    ctx: params.ctx,
-  }).catch((err) => {
-    params.warn(
-      {
-        error: formatError(err),
-        storePath,
-        sessionKey: params.sessionKey,
-        to: params.to,
-      },
-      "failed updating last route",
-    );
-  });
-  trackBackgroundTask(params.backgroundTasks, task);
-}
-
-export function awaitBackgroundTasks(backgroundTasks: Set<Promise<unknown>>) {
-  if (backgroundTasks.size === 0) {
-    return Promise.resolve();
-  }
-  return Promise.allSettled(backgroundTasks).then(() => {
-    backgroundTasks.clear();
-  });
-}

package/src/auto-reply/monitor/message-line.runtime.ts

@@ -1,38 +0,0 @@
-import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
-
-export {
-  formatInboundEnvelope,
-  type EnvelopeFormatOptions,
-} from "openclaw/plugin-sdk/channel-envelope";
-
-type WhatsAppMessagePrefixConfig = OpenClawConfig;
-
-function normalizeAgentId(agentId: string): string {
-  return agentId.trim().toLowerCase() || "main";
-}
-
-function resolveIdentityNamePrefix(
-  cfg: WhatsAppMessagePrefixConfig,
-  agentId: string,
-): string | undefined {
-  const normalizedAgentId = normalizeAgentId(agentId);
-  const identityName = cfg.agents?.list
-    ?.find((agent) => normalizeAgentId(agent.id ?? "") === normalizedAgentId)
-    ?.identity?.name?.trim();
-  return identityName ? `[${identityName}]` : undefined;
-}
-
-export function resolveMessagePrefix(
-  cfg: WhatsAppMessagePrefixConfig,
-  agentId: string,
-  opts?: { configured?: string; hasAllowFrom?: boolean; fallback?: string },
-): string {
-  const configured = opts?.configured ?? cfg.messages?.messagePrefix;
-  if (configured !== undefined) {
-    return configured;
-  }
-  if (opts?.hasAllowFrom === true) {
-    return "";
-  }
-  return resolveIdentityNamePrefix(cfg, agentId) ?? opts?.fallback ?? "[openclaw]";
-}

package/src/auto-reply/monitor/message-line.ts

@@ -1,54 +0,0 @@
-import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
-import { getPrimaryIdentityId, getReplyContext, getSenderIdentity } from "../../identity.js";
-import type { WebInboundMsg } from "../types.js";
-import {
-  formatInboundEnvelope,
-  resolveMessagePrefix,
-  type EnvelopeFormatOptions,
-} from "./message-line.runtime.js";
-
-export function formatReplyContext(msg: WebInboundMsg) {
-  const replyTo = getReplyContext(msg);
-  if (!replyTo?.body) {
-    return null;
-  }
-  const sender = replyTo.sender?.label ?? replyTo.sender?.e164 ?? "unknown sender";
-  const idPart = replyTo.id ? ` id:${replyTo.id}` : "";
-  return `[Replying to ${sender}${idPart}]\n${replyTo.body}\n[/Replying]`;
-}
-
-export function buildInboundLine(params: {
-  cfg: OpenClawConfig;
-  msg: WebInboundMsg;
-  agentId: string;
-  previousTimestamp?: number;
-  envelope?: EnvelopeFormatOptions;
-}) {
-  const { cfg, msg, agentId, previousTimestamp, envelope } = params;
-  // WhatsApp inbound prefix: channels.whatsapp.messagePrefix > legacy messages.messagePrefix > identity/defaults
-  const messagePrefix = resolveMessagePrefix(cfg, agentId, {
-    configured: cfg.channels?.whatsapp?.messagePrefix,
-    hasAllowFrom: (cfg.channels?.whatsapp?.allowFrom?.length ?? 0) > 0,
-  });
-  const prefixStr = messagePrefix ? `${messagePrefix} ` : "";
-  const replyContext = formatReplyContext(msg);
-  const baseLine = `${prefixStr}${msg.body}${replyContext ? `\n\n${replyContext}` : ""}`;
-  const sender = getSenderIdentity(msg);
-
-  // Wrap with standardized envelope for the agent.
-  return formatInboundEnvelope({
-    channel: "WhatsApp",
-    from: msg.chatType === "group" ? msg.from : msg.from?.replace(/^whatsapp:/, ""),
-    timestamp: msg.timestamp,
-    body: baseLine,
-    chatType: msg.chatType,
-    sender: {
-      name: sender.name ?? undefined,
-      e164: sender.e164 ?? undefined,
-      id: getPrimaryIdentityId(sender) ?? undefined,
-    },
-    previousTimestamp,
-    envelope,
-    fromMe: msg.fromMe,
-  });
-}