@ycodium-ai/plugin-im 0.2.2980 → 0.2.2984

package/dist/index.js

@@ -128602,9 +128602,8 @@ var makeInbound = (core, deps) => {
   );
   const projectPromptCooldown = makeCooldown(PROJECT_PROMPT_COOLDOWN_MS, () => Date.now());
   const handledMessages = makeBoundedSeen(SEEN_MESSAGE_LIMIT);
-  const alreadyHandled = (target2, messageId) => {
-    return !handledMessages.claim(`${chatKeyOf(target2)}:${messageId}`);
-  };
+  const alreadyHandled = (key) => !handledMessages.claim(key);
+  const claimCallback = (rowId, callbackId) => callbackId === void 0 || callbackId === "" || !alreadyHandled(`c:${rowId}:${callbackId}`);
   const turnAwayStranger = (target2, sender) => {
     host.log.warn("chat ignored a message from someone not on the allow list", {
       bot: target2.displayName,
@@ -128651,10 +128650,14 @@ var makeInbound = (core, deps) => {
       bot: bot.displayName,
       message
     }),
-    onButton: handleButtonClick,
+    onButton: (token, operatorId, callbackId) => {
+      if (!claimCallback(bot.rowId, callbackId)) return null;
+      return handleButtonClick(token, operatorId);
+    },
     onPanelClick: (click) => {
       const current = currentBot(bot.rowId);
-      return current === void 0 ? null : handlePanelClick(current, click);
+      if (current === void 0 || !claimCallback(current.rowId, click.callbackId)) return null;
+      return handlePanelClick(current, click);
     },
     noteChatAlias: (alias, chatId) => noteChatAlias(bot, alias, chatId),
     knowsChatAlias: (alias) => chatAliasOf(core.state, bot.rowId, alias) !== void 0,
@@ -128663,7 +128666,7 @@ var makeInbound = (core, deps) => {
       if (current === void 0) return;
       const message = settleChat(current, received);
       const arrived = bindingOf2(current, message.chatId);
-      if (alreadyHandled(arrived, message.messageId)) return;
+      if (alreadyHandled(`m:${chatKeyOf(arrived)}:${message.messageId}`)) return;
       if (message.chatKind !== void 0 && chatOf(core.state, chatKeyOf(arrived)).chatKind !== message.chatKind) {
         commit("chat-updated", { chatKey: chatKeyOf(arrived), chatKind: message.chatKind });
       }
@@ -140136,12 +140139,22 @@ var makeReplyCards = (core, failures, anchors) => {
       const cards = binding === void 0 ? void 0 : adapterFor(binding.platform)?.turnCards;
       if (binding === void 0 || cards === void 0) return null;
       let anchored;
+      const chatKey = chatKeyOf(binding);
       return {
-        chatKey: chatKeyOf(binding),
+        chatKey,
         throttleMs: cards.throttleMs,
         rotates: cards.rotatesOnInteraction === true,
         open: async (view) => cards.open(await (anchored ??= anchors.anchored(binding, threadId, turnId)), view),
-        update: (cardId, view) => cards.update(binding, cardId, view)
+        // 每次改卡按聊天键重取机器人的配置：开卡时那份上的令牌和代理会过期。卡是哪个平台的开卡时就定了：
+        // 机器人行已经不在、或被改成了别的平台，就用原来那份——别的平台的配置不能交给这个平台的适配器。
+        update: (cardId, view) => {
+          const current = bindingForChatKey(chatKey);
+          return cards.update(
+            current?.platform === binding.platform ? current : binding,
+            cardId,
+            view
+          );
+        }
       };
     },
     readText: async (messageId) => (await host.projections.getThreadMessage(messageId))?.text ?? null,
@@ -140824,11 +140837,11 @@ var makeTelegramApi = (input) => {
      * `allowed_updates` 必须列全：它是服务端白名单，不写 `callback_query` 的话按钮点击
      * 根本不会投递过来，而且不会有任何报错。
      */
-    getUpdates: (offset) => call(
+    getUpdates: (offset, timeoutSeconds = POLL_TIMEOUT_SECONDS) => call(
       "getUpdates",
       {
         offset,
-        timeout: POLL_TIMEOUT_SECONDS,
+        timeout: timeoutSeconds,
         allowed_updates: ["message", "callback_query"]
       },
       POLL_CALL_TIMEOUT_MS
@@ -141128,7 +141141,8 @@ var makeTelegramAdapter = (deps) => {
       cardId: String(messageId),
       operatorId,
       op: action.op,
-      arg: action.arg ?? null
+      arg: action.arg ?? null,
+      callbackId: callback.id
     }) ?? null;
   };
   const apiFor = (binding) => {
@@ -141144,20 +141158,24 @@ var makeTelegramAdapter = (deps) => {
     });
     return api;
   };
-  const makeWriter = (api, chatId, resume) => makeTurnWriter({
+  const makeWriter = (slot, chatId, resume) => makeTurnWriter({
     t,
     limit: TELEGRAM_TEXT_MAX_CHARS,
     ...resume === void 0 ? {} : { resume },
     messages: {
       send: (text3) => withRichFallback(
         toTelegramRichMarkdown(text3),
-        (markdown) => api.sendRichOne(chatId, markdown),
-        () => api.sendOne(chatId, text3)
+        async (markdown) => (await apiFor(slot.binding)).sendRichOne(chatId, markdown),
+        async () => (await apiFor(slot.binding)).sendOne(chatId, text3)
       ),
       edit: (messageId, text3) => withRichFallback(
         toTelegramRichMarkdown(text3),
-        (markdown) => api.editRich(chatId, messageId, markdown),
-        () => api.editMessage(chatId, messageId, text3)
+        async (markdown) => {
+          await (await apiFor(slot.binding)).editRich(chatId, messageId, markdown);
+        },
+        async () => {
+          await (await apiFor(slot.binding)).editMessage(chatId, messageId, text3);
+        }
       )
     }
   });
@@ -141174,19 +141192,31 @@ var makeTelegramAdapter = (deps) => {
       const stopped = new Promise((resolve) => stop = resolve);
       let running = true;
       let offset = 0;
+      let acknowledged = 0;
       let backoff = BACKOFF_START_MS;
       let botUsername;
       let menuSent = false;
+      let liveApi;
       const isSoloGroup = makeSoloGroupCheck(async (chatId) => {
         const count = await (await apiFor(binding)).getChatMemberCount(chatId);
         return Number.isFinite(count) ? count <= 2 : void 0;
       });
+      const publishAck = () => {
+        const api = liveApi;
+        if (api === void 0 || offset <= acknowledged) return;
+        const next = offset;
+        acknowledged = next;
+        void api.getUpdates(next, 0).catch(() => void 0);
+      };
       const poll = async () => {
         for (; ; ) {
           if (!running) return;
           try {
             const api = await apiFor(binding);
+            liveApi = api;
+            if (!running) return;
             botUsername ??= (await api.getMe()).username ?? null;
+            if (!running) return;
             if (!menuSent) {
               menuSent = true;
               void api.setMyCommands(telegramCommandMenu(t)).catch((error) => {
@@ -141196,26 +141226,34 @@ var makeTelegramAdapter = (deps) => {
                 });
               });
             }
+            acknowledged = offset;
             const updates = await api.getUpdates(offset);
             if (!running) return;
             backoff = BACKOFF_START_MS;
-            offset = nextOffset(updates, offset);
             for (const update of updates) {
+              if (!running) break;
               const callback = update.callback_query;
               if (callback?.data !== void 0) {
                 const operatorId = callback.from === void 0 ? null : String(callback.from.id);
-                const notice = callback.data.startsWith(PANEL_DATA_PREFIX) ? panelClick(binding.rowId, callback, operatorId, handlers) : handlers.onButton(callback.data, operatorId);
+                const notice = callback.data.startsWith(PANEL_DATA_PREFIX) ? panelClick(binding.rowId, callback, operatorId, handlers) : handlers.onButton(callback.data, operatorId, callback.id);
+                offset = nextOffset([update], offset);
                 await api.answerCallback(callback.id, notice ?? void 0).catch(() => void 0);
                 continue;
               }
               const message = update.message;
-              if (message === void 0) continue;
+              if (message === void 0) {
+                offset = nextOffset([update], offset);
+                continue;
+              }
               const resource = resourceOf2(message);
               const text3 = commandForBot(
                 (message.text ?? message.caption ?? "").trim(),
                 botUsername
               );
-              if (text3 === null) continue;
+              if (text3 === null) {
+                offset = nextOffset([update], offset);
+                continue;
+              }
               const gated = !passesGroupGate2({
                 message,
                 text: text3,
@@ -141223,18 +141261,27 @@ var makeTelegramAdapter = (deps) => {
                 botUsername: botUsername ?? null,
                 groupMention: binding.groupMention
               });
-              if (gated && !(binding.groupMention === "always" && await isSoloGroup(String(message.chat.id)))) {
-                continue;
+              if (gated) {
+                const solo = binding.groupMention === "always" && await isSoloGroup(String(message.chat.id));
+                if (!running) break;
+                if (!solo) {
+                  offset = nextOffset([update], offset);
+                  continue;
+                }
               }
+              if (!running) break;
+              offset = nextOffset([update], offset);
+              const senderId = message.from === void 0 ? null : String(message.from.id);
+              const chatKind = message.chat.type === "private" ? "private" : "group";
               if (text3 === "" && resource === null) {
                 const unsupported = unsupportedTypeOf(message);
                 if (unsupported === null) continue;
                 handlers.onMessage({
                   messageId: String(message.message_id),
                   chatId: chatIdOf(message),
-                  senderId: message.from === void 0 ? null : String(message.from.id),
+                  senderId,
                   text: "",
-                  chatKind: message.chat.type === "private" ? "private" : "group",
+                  chatKind,
                   resources: [],
                   unsupportedType: unsupported
                 });
@@ -141245,9 +141292,9 @@ var makeTelegramAdapter = (deps) => {
                 messageId: String(message.message_id),
                 chatId: chatIdOf(message),
                 ...parentChatId === void 0 ? {} : { parentChatId },
-                senderId: message.from === void 0 ? null : String(message.from.id),
+                senderId,
                 text: text3,
-                chatKind: message.chat.type === "private" ? "private" : "group",
+                chatKind,
                 resources: resource === null ? [] : [
                   {
                     key: resource.fileId,
@@ -141273,6 +141320,7 @@ var makeTelegramAdapter = (deps) => {
         close: () => {
           running = false;
           stop();
+          publishAck();
           apis.delete(binding.rowId);
         }
       };
@@ -141383,8 +141431,8 @@ ${line}`
     turnCards: {
       throttleMs: TELEGRAM_CARD_THROTTLE_MS,
       open: async (binding, view) => {
-        const api = await apiFor(binding);
-        const writer = makeWriter(api, binding.chatId);
+        const slot = { binding };
+        const writer = makeWriter(slot, binding.chatId);
         try {
           await writer.write(view);
         } catch (error) {
@@ -141395,16 +141443,22 @@ ${line}`
         }
         const cardId = writer.firstId();
         if (cardId !== null && view.status === "working") {
-          turnWriters.set(`${binding.rowId}:${binding.chatId}:${cardId}`, writer);
+          turnWriters.set(`${binding.rowId}:${binding.chatId}:${cardId}`, { slot, writer });
         }
         return cardId;
       },
       update: async (binding, cardId, view) => {
         const key = `${binding.rowId}:${binding.chatId}:${cardId}`;
-        const writer = turnWriters.get(key) ?? makeWriter(await apiFor(binding), binding.chatId, cardId);
-        await writer.write(view);
+        let stored = turnWriters.get(key);
+        if (stored === void 0) {
+          const slot = { binding };
+          stored = { slot, writer: makeWriter(slot, binding.chatId, cardId) };
+        } else {
+          stored.slot.binding = binding;
+        }
+        await stored.writer.write(view);
         if (view.status !== "working") turnWriters.delete(key);
-        else turnWriters.set(key, writer);
+        else turnWriters.set(key, stored);
       }
     },
     panel: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/plugin-im",
-  "version": "0.2.2980",
+  "version": "0.2.2984",
   "description": "Talk to your agents from Telegram, WeCom, Lark, or WeChat (experimental).",
   "keywords": [
     "im",
@@ -32,7 +32,7 @@
     "markdown-it": "^15.0.2",
     "react": "19.2.6",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2980"
+    "@ycodium-ai/plugin-api": "0.2.2984"
   },
   "ycodium": {
     "plugin": "./dist/index.js",