@grinev/opencode-telegram-bot 0.21.1 → 0.22.0

package/dist/bot/{commands/mcps.js → callbacks/mcp-catalog-callback-handler.js}

@@ -1,18 +1,8 @@
-import { InlineKeyboard } from "grammy";
-import { opencodeClient } from "../../opencode/client.js";
-import { getCurrentProject } from "../../settings/manager.js";
-import { interactionManager } from "../../interaction/manager.js";
+import { loadMcpCatalog, toggleMcpCatalogServer, } from "../../app/services/mcp-catalog-service.js";
+import { interactionManager } from "../../app/managers/interaction-manager.js";
 import { logger } from "../../utils/logger.js";
 import { t } from "../../i18n/index.js";
-const MCPS_CALLBACK_PREFIX = "mcps:";
-const MCPS_CALLBACK_SELECT_PREFIX = `${MCPS_CALLBACK_PREFIX}select:`;
-const MCPS_CALLBACK_TOGGLE = `${MCPS_CALLBACK_PREFIX}toggle`;
-const MCPS_CALLBACK_BACK = `${MCPS_CALLBACK_PREFIX}back`;
-const MCPS_CALLBACK_CANCEL = `${MCPS_CALLBACK_PREFIX}cancel`;
-const MAX_INLINE_BUTTON_LABEL_LENGTH = 64;
-function normalizeDirectoryForApi(directory) {
-    return directory.replace(/\\/g, "/");
-}
+import { buildMcpsDetailKeyboard, buildMcpsDetailText, buildMcpsListKeyboard, MCPS_CALLBACK_BACK, MCPS_CALLBACK_CANCEL, MCPS_CALLBACK_PREFIX, MCPS_CALLBACK_SELECT_PREFIX, MCPS_CALLBACK_TOGGLE, parseMcpSelectCallback, } from "../menus/mcp-catalog-menu.js";
 function getCallbackMessageId(ctx) {
     const message = ctx.callbackQuery?.message;
     if (!message || !("message_id" in message)) {
@@ -21,87 +11,6 @@ function getCallbackMessageId(ctx) {
     const messageId = message.message_id;
     return typeof messageId === "number" ? messageId : null;
 }
-function getStatusLabel(status) {
-    switch (status.status) {
-        case "connected":
-            return t("mcps.status.connected");
-        case "disabled":
-            return t("mcps.status.disabled");
-        case "failed":
-            return t("mcps.status.failed");
-        case "needs_auth":
-            return t("mcps.status.needs_auth");
-        case "needs_client_registration":
-            return t("mcps.status.needs_client_registration");
-        default:
-            return t("common.unknown");
-    }
-}
-function getStatusEmoji(status) {
-    switch (status.status) {
-        case "connected":
-            return "🟢";
-        case "disabled":
-            return "🔴";
-        case "failed":
-            return "⚠️";
-        case "needs_auth":
-            return "🔒";
-        case "needs_client_registration":
-            return "🔒";
-        default:
-            return "❓";
-    }
-}
-function formatMcpButtonLabel(server) {
-    const rawLabel = `${getStatusEmoji(server.status)} ${server.name}`;
-    if (rawLabel.length <= MAX_INLINE_BUTTON_LABEL_LENGTH) {
-        return rawLabel;
-    }
-    return `${rawLabel.slice(0, MAX_INLINE_BUTTON_LABEL_LENGTH - 3)}...`;
-}
-function buildMcpsListKeyboard(servers) {
-    const keyboard = new InlineKeyboard();
-    servers.forEach((server, index) => {
-        keyboard
-            .text(formatMcpButtonLabel(server), `${MCPS_CALLBACK_SELECT_PREFIX}${index}`)
-            .row();
-    });
-    keyboard.text(t("inline.button.cancel"), MCPS_CALLBACK_CANCEL);
-    return keyboard;
-}
-function buildMcpsDetailKeyboard(server) {
-    const keyboard = new InlineKeyboard();
-    let hasToggleButton = false;
-    if (server.status.status === "connected") {
-        keyboard.text(t("mcps.button.disable"), MCPS_CALLBACK_TOGGLE);
-        hasToggleButton = true;
-    }
-    else if (server.status.status === "disabled" || server.status.status === "failed") {
-        keyboard.text(t("mcps.button.enable"), MCPS_CALLBACK_TOGGLE);
-        hasToggleButton = true;
-    }
-    if (hasToggleButton) {
-        keyboard.row();
-    }
-    keyboard.text(t("mcps.button.back"), MCPS_CALLBACK_BACK);
-    keyboard.text(t("inline.button.cancel"), MCPS_CALLBACK_CANCEL);
-    return keyboard;
-}
-function buildMcpsDetailText(server) {
-    const lines = [];
-    lines.push(t("mcps.detail.title", { name: server.name }));
-    lines.push("");
-    lines.push(t("mcps.detail.status", { status: getStatusLabel(server.status) }));
-    if (server.status.status === "failed" || server.status.status === "needs_client_registration") {
-        lines.push(t("mcps.detail.error", { error: server.status.error }));
-    }
-    if (server.status.status === "needs_auth" || server.status.status === "needs_client_registration") {
-        lines.push("");
-        lines.push(t("mcps.auth_required"));
-    }
-    return lines.join("\n");
-}
 function parseMcpsServers(value) {
     if (!value || typeof value !== "object") {
         return null;
@@ -193,80 +102,6 @@ function clearMcpsInteraction(reason) {
         interactionManager.clear(reason);
     }
 }
-function parseSelectIndex(data) {
-    if (!data.startsWith(MCPS_CALLBACK_SELECT_PREFIX)) {
-        return null;
-    }
-    const index = Number(data.slice(MCPS_CALLBACK_SELECT_PREFIX.length));
-    if (!Number.isInteger(index) || index < 0) {
-        return null;
-    }
-    return index;
-}
-async function getMcpServerList(projectDirectory) {
-    const { data, error } = await opencodeClient.mcp.status({
-        directory: normalizeDirectoryForApi(projectDirectory),
-    });
-    if (error || !data) {
-        throw error || new Error("No MCP status data received");
-    }
-    const servers = parseMcpsServers(data);
-    if (!servers) {
-        throw new Error("Invalid MCP status data format");
-    }
-    return servers;
-}
-async function toggleMcpServer(projectDirectory, serverName, enable) {
-    const params = {
-        name: serverName,
-        directory: normalizeDirectoryForApi(projectDirectory),
-    };
-    if (enable) {
-        const { error } = await opencodeClient.mcp.connect(params);
-        if (error) {
-            throw error;
-        }
-    }
-    else {
-        const { error } = await opencodeClient.mcp.disconnect(params);
-        if (error) {
-            throw error;
-        }
-    }
-}
-export async function mcpsCommand(ctx) {
-    try {
-        const currentProject = getCurrentProject();
-        if (!currentProject) {
-            await ctx.reply(t("bot.project_not_selected"));
-            return;
-        }
-        const servers = await getMcpServerList(currentProject.worktree);
-        if (servers.length === 0) {
-            await ctx.reply(t("mcps.empty"));
-            return;
-        }
-        const keyboard = buildMcpsListKeyboard(servers);
-        const message = await ctx.reply(t("mcps.select"), {
-            reply_markup: keyboard,
-        });
-        interactionManager.start({
-            kind: "custom",
-            expectedInput: "callback",
-            metadata: {
-                flow: "mcps",
-                stage: "list",
-                messageId: message.message_id,
-                projectDirectory: currentProject.worktree,
-                servers,
-            },
-        });
-    }
-    catch (error) {
-        logger.error("[Mcps] Error fetching MCP servers list:", error);
-        await ctx.reply(t("mcps.fetch_error"));
-    }
-}
 export async function handleMcpsCallback(ctx) {
     const data = ctx.callbackQuery?.data;
     if (!data || !data.startsWith(MCPS_CALLBACK_PREFIX)) {
@@ -290,7 +125,7 @@ export async function handleMcpsCallback(ctx) {
                 await ctx.answerCallbackQuery({ text: t("callback.processing_error"), show_alert: true });
                 return true;
             }
-            const servers = await getMcpServerList(metadata.projectDirectory);
+            const servers = await loadMcpCatalog(metadata.projectDirectory);
             const keyboard = buildMcpsListKeyboard(servers);
             await ctx.editMessageText(t("mcps.select"), { reply_markup: keyboard });
             await ctx.answerCallbackQuery();
@@ -319,8 +154,8 @@ export async function handleMcpsCallback(ctx) {
             }
             const enable = server.status.status !== "connected";
             await ctx.answerCallbackQuery({ text: enable ? t("mcps.enabling") : t("mcps.disabling") });
-            await toggleMcpServer(metadata.projectDirectory, serverName, enable);
-            const updatedServers = await getMcpServerList(metadata.projectDirectory);
+            await toggleMcpCatalogServer(metadata.projectDirectory, serverName, enable);
+            const updatedServers = await loadMcpCatalog(metadata.projectDirectory);
             const updatedServer = updatedServers.find((s) => s.name === serverName);
             if (!updatedServer) {
                 await ctx.editMessageText(t("mcps.select"), {
@@ -359,7 +194,7 @@ export async function handleMcpsCallback(ctx) {
                 await ctx.answerCallbackQuery({ text: t("callback.processing_error"), show_alert: true });
                 return true;
             }
-            const serverIndex = parseSelectIndex(data);
+            const serverIndex = parseMcpSelectCallback(data);
             const server = serverIndex === null ? undefined : metadata.servers[serverIndex];
             if (!server) {
                 await ctx.answerCallbackQuery({ text: t("inline.inactive_callback"), show_alert: true });

package/dist/bot/{commands/messages.js → callbacks/message-history-callback-handler.js}

@@ -1,27 +1,18 @@
-import { InlineKeyboard } from "grammy";
 import { config } from "../../config.js";
-import { interactionManager } from "../../interaction/manager.js";
+import { clearAllInteractionState, interactionManager } from "../../app/managers/interaction-manager.js";
 import { opencodeClient } from "../../opencode/client.js";
-import { getCurrentSession, setCurrentSession } from "../../session/manager.js";
-import { getCurrentProject } from "../../settings/manager.js";
-import { clearAllInteractionState } from "../../interaction/cleanup.js";
-import { attachToSession } from "../../attach/service.js";
-import { ingestSessionInfoForCache } from "../../session/cache-manager.js";
+import { setCurrentSession } from "../../app/services/session-service.js";
+import { attachToSession } from "../../app/services/attach-service.js";
+import { ingestSessionInfoForCache } from "../../app/services/session-cache-service.js";
+import { loadLatestAssistantResponse } from "../../app/services/message-history-service.js";
+import { isForegroundBusy } from "../../app/services/run-control-service.js";
 import { t } from "../../i18n/index.js";
 import { logger } from "../../utils/logger.js";
 import { safeBackgroundTask } from "../../utils/safe-background-task.js";
-import { renderAssistantFinalPartsSafe } from "../utils/assistant-rendering.js";
-import { sendRenderedBotPart } from "../utils/telegram-text.js";
-const MESSAGES_CALLBACK_PREFIX = "messages:";
-const MESSAGES_CALLBACK_SELECT_PREFIX = `${MESSAGES_CALLBACK_PREFIX}select:`;
-const MESSAGES_CALLBACK_PAGE_PREFIX = `${MESSAGES_CALLBACK_PREFIX}page:`;
-const MESSAGES_CALLBACK_REVERT = `${MESSAGES_CALLBACK_PREFIX}revert`;
-const MESSAGES_CALLBACK_FORK = `${MESSAGES_CALLBACK_PREFIX}fork`;
-const MESSAGES_CALLBACK_BACK = `${MESSAGES_CALLBACK_PREFIX}back`;
-const MESSAGES_CALLBACK_CANCEL = `${MESSAGES_CALLBACK_PREFIX}cancel`;
-const MAX_INLINE_BUTTON_LABEL_LENGTH = 64;
-const TELEGRAM_MESSAGE_LIMIT = 4096;
-const LATEST_ASSISTANT_RESPONSE_MESSAGES_LIMIT = 20;
+import { renderAssistantFinalPartsSafe } from "../messages/assistant-rendering.js";
+import { replyBusyBlocked } from "../messages/busy-blocked-renderer.js";
+import { sendRenderedBotPart } from "../messages/telegram-text.js";
+import { buildMessageDetailKeyboard, buildMessagesListKeyboard, calculateMessagesPaginationRange, formatMessageDetailText, formatMessagesSelectText, MESSAGES_CALLBACK_BACK, MESSAGES_CALLBACK_CANCEL, MESSAGES_CALLBACK_FORK, MESSAGES_CALLBACK_PREFIX, MESSAGES_CALLBACK_REVERT, parseMessagePageCallback, parseMessageSelectCallback, TELEGRAM_MESSAGE_LIMIT, truncateMessageHistoryText, } from "../menus/message-history-menu.js";
 function getCallbackMessageId(ctx) {
     const message = ctx.callbackQuery?.message;
     if (!message || !("message_id" in message)) {
@@ -30,99 +21,6 @@ function getCallbackMessageId(ctx) {
     const messageId = message.message_id;
     return typeof messageId === "number" ? messageId : null;
 }
-function extractTextParts(parts) {
-    const text = parts
-        .filter((part) => part.type === "text" && typeof part.text === "string")
-        .map((part) => part.text)
-        .join("")
-        .trim();
-    return text.length > 0 ? text : null;
-}
-function truncateText(text, maxLength) {
-    if (text.length <= maxLength) {
-        return text;
-    }
-    return `${text.slice(0, Math.max(0, maxLength - 3)).trimEnd()}...`;
-}
-function normalizeButtonText(text) {
-    return text.replace(/\s+/g, " ").trim();
-}
-function formatMessageTime(created) {
-    const date = new Date(created);
-    const hours = date.getHours().toString().padStart(2, "0");
-    const minutes = date.getMinutes().toString().padStart(2, "0");
-    return `${hours}:${minutes}`;
-}
-function formatMessageButtonLabel(message) {
-    const prefix = `[${formatMessageTime(message.created)}] `;
-    const text = normalizeButtonText(message.text);
-    return `${prefix}${truncateText(text, MAX_INLINE_BUTTON_LABEL_LENGTH - prefix.length)}`;
-}
-function formatMessagesSelectText(page) {
-    if (page === 0) {
-        return t("messages.select");
-    }
-    return t("messages.select_page", { page: page + 1 });
-}
-function formatMessageDetailText(message) {
-    const prefix = `[${formatMessageTime(message.created)}]\n\n`;
-    return truncateText(`${prefix}${message.text}`, TELEGRAM_MESSAGE_LIMIT);
-}
-export function buildMessagePageCallback(page) {
-    return `${MESSAGES_CALLBACK_PAGE_PREFIX}${page}`;
-}
-export function parseMessagePageCallback(data) {
-    if (!data.startsWith(MESSAGES_CALLBACK_PAGE_PREFIX)) {
-        return null;
-    }
-    const rawPage = data.slice(MESSAGES_CALLBACK_PAGE_PREFIX.length);
-    const page = Number(rawPage);
-    if (!Number.isInteger(page) || page < 0) {
-        return null;
-    }
-    return page;
-}
-export function calculateMessagesPaginationRange(totalMessages, page, pageSize) {
-    const safePageSize = Math.max(1, pageSize);
-    const totalPages = Math.max(1, Math.ceil(totalMessages / safePageSize));
-    const normalizedPage = Math.min(Math.max(0, page), totalPages - 1);
-    const startIndex = normalizedPage * safePageSize;
-    const endIndex = Math.min(startIndex + safePageSize, totalMessages);
-    return {
-        page: normalizedPage,
-        totalPages,
-        startIndex,
-        endIndex,
-    };
-}
-function buildMessagesListKeyboard(messages, page, pageSize) {
-    const keyboard = new InlineKeyboard();
-    const { page: normalizedPage, totalPages, startIndex, endIndex, } = calculateMessagesPaginationRange(messages.length, page, pageSize);
-    messages.slice(startIndex, endIndex).forEach((message, index) => {
-        const globalIndex = startIndex + index;
-        keyboard.text(formatMessageButtonLabel(message), `${MESSAGES_CALLBACK_SELECT_PREFIX}${globalIndex}`).row();
-    });
-    if (totalPages > 1) {
-        if (normalizedPage > 0) {
-            keyboard.text(t("messages.button.prev_page"), buildMessagePageCallback(normalizedPage - 1));
-        }
-        if (normalizedPage < totalPages - 1) {
-            keyboard.text(t("messages.button.next_page"), buildMessagePageCallback(normalizedPage + 1));
-        }
-        keyboard.row();
-    }
-    keyboard.text(t("messages.button.cancel"), MESSAGES_CALLBACK_CANCEL);
-    return keyboard;
-}
-function buildMessageDetailKeyboard() {
-    return new InlineKeyboard()
-        .text(t("messages.button.revert"), MESSAGES_CALLBACK_REVERT)
-        .row()
-        .text(t("messages.button.fork"), MESSAGES_CALLBACK_FORK)
-        .row()
-        .text(t("messages.button.back"), MESSAGES_CALLBACK_BACK)
-        .text(t("messages.button.cancel"), MESSAGES_CALLBACK_CANCEL);
-}
 function parseMessages(value) {
     if (!Array.isArray(value)) {
         return null;
@@ -197,83 +95,6 @@ function clearMessagesInteraction(reason) {
         interactionManager.clear(reason);
     }
 }
-async function loadUserMessages(sessionId, directory) {
-    const { data, error } = await opencodeClient.session.messages({
-        sessionID: sessionId,
-        directory,
-    });
-    if (error || !data) {
-        throw error || new Error("No message data received");
-    }
-    // Get session info to check for revert
-    const { data: sessionData } = await opencodeClient.session.get({
-        sessionID: sessionId,
-        directory,
-    });
-    const revertMessageID = sessionData?.revert?.messageID;
-    const messages = data
-        .map((message) => {
-        if (message.info.role !== "user") {
-            return null;
-        }
-        const text = extractTextParts(message.parts);
-        if (!text) {
-            return null;
-        }
-        return {
-            id: message.info.id ?? `${message.info.time?.created ?? 0}`,
-            text,
-            created: message.info.time?.created ?? 0,
-        };
-    })
-        .filter((message) => Boolean(message))
-        .sort((a, b) => b.created - a.created);
-    // If there's a revert, filter messages to only include those before the revert point
-    // Messages are sorted newest first, so we need to skip the revert message and everything after it
-    if (revertMessageID) {
-        const revertIndex = messages.findIndex((msg) => msg.id === revertMessageID);
-        if (revertIndex !== -1) {
-            return messages.slice(revertIndex + 1);
-        }
-    }
-    return messages;
-}
-async function loadLatestAssistantResponse(sessionId, directory) {
-    try {
-        const { data: messages, error } = await opencodeClient.session.messages({
-            sessionID: sessionId,
-            directory,
-            limit: LATEST_ASSISTANT_RESPONSE_MESSAGES_LIMIT,
-        });
-        if (error || !messages) {
-            logger.warn("[Messages] Failed to fetch latest assistant response:", error);
-            return null;
-        }
-        const latestResponse = messages.reduce((latest, message) => {
-            if (message.info.role !== "assistant") {
-                return latest;
-            }
-            const assistantInfo = message.info;
-            if (assistantInfo.summary) {
-                return latest;
-            }
-            const text = extractTextParts(message.parts);
-            if (!text) {
-                return latest;
-            }
-            const created = message.info.time?.created ?? 0;
-            if (!latest || created >= latest.created) {
-                return { text, created };
-            }
-            return latest;
-        }, null);
-        return latestResponse?.text ?? null;
-    }
-    catch (err) {
-        logger.error("[Messages] Error loading latest assistant response:", err);
-        return null;
-    }
-}
 async function sendLatestAssistantResponse(api, chatId, sessionId, directory) {
     const responseText = await loadLatestAssistantResponse(sessionId, directory);
     if (!responseText) {
@@ -288,67 +109,15 @@ async function sendLatestAssistantResponse(api, chatId, sessionId, directory) {
         });
     }
 }
-function parseSelectIndex(data) {
-    if (!data.startsWith(MESSAGES_CALLBACK_SELECT_PREFIX)) {
-        return null;
-    }
-    const rawIndex = data.slice(MESSAGES_CALLBACK_SELECT_PREFIX.length);
-    const index = Number(rawIndex);
-    if (!Number.isInteger(index) || index < 0) {
-        return null;
-    }
-    return index;
-}
-export async function messagesCommand(ctx) {
-    try {
-        const currentProject = getCurrentProject();
-        if (!currentProject) {
-            await ctx.reply(t("messages.project_not_selected"));
-            return;
-        }
-        const currentSession = getCurrentSession();
-        if (!currentSession) {
-            await ctx.reply(t("messages.session_not_selected"));
-            return;
-        }
-        if (currentSession.directory !== currentProject.worktree) {
-            await ctx.reply(t("messages.session_project_mismatch"));
-            return;
-        }
-        const messages = await loadUserMessages(currentSession.id, currentSession.directory);
-        if (messages.length === 0) {
-            await ctx.reply(t("messages.empty"));
-            return;
-        }
-        const pageSize = config.bot.messagesListLimit;
-        const keyboard = buildMessagesListKeyboard(messages, 0, pageSize);
-        const message = await ctx.reply(formatMessagesSelectText(0), {
-            reply_markup: keyboard,
-        });
-        interactionManager.start({
-            kind: "custom",
-            expectedInput: "callback",
-            metadata: {
-                flow: "messages",
-                stage: "list",
-                messageId: message.message_id,
-                projectDirectory: currentProject.worktree,
-                sessionId: currentSession.id,
-                messages,
-                page: 0,
-            },
-        });
-    }
-    catch (error) {
-        logger.error("[Messages] Error fetching messages list:", error);
-        await ctx.reply(t("messages.fetch_error"));
-    }
-}
 export async function handleMessagesCallback(ctx, deps) {
     const data = ctx.callbackQuery?.data;
     if (!data || !data.startsWith(MESSAGES_CALLBACK_PREFIX)) {
         return false;
     }
+    if (isForegroundBusy()) {
+        await replyBusyBlocked(ctx);
+        return true;
+    }
     const metadata = parseMessagesMetadata(interactionManager.getSnapshot());
     const callbackMessageId = getCallbackMessageId(ctx);
     if (!metadata || callbackMessageId === null || metadata.messageId !== callbackMessageId) {
@@ -374,7 +143,7 @@ export async function handleMessagesCallback(ctx, deps) {
                     messageID: selectedMessage.id,
                 });
                 const successText = t("messages.revert_success", { text: selectedMessage.text });
-                await ctx.editMessageText(truncateText(successText, TELEGRAM_MESSAGE_LIMIT), {
+                await ctx.editMessageText(truncateMessageHistoryText(successText, TELEGRAM_MESSAGE_LIMIT), {
                     reply_markup: undefined,
                 });
                 clearMessagesInteraction("messages_revert_success");
@@ -422,7 +191,7 @@ export async function handleMessagesCallback(ctx, deps) {
                     ensureEventSubscription: deps.ensureEventSubscription,
                 });
                 const successText = t("messages.fork_success", { text: selectedMessage.text });
-                await ctx.editMessageText(truncateText(successText, TELEGRAM_MESSAGE_LIMIT), {
+                await ctx.editMessageText(truncateMessageHistoryText(successText, TELEGRAM_MESSAGE_LIMIT), {
                     reply_markup: undefined,
                 });
                 clearMessagesInteraction("messages_fork_success");
@@ -499,7 +268,7 @@ export async function handleMessagesCallback(ctx, deps) {
             });
             return true;
         }
-        const messageIndex = parseSelectIndex(data);
+        const messageIndex = parseMessageSelectCallback(data);
         if (messageIndex === null || metadata.stage !== "list") {
             await ctx.answerCallbackQuery({ text: t("callback.processing_error"), show_alert: true });
             return true;

package/dist/bot/{handlers/model.js → callbacks/model-selection-callback-handler.js}

@@ -1,29 +1,16 @@
 import { InlineKeyboard } from "grammy";
-import { selectModel, fetchCurrentModel, getModelSelectionLists, searchModels, } from "../../model/manager.js";
-import { formatModelForDisplay } from "../../model/types.js";
-import { formatVariantForButton } from "../../variant/manager.js";
+import { getStoredAgent, resolveProjectAgent } from "../../app/services/agent-selection-service.js";
+import { searchModels, selectModel, } from "../../app/services/model-selection-service.js";
+import { formatVariantForButton } from "../../app/services/variant-selection-service.js";
+import { formatModelForDisplay } from "../../app/types/model.js";
+import { interactionManager } from "../../app/managers/interaction-manager.js";
 import { logger } from "../../utils/logger.js";
-import { createMainKeyboard } from "../utils/keyboard.js";
-import { getStoredAgent, resolveProjectAgent } from "../../agent/manager.js";
-import { pinnedMessageManager } from "../../pinned/manager.js";
-import { keyboardManager } from "../../keyboard/manager.js";
-import { clearActiveInlineMenu, ensureActiveInlineMenu, replyWithInlineMenu, } from "./inline-menu.js";
-import { interactionManager } from "../../interaction/manager.js";
 import { t } from "../../i18n/index.js";
-const MODEL_SEARCH_CALLBACK = "model:search";
-const MODEL_SEARCH_AGAIN_CALLBACK = "model:search:again";
-const MODEL_SEARCH_CANCEL_CALLBACK = "model:search:cancel";
-function buildModelSelectionMenuText(modelLists) {
-    const lines = [t("model.menu.select"), t("model.menu.favorites_title")];
-    if (modelLists.favorites.length === 0) {
-        lines.push(t("model.menu.favorites_empty"));
-    }
-    lines.push(t("model.menu.recent_title"));
-    if (modelLists.recent.length === 0) {
-        lines.push(t("model.menu.recent_empty"));
-    }
-    return lines.join("\n");
-}
+import { createMainKeyboard } from "../keyboards/main-reply-keyboard.js";
+import { keyboardManager } from "../keyboards/keyboard-manager.js";
+import { pinnedMessageManager } from "../pinned/pinned-message-manager.js";
+import { clearActiveInlineMenu, ensureActiveInlineMenu } from "../menus/inline-menu.js";
+import { MODEL_SEARCH_AGAIN_CALLBACK, MODEL_SEARCH_CALLBACK, MODEL_SEARCH_CANCEL_CALLBACK, } from "../menus/model-selection-menu.js";
 function parseModelSearchMetadata() {
     const state = interactionManager.getSnapshot();
     if (!state || state.kind !== "custom") {
@@ -114,54 +101,6 @@ export async function handleModelSelect(ctx) {
         return false;
     }
 }
-/**
- * Build inline keyboard with favorite and recent models, plus a search button at the top.
- */
-export async function buildModelSelectionMenu(currentModel, modelLists) {
-    const keyboard = new InlineKeyboard();
-    const lists = modelLists ?? (await getModelSelectionLists());
-    const favorites = lists.favorites;
-    const recent = lists.recent;
-    // Search button — always present as first row
-    keyboard.text(t("model.search.button"), MODEL_SEARCH_CALLBACK).row();
-    if (favorites.length === 0 && recent.length === 0) {
-        logger.warn("[ModelHandler] No model choices found in favorites/recent");
-        return keyboard;
-    }
-    const addButton = (model, prefix) => {
-        const isActive = currentModel &&
-            model.providerID === currentModel.providerID &&
-            model.modelID === currentModel.modelID;
-        const label = `${prefix} ${model.providerID}/${model.modelID}`;
-        const labelWithCheck = isActive ? `✅ ${label}` : label;
-        keyboard.text(labelWithCheck, `model:${model.providerID}:${model.modelID}`).row();
-    };
-    favorites.forEach((model) => addButton(model, "⭐"));
-    recent.forEach((model) => addButton(model, "🕘"));
-    return keyboard;
-}
-/**
- * Show model selection menu
- */
-export async function showModelSelectionMenu(ctx) {
-    try {
-        const currentModel = fetchCurrentModel();
-        const modelLists = await getModelSelectionLists();
-        const keyboard = await buildModelSelectionMenu(currentModel, modelLists);
-        // keyboard always has at least the search button, so length > 0
-        const text = buildModelSelectionMenuText(modelLists);
-        await replyWithInlineMenu(ctx, {
-            menuKind: "model",
-            text,
-            keyboard,
-        });
-    }
-    catch (err) {
-        logger.error("[ModelHandler] Error showing model menu:", err);
-        await ctx.reply(t("model.menu.error"));
-    }
-}
-// ─── Model search handlers ────────────────────────────────────────────────
 /**
  * Handle the search button callback (model:search) from the inline menu.
  * Transitions the interaction to text-input mode and prompts the user.