openclaw-weixin 3.1.6 → 3.2.0

package/dist/src/config/block-streaming.js

@@ -0,0 +1,8 @@
+export function resolveWeixinBlockStreamingEnabled(cfg, accountId, fallbackAccountId) {
+    const section = cfg.channels?.["openclaw-weixin"];
+    return (section?.accounts?.[accountId]?.blockStreaming ??
+        (fallbackAccountId ? section?.accounts?.[fallbackAccountId]?.blockStreaming : undefined) ??
+        section?.blockStreaming ??
+        true);
+}
+//# sourceMappingURL=block-streaming.js.map

package/dist/src/config/block-streaming.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-streaming.js","sourceRoot":"","sources":["../../../src/config/block-streaming.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,kCAAkC,CAChD,GAAmB,EACnB,SAAiB,EACjB,iBAA0B;IAE1B,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,iBAAiB,CAA2C,CAAC;IAC5F,OAAO,CACL,OAAO,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,cAAc;QAC9C,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,OAAO,EAAE,cAAc;QACvB,IAAI,CACL,CAAC;AACJ,CAAC"}

package/dist/src/config/config-schema.js

@@ -9,6 +9,10 @@ const weixinAccountProperties = {
     baseUrl: { type: "string", default: DEFAULT_BASE_URL },
     cdnBaseUrl: { type: "string", default: CDN_BASE_URL },
     routeTag: { type: "number" },
+    blockStreaming: {
+        type: "boolean",
+        description: "Send completed text blocks before the final reply.",
+    },
 };
 const weixinAccountSchema = {
     type: "object",
@@ -24,6 +28,11 @@ const replyProgressMessagesSchema = {
     default: true,
     description: "Send structured tool-call progress messages.",
 };
+const blockStreamingSchema = {
+    type: "boolean",
+    default: true,
+    description: "Send completed text blocks before the final reply.",
+};
 /** Top-level weixin config schema (token is stored in credentials file, not config). */
 const weixinChannelConfigJsonSchema = {
     type: "object",
@@ -37,6 +46,7 @@ const weixinChannelConfigJsonSchema = {
             additionalProperties: weixinAccountSchema,
         },
         botAgent: botAgentSchema,
+        blockStreaming: blockStreamingSchema,
         replyProgressMessages: replyProgressMessagesSchema,
         /** ISO 8601; bumped on each successful login to refresh gateway config from disk. */
         channelConfigUpdatedAt: { type: "string" },

package/dist/src/config/config-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-schema.js","sourceRoot":"","sources":["../../../src/config/config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAEzF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,cAAc,GAAG;IACrB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;CACvC,CAAC;AAEX,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACxB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;IAC5B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE;IACtD,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE;IACrD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;CACpB,CAAC;AAEX,MAAM,mBAAmB,GAAG;IAC1B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,UAAU,EAAE,uBAAuB;CAC3B,CAAC;AAEX,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,+DAA+D;CACpE,CAAC;AAEX,MAAM,2BAA2B,GAAG;IAClC,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,8CAA8C;CACnD,CAAC;AAEX,wFAAwF;AACxF,MAAM,6BAA6B,GAAG;IACpC,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,UAAU,EAAE;QACV,GAAG,uBAAuB;QAC1B,iFAAiF;QACjF,QAAQ,EAAE,cAAc;QACxB,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,oBAAoB,EAAE,mBAAmB;SAC1C;QACD,QAAQ,EAAE,cAAc;QACxB,qBAAqB,EAAE,2BAA2B;QAClD,qFAAqF;QACrF,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC3C;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC,6BAA6B,CAAC,CAAC"}
+{"version":3,"file":"config-schema.js","sourceRoot":"","sources":["../../../src/config/config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAEzF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,cAAc,GAAG;IACrB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;CACvC,CAAC;AAEX,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACxB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;IAC5B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE;IACtD,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE;IACrD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC5B,cAAc,EAAE;QACd,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,oDAAoD;KAClE;CACO,CAAC;AAEX,MAAM,mBAAmB,GAAG;IAC1B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,UAAU,EAAE,uBAAuB;CAC3B,CAAC;AAEX,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,+DAA+D;CACpE,CAAC;AAEX,MAAM,2BAA2B,GAAG;IAClC,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,8CAA8C;CACnD,CAAC;AAEX,MAAM,oBAAoB,GAAG;IAC3B,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,oDAAoD;CACzD,CAAC;AAEX,wFAAwF;AACxF,MAAM,6BAA6B,GAAG;IACpC,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,UAAU,EAAE;QACV,GAAG,uBAAuB;QAC1B,iFAAiF;QACjF,QAAQ,EAAE,cAAc;QACxB,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,oBAAoB,EAAE,mBAAmB;SAC1C;QACD,QAAQ,EAAE,cAAc;QACxB,cAAc,EAAE,oBAAoB;QACpC,qBAAqB,EAAE,2BAA2B;QAClD,qFAAqF;QACrF,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC3C;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC,6BAA6B,CAAC,CAAC"}

package/dist/src/messaging/inbound-turn.js

@@ -0,0 +1,102 @@
+import { sendWeixinWithHooks } from "./outbound-hooks.js";
+/** Only the two public inbound contracts are supported; a failed dispatch is never replayed. */
+export async function dispatchWeixinInboundTurn(params) {
+    const { channelRuntime, route, onReplyAdmitted, onReplyDeferred, onDeferredComplete, ...turn } = params;
+    const inbound = channelRuntime.inbound;
+    if (!inbound) {
+        throw new Error("weixin: host inbound runtime is missing");
+    }
+    let admitted = false;
+    const admit = () => {
+        if (admitted)
+            return;
+        admitted = true;
+        onReplyAdmitted?.();
+    };
+    const defer = () => {
+        onReplyDeferred?.();
+        admit();
+    };
+    const onAgentRunStart = turn.replyOptions?.onAgentRunStart;
+    const replyOptions = {
+        ...turn.replyOptions,
+        onAgentRunStart: (...args) => {
+            admit();
+            return onAgentRunStart?.(...args);
+        },
+    };
+    if ("dispatch" in inbound) {
+        if (typeof inbound.dispatch !== "function") {
+            throw new Error("weixin: host inbound.dispatch is not callable");
+        }
+        const delivery = { ...turn.delivery, observeMessageSent: true };
+        const routedReplyOptions = {
+            ...replyOptions,
+            turnAdoptionLifecycle: {
+                onAdopted: admit,
+                onDeferred: defer,
+                onSettled: onDeferredComplete,
+            },
+        };
+        return await inbound.dispatch({
+            ...turn,
+            route,
+            delivery,
+            replyOptions: routedReplyOptions,
+        });
+    }
+    if (typeof inbound.dispatchReply !== "function" ||
+        typeof channelRuntime.session?.resolveStorePath !== "function" ||
+        typeof channelRuntime.session?.recordInboundSession !== "function" ||
+        typeof channelRuntime.reply?.dispatchReplyWithBufferedBlockDispatcher !== "function") {
+        throw new Error("weixin: host legacy inbound contract is incomplete");
+    }
+    const to = turn.ctxPayload.To;
+    if (typeof to !== "string") {
+        throw new Error("weixin: inbound reply target is missing");
+    }
+    const hookContext = {
+        to,
+        accountId: turn.accountId,
+        runId: turn.replyOptions?.runId,
+        sessionKey: route.sessionKey,
+    };
+    const { preparePayload, ...rawDelivery } = turn.delivery;
+    const delivery = {
+        ...rawDelivery,
+        deliver: async (payload, info) => {
+            // Old helpers do not preserve SDK payload metadata across a preparePayload clone.
+            // Prepare only inside provider delivery so the host keeps its original payload.
+            const prepared = preparePayload ? await preparePayload(payload, info) : payload;
+            if (prepared === null)
+                return { visibleReplySent: false };
+            return sendWeixinWithHooks({
+                ...hookContext,
+                text: prepared.text ?? "",
+                mediaUrl: prepared.mediaUrl ?? prepared.mediaUrls?.[0],
+            }, (text) => rawDelivery.deliver({ ...prepared, text }, info));
+        },
+    };
+    const legacyReplyOptions = {
+        ...replyOptions,
+        queuedFollowupLifecycle: { onEnqueued: defer, onComplete: onDeferredComplete },
+        onTurnAdopted: admit,
+    };
+    return await inbound.dispatchReply({
+        ...turn,
+        agentId: route.agentId,
+        routeSessionKey: route.sessionKey,
+        storePath: channelRuntime.session.resolveStorePath(turn.cfg.session?.store, { agentId: route.agentId }),
+        recordInboundSession: channelRuntime.session.recordInboundSession,
+        dispatchReplyWithBufferedBlockDispatcher: channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher,
+        dispatcherOptions: {
+            ...turn.dispatcherOptions,
+            // Replace the legacy SDK's text-only modifier; our provider wrapper owns
+            // message_sending after preparation, including captionless media.
+            beforeDeliver: turn.dispatcherOptions?.beforeDeliver ?? ((payload) => payload),
+        },
+        delivery,
+        replyOptions: legacyReplyOptions,
+    });
+}
+//# sourceMappingURL=inbound-turn.js.map

package/dist/src/messaging/inbound-turn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbound-turn.js","sourceRoot":"","sources":["../../../src/messaging/inbound-turn.ts"],"names":[],"mappings":"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"}

package/dist/src/messaging/outbound-hooks.js

@@ -3,8 +3,34 @@ import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { logger } from "../util/logger.js";
 import { redactError } from "../util/redact.js";
 const CHANNEL_ID = "openclaw-weixin";
+/** Local sends share cancellation and settlement; host-managed sends bypass this wrapper. */
+export async function sendWeixinWithHooks(params, send) {
+    const sending = await applyWeixinMessageSendingHook(params);
+    if (sending.cancelled) {
+        logger.info("outbound: cancelled by message_sending hook");
+        return { visibleReplySent: false };
+    }
+    let result;
+    try {
+        result = await send(sending.text);
+    }
+    catch (error) {
+        emitWeixinMessageSent({ ...params, content: sending.text, success: false, error: redactError(error) });
+        throw error;
+    }
+    if (result?.visibleReplySent !== false) {
+        emitWeixinMessageSent({
+            ...params,
+            content: sending.text,
+            success: true,
+            messageId: result?.messageIds?.find((id) => id.trim()),
+        });
+    }
+    return result;
+}
 /**
- * Run message_sending hook before sending.
+ * Local hook boundary for legacy inbound replies and independent debug sends.
+ * Host-managed outbound adapters and routed inbound delivery must not call it.
  * Returns the (possibly modified) text content plus a cancelled flag.
  * Hook errors are caught and logged — sending proceeds regardless.
  */
@@ -23,7 +49,11 @@ export async function applyWeixinMessageSendingHook(params) {
                 runId: params.runId,
                 ...(params.mediaUrl ? { mediaUrls: [params.mediaUrl] } : {}),
             },
-        }, { channelId: CHANNEL_ID, accountId: params.accountId });
+        }, {
+            channelId: CHANNEL_ID,
+            accountId: params.accountId,
+            ...(params.sessionKey ? { sessionKey: params.sessionKey } : {}),
+        });
         if (hookResult?.cancel) {
             return { cancelled: true, text: params.text };
         }
@@ -53,6 +83,8 @@ export function emitWeixinMessageSent(params) {
         accountId: params.accountId,
         conversationId: params.to,
         runId: params.runId,
+        sessionKey: params.sessionKey,
+        messageId: params.messageId,
     });
     fireAndForgetHook(Promise.resolve(hookRunner.runMessageSent(toPluginMessageSentEvent(canonical), toPluginMessageContext(canonical))), "weixin: message_sent plugin hook failed");
 }

package/dist/src/messaging/outbound-hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbound-hooks.js","sourceRoot":"","sources":["../../../src/messaging/outbound-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oCAAoC,EACpC,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAErC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,MAMnD;IACC,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;IACzC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC7C,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,iBAAiB,CACnD;YACE,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,QAAQ,EAAE;gBACR,OAAO,EAAE,UAAU;gBACnB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7D;SACF,EACD,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CACvD,CAAC;QACF,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAChD,CAAC;QACD,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,IAAI,EAAE,UAAU,EAAE,OAAO,IAAI,MAAM,CAAC,IAAI;SACzC,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,qDAAqD,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrF,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAOrC;IACC,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;IACzC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC;QAAE,OAAO;IAClD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QACrD,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,SAAS,EAAE,UAAU;QACrB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,cAAc,EAAE,MAAM,CAAC,EAAE;QACzB,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC,CAAC;IACH,iBAAiB,CACf,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC,EAClH,yCAAyC,CAC1C,CAAC;AACJ,CAAC"}
+{"version":3,"file":"outbound-hooks.js","sourceRoot":"","sources":["../../../src/messaging/outbound-hooks.ts"],"names":[],"mappings":"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"}

package/dist/src/messaging/process-message.js

@@ -9,6 +9,7 @@ import { MessageItemType, TypingStatus } from "../api/types.js";
 import { loadWeixinAccount } from "../auth/accounts.js";
 import { readFrameworkAllowFromList } from "../auth/pairing.js";
 import { downloadRemoteImageToTemp } from "../cdn/upload.js";
+import { resolveWeixinBlockStreamingEnabled } from "../config/block-streaming.js";
 import { resolveReplyProgressMessagesEnabled } from "../config/reply-progress.js";
 import { downloadMediaFromItem } from "../media/media-download.js";
 import { logger } from "../util/logger.js";
@@ -16,8 +17,9 @@ import { redactError, redactToken } from "../util/redact.js";
 import { isDebugMode } from "./debug-mode.js";
 import { sendWeixinErrorNotice } from "./error-notice.js";
 import { getContextTokenFromMsgContext, isMediaItem, weixinMessageToMsgContext } from "./inbound.js";
+import { dispatchWeixinInboundTurn } from "./inbound-turn.js";
 import { StreamingMarkdownFilter } from "./markdown-filter.js";
-import { applyWeixinMessageSendingHook, emitWeixinMessageSent } from "./outbound-hooks.js";
+import { sendWeixinWithHooks } from "./outbound-hooks.js";
 import { WeixinReplyProgressSender } from "./reply-progress-sender.js";
 import { sendMessageWeixin } from "./send.js";
 import { sendWeixinMediaFile } from "./send-media.js";
@@ -140,7 +142,6 @@ export async function processOneMessage(full, deps) {
     const ctx = weixinMessageToMsgContext(full, deps.accountId, mediaOpts);
     // --- Framework command authorization ---
     const rawBody = textBody.trim() || (ctx.Body?.trim() ?? "");
-    ctx.CommandBody = rawBody;
     const { senderAllowedForCommands, commandAuthorized } = await resolveSenderCommandAuthorizationWithRuntime({
         cfg: deps.config,
         rawBody,
@@ -169,108 +170,76 @@ export async function processOneMessage(full, deps) {
         logger.info(`authorization: dropping message from=${redactToken(senderId)} outcome=${directDmOutcome}`);
         return;
     }
-    ctx.CommandAuthorized = commandAuthorized;
     logger.debug(`authorization: senderId=${redactToken(senderId, 6)} commandAuthorized=${String(commandAuthorized)} senderAllowed=${String(senderAllowedForCommands)}`);
     if (debug) {
         debugTrace.push("── 鉴权 ──", `│ auth: cmdAuthorized=${String(commandAuthorized)} senderAllowed=${String(senderAllowedForCommands)}`);
         debugTs.preDispatch = Date.now();
     }
-    // Note: `route` was resolved earlier so downloadMedia could pick the
-    // per-agent subdirectory. Session/storePath/dispatch below reuse the same
-    // resolved object; no second routing call is needed.
-    // Propagate the resolved session key into ctx so dispatchReplyFromConfig uses
-    // the correct session (matching the dmScope from config) instead of falling back
-    // to agent:main:main.
-    ctx.SessionKey = route.sessionKey;
-    const storePath = deps.channelRuntime.session.resolveStorePath(deps.config.session?.store, {
+    if (typeof deps.channelRuntime.inbound?.buildContext !== "function") {
+        throw new Error("weixin: host inbound.buildContext is missing");
+    }
+    const contextRoute = {
         agentId: route.agentId,
+        routeSessionKey: route.sessionKey,
+        ...("dmScope" in route ? { dmScope: route.dmScope } : {}),
+    };
+    const finalized = deps.channelRuntime.inbound.buildContext({
+        channel: "openclaw-weixin",
+        accountId: deps.accountId,
+        from: ctx.From,
+        sender: { id: senderId },
+        conversation: { kind: "direct", id: ctx.To },
+        route: contextRoute,
+        reply: { to: ctx.To },
+        message: { body: ctx.Body, rawBody: ctx.Body, bodyForAgent: ctx.Body, commandBody: rawBody },
+        messageId: ctx.MessageSid,
+        timestamp: ctx.Timestamp,
+        access: { commands: { authorized: commandAuthorized === true } },
+        media: ctx.MediaPath || ctx.MediaUrl
+            ? [{ path: ctx.MediaPath, url: ctx.MediaUrl, contentType: ctx.MediaType }]
+            : undefined,
     });
-    const finalized = deps.channelRuntime.reply.finalizeInboundContext({
-        ...ctx,
-        BodyForAgent: ctx.Body,
-    });
-    logger.info(`inbound: from=${redactToken(finalized.From)} to=${redactToken(finalized.To)} bodyLen=${(finalized.Body ?? "").length} hasMedia=${Boolean(finalized.MediaPath ?? finalized.MediaUrl)}`);
-    await deps.channelRuntime.session.recordInboundSession({
-        storePath,
-        sessionKey: route.sessionKey,
-        ctx: finalized,
-        updateLastRoute: {
-            sessionKey: route.mainSessionKey,
-            channel: "openclaw-weixin",
-            to: ctx.To,
-            accountId: deps.accountId,
-        },
-        onRecordError: (err) => deps.errLog(`recordInboundSession: ${redactError(err)}`),
-    });
-    logger.debug(`recordInboundSession: done sessionKey=${redactToken(route.sessionKey, 6)}`);
+    logger.info(`inbound: from=${redactToken(finalized.From)} to=${redactToken(finalized.To)} bodyLen=${(finalized.Body ?? "").length} hasMedia=${Boolean(ctx.MediaPath ?? ctx.MediaUrl)}`);
     const contextToken = getContextTokenFromMsgContext(ctx);
     const runId = randomUUID();
-    const replyProgressSender = resolveReplyProgressMessagesEnabled(deps.config)
-        ? new WeixinReplyProgressSender({
-            runId,
-            to: ctx.To,
-            accountId: deps.accountId,
-            opts: {
-                baseUrl: deps.baseUrl,
-                token: deps.token,
-                contextToken,
-            },
-        })
-        : undefined;
+    const sendOptions = { baseUrl: deps.baseUrl, token: deps.token, contextToken, runId };
     const humanDelay = deps.channelRuntime.reply.resolveHumanDelayConfig(deps.config, route.agentId);
     const typingTicket = deps.typingTicket;
-    const typingCallbacks = createTypingCallbacks({
-        start: typingTicket
-            ? () => sendTyping({
+    const updateTyping = async (status) => {
+        if (typingTicket) {
+            await sendTyping({
                 baseUrl: deps.baseUrl,
                 token: deps.token,
-                body: {
-                    ilink_user_id: ctx.To,
-                    typing_ticket: typingTicket,
-                    status: TypingStatus.TYPING,
-                },
-            })
-            : async () => { },
-        stop: typingTicket
-            ? () => sendTyping({
-                baseUrl: deps.baseUrl,
-                token: deps.token,
-                body: {
-                    ilink_user_id: ctx.To,
-                    typing_ticket: typingTicket,
-                    status: TypingStatus.CANCEL,
-                },
-            })
-            : async () => { },
+                body: { ilink_user_id: ctx.To, typing_ticket: typingTicket, status },
+            });
+        }
+    };
+    const typingCallbacks = createTypingCallbacks({
+        start: () => updateTyping(TypingStatus.TYPING),
+        stop: () => updateTyping(TypingStatus.CANCEL),
         onStartError: (err) => deps.log(`[weixin] typing send error: ${redactError(err)}`),
         onStopError: (err) => deps.log(`[weixin] typing cancel error: ${redactError(err)}`),
         keepaliveIntervalMs: 5000,
     });
+    const replyProgressSender = resolveReplyProgressMessagesEnabled(deps.config)
+        ? new WeixinReplyProgressSender({
+            runId,
+            to: ctx.To,
+            accountId: deps.accountId,
+            opts: sendOptions,
+        })
+        : undefined;
     /** Delivery records populated synchronously at deliver() entry, safe to read in finally. */
     const debugDeliveries = [];
-    const { dispatcher, replyOptions, markDispatchIdle } = deps.channelRuntime.reply.createReplyDispatcherWithTyping({
-        humanDelay,
-        typingCallbacks,
+    const delivery = {
+        preparePayload: (payload) => {
+            const filter = new StreamingMarkdownFilter();
+            return { ...payload, text: filter.feed(payload.text ?? "") + filter.flush() };
+        },
         deliver: async (payload) => {
-            const rawText = payload.text ?? "";
-            let text = (() => {
-                const f = new StreamingMarkdownFilter();
-                return f.feed(rawText) + f.flush();
-            })();
+            const text = payload.text ?? "";
             const mediaUrl = payload.mediaUrl ?? payload.mediaUrls?.[0];
             logger.info(`outbound: to=${redactToken(ctx.To)} contextToken=${redactToken(contextToken)} textLen=${text.length} mediaUrl=${mediaUrl ? "present" : "none"}`);
-            const sendingResult = await applyWeixinMessageSendingHook({
-                to: ctx.To,
-                text,
-                accountId: deps.accountId,
-                mediaUrl,
-                runId,
-            });
-            if (sendingResult.cancelled) {
-                logger.info(`outbound: cancelled by message_sending hook to=${redactToken(ctx.To)}`);
-                return;
-            }
-            text = sendingResult.text;
             if (debug) {
                 debugDeliveries.push({
                     textLen: text.length,
@@ -279,76 +248,39 @@ export async function processOneMessage(full, deps) {
                 });
             }
             try {
-                if (mediaUrl) {
-                    let filePath;
-                    if (!mediaUrl.includes("://") || mediaUrl.startsWith("file://")) {
-                        if (mediaUrl.startsWith("file://")) {
-                            filePath = new URL(mediaUrl).pathname;
-                        }
-                        else if (!path.isAbsolute(mediaUrl)) {
-                            filePath = path.resolve(mediaUrl);
-                        }
-                        else {
-                            filePath = mediaUrl;
-                        }
-                        logger.debug("outbound: local media path resolved");
-                    }
-                    else if (mediaUrl.startsWith("http://") || mediaUrl.startsWith("https://")) {
+                const remote = mediaUrl?.startsWith("http://") || mediaUrl?.startsWith("https://");
+                let result;
+                if (mediaUrl && (!mediaUrl.includes("://") || mediaUrl.startsWith("file://") || remote)) {
+                    let filePath = mediaUrl;
+                    if (remote) {
                         logger.debug("outbound: downloading remote media");
                         filePath = await downloadRemoteImageToTemp(mediaUrl, MEDIA_OUTBOUND_TEMP_DIR);
                         logger.debug("outbound: remote media downloaded");
                     }
-                    else {
-                        logger.warn("outbound: unrecognized media URL scheme, sending text only");
-                        await sendMessageWeixin({
-                            to: ctx.To,
-                            text,
-                            opts: {
-                                baseUrl: deps.baseUrl,
-                                token: deps.token,
-                                contextToken,
-                                runId,
-                            },
-                        });
-                        emitWeixinMessageSent({ to: ctx.To, content: text, success: true, accountId: deps.accountId, runId });
-                        logger.info(`outbound: text sent to=${redactToken(ctx.To)}`);
-                        return;
+                    else if (mediaUrl.startsWith("file://")) {
+                        filePath = new URL(mediaUrl).pathname;
+                    }
+                    else if (!path.isAbsolute(mediaUrl)) {
+                        filePath = path.resolve(mediaUrl);
                     }
-                    await sendWeixinMediaFile({
+                    result = await sendWeixinMediaFile({
                         filePath,
                         to: ctx.To,
                         text,
-                        opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken, runId },
+                        opts: sendOptions,
                         cdnBaseUrl: deps.cdnBaseUrl,
                     });
-                    emitWeixinMessageSent({ to: ctx.To, content: text, success: true, accountId: deps.accountId, runId });
                     logger.info(`outbound: media sent OK to=${redactToken(ctx.To)}`);
                 }
                 else {
-                    logger.debug(`outbound: sending text message to=${redactToken(ctx.To, 6)}`);
-                    await sendMessageWeixin({
-                        to: ctx.To,
-                        text,
-                        opts: {
-                            baseUrl: deps.baseUrl,
-                            token: deps.token,
-                            contextToken,
-                            runId,
-                        },
-                    });
-                    emitWeixinMessageSent({ to: ctx.To, content: text, success: true, accountId: deps.accountId, runId });
+                    if (mediaUrl)
+                        logger.warn("outbound: unrecognized media URL scheme, sending text only");
+                    result = await sendMessageWeixin({ to: ctx.To, text, opts: sendOptions });
                     logger.info(`outbound: text sent OK to=${redactToken(ctx.To)}`);
                 }
+                return { messageIds: [result.messageId], content: text };
             }
             catch (err) {
-                emitWeixinMessageSent({
-                    to: ctx.To,
-                    content: text,
-                    success: false,
-                    error: redactError(err),
-                    accountId: deps.accountId,
-                    runId,
-                });
                 logger.error(`outbound: FAILED to=${redactToken(ctx.To)} hasMedia=${Boolean(mediaUrl)} err=${redactError(err)}`);
                 throw err;
             }
@@ -376,42 +308,46 @@ export async function processOneMessage(full, deps) {
                 errLog: deps.errLog,
             });
         },
-    });
+    };
     let queuedFollowup = false;
-    const dispatchReplyOptions = {
-        ...replyOptions,
-        ...(replyProgressSender?.replyOptions ?? {}),
-        // Newer hosts use this marker for active-run admission; older hosts ignore it.
-        queuedFollowupLifecycle: {
-            onEnqueued: () => {
+    try {
+        logger.debug(`inbound.dispatch: starting agentId=${redactToken(route.agentId, 6)}`);
+        await dispatchWeixinInboundTurn({
+            channelRuntime: deps.channelRuntime,
+            channel: "openclaw-weixin",
+            accountId: deps.accountId,
+            cfg: deps.config,
+            route,
+            ctxPayload: finalized,
+            record: {
+                updateLastRoute: {
+                    sessionKey: route.mainSessionKey,
+                    channel: "openclaw-weixin",
+                    to: ctx.To,
+                    accountId: deps.accountId,
+                },
+                onRecordError: (err) => deps.errLog(`recordInboundSession: ${redactError(err)}`),
+            },
+            delivery,
+            dispatcherOptions: { humanDelay, typingCallbacks },
+            replyOptions: {
+                ...(replyProgressSender?.replyOptions ?? {}),
+                runId,
+                disableBlockStreaming: !resolveWeixinBlockStreamingEnabled(deps.config, routeAccountId, deps.accountId),
+            },
+            onReplyAdmitted: deps.onReplyAdmitted,
+            onReplyDeferred: () => {
                 queuedFollowup = true;
-                deps.onReplyAdmitted?.();
             },
-            onComplete: () => void replyProgressSender?.finalize(),
-        },
-        onAgentRunStart: () => deps.onReplyAdmitted?.(),
-        onTurnAdopted: deps.onReplyAdmitted,
-        disableBlockStreaming: true,
-    };
-    logger.debug(`dispatchReplyFromConfig: starting agentId=${redactToken(route.agentId, 6)}`);
-    try {
-        await deps.channelRuntime.reply.withReplyDispatcher({
-            dispatcher,
-            run: () => deps.channelRuntime.reply.dispatchReplyFromConfig({
-                ctx: finalized,
-                cfg: deps.config,
-                dispatcher,
-                replyOptions: dispatchReplyOptions,
-            }),
+            onDeferredComplete: () => void replyProgressSender?.finalize(),
         });
-        logger.debug(`dispatchReplyFromConfig: done agentId=${redactToken(route.agentId, 6)}`);
+        logger.debug(`inbound.dispatch: done agentId=${redactToken(route.agentId, 6)}`);
     }
     catch (err) {
-        logger.error(`dispatchReplyFromConfig: error agentId=${redactToken(route.agentId)} err=${redactError(err)}`);
+        logger.error(`inbound.dispatch: error agentId=${redactToken(route.agentId)} err=${redactError(err)}`);
         throw err;
     }
     finally {
-        markDispatchIdle();
         if (!queuedFollowup)
             await replyProgressSender?.finalize();
         logger.info(`debug-check: account=${redactToken(deps.accountId)} debug=${String(debug)} hasContextToken=${Boolean(contextToken)}`);
@@ -436,45 +372,14 @@ export async function processOneMessage(full, deps) {
             debugTrace.push("── 耗时 ──", `├ 平台→插件: ${platformDelay}`, `├ 入站处理(auth+route+media): ${inboundProcessMs}ms (mediaDownload: ${mediaDownloadMs}ms)`, `├ AI生成+回复: ${aiMs}ms`, `├ 总耗时: ${totalTime}`, `└ eventTime: ${eventTs > 0 ? new Date(eventTs).toISOString() : "N/A"}`);
             const timingText = `⏱ Debug 全链路\n${debugTrace.join("\n")}`;
             logger.info(`debug-timing: sending to=${redactToken(ctx.To)}`);
-            let debugSentContent;
             try {
-                const debugSendingResult = await applyWeixinMessageSendingHook({
-                    to: ctx.To,
-                    text: timingText,
-                    accountId: deps.accountId,
-                    runId,
+                const result = await sendWeixinWithHooks({ to: ctx.To, text: timingText, accountId: deps.accountId, runId }, async (text) => {
+                    await sendMessageWeixin({ to: ctx.To, text, opts: sendOptions });
                 });
-                if (debugSendingResult.cancelled) {
-                    logger.info(`debug-timing: cancelled by message_sending hook to=${redactToken(ctx.To)}`);
-                }
-                else {
-                    debugSentContent = debugSendingResult.text;
-                    await sendMessageWeixin({
-                        to: ctx.To,
-                        text: debugSentContent,
-                        opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken, runId },
-                    });
-                    emitWeixinMessageSent({
-                        to: ctx.To,
-                        content: debugSentContent,
-                        success: true,
-                        accountId: deps.accountId,
-                        runId,
-                    });
+                if (result?.visibleReplySent !== false)
                     logger.info(`debug-timing: sent OK`);
-                }
             }
             catch (debugErr) {
-                if (debugSentContent !== undefined) {
-                    emitWeixinMessageSent({
-                        to: ctx.To,
-                        content: debugSentContent,
-                        success: false,
-                        error: redactError(debugErr),
-                        accountId: deps.accountId,
-                        runId,
-                    });
-                }
                 logger.error(`debug-timing: send FAILED err=${redactError(debugErr)}`);
             }
         }