@tencent-weixin/openclaw-weixin 2.4.2 → 2.4.4

package/dist/src/streaming/batch-session.js

@@ -0,0 +1,271 @@
+import crypto from "node:crypto";
+import { onAgentEvent, } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { MessageItemType } from "../api/types.js";
+import { logger } from "../util/logger.js";
+/** Max chars for a tool result summary before truncation. */
+const TOOL_OUTPUT_CHAR_LIMIT = 120_000;
+/** Default size budget for a single batch sendMessage (bytes, JSON estimate). */
+export const BATCH_SIZE_LIMIT_BYTES = 200 * 1024;
+function estimateSizeBytes(items) {
+    try {
+        return Buffer.byteLength(JSON.stringify(items), "utf8");
+    }
+    catch {
+        return 0;
+    }
+}
+function truncateText(text, limit) {
+    if (text.length <= limit)
+        return text;
+    return `${text.slice(0, limit)}\n\n… truncated (${text.length} chars, showing first ${limit}).`;
+}
+function formatToolOutput(value) {
+    if (value === null || value === undefined)
+        return "";
+    if (typeof value === "number" || typeof value === "boolean")
+        return String(value);
+    let text;
+    if (typeof value === "string") {
+        text = value;
+    }
+    else {
+        if (typeof value === "object") {
+            const rec = value;
+            if (typeof rec.text === "string") {
+                text = rec.text;
+            }
+            else if (Array.isArray(rec.content)) {
+                const parts = rec.content
+                    .map((item) => {
+                    if (item && typeof item === "object") {
+                        const e = item;
+                        if (e.type === "text" && typeof e.text === "string")
+                            return e.text;
+                    }
+                    return null;
+                })
+                    .filter((p) => p !== null);
+                text = parts.length > 0 ? parts.join("\n") : JSON.stringify(value, null, 2);
+            }
+            else {
+                text = JSON.stringify(value, null, 2);
+            }
+        }
+        else {
+            text = String(value);
+        }
+    }
+    return truncateText(text, TOOL_OUTPUT_CHAR_LIMIT);
+}
+function tryStringifyArgs(args) {
+    if (args === undefined)
+        return undefined;
+    try {
+        return JSON.stringify(args);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * BatchSession — accumulates thinking, tool calls, and text payloads during
+ * an AI turn and sends them all in a single sendMessage at finalize time.
+ *
+ * Drop priority when item_list > BATCH_SIZE_LIMIT_BYTES:
+ *   1. Drop ThinkingItem (largest, optional for client UX)
+ *   2. Drop all ToolCallStart/Result items
+ *   3. Always keep TextItem(s) — the actual reply
+ *
+ * Usage:
+ *   const session = new BatchSession({ onSendBatch });
+ *   // spread replyCallbacks + runId into replyOptions
+ *   replyOptions = { ...replyOptions, runId: session.runId, ...session.replyCallbacks }
+ *   // in deliver(): session.addTextPayload(text)
+ *   // after dispatchReplyFromConfig: await session.finalize()
+ *   // on error: await session.abort()
+ */
+export class BatchSession {
+    /** Run id this session listens for on the global agent event bus. */
+    runId;
+    thinkingText = null;
+    toolStarts = [];
+    toolResults = [];
+    textPayloads = [];
+    done = false;
+    unsubscribeAgentEvent;
+    onSendBatch;
+    constructor(deps) {
+        this.runId = deps.runId ?? crypto.randomUUID();
+        this.onSendBatch = deps.onSendBatch;
+        this.unsubscribeAgentEvent = onAgentEvent((evt) => this.handleRawAgentEvent(evt));
+        logger.debug(`BatchSession.ctor: runId=${this.runId} agentEventListener=registered`);
+    }
+    /**
+     * Spread into replyOptions so the SDK delivers thinking/tool events here.
+     * Also set `replyOptions.runId = session.runId` so agent events carry the
+     * matching runId.
+     */
+    get replyCallbacks() {
+        return {
+            onReasoningStream: (payload) => this.handleReasoningStream(payload),
+            onReasoningEnd: () => { },
+        };
+    }
+    /**
+     * Store a text payload from deliver(). Each call appends one TextItem to the
+     * final item_list in call order. Skips empty strings.
+     */
+    addTextPayload(text) {
+        if (!text.trim())
+            return;
+        this.textPayloads.push(text);
+        logger.debug(`BatchSession.addTextPayload: len=${text.length} total=${this.textPayloads.length}`);
+    }
+    // ---- private callbacks --------------------------------------------------
+    handleReasoningStream(payload) {
+        if (this.done)
+            return;
+        const text = typeof payload.text === "string" ? payload.text : "";
+        if (text) {
+            this.thinkingText = text;
+        }
+    }
+    handleRawAgentEvent(evt) {
+        if (this.done)
+            return;
+        if (evt.runId !== this.runId)
+            return;
+        if (evt.stream !== "tool")
+            return;
+        const data = evt.data;
+        if (typeof data.toolCallId !== "string" || !data.toolCallId)
+            return;
+        if (data.phase === "start") {
+            this.toolStarts.push({
+                tool_call_id: data.toolCallId,
+                tool_name: typeof data.name === "string" && data.name ? data.name : "tool",
+                args_json: tryStringifyArgs(data.args),
+            });
+            logger.debug(`BatchSession: tool_call_start tool=${data.name ?? "?"} id=${data.toolCallId}` +
+                ` totalStarts=${this.toolStarts.length}`);
+            return;
+        }
+        if (data.phase === "result") {
+            this.toolResults.push({
+                tool_call_id: data.toolCallId,
+                summary: formatToolOutput(data.result),
+            });
+            logger.debug(`BatchSession: tool_call_result id=${data.toolCallId}` +
+                ` totalResults=${this.toolResults.length}`);
+        }
+    }
+    // ---- item_list assembly -------------------------------------------------
+    /**
+     * Build the item_list applying the 200 KB budget.
+     *
+     * Order: [ThinkingItem?, ToolCallStart+Result pairs..., TextItem(s)...]
+     *
+     * If full list > maxBytes:
+     *   - drop ThinkingItem and retry
+     *   - if still > maxBytes, drop all tool items too
+     *   - TextItem(s) are always kept
+     */
+    buildItemList(maxBytes = BATCH_SIZE_LIMIT_BYTES) {
+        const textItems = this.textPayloads.map((t) => ({
+            type: MessageItemType.TEXT,
+            text_item: { text: t },
+        }));
+        const toolItems = [];
+        for (const start of this.toolStarts) {
+            toolItems.push({
+                type: MessageItemType.TOOL_CALL_START,
+                tool_call_start_item: {
+                    tool_name: start.tool_name,
+                    tool_call_id: start.tool_call_id,
+                    args_json: start.args_json,
+                },
+            });
+            const result = this.toolResults.find((r) => r.tool_call_id === start.tool_call_id);
+            if (result) {
+                toolItems.push({
+                    type: MessageItemType.TOOL_CALL_RESULT,
+                    tool_call_result_item: {
+                        tool_call_id: result.tool_call_id,
+                        summary: result.summary,
+                    },
+                });
+            }
+        }
+        const thinkingItem = this.thinkingText
+            ? { type: MessageItemType.THINKING, thinking_item: { text: this.thinkingText } }
+            : null;
+        // Attempt 1: full list
+        const full = [
+            ...(thinkingItem ? [thinkingItem] : []),
+            ...toolItems,
+            ...textItems,
+        ];
+        if (full.length === 0)
+            return [];
+        const fullSize = estimateSizeBytes(full);
+        logger.debug(`BatchSession.buildItemList: items=${full.length} size=${fullSize}B` +
+            ` thinking=${thinkingItem !== null} tools=${this.toolStarts.length}` +
+            ` texts=${this.textPayloads.length}`);
+        if (fullSize <= maxBytes)
+            return full;
+        // Attempt 2: drop thinking
+        logger.warn(`BatchSession.buildItemList: size=${fullSize}B > limit=${maxBytes}B,` +
+            ` dropping ThinkingItem (len=${this.thinkingText?.length ?? 0} chars).` +
+            ` Full thinking content is in the log: ${logger.getLogFilePath()}`);
+        const withoutThinking = [...toolItems, ...textItems];
+        if (withoutThinking.length === 0)
+            return [];
+        const noThinkingSize = estimateSizeBytes(withoutThinking);
+        if (noThinkingSize <= maxBytes)
+            return withoutThinking;
+        // Attempt 3: drop tool items too
+        logger.warn(`BatchSession.buildItemList: size=${noThinkingSize}B still > limit=${maxBytes}B,` +
+            ` dropping ${this.toolStarts.length} tool call(s) (${toolItems.length} items).` +
+            ` Full tool content is in the log: ${logger.getLogFilePath()}`);
+        return textItems.length > 0 ? textItems : [];
+    }
+    // ---- lifecycle ----------------------------------------------------------
+    /**
+     * Assemble item_list, call onSendBatch once, then clean up. Idempotent.
+     */
+    async finalize() {
+        if (this.done)
+            return;
+        this.done = true;
+        this.cleanup();
+        const items = this.buildItemList();
+        if (items.length === 0) {
+            logger.debug("BatchSession.finalize: item_list empty, skipping send");
+            return;
+        }
+        logger.debug(`BatchSession.finalize: sending ${items.length} item(s)` +
+            ` thinking=${this.thinkingText !== null}` +
+            ` toolStarts=${this.toolStarts.length}` +
+            ` texts=${this.textPayloads.length}`);
+        await this.onSendBatch(items);
+    }
+    /**
+     * Discard all buffered data, release event listener. Does not send. Idempotent.
+     */
+    async abort() {
+        if (this.done)
+            return;
+        this.done = true;
+        this.cleanup();
+        logger.debug("BatchSession.abort: discarded without send");
+    }
+    cleanup() {
+        try {
+            this.unsubscribeAgentEvent();
+        }
+        catch (err) {
+            logger.warn(`BatchSession.cleanup: unsubscribe failed err=${String(err)}`);
+        }
+    }
+}
+//# sourceMappingURL=batch-session.js.map

package/dist/src/streaming/batch-session.js.map

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

package/dist/src/streaming/stream-piece.js

@@ -0,0 +1,54 @@
+/**
+ * Stream piece JSON schema — what gets base64-encoded into PieceItem.piece_data
+ * and pushed onto the ilink uplink stream.
+ *
+ * The protocol distinguishes 7 `kind`s:
+ *
+ *   Lifecycle (streaming, accumulative — multiple pieces per node):
+ *     - "result"            agent's final reply text stream
+ *     - "thinking"          agent's reasoning block stream
+ *
+ *   Discrete (single-frame — exactly 1 piece per occurrence):
+ *     - "tool_call_start"   tool invocation start snapshot
+ *     - "tool_call_result"  tool invocation result snapshot
+ *
+ *   Piece-only (no companion sendMessage / KV write):
+ *     - "tool_progress"     command stdout slices / patch file list
+ *     - "compaction_start"  context compaction begin signal
+ *     - "compaction_end"    context compaction end signal
+ *
+ * Each piece carries `client_id` (the renderer node id; equals the companion
+ * sendMessage's client_id when one exists), `root_id` (= the stream_start
+ * signal's client_id, shared across the whole stream), and an optional
+ * `parent_id` (subagent only, unused this iteration).
+ *
+ * Field naming follows pb conventions (snake_case) so the same wire format is
+ * readable on every consumer language.
+ */
+/**
+ * Parse the SDK's `itemId` (as seen on `onItemEvent`) and extract the
+ * `tool_call_id` + `item_kind` so the channel can build a `tool_progress` piece.
+ *
+ * The SDK encodes the source kind as a prefix:
+ *   - "command:<callId>" → command output progress
+ *   - "patch:<callId>"   → apply_patch file list summary
+ *
+ * Other prefixes (e.g. "tool:..." / "search:..." / "analysis:...") and
+ * unprefixed values return null — the caller MUST then no-op (skip the piece)
+ * to honor the "only command + patch" filter described in the plan.
+ */
+export function parseToolCallIdFromItemId(itemId) {
+    if (typeof itemId !== "string" || itemId.length === 0)
+        return null;
+    const m = /^(command|patch):(.+)$/.exec(itemId);
+    if (!m)
+        return null;
+    return { item_kind: m[1], tool_call_id: m[2] };
+}
+/**
+ * Encode a `StreamPiece` to the base64 string consumed by `PieceItem.piece_data`.
+ */
+export function encodeStreamPiece(piece) {
+    return Buffer.from(JSON.stringify(piece), "utf-8").toString("base64");
+}
+//# sourceMappingURL=stream-piece.js.map

package/dist/src/streaming/stream-piece.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-piece.js","sourceRoot":"","sources":["../../../src/streaming/stream-piece.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AA2HH;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAc;IACtD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnE,MAAM,CAAC,GAAG,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAwB,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAkB;IAClD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACxE,CAAC"}

package/openclaw.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "openclaw-weixin",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "channels": [
     "openclaw-weixin"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-weixin/openclaw-weixin",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "OpenClaw Weixin channel",
   "license": "MIT",
   "author": "Tencent",

package/src/api/api.ts

@@ -38,14 +38,49 @@ interface PackageJson {
   ilink_appid?: string;
 }
 
-function readPackageJson(): PackageJson {
+/**
+ * Identify whether a parsed package.json belongs to this plugin.
+ *
+ * The walk-up search may pass through unrelated `package.json` files
+ * (e.g. nested `node_modules/<dep>/package.json`); only ours is accepted.
+ */
+function isOwnPackageJson(parsed: PackageJson): boolean {
+  if (parsed.ilink_appid !== undefined) return true;
+  return typeof parsed.name === "string" && parsed.name.includes("openclaw-weixin");
+}
+
+/**
+ * Walk up from `startDir` searching for the plugin's own `package.json`.
+ *
+ * Resilient to differing layouts between dev (TS source under `src/`) and
+ * publish (compiled output under `dist/src/`) by not assuming a fixed depth.
+ */
+export function readPackageJsonFromDir(startDir: string): PackageJson {
   try {
-    const dir = path.dirname(fileURLToPath(import.meta.url));
-    const pkgPath = path.resolve(dir, "..", "..", "package.json");
-    return JSON.parse(fs.readFileSync(pkgPath, "utf-8")) as PackageJson;
+    let dir = startDir;
+    const { root } = path.parse(dir);
+    while (dir && dir !== root) {
+      const candidate = path.join(dir, "package.json");
+      if (fs.existsSync(candidate)) {
+        try {
+          const parsed = JSON.parse(fs.readFileSync(candidate, "utf-8")) as PackageJson;
+          if (isOwnPackageJson(parsed)) {
+            return parsed;
+          }
+        } catch {
+          // Malformed package.json — keep walking up.
+        }
+      }
+      dir = path.dirname(dir);
+    }
   } catch {
-    return {};
+    // Fall through to empty default.
   }
+  return {};
+}
+
+function readPackageJson(): PackageJson {
+  return readPackageJsonFromDir(path.dirname(fileURLToPath(import.meta.url)));
 }
 
 const pkg = readPackageJson();
@@ -260,11 +295,42 @@ export async function apiGetFetch(params: {
   }
 }
 
+/**
+ * Combine an internal timeout controller with an optional external abort signal.
+ * This lets gateway channel-stop aborts cancel in-flight long-poll requests
+ * immediately while preserving the existing timeout-driven AbortError path.
+ */
+function combineAbortSignals(params: {
+  internal?: AbortController;
+  external?: AbortSignal;
+}): { signal?: AbortSignal; cleanup: () => void } {
+  const { internal, external } = params;
+  if (!external) {
+    return { signal: internal?.signal, cleanup: () => {} };
+  }
+  if (!internal) {
+    return { signal: external, cleanup: () => {} };
+  }
+  if (external.aborted) {
+    internal.abort();
+    return { signal: internal.signal, cleanup: () => {} };
+  }
+  const onExternalAbort = () => internal.abort();
+  external.addEventListener("abort", onExternalAbort, { once: true });
+  return {
+    signal: internal.signal,
+    cleanup: () => external.removeEventListener("abort", onExternalAbort),
+  };
+}
+
 /**
  * Common fetch wrapper: POST JSON to a Weixin API endpoint.
  * When `timeoutMs` is provided, the request is aborted after that many milliseconds.
  * When omitted, no client-side timeout is applied (relies on OS/TCP stack).
  * Returns the raw response text on success; throws on HTTP error or timeout.
+ *
+ * When `abortSignal` is provided, an external abort (e.g. gateway channel stop)
+ * cancels the in-flight request immediately instead of waiting for `timeoutMs`.
  */
 export async function apiPostFetch(params: {
   baseUrl: string;
@@ -273,6 +339,7 @@ export async function apiPostFetch(params: {
   token?: string;
   timeoutMs?: number;
   label: string;
+  abortSignal?: AbortSignal;
 }): Promise<string> {
   const base = ensureTrailingSlash(params.baseUrl);
   const url = new URL(params.endpoint, base);
@@ -285,12 +352,16 @@ export async function apiPostFetch(params: {
     controller != null && params.timeoutMs !== undefined
       ? setTimeout(() => controller.abort(), params.timeoutMs)
       : undefined;
+  const { signal, cleanup } = combineAbortSignals({
+    internal: controller,
+    external: params.abortSignal,
+  });
   try {
     const res = await fetch(url.toString(), {
       method: "POST",
       headers: hdrs,
       body: params.body,
-      ...(controller ? { signal: controller.signal } : {}),
+      ...(signal ? { signal } : {}),
     });
     if (t !== undefined) clearTimeout(t);
     const rawText = await res.text();
@@ -302,6 +373,8 @@ export async function apiPostFetch(params: {
   } catch (err) {
     if (t !== undefined) clearTimeout(t);
     throw err;
+  } finally {
+    cleanup();
   }
 }
 
@@ -316,6 +389,11 @@ export async function getUpdates(
     baseUrl: string;
     token?: string;
     timeoutMs?: number;
+    /**
+     * Optional external abort signal from the gateway. When stopping the channel,
+     * this aborts the in-flight long-poll immediately so hot reload can restart.
+     */
+    abortSignal?: AbortSignal;
   },
 ): Promise<GetUpdatesResp> {
   const timeout = params.timeoutMs ?? DEFAULT_LONG_POLL_TIMEOUT_MS;
@@ -330,13 +408,19 @@ export async function getUpdates(
       token: params.token,
       timeoutMs: timeout,
       label: "getUpdates",
+      abortSignal: params.abortSignal,
     });
     const resp: GetUpdatesResp = JSON.parse(rawText);
     return resp;
   } catch (err) {
-    // Long-poll timeout is normal; return empty response so caller can retry
+    // Long-poll timeout or external abort are both normal control-flow exits.
+    // The monitor loop checks abortSignal after return and exits when needed.
     if (err instanceof Error && err.name === "AbortError") {
-      logger.debug(`getUpdates: client-side timeout after ${timeout}ms, returning empty response`);
+      if (params.abortSignal?.aborted) {
+        logger.debug(`getUpdates: aborted by external signal`);
+      } else {
+        logger.debug(`getUpdates: client-side timeout after ${timeout}ms, returning empty response`);
+      }
       return { ret: 0, msgs: [], get_updates_buf: params.get_updates_buf };
     }
     throw err;

package/src/api/types.ts

@@ -74,6 +74,8 @@ export const MessageItemType = {
   VOICE: 3,
   FILE: 4,
   VIDEO: 5,
+  TOOL_CALL_START: 11,
+  TOOL_CALL_RESULT: 12,
 } as const;
 
 export const MessageState = {
@@ -147,6 +149,17 @@ export interface RefMessage {
   title?: string; // 摘要
 }
 
+export interface ToolCallStartItem {
+  tool_name?: string;
+  tool_call_id?: string;
+}
+
+export interface ToolCallResultItem {
+  tool_name?: string;
+  tool_call_id?: string;
+  status?: string;
+}
+
 export interface MessageItem {
   type?: number;
   create_time_ms?: number;
@@ -159,6 +172,8 @@ export interface MessageItem {
   voice_item?: VoiceItem;
   file_item?: FileItem;
   video_item?: VideoItem;
+  tool_call_start_item?: ToolCallStartItem;
+  tool_call_result_item?: ToolCallResultItem;
 }
 
 /** Unified message (proto: WeixinMessage). Replaces the old split Message + MessageContent + FullMessage. */
@@ -177,6 +192,7 @@ export interface WeixinMessage {
   message_state?: number;
   item_list?: MessageItem[];
   context_token?: string;
+  run_id?: string;
 }
 
 /** GetUpdates request: bytes fields are base64 strings in JSON. */

package/src/auth/login-qr.ts

@@ -159,6 +159,13 @@ export type WeixinQrStartResult = {
 
 export type WeixinQrWaitResult = {
   connected: boolean;
+  /**
+   * Server reported `binded_redirect`: the scanned bot is already bound to
+   * this OpenClaw instance, so no new credentials are issued and existing
+   * local credentials remain valid. Callers should treat this as a successful
+   * outcome (semantically "already done") rather than a login failure.
+   */
+  alreadyConnected?: boolean;
   botToken?: string;
   accountId?: string;
   baseUrl?: string;
@@ -385,6 +392,7 @@ export async function waitForWeixinLogin(opts: {
           activeLogins.delete(opts.sessionKey);
           return {
             connected: false,
+            alreadyConnected: true,
             message: "已连接过此 OpenClaw，无需重复连接。",
           };
         }

package/src/channel.ts

@@ -167,7 +167,13 @@ export const weixinPlugin: ChannelPlugin<ResolvedWeixinAccount> = {
     schema: {
       type: "object",
       additionalProperties: false,
-      properties: {},
+      properties: {
+        replyProgressMessages: {
+          type: "boolean",
+          default: true,
+          description: "Send structured tool-call progress messages.",
+        },
+      },
     },
   },
   capabilities: {
@@ -373,6 +379,15 @@ export const weixinPlugin: ChannelPlugin<ResolvedWeixinAccount> = {
           );
           log(`⚠️  保存账号数据失败: ${String(err)}`);
         }
+      } else if (waitResult.alreadyConnected) {
+        // Server confirmed this OpenClaw is already bound to the scanned bot;
+        // local credentials are intact, nothing to persist. Exit successfully
+        // so that automated installers don't treat re-runs as login failures.
+        // The QR poller already wrote the user-facing message to stdout, so
+        // we deliberately do NOT echo it again via `log(...)`.
+        logger.info(
+          `auth.login: bot already connected to this OpenClaw accountId=${account.accountId}`,
+        );
       } else {
         logger.warn(
           `auth.login: login did not complete accountId=${account.accountId} message=${waitResult.message}`,

package/src/config/config-schema.ts

@@ -17,6 +17,7 @@ const weixinAccountSchema = z.object({
 /** Top-level weixin config schema (token is stored in credentials file, not config). */
 export const WeixinConfigSchema = weixinAccountSchema.extend({
   accounts: z.record(z.string(), weixinAccountSchema).optional(),
+  replyProgressMessages: z.boolean().default(true),
   /** ISO 8601; bumped on each successful login to refresh gateway config from disk. */
   channelConfigUpdatedAt: z.string().optional(),
 });

package/src/config/reply-progress.ts

@@ -0,0 +1,10 @@
+import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
+
+type WeixinChannelConfig = {
+  replyProgressMessages?: boolean;
+};
+
+export function resolveReplyProgressMessagesEnabled(cfg: OpenClawConfig): boolean {
+  const section = cfg.channels?.["openclaw-weixin"] as WeixinChannelConfig | undefined;
+  return section?.replyProgressMessages !== false;
+}

package/src/messaging/error-notice.ts

@@ -12,6 +12,7 @@ export async function sendWeixinErrorNotice(params: {
   message: string;
   baseUrl: string;
   token?: string;
+  runId?: string;
   errLog: (m: string) => void;
 }): Promise<void> {
   if (!params.contextToken) {
@@ -22,6 +23,7 @@ export async function sendWeixinErrorNotice(params: {
       baseUrl: params.baseUrl,
       token: params.token,
       contextToken: params.contextToken,
+      ...(params.runId ? { runId: params.runId } : {}),
     }});
     logger.debug(`sendWeixinErrorNotice: sent to=${params.to}`);
   } catch (err) {