@llblab/pi-telegram 0.52.2 → 0.53.1

package/lib/menu-status.ts

@@ -5,12 +5,11 @@
  */
 
 import { formatTelegramCommandEmojiPrefix } from "./commands.ts";
+import { refuseUnavailableTelegramThinkingControls } from "./menu-thinking.ts";
 import {
-  getTelegramSectionMainMenuRows,
-  type TelegramSectionRegistry,
-} from "./sections.ts";
-import {
+  editTelegramMenuMessage,
   formatStatusButtonLabel,
+  sendTelegramMenuMessage,
   type TelegramMenuMessageRuntimeDeps,
   type TelegramMenuRenderPayload,
   type TelegramModelMenuState,
@@ -21,6 +20,10 @@ import {
   type MenuModel,
   type ThinkingLevel,
 } from "./model.ts";
+import {
+  getTelegramSectionMainMenuRows,
+  type TelegramSectionRegistry,
+} from "./sections.ts";
 
 export interface TelegramStatusMenuCallbackDeps {
   updateModelMenuMessage: () => Promise<void>;
@@ -60,46 +63,6 @@ function isTelegramStatusMenuCallbackAction(
   return data === `menu:${action}` || data === `status:${action}`;
 }
 
-function applyTelegramMenuRenderPayload(
-  state: TelegramModelMenuState,
-  payload: TelegramMenuRenderPayload,
-): TelegramMenuRenderPayload {
-  state.mode = payload.nextMode;
-  return payload;
-}
-
-async function editTelegramMenuMessage(
-  state: TelegramModelMenuState,
-  payload: TelegramMenuRenderPayload,
-  deps: TelegramMenuMessageRuntimeDeps,
-): Promise<void> {
-  const appliedPayload = applyTelegramMenuRenderPayload(state, payload);
-  await deps.editInteractiveMessage(
-    state.chatId,
-    state.messageId,
-    appliedPayload.text,
-    appliedPayload.mode,
-    appliedPayload.replyMarkup,
-  );
-}
-
-function sendTelegramMenuMessage(
-  state: TelegramModelMenuState,
-  payload: TelegramMenuRenderPayload,
-  deps: TelegramMenuMessageRuntimeDeps,
-): Promise<number | undefined> {
-  const appliedPayload = applyTelegramMenuRenderPayload(state, payload);
-  return deps.sendInteractiveMessage(
-    state.chatId,
-    appliedPayload.text,
-    appliedPayload.mode,
-    appliedPayload.replyMarkup,
-    state.threadId !== undefined
-      ? { target: { chatId: state.chatId, threadId: state.threadId } }
-      : undefined,
-  );
-}
-
 export async function openTelegramStatusMenu<
   TModel extends MenuModel = MenuModel,
 >(deps: TelegramStatusMenuOpenDeps<TModel>): Promise<void> {
@@ -135,20 +98,14 @@ export async function handleTelegramStatusMenuCallbackAction(
     return true;
   }
   if (!isTelegramStatusMenuCallbackAction(data, "thinking")) return false;
-  if (deps.isVoiceReplyActive?.()) {
-    await deps.answerCallbackQuery(
-      callbackQueryId,
-      "Thinking controls are disabled during voice replies.",
-    );
-    return true;
-  }
-  if (!activeModel?.reasoning) {
-    await deps.answerCallbackQuery(
+  if (
+    await refuseUnavailableTelegramThinkingControls(
       callbackQueryId,
-      "This model has no reasoning controls.",
-    );
+      activeModel,
+      deps,
+    )
+  )
     return true;
-  }
   await deps.updateThinkingMenuMessage();
   await deps.answerCallbackQuery(callbackQueryId);
   return true;
@@ -189,10 +146,13 @@ export function buildStatusReplyMarkup(
       callback_data: "menu:queue",
     },
   ]);
-  if (pendingCancellationCount > 0) rows.push([{
-    text: `❌ Pending cancellations: ${pendingCancellationCount}`,
-    callback_data: "reroutecancel:review:open",
-  }]);
+  if (pendingCancellationCount > 0)
+    rows.push([
+      {
+        text: `❌ Pending cancellations: ${pendingCancellationCount}`,
+        callback_data: "reroutecancel:review:open",
+      },
+    ]);
   if (sectionRegistry) {
     const sectionRows = getTelegramSectionMainMenuRows(sectionRegistry);
     for (const row of sectionRows) {

package/lib/menu-thinking.ts

@@ -4,11 +4,13 @@
  * Owns thinking-menu text, reply markup, callback handling, and thinking-menu message rendering
  */
 
-import type {
-  TelegramMenuMessageRuntimeDeps,
-  TelegramMenuRenderPayload,
-  TelegramModelMenuState,
-  TelegramReplyMarkup,
+import {
+  editTelegramMenuMessage,
+  sendTelegramMenuMessage,
+  type TelegramMenuMessageRuntimeDeps,
+  type TelegramMenuRenderPayload,
+  type TelegramModelMenuState,
+  type TelegramReplyMarkup,
 } from "./menu-model.ts";
 import {
   isThinkingLevel,
@@ -45,72 +47,55 @@ function parseTelegramThinkingMenuCallbackAction(
   return { kind: "thinking:set", level: data.slice("thinking:set:".length) };
 }
 
-function applyTelegramMenuRenderPayload(
-  state: TelegramModelMenuState,
-  payload: TelegramMenuRenderPayload,
-): TelegramMenuRenderPayload {
-  state.mode = payload.nextMode;
-  return payload;
-}
-
-async function editTelegramMenuMessage(
-  state: TelegramModelMenuState,
-  payload: TelegramMenuRenderPayload,
-  deps: TelegramMenuMessageRuntimeDeps,
-): Promise<void> {
-  const appliedPayload = applyTelegramMenuRenderPayload(state, payload);
-  await deps.editInteractiveMessage(
-    state.chatId,
-    state.messageId,
-    appliedPayload.text,
-    appliedPayload.mode,
-    appliedPayload.replyMarkup,
-  );
-}
-
-function sendTelegramMenuMessage(
-  state: TelegramModelMenuState,
-  payload: TelegramMenuRenderPayload,
-  deps: TelegramMenuMessageRuntimeDeps,
-): Promise<number | undefined> {
-  const appliedPayload = applyTelegramMenuRenderPayload(state, payload);
-  return deps.sendInteractiveMessage(
-    state.chatId,
-    appliedPayload.text,
-    appliedPayload.mode,
-    appliedPayload.replyMarkup,
-    state.threadId !== undefined
-      ? { target: { chatId: state.chatId, threadId: state.threadId } }
-      : undefined,
-  );
-}
-
-export async function handleTelegramThinkingMenuCallbackAction(
+/** Answers and returns true when voice replies or a non-reasoning model disable thinking controls. */
+export async function refuseUnavailableTelegramThinkingControls(
   callbackQueryId: string,
-  data: string | undefined,
   activeModel: MenuModel | undefined,
-  deps: TelegramThinkingMenuCallbackDeps,
+  deps: {
+    answerCallbackQuery: (
+      callbackQueryId: string,
+      text?: string,
+    ) => Promise<void>;
+    isVoiceReplyActive?: () => boolean;
+  },
 ): Promise<boolean> {
-  const action = parseTelegramThinkingMenuCallbackAction(data);
-  if (!action) return false;
-  if (!isThinkingLevel(action.level)) {
-    await deps.answerCallbackQuery(callbackQueryId, "Invalid thinking level.");
-    return true;
-  }
   if (deps.isVoiceReplyActive?.()) {
     await deps.answerCallbackQuery(
       callbackQueryId,
-      "Thinking controls are disabled during voice replies.",
+      "Thinking controls are disabled during voice replies",
     );
     return true;
   }
   if (!activeModel?.reasoning) {
     await deps.answerCallbackQuery(
       callbackQueryId,
-      "This model has no reasoning controls.",
+      "This model has no reasoning controls",
     );
     return true;
   }
+  return false;
+}
+
+export async function handleTelegramThinkingMenuCallbackAction(
+  callbackQueryId: string,
+  data: string | undefined,
+  activeModel: MenuModel | undefined,
+  deps: TelegramThinkingMenuCallbackDeps,
+): Promise<boolean> {
+  const action = parseTelegramThinkingMenuCallbackAction(data);
+  if (!action) return false;
+  if (!isThinkingLevel(action.level)) {
+    await deps.answerCallbackQuery(callbackQueryId, "Invalid thinking level");
+    return true;
+  }
+  if (
+    await refuseUnavailableTelegramThinkingControls(
+      callbackQueryId,
+      activeModel,
+      deps,
+    )
+  )
+    return true;
   deps.setThinkingLevel(action.level);
   await deps.updateThinkingMenuMessage();
   await deps.answerCallbackQuery(