@tencent-weixin/openclaw-weixin 2.4.3 → 2.4.5

package/src/messaging/reply-progress-sender.ts

@@ -0,0 +1,122 @@
+import type { WeixinApiOptions } from "../api/api.js";
+import type { MessageItem } from "../api/types.js";
+import { MessageItemType } from "../api/types.js";
+import { logger } from "../util/logger.js";
+
+import { sendMessageItemWeixin } from "./send.js";
+
+export type WeixinReplyProgressSenderDeps = {
+  runId: string;
+  to: string;
+  accountId: string;
+  opts: WeixinApiOptions & {
+    contextToken?: string;
+    runId?: string;
+  };
+};
+
+type ToolItemEventPayload = {
+  itemId?: string;
+  kind?: string;
+  title?: string;
+  name?: string;
+  phase?: string;
+  status?: string;
+};
+
+function normalizeToolStatus(status?: string): string {
+  if (status === "completed") return "completed";
+  if (status === "failed") return "failed";
+  if (status === "blocked") return "blocked";
+  return "unknown";
+}
+
+export class WeixinReplyProgressSender {
+  readonly runId: string;
+
+  private readonly to: string;
+  private readonly accountId: string;
+  private readonly opts: WeixinReplyProgressSenderDeps["opts"];
+  private finalized = false;
+  private sendChain: Promise<void> = Promise.resolve();
+
+  constructor(deps: WeixinReplyProgressSenderDeps) {
+    this.runId = deps.runId;
+    this.to = deps.to;
+    this.accountId = deps.accountId;
+    this.opts = { ...deps.opts, runId: deps.runId };
+  }
+
+  get replyOptions() {
+    return {
+      runId: this.runId,
+      onItemEvent: (payload: ToolItemEventPayload) => this.handleToolItemEvent(payload),
+    };
+  }
+
+  private enqueueMessage(item: MessageItem, label: string): void {
+    if (this.finalized) return;
+    this.sendChain = this.sendChain
+      .then(async () => {
+        await sendMessageItemWeixin({
+          to: this.to,
+          item,
+          opts: this.opts,
+          label,
+        });
+      })
+      .catch((err) => {
+        logger.warn(`${label}: failed to=${this.to} accountId=${this.accountId} runId=${this.runId} err=${String(err)}`);
+      });
+  }
+
+  private handleToolItemEvent(payload: ToolItemEventPayload): void {
+    if (this.finalized) return;
+    if (payload.kind !== "tool") return;
+    if (payload.phase !== "start" && payload.phase !== "end") return;
+
+    const now = Date.now();
+    const toolName = payload.name?.trim() || payload.title?.trim() || "tool";
+    const toolCallId = payload.itemId?.trim() || undefined;
+
+    if (payload.phase === "start") {
+      this.enqueueMessage(
+        {
+          type: MessageItemType.TOOL_CALL_START,
+          create_time_ms: now,
+          is_completed: false,
+          tool_call_start_item: {
+            tool_name: toolName,
+            tool_call_id: toolCallId,
+          },
+        },
+        "sendToolCallStartMessage",
+      );
+      return;
+    }
+
+    this.enqueueMessage(
+      {
+        type: MessageItemType.TOOL_CALL_RESULT,
+        create_time_ms: now,
+        is_completed: true,
+        tool_call_result_item: {
+          tool_name: toolName,
+          tool_call_id: toolCallId,
+          status: normalizeToolStatus(payload.status),
+        },
+      },
+      "sendToolCallResultMessage",
+    );
+  }
+
+  async finalize(): Promise<void> {
+    if (this.finalized) return;
+    this.finalized = true;
+    try {
+      await this.sendChain;
+    } catch (err) {
+      logger.warn(`WeixinReplyProgressSender.finalize: send drain failed runId=${this.runId} err=${String(err)}`);
+    }
+  }
+}

package/src/messaging/send-media.ts

@@ -18,7 +18,7 @@ export async function sendWeixinMediaFile(params: {
   filePath: string;
   to: string;
   text: string;
-  opts: WeixinApiOptions & { contextToken?: string };
+  opts: WeixinApiOptions & { contextToken?: string; runId?: string };
   cdnBaseUrl: string;
 }): Promise<{ messageId: string }> {
   const { filePath, to, text, opts, cdnBaseUrl } = params;

package/src/messaging/send.ts

@@ -10,6 +10,11 @@ import type { UploadedFileInfo } from "../cdn/upload.js";
 
 export { StreamingMarkdownFilter } from "./markdown-filter.js";
 
+type WeixinMessageSendOptions = WeixinApiOptions & {
+  contextToken?: string;
+  runId?: string;
+};
+
 function generateClientId(): string {
   return generateId("openclaw-weixin");
 }
@@ -19,9 +24,10 @@ function buildTextMessageReq(params: {
   to: string;
   text: string;
   contextToken?: string;
+  runId?: string;
   clientId: string;
 }): SendMessageReq {
-  const { to, text, contextToken, clientId } = params;
+  const { to, text, contextToken, runId, clientId } = params;
   const item_list: MessageItem[] = text
     ? [{ type: MessageItemType.TEXT, text_item: { text } }]
     : [];
@@ -34,6 +40,7 @@ function buildTextMessageReq(params: {
       message_state: MessageState.FINISH,
       item_list: item_list.length ? item_list : undefined,
       context_token: contextToken ?? undefined,
+      run_id: runId ?? undefined,
     },
   };
 }
@@ -42,14 +49,16 @@ function buildTextMessageReq(params: {
 function buildSendMessageReq(params: {
   to: string;
   contextToken?: string;
+  runId?: string;
   payload: ReplyPayload;
   clientId: string;
 }): SendMessageReq {
-  const { to, contextToken, payload, clientId } = params;
+  const { to, contextToken, runId, payload, clientId } = params;
   return buildTextMessageReq({
     to,
     text: payload.text ?? "",
     contextToken,
+    runId,
     clientId,
   });
 }
@@ -60,7 +69,7 @@ function buildSendMessageReq(params: {
 export async function sendMessageWeixin(params: {
   to: string;
   text: string;
-  opts: WeixinApiOptions & { contextToken?: string };
+  opts: WeixinMessageSendOptions;
 }): Promise<{ messageId: string }> {
   const { to, text, opts } = params;
   if (!opts.contextToken) {
@@ -70,6 +79,7 @@ export async function sendMessageWeixin(params: {
   const req = buildSendMessageReq({
     to,
     contextToken: opts.contextToken,
+    runId: opts.runId,
     payload: { text },
     clientId,
   });
@@ -87,6 +97,47 @@ export async function sendMessageWeixin(params: {
   return { messageId: clientId };
 }
 
+/** Send a single structured MessageItem downstream. */
+export async function sendMessageItemWeixin(params: {
+  to: string;
+  item: MessageItem;
+  opts: WeixinMessageSendOptions;
+  clientId?: string;
+  label?: string;
+}): Promise<{ messageId: string }> {
+  const { to, item, opts } = params;
+  if (!opts.contextToken) {
+    logger.warn(`sendMessageItemWeixin: contextToken missing for to=${to}, sending without context`);
+  }
+  const clientId = params.clientId ?? generateClientId();
+  const req: SendMessageReq = {
+    msg: {
+      from_user_id: "",
+      to_user_id: to,
+      client_id: clientId,
+      message_type: MessageType.BOT,
+      message_state: MessageState.FINISH,
+      item_list: [item],
+      context_token: opts.contextToken ?? undefined,
+      run_id: opts.runId,
+    },
+  };
+  try {
+    await sendMessageApi({
+      baseUrl: opts.baseUrl,
+      token: opts.token,
+      timeoutMs: opts.timeoutMs,
+      body: req,
+    });
+  } catch (err) {
+    logger.error(
+      `${params.label ?? "sendMessageItemWeixin"}: failed to=${to} clientId=${clientId} err=${String(err)}`,
+    );
+    throw err;
+  }
+  return { messageId: clientId };
+}
+
 /**
  * Send one or more MessageItems (optionally preceded by a text caption) downstream.
  * Each item is sent as its own request so that item_list always has exactly one entry.
@@ -95,10 +146,11 @@ async function sendMediaItems(params: {
   to: string;
   text: string;
   mediaItem: MessageItem;
-  opts: WeixinApiOptions & { contextToken?: string };
+  opts: WeixinMessageSendOptions;
   label: string;
 }): Promise<{ messageId: string }> {
   const { to, text, mediaItem, opts, label } = params;
+  const runId = opts.runId;
 
   const items: MessageItem[] = [];
   if (text) {
@@ -118,6 +170,7 @@ async function sendMediaItems(params: {
         message_state: MessageState.FINISH,
         item_list: [item],
         context_token: opts.contextToken ?? undefined,
+        run_id: runId,
       },
     };
     try {
@@ -152,7 +205,7 @@ export async function sendImageMessageWeixin(params: {
   to: string;
   text: string;
   uploaded: UploadedFileInfo;
-  opts: WeixinApiOptions & { contextToken?: string };
+  opts: WeixinMessageSendOptions;
 }): Promise<{ messageId: string }> {
   const { to, text, uploaded, opts } = params;
   if (!opts.contextToken) {
@@ -186,7 +239,7 @@ export async function sendVideoMessageWeixin(params: {
   to: string;
   text: string;
   uploaded: UploadedFileInfo;
-  opts: WeixinApiOptions & { contextToken?: string };
+  opts: WeixinMessageSendOptions;
 }): Promise<{ messageId: string }> {
   const { to, text, uploaded, opts } = params;
   if (!opts.contextToken) {
@@ -218,7 +271,7 @@ export async function sendFileMessageWeixin(params: {
   text: string;
   fileName: string;
   uploaded: UploadedFileInfo;
-  opts: WeixinApiOptions & { contextToken?: string };
+  opts: WeixinMessageSendOptions;
 }): Promise<{ messageId: string }> {
   const { to, text, fileName, uploaded, opts } = params;
   if (!opts.contextToken) {

package/src/monitor/monitor.ts

@@ -1,9 +1,9 @@
 import type { ChannelAccountSnapshot } from "openclaw/plugin-sdk/channel-contract";
 import type { PluginRuntime } from "openclaw/plugin-sdk/core";
 
-import { getUpdates } from "../api/api.js";
+import { getUpdates, classifyFetchError } from "../api/api.js";
 import { WeixinConfigManager } from "../api/config-cache.js";
-import { SESSION_EXPIRED_ERRCODE, pauseSession, getRemainingPauseMs } from "../api/session-guard.js";
+import { STALE_TOKEN_ERRCODE, pauseSession, getRemainingPauseMs } from "../api/session-guard.js";
 import { processOneMessage } from "../messaging/process-message.js";
 import { getSyncBufFilePath, loadGetUpdatesBuf, saveGetUpdatesBuf } from "../storage/sync-buf.js";
 import { logger } from "../util/logger.js";
@@ -96,6 +96,9 @@ export async function monitorWeixinProvider(opts: MonitorWeixinOpts): Promise<vo
         token,
         get_updates_buf: getUpdatesBuf,
         timeoutMs: nextTimeoutMs,
+        // Stop/hot-reload should cancel the in-flight long-poll immediately
+        // instead of waiting for the server-side long-poll timeout.
+        abortSignal,
       });
       aLog.debug(
         `getUpdates response: ret=${resp.ret}, msgs=${resp.msgs?.length ?? 0}, get_updates_buf_length=${resp.get_updates_buf?.length ?? 0}`,
@@ -109,17 +112,14 @@ export async function monitorWeixinProvider(opts: MonitorWeixinOpts): Promise<vo
         (resp.ret !== undefined && resp.ret !== 0) ||
         (resp.errcode !== undefined && resp.errcode !== 0);
       if (isApiError) {
-        const isSessionExpired =
-          resp.errcode === SESSION_EXPIRED_ERRCODE || resp.ret === SESSION_EXPIRED_ERRCODE;
+        const isStaleToken =
+          resp.errcode === STALE_TOKEN_ERRCODE || resp.ret === STALE_TOKEN_ERRCODE;
 
-        if (isSessionExpired) {
+        if (isStaleToken) {
           pauseSession(accountId);
           const pauseMs = getRemainingPauseMs(accountId);
-          errLog(
-            `weixin getUpdates: session expired (errcode ${SESSION_EXPIRED_ERRCODE}), pausing bot for ${Math.ceil(pauseMs / 60_000)} min`,
-          );
           aLog.error(
-            `getUpdates: session expired (errcode=${resp.errcode} ret=${resp.ret}), pausing all requests for ${Math.ceil(pauseMs / 60_000)} min`,
+            `getUpdates: token for ${accountId} is stale, pausing all requests for ${Math.ceil(pauseMs / 60_000)} min`,
           );
           consecutiveFailures = 0;
           await sleep(pauseMs, abortSignal);
@@ -187,10 +187,11 @@ export async function monitorWeixinProvider(opts: MonitorWeixinOpts): Promise<vo
         return;
       }
       consecutiveFailures += 1;
+      const classified = classifyFetchError(err);
       errLog(
-        `weixin getUpdates error (${consecutiveFailures}/${MAX_CONSECUTIVE_FAILURES}): ${String(err)}`,
+        `weixin getUpdates error (${consecutiveFailures}/${MAX_CONSECUTIVE_FAILURES}): ${String(err)} type=${classified.type} description=${classified.description}${classified.code ? ` code=${classified.code}` : ""}`,
       );
-      aLog.error(`getUpdates error: ${String(err)}, stack=${(err as Error).stack}`);
+      aLog.error(`getUpdates error: ${String(err)}, type=${classified.type} code=${classified.code ?? "none"}, stack=${(err as Error).stack}`);
       if (consecutiveFailures >= MAX_CONSECUTIVE_FAILURES) {
         errLog(
           `weixin getUpdates: ${MAX_CONSECUTIVE_FAILURES} consecutive failures, backing off 30s`,

package/dist/src/media/voice-outbound.js

@@ -1,177 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { logger } from "../util/logger.js";
-const OGG_CAPTURE = Buffer.from("OggS");
-const OPUS_HEAD_MAGIC = Buffer.from("OpusHead");
-const GP_UNKNOWN = 0xffffffffffffffffn;
-/** Weixin `VoiceItem.encode_type`: 6=silk (README: inbound SILK). */
-export const VOICE_ENCODE_SILK = 6;
-/** Ogg container (used for Opus-in-Ogg outbound). */
-export const VOICE_ENCODE_OGG_SPEEX = 8;
-/**
- * Extensions always treated as outbound voice (upload + VOICE item).
- * `.ogg` is handled separately: only when the file is Ogg Opus (see {@link isWeixinVoiceOutboundPath}).
- */
-const VOICE_EXTENSIONS = new Set([".opus", ".silk", ".slk"]);
-function readUint32LE(buf, o) {
-    return buf.readUInt32LE(o);
-}
-/**
- * Parse one Ogg page starting at `start`. Returns next byte offset after this page, or null if invalid.
- */
-function skipOggPage(buf, start) {
-    if (start + 27 > buf.length)
-        return null;
-    if (!buf.subarray(start, start + 4).equals(OGG_CAPTURE))
-        return null;
-    const nsegs = buf[start + 26];
-    if (start + 27 + nsegs > buf.length)
-        return null;
-    let bodySize = 0;
-    for (let i = 0; i < nsegs; i++) {
-        bodySize += buf[start + 27 + i];
-    }
-    const end = start + 27 + nsegs + bodySize;
-    if (end > buf.length)
-        return null;
-    return end;
-}
-/**
- * First Ogg page whose first packet payload starts with OpusHead defines the Opus logical stream serial.
- */
-function findOpusStreamSerial(buf) {
-    let off = 0;
-    while (off < buf.length) {
-        const idx = buf.indexOf(OGG_CAPTURE, off);
-        if (idx < 0)
-            return null;
-        const end = skipOggPage(buf, idx);
-        if (end === null) {
-            off = idx + 1;
-            continue;
-        }
-        const nsegs = buf[idx + 26];
-        const bodyStart = idx + 27 + nsegs;
-        const firstSegLen = nsegs > 0 ? buf[idx + 27] : 0;
-        if (firstSegLen >= OPUS_HEAD_MAGIC.length &&
-            bodyStart + firstSegLen <= buf.length) {
-            const payload = buf.subarray(bodyStart, bodyStart + firstSegLen);
-            if (payload.subarray(0, OPUS_HEAD_MAGIC.length).equals(OPUS_HEAD_MAGIC)) {
-                return readUint32LE(buf, idx + 14);
-            }
-        }
-        off = end;
-    }
-    return null;
-}
-function maxGranuleForSerial(buf, targetSerial) {
-    let off = 0;
-    let maxGp = 0n;
-    while (off < buf.length) {
-        const idx = buf.indexOf(OGG_CAPTURE, off);
-        if (idx < 0)
-            break;
-        const end = skipOggPage(buf, idx);
-        if (end === null) {
-            off = idx + 1;
-            continue;
-        }
-        const serial = readUint32LE(buf, idx + 14);
-        if (serial === targetSerial) {
-            const gp = buf.readBigUInt64LE(idx + 6);
-            if (gp !== GP_UNKNOWN && gp > maxGp)
-                maxGp = gp;
-        }
-        off = end;
-    }
-    return maxGp;
-}
-/**
- * Opus granule position counts 48 kHz PCM samples (RFC 7845). Duration in ms = gp * 1000 / 48000.
- */
-export function playtimeMsFromOpusGranule(maxGp) {
-    if (maxGp <= 0n)
-        return 0;
-    const ms = (maxGp * 1000n) / 48000n;
-    return Number(ms);
-}
-export function parseOggOpusPlaytimeMs(buf) {
-    const serial = findOpusStreamSerial(buf);
-    if (serial === null)
-        return null;
-    const maxGp = maxGranuleForSerial(buf, serial);
-    if (maxGp <= 0n)
-        return null;
-    const ms = playtimeMsFromOpusGranule(maxGp);
-    return ms > 0 ? ms : null;
-}
-export function bufferLooksLikeOggOpus(buf) {
-    return findOpusStreamSerial(buf) !== null;
-}
-async function silkPlaytimeMsWithOptionalWasm(buf) {
-    try {
-        const { decode } = await import("silk-wasm");
-        const result = await decode(buf, 24_000);
-        const d = result.duration;
-        if (typeof d !== "number" || !Number.isFinite(d) || d <= 0)
-            return null;
-        return Math.round(d);
-    }
-    catch (err) {
-        logger.debug(`voice-outbound: silk-wasm decode unavailable or failed err=${String(err)}`);
-        return null;
-    }
-}
-export async function isWeixinVoiceOutboundPath(filePath) {
-    const ext = path.extname(filePath).toLowerCase();
-    if (VOICE_EXTENSIONS.has(ext))
-        return true;
-    if (ext !== ".ogg")
-        return false;
-    const head = Buffer.allocUnsafe(65536);
-    const fh = await fs.open(filePath, "r");
-    try {
-        const { bytesRead } = await fh.read(head, 0, head.length, 0);
-        if (bytesRead <= 0)
-            return false;
-        return bufferLooksLikeOggOpus(head.subarray(0, bytesRead));
-    }
-    finally {
-        await fh.close();
-    }
-}
-/**
- * Compute voice playtime (ms) and encoding hints for Weixin VOICE item.
- * Returns null if duration cannot be determined (caller should send as file).
- */
-export async function resolveWeixinOutboundVoiceMeta(filePath) {
-    const ext = path.extname(filePath).toLowerCase();
-    const buf = await fs.readFile(filePath);
-    if (ext === ".opus" || ext === ".ogg") {
-        const ms = parseOggOpusPlaytimeMs(buf);
-        if (ms == null || ms <= 0) {
-            logger.warn(`voice-outbound: cannot resolve playtime for ${ext} file — parseOggOpusPlaytimeMs returned ${ms} (not a valid Ogg Opus stream?) filePath=${filePath} size=${buf.length}`);
-            return null;
-        }
-        return {
-            playtimeMs: ms,
-            encode_type: VOICE_ENCODE_OGG_SPEEX,
-            sample_rate: 48_000,
-        };
-    }
-    if (ext === ".silk" || ext === ".slk") {
-        const ms = await silkPlaytimeMsWithOptionalWasm(buf);
-        if (ms == null || ms <= 0) {
-            logger.warn(`voice-outbound: cannot resolve playtime for ${ext} file — silk-wasm decode returned ${ms} (wasm missing, or invalid SILK bitstream?) filePath=${filePath} size=${buf.length}`);
-            return null;
-        }
-        return {
-            playtimeMs: ms,
-            encode_type: VOICE_ENCODE_SILK,
-            sample_rate: 24_000,
-        };
-    }
-    logger.warn(`voice-outbound: unsupported voice extension '${ext}' for filePath=${filePath}`);
-    return null;
-}
-//# sourceMappingURL=voice-outbound.js.map

package/dist/src/media/voice-outbound.js.map

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

package/dist/src/messaging/abort-fence.js

@@ -1,70 +0,0 @@
-/**
- * Abort fence (generation barrier) for Weixin message dispatch.
- *
- * When the user sends an "abort" intent (e.g. "stop", "中止", "/abort") we
- * cannot truly cancel the in-flight LLM/tool pipeline because the underlying
- * SDK does not currently propagate an AbortSignal end-to-end. Instead, we
- * adopt the same trick used by the Telegram channel
- * (extensions/telegram/src/bot-message-dispatch.ts in the openclaw main repo):
- *
- * - Each dispatch picks up a fence `generation` at entry.
- * - An abort message bumps the generation (`supersede=true`) and starts its
- *   own dispatch with the new generation.
- * - All outbound side-effects (sendMessage, typing start/stop, debug timing,
- *   etc.) check `isDispatchSuperseded(...)` first; if the generation no longer
- *   matches, they become no-ops.
- *
- * Effect: the old long-running task keeps running in the background but its
- * output is silently dropped, so the user perceives it as cancelled and the
- * new turn begins immediately.
- *
- * The fence is keyed per chat (typically `accountId:userId` for Weixin DMs),
- * so different users do not share state.
- */
-const fenceByKey = new Map();
-/**
- * Begin a new dispatch and return its generation. When `supersede` is true
- * (i.e. this dispatch is itself an abort request), bump the generation first
- * so all already-running dispatches on this key become superseded.
- */
-export function beginAbortFence(params) {
-    const existing = fenceByKey.get(params.key);
-    const state = existing ?? { generation: 0, activeDispatches: 0 };
-    if (params.supersede) {
-        state.generation += 1;
-    }
-    state.activeDispatches += 1;
-    fenceByKey.set(params.key, state);
-    return state.generation;
-}
-/**
- * Returns true when the dispatch with `generation` has been superseded by a
- * later abort on `key`. Cheap to call; check before any user-visible side
- * effect.
- */
-export function isDispatchSuperseded(params) {
-    return (fenceByKey.get(params.key)?.generation ?? 0) !== params.generation;
-}
-/**
- * Mark a dispatch finished. When the lane goes idle we drop the entry to
- * avoid unbounded growth across many distinct users.
- */
-export function endAbortFence(key) {
-    const state = fenceByKey.get(key);
-    if (!state) {
-        return;
-    }
-    state.activeDispatches -= 1;
-    if (state.activeDispatches <= 0) {
-        fenceByKey.delete(key);
-    }
-}
-/** Number of tracked fence keys. Exposed for diagnostics and tests. */
-export function getAbortFenceSizeForTests() {
-    return fenceByKey.size;
-}
-/** Clear all fence state. Tests only. */
-export function resetAbortFenceForTests() {
-    fenceByKey.clear();
-}
-//# sourceMappingURL=abort-fence.js.map

package/dist/src/messaging/abort-fence.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"abort-fence.js","sourceRoot":"","sources":["../../../src/messaging/abort-fence.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAOH,MAAM,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAC;AAEtD;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,MAA2C;IACzE,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAoB,QAAQ,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC;IAClF,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;IAC5B,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,UAAU,CAAC;AAC1B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAA2C;IAC9E,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,UAAU,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC,UAAU,CAAC;AAC7E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO;IACT,CAAC;IACD,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;IAC5B,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,EAAE,CAAC;QAChC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,yBAAyB;IACvC,OAAO,UAAU,CAAC,IAAI,CAAC;AACzB,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,uBAAuB;IACrC,UAAU,CAAC,KAAK,EAAE,CAAC;AACrB,CAAC"}