@rubytech/create-maxy-code 0.1.592 → 0.1.593

package/payload/server/server.js

@@ -7177,11 +7177,29 @@ function createScheduleInjectRoutes(deps) {
       console.error(`${TAG6} op=schedule-telegram-reject eventId=${eventId} destination=${destination} reason=unresolved-effective-account`);
       return c.json({ ok: false, error: "unresolved-effective-account" }, 403);
     }
-    if (resolution.kind === "ambiguous") {
-      console.error(`${TAG6} op=telegram-destination-ambiguous eventId=${eventId} destination=${destination} accounts=${resolution.count} dispatched=no`);
-      return c.json({ ok: false, error: "telegram-destination-ambiguous" }, 403);
+    let claimant;
+    if (resolution.kind === "one") {
+      claimant = resolution;
+    } else {
+      const mine = resolution.claimants.filter((c2) => c2.accountId === eventAccountId);
+      if (mine.length === 0) {
+        console.error(
+          `${TAG6} op=event-account-scope-mismatch eventId=${eventId} eventAccount=${eventAccountId ?? "-"} effectiveAccount=none claimants=${resolution.claimants.length} destination=${destination} dispatched=no`
+        );
+        return c.json({ ok: false, error: "event-account-scope-mismatch" }, 403);
+      }
+      if (mine.length > 1) {
+        console.error(
+          `${TAG6} op=telegram-destination-ambiguous eventId=${eventId} destination=${destination} accounts=${mine.length} scope=within-account dispatched=no`
+        );
+        return c.json({ ok: false, error: "telegram-destination-ambiguous" }, 403);
+      }
+      claimant = mine[0];
+      console.error(
+        `${TAG6} op=telegram-destination-narrowed eventId=${eventId} destination=${destination} claimants=${resolution.claimants.length} account=${claimant.accountId} botId=${claimant.botId}`
+      );
     }
-    const { accountId: effectiveAccount, botId, botToken } = resolution;
+    const { accountId: effectiveAccount, botId, botToken } = claimant;
     console.error(`${TAG6} op=effective-account eventId=${eventId} effectiveAccount=${effectiveAccount} botId=${botId}`);
     if (eventAccountId === null || eventAccountId !== effectiveAccount) {
       console.error(`${TAG6} op=event-account-scope-mismatch eventId=${eventId} eventAccount=${eventAccountId ?? "-"} effectiveAccount=${effectiveAccount} destination=${destination} dispatched=no`);
@@ -7189,8 +7207,8 @@ function createScheduleInjectRoutes(deps) {
     }
     const sendVerdict = checkTelegramChatSend({
       chatId: Number(destination),
-      allowChannels: resolution.allowChannels,
-      allowGroups: resolution.allowGroups
+      allowChannels: claimant.allowChannels,
+      allowGroups: claimant.allowGroups
     });
     console.error(
       `[telegram-outbound] op=channel-send botId=${botId} chatId=${destination} allowed=${sendVerdict.allowed ? "yes" : "no"} reason=${sendVerdict.reason} messageId=none`
@@ -39977,6 +39995,16 @@ function startEmitter(opts) {
             }
             continue;
           }
+          if (opts.onToolUse && !suppressing && event.type === "assistant") {
+            const pre = event.message;
+            if (pre && Array.isArray(pre.content)) {
+              for (const block of pre.content) {
+                if (block?.type === "tool_use" && typeof block.name === "string") {
+                  opts.onToolUse(block.name);
+                }
+              }
+            }
+          }
           for (const answer of answers.push(line)) {
             if (suppressing) {
               discardedAnswers += 1;
@@ -41215,7 +41243,17 @@ function buildTelegramSpawnRequest(input) {
     // session resolve under that account, not the manager's boot-time house
     // default. Mirror of the WhatsApp builder.
     targetAccountId: input.accountId,
-    telegramChannel: { senderId: channelKey, gatewayUrl: input.gatewayUrl, serverPath: input.serverPath },
+    // Task 2666 — the pin travels with the channel binding. Sent on EVERY role,
+    // not just public: the manager grants the rich tool surface only on
+    // role:'public', and putting a role branch here would be a second place
+    // that has to be kept in step with the manager's own gate.
+    telegramChannel: {
+      senderId: channelKey,
+      gatewayUrl: input.gatewayUrl,
+      serverPath: input.serverPath,
+      botId: input.botId,
+      chatId: input.chatId
+    },
     logContext: `channel=telegram-native role=${input.role} botId=${input.botId} senderId=${input.senderId}`
   };
 }
@@ -41239,6 +41277,10 @@ function buildTelegramEnsureSession(deps) {
       gatewayUrl: input.gatewayUrl,
       serverPath: input.serverPath,
       botId: input.botId,
+      // Task 2666 — the chat the public spawn's tools are pinned to. The same
+      // value handed to the file follower below, so a group answers into the
+      // group and a business chat into the customer's chat.
+      chatId: input.chatId,
       // Task 2615 — the builder keys both the channel key and the session id on
       // this when present, instead of on the sender.
       businessChatId: input.businessChatId ?? null,
@@ -41510,6 +41552,7 @@ function runTelegramPresenceCensus() {
 }
 
 // app/lib/telegram/gateway/native-file-follower.ts
+var TELEGRAM_CARD_TOOL = "mcp__telegram__telegram-card";
 var CHAT_ACTION_REFRESH_MS = 4e3;
 function startTelegramNativeFileFollower(input) {
   const entry2 = {
@@ -41532,6 +41575,7 @@ function startTelegramNativeFileFollower(input) {
   };
   let lastChatActionAt = Number.NEGATIVE_INFINITY;
   let turnOpen = false;
+  let cardSentThisTurn = false;
   let heartbeat = null;
   const send = (driver2) => {
     lastChatActionAt = Date.now();
@@ -41568,6 +41612,7 @@ function startTelegramNativeFileFollower(input) {
   };
   const onTurnComplete = () => {
     turnOpen = false;
+    cardSentThisTurn = false;
     if (input.backgroundActive?.() === true) return;
     stopHeartbeat();
     lastChatActionAt = Number.NEGATIVE_INFINITY;
@@ -41596,10 +41641,30 @@ function startTelegramNativeFileFollower(input) {
     onActivity,
     onTurnComplete,
     onTurnStart,
+    // Task 2666 — which tools this turn used. Only `telegram-card` matters: it
+    // posts the answer's own words WITH its buttons, so delivering the turn's
+    // final text beside it shows the visitor the same answer twice. A poll or a
+    // photo is a separate object and its accompanying sentence is usually the
+    // part that explains what it is, so those are left alone.
+    //
+    // Every card call posts or edits a message: `text` is required in
+    // CARD_SHAPE and card.ts always issues sendMessage or editMessageText
+    // before it reaches the optional answerCallbackQuery, so there is no card
+    // call that posts nothing and no bare acknowledgement to keep the text for.
+    onToolUse: (name) => {
+      if (name === TELEGRAM_CARD_TOOL) cardSentThisTurn = true;
+    },
     // Task 2521 — the answer reaches every bound door through the one fan-out.
     // Ungated by design: whatever woke the turn, the reader and the chats show
-    // the same thing.
+    // the same thing. Task 2666 adds the one exception above.
     onAnswer: async (answer) => {
+      if (cardSentThisTurn) {
+        cardSentThisTurn = false;
+        console.error(
+          `[telegram-public] op=text-suppressed sessionId=${input.sessionId.slice(0, 8)} messageId=${answer.messageId} reason=card-sent`
+        );
+        return;
+      }
       const targets = input.fanTargets?.() ?? [];
       if (targets.length === 0) return;
       noteAnswer(input.sessionId, answer.messageId);
@@ -43481,7 +43546,7 @@ var scheduleInjectRoutes = createScheduleInjectRoutes({
       }
     }
     if (hits.length === 0) return { kind: "none" };
-    if (hits.length > 1) return { kind: "ambiguous", count: hits.length };
+    if (hits.length > 1) return { kind: "ambiguous", claimants: hits };
     return { kind: "one", ...hits[0] };
   }
   // Task 2078 — the same binding the live inbound resolves. Without it a