@llblab/pi-telegram 0.52.2 → 0.53.0

package/lib/menu-model.ts

@@ -16,6 +16,11 @@ import {
   type TelegramModelSwitchContinuationSource,
   type ThinkingLevel,
 } from "./model.ts";
+import type { TelegramTarget } from "./target.ts";
+import {
+  TelegramApiAuthorityError,
+  type TelegramApiCallOptions,
+} from "./telegram-api.ts";
 
 const TELEGRAM_MODEL_MENU_CACHE_TTL_MS = 5000;
 const TELEGRAM_MODEL_MENU_STATE_TTL_MS = 10 * 60 * 1000;
@@ -141,10 +146,72 @@ export interface TelegramMenuMessageRuntimeDeps {
     text: string,
     mode: "markdown" | "html" | "plain",
     replyMarkup: TelegramReplyMarkup,
-    options?: { target?: { chatId: number; threadId?: number } },
+    options?: { target?: TelegramTarget } & Pick<
+      TelegramApiCallOptions,
+      "assertAuthority"
+    >,
   ) => Promise<number | undefined>;
 }
 
+/** Per-open delivery lifetime; never retain this guard in stored callback state. */
+export function createTelegramMenuDelivery<TModel extends MenuModel>(
+  target: TelegramTarget,
+  options: Pick<TelegramApiCallOptions, "assertAuthority"> | undefined,
+  deps: Pick<TelegramMenuMessageRuntimeDeps, "sendInteractiveMessage"> & {
+    storeModelMenuState: (state: TelegramModelMenuState<TModel>) => void;
+  },
+) {
+  const assertAuthority = options?.assertAuthority,
+    capturedTarget = { ...target };
+  const sendInteractiveMessage = deps.sendInteractiveMessage,
+    storeModelMenuState = deps.storeModelMenuState;
+  let requestIssued = false;
+  const assertCurrent = () => {
+    try {
+      assertAuthority?.();
+    } catch {
+      throw new TelegramApiAuthorityError(requestIssued);
+    }
+  };
+  assertCurrent();
+  return {
+    assertCurrent,
+    assertAuthority,
+    sendInteractiveMessage: async (
+      ...args: Parameters<
+        TelegramMenuMessageRuntimeDeps["sendInteractiveMessage"]
+      >
+    ) => {
+      assertCurrent();
+      const [chatId, text, mode, replyMarkup, sendOptions] = args;
+      const messageId = await sendInteractiveMessage(
+        assertAuthority ? capturedTarget.chatId : chatId,
+        text,
+        mode,
+        replyMarkup,
+        assertAuthority
+          ? { ...sendOptions, target: { ...capturedTarget }, assertAuthority }
+          : sendOptions,
+      );
+      requestIssued = true;
+      assertCurrent();
+      return messageId;
+    },
+    storeModelMenuState: (state: TelegramModelMenuState<TModel>) => {
+      assertCurrent();
+      if (
+        assertAuthority &&
+        (state.chatId !== capturedTarget.chatId ||
+          state.threadId !== capturedTarget.threadId)
+      ) {
+        throw new TelegramApiAuthorityError(requestIssued);
+      }
+      storeModelMenuState(state);
+      assertCurrent();
+    },
+  };
+}
+
 export type TelegramModelMenuCallbackDeps<
   TModel extends MenuModel = MenuModel,
 > = {
@@ -322,7 +389,8 @@ function applyTelegramMenuRenderPayload(
   return payload;
 }
 
-async function editTelegramMenuMessage(
+/** Apply the payload mode to state, then edit the existing menu message in place. */
+export async function editTelegramMenuMessage(
   state: TelegramModelMenuState,
   payload: TelegramMenuRenderPayload,
   deps: TelegramMenuMessageRuntimeDeps,
@@ -337,7 +405,8 @@ async function editTelegramMenuMessage(
   );
 }
 
-function sendTelegramMenuMessage(
+/** Apply the payload mode to state, then send a fresh menu message to its exact chat/Thread. */
+export function sendTelegramMenuMessage(
   state: TelegramModelMenuState,
   payload: TelegramMenuRenderPayload,
   deps: TelegramMenuMessageRuntimeDeps,
@@ -661,9 +730,9 @@ function applyTelegramModelDetailSelection(
   return "changed";
 }
 
-function getTelegramSelectedDetailModel<
-  TModel extends MenuModel = MenuModel,
->(state: TelegramModelMenuState<TModel>): TelegramMenuSelectionResult<TModel> {
+function getTelegramSelectedDetailModel<TModel extends MenuModel = MenuModel>(
+  state: TelegramModelMenuState<TModel>,
+): TelegramMenuSelectionResult<TModel> {
   const indexedSelection = getTelegramModelSelection(
     state,
     state.selectedModelIndex?.toString(),
@@ -810,7 +879,7 @@ export function buildTelegramModelCallbackPlan<
       action.value,
     );
     if (detailResult === "invalid") {
-      return { kind: "answer", text: "Selected model is no longer available." };
+      return { kind: "answer", text: "Selected model is no longer available" };
     }
     return { kind: "update-menu" };
   }
@@ -822,12 +891,12 @@ export function buildTelegramModelCallbackPlan<
     if (params.state.canMutateScope === false) {
       return {
         kind: "answer",
-        text: "Model scope is controlled by CLI --models.",
+        text: "Model scope is controlled by CLI --models",
       };
     }
     const selectionResult = getTelegramSelectedDetailModel(params.state);
     if (selectionResult.kind !== "selected") {
-      return { kind: "answer", text: "Selected model is no longer available." };
+      return { kind: "answer", text: "Selected model is no longer available" };
     }
     const model = selectionResult.selection.model;
     const enabled =
@@ -854,10 +923,10 @@ export function buildTelegramModelCallbackPlan<
       ? getTelegramSelectedDetailModel(params.state)
       : getTelegramModelSelection(params.state, action.value);
   if (selectionResult.kind === "invalid") {
-    return { kind: "answer", text: "Invalid model selection." };
+    return { kind: "answer", text: "Invalid model selection" };
   }
   if (selectionResult.kind === "missing") {
-    return { kind: "answer", text: "Selected model is no longer available." };
+    return { kind: "answer", text: "Selected model is no longer available" };
   }
   const selection = selectionResult.selection;
   if (modelsMatch(selection.model, params.activeModel)) {
@@ -877,7 +946,7 @@ export function buildTelegramModelCallbackPlan<
     if (!params.canRestartBusyRun) {
       return {
         kind: "answer",
-        text: "Pi is busy. Send /abort, /next, or /stop.",
+        text: "Pi is busy. Send /abort, /next, or /stop",
       };
     }
     return {
@@ -940,7 +1009,7 @@ export async function handleTelegramModelMenuCallbackAction<
     if (!deps.persistScopedModelPatterns) {
       await deps.answerCallbackQuery(
         callbackQueryId,
-        "Scoped model persistence is unavailable.",
+        "Scoped model persistence is unavailable",
       );
       return true;
     }
@@ -959,7 +1028,7 @@ export async function handleTelegramModelMenuCallbackAction<
   }
   const changed = await deps.setModel(plan.selection.model);
   if (changed === false) {
-    await deps.answerCallbackQuery(callbackQueryId, "Model is not available.");
+    await deps.answerCallbackQuery(callbackQueryId, "Model is not available");
     return true;
   }
   deps.setCurrentModel(plan.selection.model);
@@ -991,7 +1060,7 @@ export async function handleTelegramModelMenuCallbackAction<
     if (!restarted) {
       await deps.answerCallbackQuery(
         callbackQueryId,
-        "Pi is busy. Send /abort, /next, or /stop.",
+        "Pi is busy. Send /abort, /next, or /stop",
       );
       return true;
     }
@@ -1100,9 +1169,7 @@ function buildModelDetailMenuReplyMarkup(
   };
 }
 
-function buildModelDetailMenuText(
-  state: TelegramModelMenuState,
-): string {
+function buildModelDetailMenuText(state: TelegramModelMenuState): string {
   const selection = getTelegramSelectedDetailModel(state);
   if (selection.kind !== "selected") return MODEL_DETAIL_MENU_TITLE;
   const model = selection.selection.model;

package/lib/menu-queue.ts

@@ -5,11 +5,14 @@
  */
 
 import type { TelegramInlineKeyboardMarkup } from "./keyboard.ts";
-import type { TelegramModelMenuState } from "./menu.ts";
+import {
+  createTelegramMenuDelivery,
+  type TelegramMenuMessageRuntimeDeps,
+  type TelegramModelMenuState,
+} from "./menu-model.ts";
 import type { MenuModel } from "./model.ts";
 import * as Queue from "./queue.ts";
-
-// --- Queue Menu ---
+import type { TelegramApiCallOptions } from "./telegram-api.ts";
 
 const QUEUE_ITEM_PROMPT_HTML_LIMIT = 3600;
 const QUEUE_ITEM_PROMPT_TRUNCATION_SUFFIX = "\n… [truncated]";
@@ -119,21 +122,13 @@ function buildTelegramQueueMenuReplyMarkup(
   return { inline_keyboard: [backRow, refreshRow, ...rows] };
 }
 
-function findTelegramQueueItem<Context>(
-  items: readonly Queue.TelegramQueueItem<Context>[],
-  chatId: number,
-  replyToMessageId: number,
-): Queue.TelegramQueueItem<Context> | undefined {
-  return items.find((item) => {
-    return item.chatId === chatId && item.replyToMessageId === replyToMessageId;
-  });
-}
-
-function findTelegramQueueMenuItem(
-  items: readonly TelegramQueueMenuItem[],
+function findTelegramQueueItem<
+  TItem extends { chatId: number; replyToMessageId: number },
+>(
+  items: readonly TItem[],
   chatId: number,
   replyToMessageId: number,
-): TelegramQueueMenuItem | undefined {
+): TItem | undefined {
   return items.find((item) => {
     return item.chatId === chatId && item.replyToMessageId === replyToMessageId;
   });
@@ -327,7 +322,7 @@ async function handleTelegramQueueMenuCallback<Context>(
       replyChatId,
       replyMessageId,
       deps,
-      "Guest prompt skipped.",
+      "Guest prompt skipped",
     );
     return true;
   }
@@ -372,9 +367,7 @@ async function handleTelegramQueueMenuCallback<Context>(
     );
     return true;
   }
-  const skipSetMatch = data.match(
-    /^queue:skip-set:(\d+):(\d+):(skip|keep)$/,
-  );
+  const skipSetMatch = data.match(/^queue:skip-set:(\d+):(\d+):(skip|keep)$/);
   if (skipSetMatch) {
     await handleTelegramQueueMenuSkipSet(
       callbackQueryId,
@@ -431,7 +424,7 @@ async function refreshStaleTelegramQueueMenuItem<Context>(
     replyChatId,
     replyMessageId,
     deps,
-    "Item no longer in queue.",
+    "Item no longer in queue",
   );
 }
 
@@ -586,7 +579,7 @@ async function updateTelegramQueueMenuPriority<Context>(
   );
   await deps.answerCallbackQuery(
     callbackQueryId,
-    updated.isPriority ? "Prioritized." : "Normal priority.",
+    updated.isPriority ? "Prioritized" : "Normal priority",
   );
 }
 
@@ -644,6 +637,8 @@ interface TelegramQueueMenuRuntime<Context> {
     chatId: number,
     replyToMessageId: number,
     ctx: Context,
+    threadId?: number,
+    options?: Pick<TelegramApiCallOptions, "assertAuthority">,
   ) => Promise<void>;
   handleCallbackQuery: (
     query: TelegramQueueMenuCallbackQuery,
@@ -656,12 +651,7 @@ export function createTelegramQueueMenuRuntime<
 >(deps: {
   telegramQueueStore: Queue.TelegramQueueStateStore<Context>;
   queueMutationRuntime: Queue.TelegramQueueMutationController<Context>;
-  sendInteractiveMessage: (
-    chatId: number,
-    text: string,
-    mode: "html",
-    replyMarkup: TelegramQueueMenuReplyMarkup,
-  ) => Promise<number | undefined>;
+  sendInteractiveMessage: TelegramMenuMessageRuntimeDeps["sendInteractiveMessage"];
   editInteractiveMessage: (
     chatId: number,
     messageId: number,
@@ -676,6 +666,7 @@ export function createTelegramQueueMenuRuntime<
   getModelMenuState: (
     chatId: number,
     ctx: Context,
+    threadId?: number,
   ) => Promise<TelegramModelMenuState<TModel>>;
   getStoredModelMenuState: (
     messageId: number | undefined,
@@ -696,12 +687,22 @@ export function createTelegramQueueMenuRuntime<
     deps.editInteractiveMessage,
   );
   return {
-    openQueueMenu: createOpenQueueMenu<Context, TModel>({
-      getQueuedItems: deps.telegramQueueStore.getQueuedItems,
-      getModelMenuState: deps.getModelMenuState,
-      storeModelMenuState: deps.storeModelMenuState,
-      sendInteractiveMessage: sendQueueMenuMessage,
-    }),
+    openQueueMenu: (chatId, replyToMessageId, ctx, threadId, options) => {
+      const delivery = createTelegramMenuDelivery(
+        { chatId, threadId },
+        options,
+        deps,
+      );
+      return createOpenQueueMenu<Context, TModel>({
+        getQueuedItems: deps.telegramQueueStore.getQueuedItems,
+        getModelMenuState: (chat, context) =>
+          deps.getModelMenuState(chat, context, threadId),
+        storeModelMenuState: delivery.storeModelMenuState,
+        sendInteractiveMessage: delivery.assertAuthority
+          ? createQueueMenuSendMessageAdapter(delivery.sendInteractiveMessage)
+          : sendQueueMenuMessage,
+      })(chatId, replyToMessageId, ctx);
+    },
     handleCallbackQuery: createQueueMenuCallbackHandler<Context, TModel>({
       telegramQueueStore: deps.telegramQueueStore,
       queueMutationRuntime: deps.queueMutationRuntime,
@@ -792,10 +793,7 @@ function createQueueMenuCallbackHandler<
     if (data === "menu:queue" || data === "status:queue") {
       const state = deps.getStoredModelMenuState(messageId, chatId);
       if (!state) {
-        await deps.answerCallbackQuery(
-          query.id,
-          "Interactive message expired.",
-        );
+        await deps.answerCallbackQuery(query.id, "Interactive message expired");
         return true;
       }
       const menuItems = toTelegramQueueMenuItems(
@@ -819,13 +817,17 @@ function createQueueMenuCallbackHandler<
       return toTelegramQueueMenuItems(getQueueSnapshot());
     };
     const findItem = (cId: number, rId: number) => {
-      return findTelegramQueueMenuItem(toMenuItems(), cId, rId);
+      return findTelegramQueueItem(toMenuItems(), cId, rId);
     };
     const findGuestItem = (queueOrder: number) => {
       return toMenuItems().find((item) => {
         return item.isGuest && item.queueOrder === queueOrder;
       });
     };
+    const flagDeps = {
+      getQueueSnapshot,
+      queueMutationRuntime: deps.queueMutationRuntime,
+    };
     return handleTelegramQueueMenuCallback(
       query.id,
       data,
@@ -843,24 +845,34 @@ function createQueueMenuCallbackHandler<
             dismissGuestPlaceholder: deps.dismissGuestPlaceholder,
           });
         },
-        togglePriority: (cId, rId) => {
-          return toggleQueuedTelegramPromptPriority(cId, rId, ctx, {
-            getQueueSnapshot,
-            queueMutationRuntime: deps.queueMutationRuntime,
-          });
-        },
-        setPriority: (cId, rId, enabled) => {
-          return setQueuedTelegramPromptPriority(cId, rId, enabled, ctx, {
-            getQueueSnapshot,
-            queueMutationRuntime: deps.queueMutationRuntime,
-          });
-        },
-        setSkipped: (cId, rId, skipped) => {
-          return setQueuedTelegramPromptSkipped(cId, rId, skipped, ctx, {
-            getQueueSnapshot,
-            queueMutationRuntime: deps.queueMutationRuntime,
-          });
-        },
+        togglePriority: (cId, rId) =>
+          applyQueuedTelegramPromptMenuFlags(
+            cId,
+            rId,
+            ctx,
+            flagDeps,
+            (item) => ({
+              priority: item.queueLane !== "priority",
+              skipped: isQueuedTelegramPromptSkipped(item),
+            }),
+          ),
+        setPriority: (cId, rId, enabled) =>
+          applyQueuedTelegramPromptMenuFlags(
+            cId,
+            rId,
+            ctx,
+            flagDeps,
+            (item) => ({
+              priority: enabled,
+              skipped: isQueuedTelegramPromptSkipped(item),
+            }),
+          ),
+        setSkipped: (cId, rId, skipped) =>
+          applyQueuedTelegramPromptMenuFlags(cId, rId, ctx, flagDeps, (item) =>
+            item.kind === "prompt"
+              ? { priority: item.queueLane === "priority", skipped }
+              : undefined,
+          ),
         updateQueueMessage: deps.editInteractiveMessage,
         answerCallbackQuery: deps.answerCallbackQuery,
         updateStatus: deps.updateStatus,
@@ -879,9 +891,11 @@ async function skipQueuedTelegramGuestPrompt<Context>(
   },
 ): Promise<boolean> {
   const item = deps.getQueueSnapshot().find((candidate) => {
-    return candidate.kind === "prompt" &&
+    return (
+      candidate.kind === "prompt" &&
       candidate.guestQueryId !== undefined &&
-      candidate.queueOrder === queueOrder;
+      candidate.queueOrder === queueOrder
+    );
   });
   if (!item || !deps.queueMutationRuntime.removeGuestPromptByQueueOrder) {
     return false;
@@ -906,111 +920,56 @@ function getQueueMenuReactionDisposition<Context>(
     return {
       kind: "priority-suppressed",
       priorityEmoji:
-        item.kind === "prompt" ? item.priorityEmoji ?? "⚡" : "⚡",
+        item.kind === "prompt" ? (item.priorityEmoji ?? "⚡") : "⚡",
       suppressionEmoji:
-        item.kind === "prompt"
-          ? item.reactionSuppressionEmoji ?? "👎"
-          : "👎",
+        item.kind === "prompt" ? (item.reactionSuppressionEmoji ?? "👎") : "👎",
     };
   }
   if (priority) {
     return {
       kind: "priority",
-      emoji: item.kind === "prompt" ? item.priorityEmoji ?? "⚡" : "⚡",
+      emoji: item.kind === "prompt" ? (item.priorityEmoji ?? "⚡") : "⚡",
     };
   }
   if (skipped) {
     return {
       kind: "suppressed",
       emoji:
-        item.kind === "prompt"
-          ? item.reactionSuppressionEmoji ?? "👎"
-          : "👎",
+        item.kind === "prompt" ? (item.reactionSuppressionEmoji ?? "👎") : "👎",
     };
   }
   return { kind: "default" };
 }
 
-function toggleQueuedTelegramPromptPriority<Context>(
-  chatId: number,
-  replyToMessageId: number,
-  ctx: Context,
-  deps: {
-    getQueueSnapshot: () => Queue.TelegramQueueItem<Context>[];
-    queueMutationRuntime: Queue.TelegramQueueMutationController<Context>;
-  },
-): boolean {
-  const item = findTelegramQueueItem(
-    deps.getQueueSnapshot(),
-    chatId,
-    replyToMessageId,
-  );
-  if (!item) return false;
-  deps.queueMutationRuntime.applyReactionByMessageId(
-    replyToMessageId,
-    getQueueMenuReactionDisposition(
-      item,
-      item.queueLane !== "priority",
-      item.kind === "prompt" &&
-        item.reactionSuppressionEmoji !== undefined,
-    ),
-    ctx,
-  );
-  return true;
-}
-
-function setQueuedTelegramPromptPriority<Context>(
-  chatId: number,
-  replyToMessageId: number,
-  enabled: boolean,
-  ctx: Context,
-  deps: {
-    getQueueSnapshot: () => Queue.TelegramQueueItem<Context>[];
-    queueMutationRuntime: Queue.TelegramQueueMutationController<Context>;
-  },
+function isQueuedTelegramPromptSkipped<Context>(
+  item: Queue.TelegramQueueItem<Context>,
 ): boolean {
-  const item = findTelegramQueueItem(
-    deps.getQueueSnapshot(),
-    chatId,
-    replyToMessageId,
-  );
-  if (!item) return false;
-  deps.queueMutationRuntime.applyReactionByMessageId(
-    replyToMessageId,
-    getQueueMenuReactionDisposition(
-      item,
-      enabled,
-      item.kind === "prompt" &&
-        item.reactionSuppressionEmoji !== undefined,
-    ),
-    ctx,
-  );
-  return true;
+  return item.kind === "prompt" && item.reactionSuppressionEmoji !== undefined;
 }
 
-function setQueuedTelegramPromptSkipped<Context>(
+/** Applies a menu Priority/Skip choice to one queued item through the reaction disposition path. */
+function applyQueuedTelegramPromptMenuFlags<Context>(
   chatId: number,
   replyToMessageId: number,
-  skipped: boolean,
   ctx: Context,
   deps: {
     getQueueSnapshot: () => Queue.TelegramQueueItem<Context>[];
     queueMutationRuntime: Queue.TelegramQueueMutationController<Context>;
   },
+  chooseFlags: (
+    item: Queue.TelegramQueueItem<Context>,
+  ) => { priority: boolean; skipped: boolean } | undefined,
 ): boolean {
   const item = findTelegramQueueItem(
     deps.getQueueSnapshot(),
     chatId,
     replyToMessageId,
   );
-  if (!item || item.kind !== "prompt") return false;
+  const flags = item ? chooseFlags(item) : undefined;
+  if (!item || !flags) return false;
   deps.queueMutationRuntime.applyReactionByMessageId(
     replyToMessageId,
-    getQueueMenuReactionDisposition(
-      item,
-      item.queueLane === "priority",
-      skipped,
-    ),
+    getQueueMenuReactionDisposition(item, flags.priority, flags.skipped),
     ctx,
   );
   return true;