@llblab/pi-telegram 0.35.2 → 0.36.1

package/lib/menu-queue.ts

@@ -88,7 +88,7 @@ function buildTelegramQueueMenuReplyMarkup(
   if (items.length === 0) return { inline_keyboard: [backRow, refreshRow] };
   const rows = items.map((item, index) => {
     const prefix = item.reactionSuppressionEmoji
-      ? `${item.reactionSuppressionEmoji} suppressed · `
+      ? `${item.reactionSuppressionEmoji} `
       : item.isPriority
         ? `${item.priorityEmoji ?? "⚡"} `
         : item.hasAttachments
@@ -163,17 +163,15 @@ function getTelegramQueueMenuItemText(item: TelegramQueueMenuItem): string {
       ? ` ${item.priorityEmoji ?? "⚡"}`
       : "";
   const heading = `<b>${item.queuePosition}.</b>${badge}`;
-  const suppression = item.reactionSuppressionEmoji
-    ? "\n<i>Suppressed by reaction. Remove it to restore this turn.</i>"
-    : "";
   const preview = `<pre>${escapeTelegramQueueMenuHtmlPreview(item.promptText)}</pre>`;
-  return `${heading}${suppression}\n${preview}`;
+  return `${heading}\n${preview}`;
 }
 
 function buildTelegramQueueItemSubmenuReplyMarkup(
   chatId: number,
   replyToMessageId: number,
   isPriority: boolean,
+  isSkipped: boolean,
 ): TelegramQueueMenuReplyMarkup {
   return {
     inline_keyboard: [
@@ -190,33 +188,18 @@ function buildTelegramQueueItemSubmenuReplyMarkup(
       ],
       [
         {
-          text: "🗑 Delete",
-          callback_data: `queue:delete:${chatId}:${replyToMessageId}`,
+          text: isSkipped ? "⚫️ Keep" : "🟢 Keep",
+          callback_data: `queue:skip-set:${chatId}:${replyToMessageId}:keep`,
         },
-      ],
-    ],
-  };
-}
-
-function buildTelegramQueueDeleteConfirmationReplyMarkup(
-  chatId: number,
-  replyToMessageId: number,
-): TelegramQueueMenuReplyMarkup {
-  return {
-    inline_keyboard: [
-      [
         {
-          text: "🗑 Yes, delete",
-          callback_data: `queue:confirm-delete:${chatId}:${replyToMessageId}`,
-        },
-        {
-          text: "❌ No",
-          callback_data: `queue:keep:${chatId}:${replyToMessageId}`,
+          text: isSkipped ? "🔴 Skip" : "⚫️ Skip",
+          callback_data: `queue:skip-set:${chatId}:${replyToMessageId}:skip`,
         },
       ],
     ],
   };
 }
+
 interface TelegramQueueMenuCallbackDeps<Context = unknown> {
   getQueuedItems: () => TelegramQueueMenuItem[];
   findItem: (
@@ -229,10 +212,10 @@ interface TelegramQueueMenuCallbackDeps<Context = unknown> {
     replyToMessageId: number,
     enabled: boolean,
   ) => boolean;
-  cancelItem: (
+  setSkipped: (
     chatId: number,
     replyToMessageId: number,
-    ctx: Context,
+    skipped: boolean,
   ) => boolean;
   updateQueueMessage: (
     chatId: number,
@@ -322,38 +305,17 @@ async function handleTelegramQueueMenuCallback<Context>(
     );
     return true;
   }
-  const deleteMatch = data.match(/^queue:(?:delete|cancel):(\d+):(\d+)$/);
-  if (deleteMatch) {
-    await handleTelegramQueueMenuDeleteRequest(
-      callbackQueryId,
-      replyChatId,
-      replyMessageId,
-      Number(deleteMatch[1]),
-      Number(deleteMatch[2]),
-      deps,
-    );
-    return true;
-  }
-  const keepMatch = data.match(/^queue:keep:(\d+):(\d+)$/);
-  if (keepMatch) {
-    await handleTelegramQueueMenuKeep(
-      callbackQueryId,
-      replyChatId,
-      replyMessageId,
-      Number(keepMatch[1]),
-      Number(keepMatch[2]),
-      deps,
-    );
-    return true;
-  }
-  const confirmDeleteMatch = data.match(/^queue:confirm-delete:(\d+):(\d+)$/);
-  if (confirmDeleteMatch) {
-    await handleTelegramQueueMenuConfirmDelete(
+  const skipSetMatch = data.match(
+    /^queue:skip-set:(\d+):(\d+):(skip|keep)$/,
+  );
+  if (skipSetMatch) {
+    await handleTelegramQueueMenuSkipSet(
       callbackQueryId,
       replyChatId,
       replyMessageId,
-      Number(confirmDeleteMatch[1]),
-      Number(confirmDeleteMatch[2]),
+      Number(skipSetMatch[1]),
+      Number(skipSetMatch[2]),
+      skipSetMatch[3] === "skip",
       ctx,
       deps,
     );
@@ -427,7 +389,12 @@ async function handleTelegramQueueMenuPick<Context>(
     replyChatId,
     replyMessageId,
     getTelegramQueueMenuItemText(item),
-    buildTelegramQueueItemSubmenuReplyMarkup(chatId, msgId, item.isPriority),
+    buildTelegramQueueItemSubmenuReplyMarkup(
+      chatId,
+      msgId,
+      item.isPriority,
+      item.reactionSuppressionEmoji !== undefined,
+    ),
   );
   await deps.answerCallbackQuery(callbackQueryId);
 }
@@ -518,7 +485,12 @@ async function updateTelegramQueueMenuPriority<Context>(
     replyChatId,
     replyMessageId,
     getTelegramQueueMenuItemText(updated),
-    buildTelegramQueueItemSubmenuReplyMarkup(chatId, msgId, updated.isPriority),
+    buildTelegramQueueItemSubmenuReplyMarkup(
+      chatId,
+      msgId,
+      updated.isPriority,
+      updated.reactionSuppressionEmoji !== undefined,
+    ),
   );
   await deps.answerCallbackQuery(
     callbackQueryId,
@@ -526,12 +498,14 @@ async function updateTelegramQueueMenuPriority<Context>(
   );
 }
 
-async function handleTelegramQueueMenuDeleteRequest<Context>(
+async function handleTelegramQueueMenuSkipSet<Context>(
   callbackQueryId: string,
   replyChatId: number,
   replyMessageId: number,
   chatId: number,
   msgId: number,
+  skipped: boolean,
+  ctx: Context,
   deps: TelegramQueueMenuCallbackDeps<Context>,
 ): Promise<void> {
   const item = deps.findItem(chatId, msgId);
@@ -543,25 +517,10 @@ async function handleTelegramQueueMenuDeleteRequest<Context>(
       deps,
     );
   }
-  await deps.updateQueueMessage(
-    replyChatId,
-    replyMessageId,
-    "<b>Delete this queued prompt?</b>",
-    buildTelegramQueueDeleteConfirmationReplyMarkup(chatId, msgId),
-  );
-  await deps.answerCallbackQuery(callbackQueryId);
-}
-
-async function handleTelegramQueueMenuKeep<Context>(
-  callbackQueryId: string,
-  replyChatId: number,
-  replyMessageId: number,
-  chatId: number,
-  msgId: number,
-  deps: TelegramQueueMenuCallbackDeps<Context>,
-): Promise<void> {
-  const item = deps.findItem(chatId, msgId);
-  if (!item) {
+  deps.setSkipped(chatId, msgId, skipped);
+  deps.updateStatus(ctx);
+  const updated = deps.findItem(chatId, msgId);
+  if (!updated) {
     return refreshStaleTelegramQueueMenuItem(
       callbackQueryId,
       replyChatId,
@@ -572,30 +531,15 @@ async function handleTelegramQueueMenuKeep<Context>(
   await deps.updateQueueMessage(
     replyChatId,
     replyMessageId,
-    getTelegramQueueMenuItemText(item),
-    buildTelegramQueueItemSubmenuReplyMarkup(chatId, msgId, item.isPriority),
-  );
-  await deps.answerCallbackQuery(callbackQueryId, "Kept in queue.");
-}
-
-async function handleTelegramQueueMenuConfirmDelete<Context>(
-  callbackQueryId: string,
-  replyChatId: number,
-  replyMessageId: number,
-  chatId: number,
-  msgId: number,
-  ctx: Context,
-  deps: TelegramQueueMenuCallbackDeps<Context>,
-): Promise<void> {
-  const removed = deps.cancelItem(chatId, msgId, ctx);
-  deps.updateStatus(ctx);
-  await updateTelegramQueueMenuList(
-    callbackQueryId,
-    replyChatId,
-    replyMessageId,
-    deps,
-    removed ? "Deleted from queue." : "Item not found.",
+    getTelegramQueueMenuItemText(updated),
+    buildTelegramQueueItemSubmenuReplyMarkup(
+      chatId,
+      msgId,
+      updated.isPriority,
+      updated.reactionSuppressionEmoji !== undefined,
+    ),
   );
+  await deps.answerCallbackQuery(callbackQueryId);
 }
 
 interface TelegramQueueMenuCallbackQuery {
@@ -803,8 +747,8 @@ function createQueueMenuCallbackHandler<
             queueMutationRuntime: deps.queueMutationRuntime,
           });
         },
-        cancelItem: (cId, rId, c) => {
-          return cancelQueuedTelegramItem(cId, rId, c, {
+        setSkipped: (cId, rId, skipped) => {
+          return setQueuedTelegramPromptSkipped(cId, rId, skipped, ctx, {
             getQueueSnapshot,
             queueMutationRuntime: deps.queueMutationRuntime,
           });
@@ -817,6 +761,40 @@ function createQueueMenuCallbackHandler<
   };
 }
 
+function getQueueMenuReactionDisposition<Context>(
+  item: Queue.TelegramQueueItem<Context>,
+  priority: boolean,
+  skipped: boolean,
+): Queue.TelegramQueueReactionDisposition {
+  if (priority && skipped) {
+    return {
+      kind: "priority-suppressed",
+      priorityEmoji:
+        item.kind === "prompt" ? item.priorityEmoji ?? "⚡" : "⚡",
+      suppressionEmoji:
+        item.kind === "prompt"
+          ? item.reactionSuppressionEmoji ?? "👎"
+          : "👎",
+    };
+  }
+  if (priority) {
+    return {
+      kind: "priority",
+      emoji: item.kind === "prompt" ? item.priorityEmoji ?? "⚡" : "⚡",
+    };
+  }
+  if (skipped) {
+    return {
+      kind: "suppressed",
+      emoji:
+        item.kind === "prompt"
+          ? item.reactionSuppressionEmoji ?? "👎"
+          : "👎",
+    };
+  }
+  return { kind: "default" };
+}
+
 function toggleQueuedTelegramPromptPriority<Context>(
   chatId: number,
   replyToMessageId: number,
@@ -834,9 +812,12 @@ function toggleQueuedTelegramPromptPriority<Context>(
   if (!item) return false;
   deps.queueMutationRuntime.applyReactionByMessageId(
     replyToMessageId,
-    item.queueLane === "priority"
-      ? { kind: "default" }
-      : { kind: "priority", emoji: "⚡" },
+    getQueueMenuReactionDisposition(
+      item,
+      item.queueLane !== "priority",
+      item.kind === "prompt" &&
+        item.reactionSuppressionEmoji !== undefined,
+    ),
     ctx,
   );
   return true;
@@ -860,15 +841,21 @@ function setQueuedTelegramPromptPriority<Context>(
   if (!item) return false;
   deps.queueMutationRuntime.applyReactionByMessageId(
     replyToMessageId,
-    enabled ? { kind: "priority", emoji: "⚡" } : { kind: "default" },
+    getQueueMenuReactionDisposition(
+      item,
+      enabled,
+      item.kind === "prompt" &&
+        item.reactionSuppressionEmoji !== undefined,
+    ),
     ctx,
   );
   return true;
 }
 
-function cancelQueuedTelegramItem<Context>(
+function setQueuedTelegramPromptSkipped<Context>(
   chatId: number,
   replyToMessageId: number,
+  skipped: boolean,
   ctx: Context,
   deps: {
     getQueueSnapshot: () => Queue.TelegramQueueItem<Context>[];
@@ -880,11 +867,17 @@ function cancelQueuedTelegramItem<Context>(
     chatId,
     replyToMessageId,
   );
-  if (!item) return false;
-  return (
-    deps.queueMutationRuntime.removeByMessageIds([item.replyToMessageId], ctx) >
-    0
+  if (!item || item.kind !== "prompt") return false;
+  deps.queueMutationRuntime.applyReactionByMessageId(
+    replyToMessageId,
+    getQueueMenuReactionDisposition(
+      item,
+      item.queueLane === "priority",
+      skipped,
+    ),
+    ctx,
   );
+  return true;
 }
 
 function createQueueMenuSendMessageAdapter(

package/lib/outbound-buttons.ts

@@ -24,9 +24,16 @@ import {
 const TELEGRAM_BUTTON_CALLBACK_PREFIX = "tgbtn";
 const TELEGRAM_BUTTON_ACTION_TTL_MS = 24 * 60 * 60 * 1000;
 
+export interface TelegramOutboundButtonBinding {
+  generation: string;
+  app: string;
+  revision: number;
+}
+
 export interface TelegramOutboundButtonAction {
   text: string;
   prompt: string;
+  binding?: TelegramOutboundButtonBinding;
   selectedStyle?: TelegramInlineKeyboardButtonStyle;
 }
 
@@ -72,6 +79,11 @@ export interface TelegramButtonCallbackHandlerDeps<TContext = unknown> {
     action: TelegramOutboundButtonAction,
     ctx: TContext,
   ) => boolean | void;
+  invokeBoundAction?: (
+    query: TelegramButtonCallbackQuery,
+    action: TelegramOutboundButtonAction,
+    ctx: TContext,
+  ) => Promise<false | "new" | "edit">;
   editMessageReplyMarkup?: (
     chatId: number,
     messageId: number,
@@ -146,6 +158,7 @@ export function createTelegramButtonActionStore(
       return {
         text: action.text,
         prompt: action.prompt,
+        ...(action.binding ? { binding: action.binding } : {}),
         ...(action.selectedStyle
           ? { selectedStyle: action.selectedStyle }
           : {}),
@@ -159,7 +172,10 @@ const DEFAULT_TELEGRAM_BUTTON_REPLY_MARKDOWN =
 
 export function planTelegramButtonReply(
   markdown: string,
-  deps: { registerAction: (action: TelegramOutboundButtonAction) => string },
+  deps: {
+    registerAction: (action: TelegramOutboundButtonAction) => string;
+    binding?: TelegramOutboundButtonBinding;
+  },
 ): TelegramButtonReplyPlan {
   const keyboard: TelegramOutboundButtonMarkup["inline_keyboard"] = [];
   const stripped = replaceTopLevelHtmlComments(markdown, (comment) => {
@@ -167,15 +183,20 @@ export function planTelegramButtonReply(
       parseTopLevelTelegramComment(comment, candidate),
     );
     if (!command) return comment.raw;
-    const payloadRows = parseTelegramActionPayloadRows(comment, command) ?? [];
-    for (const payloadRow of payloadRows) {
-      const row = payloadRow.flatMap((payload) => {
-        const action = parseTelegramButtonAction(payload);
-        return action
-          ? [{ text: action.text, callback_data: deps.registerAction(action) }]
-          : [];
-      });
-      if (row.length > 0) keyboard.push(row);
+    const payloadRows = parseTelegramActionPayloadRows(comment, command);
+    if (!payloadRows) return "";
+    const actionRows = payloadRows.map((payloadRow) =>
+      payloadRow.map(parseTelegramButtonAction),
+    );
+    if (actionRows.some((row) => row.some((action) => !action))) return "";
+    for (const actionRow of actionRows) {
+      keyboard.push(actionRow.map((action) => ({
+        text: action!.text,
+        callback_data: deps.registerAction({
+          ...action!,
+          ...(deps.binding ? { binding: deps.binding } : {}),
+        }),
+      })));
     }
     return "";
   });
@@ -262,6 +283,33 @@ export async function handleTelegramButtonCallbackQuery<TContext = unknown>(
     return true;
   }
 
+  if (deps.invokeBoundAction) {
+    try {
+      const viewMode = await deps.invokeBoundAction(query, action, ctx);
+      if (viewMode) {
+        if (viewMode === "new" && query.data && query.message?.reply_markup) {
+          const selectedMarkup = markTelegramButtonSelected(
+            query.message.reply_markup,
+            query.data,
+            action.selectedStyle,
+          );
+          if (selectedMarkup && deps.editMessageReplyMarkup) {
+            try {
+              await deps.editMessageReplyMarkup(chatId, messageId, selectedMarkup);
+            } catch {
+              // The action already succeeded; old-surface styling is best-effort.
+            }
+          }
+        }
+        await deps.answerCallbackQuery(query.id, "Done.");
+        return true;
+      }
+    } catch (error) {
+      await deps.answerCallbackQuery(query.id, "Generative App action failed.");
+      throw error;
+    }
+  }
+
   const enqueued = deps.enqueueButtonPrompt(query, action, ctx);
   if (enqueued === false) {
     await deps.answerCallbackQuery(query.id, "Already queued.");

package/lib/outbound-markup.ts

@@ -207,7 +207,7 @@ export function parseTelegramActionPayload(
 
 const TELEGRAM_COMPACT_ACTION_CONTROL_PATTERN = /[\u0000-\u001f\u007f-\u009f]/u;
 
-function parseTelegramCompactActionPayloadRows(
+function parseTelegramAdaptiveActionPayloadRows(
   source: string,
 ): Record<string, unknown>[][] | undefined {
   let offset = 0;
@@ -219,18 +219,23 @@ function parseTelegramCompactActionPayloadRows(
   const skipWhitespace = (): void => {
     while (isStructuralWhitespace(source[offset])) offset += 1;
   };
+  const consumeOptionalSeparator = (): boolean => {
+    skipWhitespace();
+    if (source[offset] !== ",") return true;
+    offset += 1;
+    skipWhitespace();
+    return source[offset] !== "," && source[offset] !== "]";
+  };
   const normalizeAtom = (value: string): string | undefined => {
     const normalized = value.trim();
     return normalized && !TELEGRAM_COMPACT_ACTION_CONTROL_PATTERN.test(normalized)
       ? normalized
       : undefined;
   };
-  const parseCell = (): Record<string, unknown> | undefined => {
+  const parseCompactCell = (): Record<string, unknown> | undefined => {
     if (source[offset] !== "{") return undefined;
     offset += 1;
-    const keySource: string[] = [];
-    const valueSource: string[] = [];
-    let hasSeparator = false;
+    const atomSources: string[][] = [[]];
     while (offset < source.length) {
       const character = source[offset]!;
       if (character === "\\") {
@@ -238,31 +243,85 @@ function parseTelegramCompactActionPayloadRows(
         if (escaped !== "|" && escaped !== "}" && escaped !== "\\") {
           return undefined;
         }
-        if (hasSeparator) valueSource.push(escaped);
-        else keySource.push(escaped);
+        atomSources.at(-1)!.push(escaped);
         offset += 2;
         continue;
       }
       if (character === "|") {
-        if (hasSeparator) return undefined;
-        hasSeparator = true;
+        if (atomSources.length >= 3) return undefined;
+        atomSources.push([]);
         offset += 1;
         continue;
       }
       if (character === "}") {
         offset += 1;
-        const key = normalizeAtom(keySource.join(""));
-        if (!key) return undefined;
-        if (!hasSeparator) return { value: key };
-        const value = normalizeAtom(valueSource.join(""));
-        return value ? { label: key, prompt: value } : undefined;
+        const atoms = atomSources.map((atom) =>
+          normalizeAtom(atom.join("")),
+        );
+        if (atoms.some((atom) => atom === undefined)) return undefined;
+        const [label, prompt, selectedStyle] = atoms as string[];
+        if (atoms.length === 1) return { value: label };
+        if (atoms.length === 2) return { label, prompt };
+        if (
+          selectedStyle !== "primary" &&
+          selectedStyle !== "success" &&
+          selectedStyle !== "danger"
+        ) return undefined;
+        return { label, prompt, selected_style: selectedStyle };
       }
-      if (hasSeparator) valueSource.push(character);
-      else keySource.push(character);
+      atomSources.at(-1)!.push(character);
       offset += 1;
     }
     return undefined;
   };
+  const parseJsonObjectCell = (): Record<string, unknown> | undefined => {
+    if (source[offset] !== "{") return undefined;
+    const start = offset;
+    const stack: string[] = [];
+    let inString = false;
+    let escaped = false;
+    for (let index = start; index < source.length; index += 1) {
+      const character = source[index]!;
+      if (inString) {
+        if (escaped) escaped = false;
+        else if (character === "\\") escaped = true;
+        else if (character === '"') inString = false;
+        continue;
+      }
+      if (character === '"') {
+        inString = true;
+        continue;
+      }
+      if (character === "{" || character === "[") {
+        stack.push(character);
+        continue;
+      }
+      if (character !== "}" && character !== "]") continue;
+      const opening = stack.pop();
+      if (
+        (character === "}" && opening !== "{") ||
+        (character === "]" && opening !== "[")
+      ) return undefined;
+      if (stack.length > 0) continue;
+      const candidate = source.slice(start, index + 1);
+      try {
+        const value: unknown = JSON.parse(candidate);
+        if (!isTelegramActionPayload(value)) return undefined;
+        offset = index + 1;
+        return value;
+      } catch {
+        return undefined;
+      }
+    }
+    return undefined;
+  };
+  const parseCell = (): Record<string, unknown> | undefined => {
+    const start = offset;
+    const jsonCell = parseJsonObjectCell();
+    if (jsonCell) return jsonCell;
+    offset = start;
+    return parseCompactCell();
+  };
   const parseRow = (): Record<string, unknown>[] | undefined => {
     if (source[offset] !== "[") return undefined;
     offset += 1;
@@ -277,6 +336,7 @@ function parseTelegramCompactActionPayloadRows(
       const cell = parseCell();
       if (!cell) return undefined;
       row.push(cell);
+      if (!consumeOptionalSeparator()) return undefined;
     }
     return undefined;
   };
@@ -295,15 +355,14 @@ function parseTelegramCompactActionPayloadRows(
         const cell = parseCell();
         if (!cell) return undefined;
         rows.push([cell]);
-        continue;
-      }
-      if (character === "[") {
+      } else if (character === "[") {
         const row = parseRow();
         if (!row) return undefined;
         rows.push(row);
-        continue;
+      } else {
+        return undefined;
       }
-      return undefined;
+      if (!consumeOptionalSeparator()) return undefined;
     }
     return undefined;
   };
@@ -349,7 +408,7 @@ export function parseTelegramActionPayloadRows(
       }
       return rows;
     } catch {
-      return parseTelegramCompactActionPayloadRows(payload.source);
+      return parseTelegramAdaptiveActionPayloadRows(payload.source);
     }
   }
   if (payload.hasBody) return undefined;

package/lib/outbound.ts

@@ -21,6 +21,7 @@ import type {
 import {
   planTelegramButtonReply,
   type TelegramButtonActionStore,
+  type TelegramOutboundButtonBinding,
   type TelegramOutboundButtonMarkup,
 } from "./outbound-buttons.ts";
 import {
@@ -824,6 +825,7 @@ export {
   type TelegramButtonCallbackQuery,
   type TelegramButtonReplyPlan,
   type TelegramOutboundButtonAction,
+  type TelegramOutboundButtonBinding,
   type TelegramOutboundButtonMarkup,
   type TelegramOutboundButtonStoredAction,
 } from "./outbound-buttons.ts";
@@ -832,10 +834,12 @@ export function createTelegramOutboundReplyPlanner(
   store: Pick<TelegramButtonActionStore, "register">,
 ): (
   markdown: string,
+  options?: { binding?: TelegramOutboundButtonBinding },
 ) => TelegramOutboundReplyPlan<TelegramOutboundButtonMarkup> {
-  return (markdown) => {
+  return (markdown, options) => {
     const buttonReply = planTelegramButtonReply(markdown, {
       registerAction: store.register,
+      ...(options?.binding ? { binding: options.binding } : {}),
     });
 
     // Button replies can also contain <!-- telegram_voice --> markup

package/lib/prompts.ts

@@ -33,6 +33,7 @@ export const TELEGRAM_MESSAGE_PROMPT_GUIDELINES = [
 
 const TELEGRAM_MODEL_CONTEXT_TOOL_NAMES = new Set([
   "telegram_attach",
+  "telegram_bind",
   "telegram_message",
 ]);
 const TELEGRAM_MODEL_CONTEXT_MEMORY_KEY = Symbol.for(