@kyan-du/agent-wechat-openclaw 0.14.0 → 0.14.1

package/dist/index.js

@@ -5482,11 +5482,12 @@ var WeChatClient = class {
       await throwHttpError(res);
     return res.json();
   }
-  async post(path, body) {
+  async post(path, body, signal) {
     const res = await fetch(`${this.base}${path}`, {
       method: "POST",
       headers: this.headers,
-      body: body != null ? JSON.stringify(body) : void 0
+      body: body != null ? JSON.stringify(body) : void 0,
+      signal
     });
     if (!res.ok)
       await throwHttpError(res);
@@ -5531,8 +5532,8 @@ var WeChatClient = class {
   async markChatRead(chatId) {
     return this.post(`/api/chats/${encodeURIComponent(chatId)}/mark-read`);
   }
-  async openChat(chatId, clearUnreads) {
-    return this.post(`/api/chats/${encodeURIComponent(chatId)}/open${qs({ clearUnreads })}`);
+  async openChat(chatId, clearUnreads, signal, executionTimeoutMs) {
+    return this.post(`/api/chats/${encodeURIComponent(chatId)}/open${qs({ clearUnreads, executionTimeoutMs })}`, void 0, signal);
   }
   async listGroupMembersPage(groupId, limit, cursor) {
     const page = groupMembersPageSchema.parse(await this.get(`/api/groups/${encodeURIComponent(groupId)}/members${qs({ limit, cursor })}`));
@@ -6785,27 +6786,85 @@ var RETRYABLE_MEDIA_ERRORS = /* @__PURE__ */ new Set([
   "VOICE_NOT_DOWNLOADED",
   "IMAGE_NOT_STABLE"
 ]);
-var DEFAULT_MEDIA_POLL_ATTEMPTS = 30;
-var DEFAULT_MEDIA_POLL_INTERVAL_MS = 1e3;
+var DEFAULT_MEDIA_POLL_ATTEMPTS = 6;
+var DEFAULT_MEDIA_POLL_INTERVAL_MS = 500;
+var IMAGE_MATERIALIZATION_OPEN_CHAT_TIMEOUT_MS = 400;
+function createImageMaterializationTrigger(client, chatId, options) {
+  const timeoutMs = options?.timeoutMs ?? IMAGE_MATERIALIZATION_OPEN_CHAT_TIMEOUT_MS;
+  return async (result, attempt) => {
+    if (result.type === "file") return;
+    options?.log?.info?.(
+      `[wechat:media] triggering chat reopen for image attempt=${attempt} skipOpen=${options?.skipOpen === true}`
+    );
+    const controller = new AbortController();
+    const opened = Promise.resolve(client.openChat(chatId, true, controller.signal, timeoutMs));
+    void opened.catch(() => void 0);
+    try {
+      await raceWithTimeout(opened, timeoutMs);
+    } finally {
+      controller.abort();
+    }
+  };
+}
+function imageMaterializationTriggerForMessage(opts) {
+  const baseType = opts.messageType & 2147483647;
+  if (baseType !== 3) return void 0;
+  return createImageMaterializationTrigger(opts.client, opts.chatId, {
+    log: opts.log,
+    timeoutMs: opts.timeoutMs,
+    skipOpen: opts.skipOpen
+  });
+}
+function raceWithTimeout(promise, timeoutMs) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      reject(Object.assign(new Error("IMAGE_MATERIALIZATION_OPEN_CHAT_TIMEOUT"), {
+        code: "IMAGE_MATERIALIZATION_OPEN_CHAT_TIMEOUT"
+      }));
+    }, timeoutMs);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (error) => {
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
 function isRetryable(result) {
   if (result.data !== void 0) return false;
   if (result.errorCode !== void 0) return RETRYABLE_MEDIA_ERRORS.has(result.errorCode);
   return result.type === "pending";
 }
-async function pollMedia(client, chatId, localId, log, maxAttempts = DEFAULT_MEDIA_POLL_ATTEMPTS, intervalMs = DEFAULT_MEDIA_POLL_INTERVAL_MS) {
+async function pollMedia(client, chatId, localId, log, maxAttempts = DEFAULT_MEDIA_POLL_ATTEMPTS, intervalMs = DEFAULT_MEDIA_POLL_INTERVAL_MS, onRetryTrigger) {
   let lastResult;
+  let triggerUsed = false;
   const startedAt = Date.now();
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     const result = await client.getMedia(chatId, localId);
     lastResult = result;
     if (result.type === "unsupported") return result;
     if (result.data || !isRetryable(result)) return result;
+    if (!triggerUsed && onRetryTrigger) {
+      triggerUsed = true;
+      try {
+        await onRetryTrigger(result, attempt);
+        log?.info?.(`[wechat:media] download trigger completed attempt=${attempt}`);
+      } catch {
+        log?.info?.(`[wechat:media] download trigger failed attempt=${attempt} code=MEDIA_DOWNLOAD_TRIGGER_FAILED`);
+      }
+    }
     if (attempt < maxAttempts) {
       log?.info?.(`[wechat:media] pending attempt=${attempt}/${maxAttempts} elapsedMs=${Date.now() - startedAt}`);
       await new Promise((resolve) => setTimeout(resolve, intervalMs));
     }
   }
-  log?.info?.(`[wechat:media] pending exhausted attempts=${maxAttempts} elapsedMs=${Date.now() - startedAt}`);
+  log?.info?.(
+    `[wechat:media] retry exhausted attempts=${maxAttempts} elapsedMs=${Date.now() - startedAt} code=${lastResult?.errorCode ?? "MEDIA_NOT_DOWNLOADED"}`
+  );
   return lastResult ?? null;
 }
 
@@ -7392,13 +7451,54 @@ function shouldBypassNewsappAuthorization(chat) {
   return isNewsappChat(chat);
 }
 
+// src/monitor-skip.ts
+var SYSTEM_SERVICE_USERNAMES = /* @__PURE__ */ new Set([
+  "qmessage",
+  "floatbottle",
+  "medianote",
+  "notifymessage",
+  "weixin",
+  "fmessage",
+  "filehelper",
+  "newsapp",
+  "tmessage",
+  "mphelper",
+  "qqmail",
+  "weixingongzhong",
+  "qqsafe",
+  "exmail_tool",
+  "lbsapp",
+  "pc_qq"
+]);
+var EMPTY_UNREAD_BACKOFF_MS = 5e3;
+var EMPTY_UNREAD_BACKOFF_MAX_MS = 6e4;
+function isOfficialAccount(chatId) {
+  return chatId.startsWith("gh_") || SYSTEM_SERVICE_USERNAMES.has(chatId);
+}
+function isEmptyUnreadBackoffActive(backoff, chatId, now = Date.now()) {
+  const entry = backoff.get(chatId);
+  return entry !== void 0 && now < entry.nextRetryAt;
+}
+function applyEmptyUnreadSkip(chatId, opts) {
+  if (opts.unreadCount <= 0) return null;
+  const now = opts.now ?? Date.now();
+  const seededLastSeen = opts.firstPoll && !opts.lastSeenId.has(chatId);
+  if (seededLastSeen) {
+    opts.lastSeenId.set(chatId, opts.prevLastSeen);
+  }
+  const retryCount = (opts.backoff.get(chatId)?.retryCount ?? 0) + 1;
+  const backoffMs = Math.min(
+    EMPTY_UNREAD_BACKOFF_MAX_MS,
+    EMPTY_UNREAD_BACKOFF_MS * 2 ** Math.min(retryCount - 1, 6)
+  );
+  opts.backoff.set(chatId, { nextRetryAt: now + backoffMs, retryCount });
+  return { seededLastSeen, backoffMs };
+}
+
 // src/monitor.ts
 var MEDIA_TYPES = /* @__PURE__ */ new Set([3, 34, 43]);
 var HISTORY_CONTEXT_MARKER = "[Chat messages since your last reply - for context]";
 var CURRENT_MESSAGE_MARKER = "[Current message - respond to this]";
-function isOfficialAccount(chatId) {
-  return chatId.startsWith("gh_");
-}
 function sleep(ms, signal) {
   return new Promise((resolve) => {
     const timer = setTimeout(resolve, ms);
@@ -7428,6 +7528,7 @@ async function startWeChatMonitor(opts) {
   const pendingMessageScans = loadPendingResetRetries(account.accountId);
   const inboundLedger = loadInboundEventLedger(account.accountId);
   const mediaPipeline = loadMediaPipeline(account.accountId);
+  const emptyUnreadBackoff = /* @__PURE__ */ new Map();
   const cleanupMedia = async () => {
     await mediaPipeline.cleanup({
       olderThanMs: MEDIA_RETENTION_MS,
@@ -7546,9 +7647,13 @@ async function startWeChatMonitor(opts) {
           }
         }
       }
-      const unreadChats = chats.filter(
-        (c) => c.unreadCount > 0 && !isOfficialAccount(c.username ?? c.id)
-      );
+      const unreadChats = chats.filter((c) => {
+        const chatId = c.username ?? c.id;
+        if (isEmptyUnreadBackoffActive(emptyUnreadBackoff, chatId)) return false;
+        if (c.unreadCount <= 0) return false;
+        if (isNewsappChat(c)) return true;
+        return !isOfficialAccount(chatId);
+      });
       for (const chat of unreadChats) {
         const chatId = chat.username ?? chat.id;
         if (chatScanState.initialScanComplete && !lastSeenId.has(chatId) && !startupBaselines.has(chatId)) {
@@ -7562,8 +7667,9 @@ async function startWeChatMonitor(opts) {
         (chat) => !isNewsappChat(chat) || newsappHandled.get(chat.username ?? chat.id) !== `${chat.lastMsgLocalId ?? ""}:${chat.lastMessagePreview?.trim() ?? ""}`
       );
       for (const chatId of chatsToProcess.keys()) {
-        if (isOfficialAccount(chatId) && chatId !== "newsapp")
+        if (isOfficialAccount(chatId) && chatId !== "newsapp" || isEmptyUnreadBackoffActive(emptyUnreadBackoff, chatId)) {
           chatsToProcess.delete(chatId);
+        }
       }
       if (unreadChats.length > 0) {
         log?.info?.(
@@ -7585,6 +7691,7 @@ async function startWeChatMonitor(opts) {
             retryState.persist,
             inboundLedger,
             mediaPipeline,
+            emptyUnreadBackoff,
             account,
             cfg,
             log,
@@ -7615,7 +7722,7 @@ async function startWeChatMonitor(opts) {
       for (const chat of chats) {
         if (abortSignal.aborted) break;
         const chatId = chat.username ?? chat.id;
-        if (isOfficialAccount(chatId)) continue;
+        if (isOfficialAccount(chatId) && chatId !== "newsapp" || isEmptyUnreadBackoffActive(emptyUnreadBackoff, chatId)) continue;
         const prevSeen = lastSeenId.get(chatId);
         if (prevSeen === void 0) continue;
         if (unreadChats.some((c) => (c.username ?? c.id) === chatId)) continue;
@@ -7633,6 +7740,7 @@ async function startWeChatMonitor(opts) {
           retryState.persist,
           inboundLedger,
           mediaPipeline,
+          emptyUnreadBackoff,
           account,
           cfg,
           log,
@@ -7677,7 +7785,7 @@ async function startWeChatMonitor(opts) {
     connected: false
   });
 }
-async function prepareMessage(client, mediaPipeline, msg, chatId, chat, liveAccount, policy, log) {
+async function prepareMessage(client, mediaPipeline, msg, chatId, chat, liveAccount, policy, log, skipOpen) {
   const core = getWeChatRuntime();
   if (msg.isSelf) {
     log?.info?.(`[wechat:${liveAccount.accountId}] Skipping self-sent msg ${msg.localId}`);
@@ -7710,7 +7818,21 @@ async function prepareMessage(client, mediaPipeline, msg, chatId, chat, liveAcco
   if (mayHaveMedia) {
     log?.info?.(`[wechat:${liveAccount.accountId}] Checking media for msg ${msg.localId} (type ${baseType})`);
     try {
-      const result = await pollMedia(client, chatId, msg.localId, log);
+      const result = await pollMedia(
+        client,
+        chatId,
+        msg.localId,
+        log,
+        void 0,
+        void 0,
+        imageMaterializationTriggerForMessage({
+          client,
+          chatId,
+          messageType: baseType,
+          log,
+          skipOpen
+        })
+      );
       if (result && result.data && result.type !== "unsupported") {
         hasMedia = true;
         mediaSource = result.source;
@@ -8089,7 +8211,7 @@ function bufferGroupHistory(groupHistory, chatId, pm, limit) {
     if (first) groupHistory.delete(first);
   }
 }
-async function processUnreadChat(client, chat, lastSeenId, equalCursorUnreadHandled, startupBaselines, pendingMessageScans, persistRetryState, inboundLedger, mediaPipeline, account, cfg, log, skipOpen, groupHistory, groupHistoryLimit, catchup) {
+async function processUnreadChat(client, chat, lastSeenId, equalCursorUnreadHandled, startupBaselines, pendingMessageScans, persistRetryState, inboundLedger, mediaPipeline, emptyUnreadBackoff, account, cfg, log, skipOpen, groupHistory, groupHistoryLimit, catchup) {
   const core = getWeChatRuntime();
   const liveAccount = resolveWeChatAccount(cfg, account.accountId) ?? account;
   const chatId = chat.username ?? chat.id;
@@ -8178,7 +8300,22 @@ async function processUnreadChat(client, chat, lastSeenId, equalCursorUnreadHand
     const fallback = newsappFallbackMessage(chat);
     if (fallback) messages = [fallback];
   }
-  if (messages.length === 0) return "skipped";
+  if (messages.length === 0) {
+    const skip = applyEmptyUnreadSkip(chatId, {
+      unreadCount: chat.unreadCount,
+      firstPoll,
+      prevLastSeen,
+      lastSeenId,
+      backoff: emptyUnreadBackoff
+    });
+    if (skip) {
+      log?.info?.(
+        `[wechat:${liveAccount.accountId}] ${chatId}: empty unread fetch, firstPoll=${firstPoll}, unreadCount=${chat.unreadCount}; seedLastSeen=${skip.seededLastSeen}, backoff=${skip.backoffMs}ms`
+      );
+    }
+    return "skipped";
+  }
+  emptyUnreadBackoff.delete(chatId);
   const enrichedBaseline = enrichStartupBaselineFromMessages(startupBaseline, messages);
   if (enrichedBaseline) {
     startupBaselines.set(chatId, enrichedBaseline);
@@ -8292,7 +8429,7 @@ async function processUnreadChat(client, chat, lastSeenId, equalCursorUnreadHand
     log?.info?.(
       `[wechat:${liveAccount.accountId}] Processing msg ${msg.localId}: type=${msg.type}, sender=${msg.sender}, isSelf=${msg.isSelf}, content=${(msg.content || "").slice(0, 50)}`
     );
-    const pm = await prepareMessage(client, mediaPipeline, msg, chatId, chat, liveAccount, policy, log);
+    const pm = await prepareMessage(client, mediaPipeline, msg, chatId, chat, liveAccount, policy, log, skipOpen);
     if (pm) {
       processed.push(pm);
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kyan-du/agent-wechat-openclaw",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "type": "module",
   "files": [
     "dist",