@grinev/opencode-telegram-bot 0.9.1 → 0.10.0

package/README.md

@@ -24,7 +24,7 @@ Quick start: `npx @grinev/opencode-telegram-bot`
 - **Remote coding** — send prompts to OpenCode from anywhere, receive complete results with code sent as files
 - **Session management** — create new sessions or continue existing ones, just like in the TUI
 - **Live status** — pinned message with current project, model, context usage, and changed files list, updated in real time
-- **Model switching** — pick any model from your OpenCode favorites directly in the chat
+- **Model switching** — pick models from OpenCode favorites and recent history directly in the chat (favorites are shown first)
 - **Agent modes** — switch between Plan and Build modes on the fly
 - **Interactive Q&A** — answer agent questions and approve permissions via inline buttons
 - **Voice prompts** — send voice/audio messages, transcribe them via a Whisper-compatible API, then forward recognized text to OpenCode
@@ -100,8 +100,6 @@ opencode-telegram config
 | `/stop`           | Abort the current task                                  |
 | `/sessions`       | Browse and switch between recent sessions               |
 | `/projects`       | Switch between OpenCode projects                        |
-| `/model`          | Choose a model from your favorites                      |
-| `/agent`          | Switch agent mode (Plan / Build)                        |
 | `/rename`         | Rename the current session                              |
 | `/opencode_start` | Start the OpenCode server remotely                      |
 | `/opencode_stop`  | Stop the OpenCode server remotely                       |
@@ -138,7 +136,7 @@ When installed via npm, the configuration wizard handles the initial setup. The
 | `OPENCODE_MODEL_PROVIDER`       | Default model provider                                                                                       |   Yes    | `opencode`               |
 | `OPENCODE_MODEL_ID`             | Default model ID                                                                                             |   Yes    | `big-pickle`             |
 | `BOT_LOCALE`                    | Bot UI language (supported locale code, e.g. `en`, `de`, `es`, `ru`, `zh`)                                   |    No    | `en`                     |
-| `SESSIONS_LIST_LIMIT`           | Max sessions shown in `/sessions`                                                                            |    No    | `10`                     |
+| `SESSIONS_LIST_LIMIT`           | Sessions per page in `/sessions`                                                                             |    No    | `10`                     |
 | `PROJECTS_LIST_LIMIT`           | Max projects shown in `/projects`                                                                            |    No    | `10`                     |
 | `SERVICE_MESSAGES_INTERVAL_SEC` | Service messages interval (thinking + tool calls); keep `>=2` to avoid Telegram rate limits, `0` = immediate |    No    | `5`                      |
 | `HIDE_THINKING_MESSAGES`        | Hide `💭 Thinking...` service messages                                                                       |    No    | `false`                  |
@@ -178,15 +176,14 @@ If STT variables are not set, voice/audio transcription is disabled and the bot
 
 ### Model Configuration
 
-The bot picks up your **favorite models** from OpenCode. To add a model to favorites:
+The model picker uses OpenCode local model state (`favorite` + `recent`):
 
-1. Open OpenCode TUI (`opencode`)
-2. Go to model selection
-3. Hover over the model you want and press **Ctrl+F** to add it to favorites
+- Favorites are shown first, then recent
+- Models already in favorites are not duplicated in recent
+- Current model is marked with `✅`
+- Default model from `OPENCODE_MODEL_PROVIDER` + `OPENCODE_MODEL_ID` is always included in favorites
 
-These favorites will appear in the `/model` command menu in Telegram.
-
-A free model (`opencode/big-pickle`) is configured as the default fallback — if you haven't set up any favorites yet, the bot will use it automatically.
+To add a model to favorites, open OpenCode TUI (`opencode`), go to model selection, and press **Cmd+F/Ctrl+F** on the model.
 
 ## Security
 
@@ -239,9 +236,10 @@ npm run dev
 - Ensure `opencode serve` is running in your project directory
 - Check that `OPENCODE_API_URL` points to the correct address (default: `http://localhost:4096`)
 
-**No models in `/model` menu**
+**No models in model picker**
 
 - Add models to your OpenCode favorites: open OpenCode TUI, go to model selection, press **Ctrl+F** on desired models
+- Verify `OPENCODE_MODEL_PROVIDER` and `OPENCODE_MODEL_ID` point to an available model in your setup
 
 **Linux: permission denied errors**
 

package/dist/bot/commands/definitions.js

@@ -9,8 +9,6 @@ const COMMAND_DEFINITIONS = [
     { command: "stop", descriptionKey: "cmd.description.stop" },
     { command: "sessions", descriptionKey: "cmd.description.sessions" },
     { command: "projects", descriptionKey: "cmd.description.projects" },
-    { command: "model", descriptionKey: "cmd.description.model" },
-    { command: "agent", descriptionKey: "cmd.description.agent" },
     { command: "rename", descriptionKey: "cmd.description.rename" },
     { command: "opencode_start", descriptionKey: "cmd.description.opencode_start" },
     { command: "opencode_stop", descriptionKey: "cmd.description.opencode_stop" },

package/dist/bot/commands/help.js

@@ -3,7 +3,7 @@ import { getLocalizedBotCommands } from "./definitions.js";
 function formatHelpText() {
     const commands = getLocalizedBotCommands();
     const lines = commands.map((item) => `/${item.command} - ${item.description}`);
-    return `📖 ${t("cmd.description.help")}\n\n${lines.join("\n")}`;
+    return `📖 ${t("cmd.description.help")}\n\n${lines.join("\n")}\n\n${t("help.keyboard_hint")}`;
 }
 export async function helpCommand(ctx) {
     await ctx.reply(formatHelpText());

package/dist/bot/commands/sessions.js

@@ -6,45 +6,105 @@ import { clearAllInteractionState } from "../../interaction/cleanup.js";
 import { summaryAggregator } from "../../summary/aggregator.js";
 import { pinnedMessageManager } from "../../pinned/manager.js";
 import { keyboardManager } from "../../keyboard/manager.js";
-import { ensureActiveInlineMenu, replyWithInlineMenu } from "../handlers/inline-menu.js";
+import { appendInlineMenuCancelButton, ensureActiveInlineMenu, replyWithInlineMenu, } from "../handlers/inline-menu.js";
 import { logger } from "../../utils/logger.js";
 import { safeBackgroundTask } from "../../utils/safe-background-task.js";
 import { config } from "../../config.js";
 import { getDateLocale, t } from "../../i18n/index.js";
+const SESSION_CALLBACK_PREFIX = "session:";
+const SESSION_PAGE_CALLBACK_PREFIX = "session:page:";
+const SESSION_FETCH_EXTRA_COUNT = 1;
+function buildSessionPageCallback(page) {
+    return `${SESSION_PAGE_CALLBACK_PREFIX}${page}`;
+}
+function parseSessionPageCallback(data) {
+    if (!data.startsWith(SESSION_PAGE_CALLBACK_PREFIX)) {
+        return null;
+    }
+    const rawPage = data.slice(SESSION_PAGE_CALLBACK_PREFIX.length);
+    const page = Number(rawPage);
+    if (!Number.isInteger(page) || page < 0) {
+        return null;
+    }
+    return page;
+}
+function parseSessionIdCallback(data) {
+    if (!data.startsWith(SESSION_CALLBACK_PREFIX)) {
+        return null;
+    }
+    if (data.startsWith(SESSION_PAGE_CALLBACK_PREFIX)) {
+        return null;
+    }
+    const sessionId = data.slice(SESSION_CALLBACK_PREFIX.length);
+    return sessionId.length > 0 ? sessionId : null;
+}
+function formatSessionsSelectText(page) {
+    if (page === 0) {
+        return t("sessions.select");
+    }
+    return t("sessions.select_page", { page: page + 1 });
+}
+async function loadSessionPage(directory, page, pageSize) {
+    const startIndex = page * pageSize;
+    const endExclusive = startIndex + pageSize;
+    const { data: sessions, error } = await opencodeClient.session.list({
+        directory,
+        limit: endExclusive + SESSION_FETCH_EXTRA_COUNT,
+    });
+    if (error || !sessions) {
+        throw error || new Error("No data received from server");
+    }
+    const hasNext = sessions.length > endExclusive;
+    const pagedSessions = sessions.slice(startIndex, endExclusive);
+    logger.debug(`[Sessions] Loaded page=${page + 1}, startIndex=${startIndex}, endExclusive=${endExclusive}, pageSize=${pageSize}, items=${pagedSessions.length}, hasNext=${hasNext}`);
+    return {
+        sessions: pagedSessions,
+        hasNext,
+        page,
+    };
+}
+function buildSessionsKeyboard(pageData, pageSize) {
+    const keyboard = new InlineKeyboard();
+    const localeForDate = getDateLocale();
+    const pageStartIndex = pageData.page * pageSize;
+    pageData.sessions.forEach((session, index) => {
+        const date = new Date(session.time.created).toLocaleDateString(localeForDate);
+        const label = `${pageStartIndex + index + 1}. ${session.title} (${date})`;
+        keyboard.text(label, `${SESSION_CALLBACK_PREFIX}${session.id}`).row();
+    });
+    if (pageData.page > 0) {
+        keyboard.text(t("sessions.button.prev_page"), buildSessionPageCallback(pageData.page - 1));
+    }
+    if (pageData.hasNext) {
+        keyboard.text(t("sessions.button.next_page"), buildSessionPageCallback(pageData.page + 1));
+    }
+    if (pageData.page > 0 || pageData.hasNext) {
+        keyboard.row();
+    }
+    return keyboard;
+}
 export async function sessionsCommand(ctx) {
     try {
-        const maxSessions = config.bot.sessionsListLimit;
+        const pageSize = config.bot.sessionsListLimit;
         const currentProject = getCurrentProject();
         if (!currentProject) {
             await ctx.reply(t("sessions.project_not_selected"));
             return;
         }
         logger.debug(`[Sessions] Fetching sessions for directory: ${currentProject.worktree}`);
-        const { data: sessions, error } = await opencodeClient.session.list({
-            directory: currentProject.worktree,
-            limit: maxSessions,
-        });
-        if (error || !sessions) {
-            throw error || new Error("No data received from server");
-        }
-        logger.debug(`[Sessions] Found ${sessions.length} sessions`);
-        sessions.forEach((session) => {
+        const firstPage = await loadSessionPage(currentProject.worktree, 0, pageSize);
+        logger.debug(`[Sessions] Found ${firstPage.sessions.length} sessions on page 1`);
+        firstPage.sessions.forEach((session) => {
             logger.debug(`[Sessions] Session: ${session.title} | ${session.directory}`);
         });
-        if (sessions.length === 0) {
+        if (firstPage.sessions.length === 0) {
             await ctx.reply(t("sessions.empty"));
             return;
         }
-        const keyboard = new InlineKeyboard();
-        const localeForDate = getDateLocale();
-        sessions.forEach((session, index) => {
-            const date = new Date(session.time.created).toLocaleDateString(localeForDate);
-            const label = `${index + 1}. ${session.title} (${date})`;
-            keyboard.text(label, `session:${session.id}`).row();
-        });
+        const keyboard = buildSessionsKeyboard(firstPage, pageSize);
         await replyWithInlineMenu(ctx, {
             menuKind: "session",
-            text: t("sessions.select"),
+            text: formatSessionsSelectText(firstPage.page),
             keyboard,
         });
     }
@@ -55,10 +115,11 @@ export async function sessionsCommand(ctx) {
 }
 export async function handleSessionSelect(ctx) {
     const callbackQuery = ctx.callbackQuery;
-    if (!callbackQuery?.data || !callbackQuery.data.startsWith("session:")) {
+    if (!callbackQuery?.data || !callbackQuery.data.startsWith(SESSION_CALLBACK_PREFIX)) {
         return false;
     }
-    const sessionId = callbackQuery.data.replace("session:", "");
+    const page = parseSessionPageCallback(callbackQuery.data);
+    const sessionId = parseSessionIdCallback(callbackQuery.data);
     const isActiveMenu = await ensureActiveInlineMenu(ctx, "session");
     if (!isActiveMenu) {
         return true;
@@ -71,6 +132,31 @@ export async function handleSessionSelect(ctx) {
             await ctx.reply(t("sessions.select_project_first"));
             return true;
         }
+        if (page !== null) {
+            try {
+                const pageSize = config.bot.sessionsListLimit;
+                const pageData = await loadSessionPage(currentProject.worktree, page, pageSize);
+                if (pageData.sessions.length === 0) {
+                    await ctx.answerCallbackQuery({ text: t("sessions.page_empty_callback") });
+                    return true;
+                }
+                const keyboard = buildSessionsKeyboard(pageData, pageSize);
+                appendInlineMenuCancelButton(keyboard, "session");
+                await ctx.editMessageText(formatSessionsSelectText(pageData.page), {
+                    reply_markup: keyboard,
+                });
+                await ctx.answerCallbackQuery();
+            }
+            catch (error) {
+                logger.error("[Sessions] Error loading sessions page:", error);
+                await ctx.answerCallbackQuery({ text: t("sessions.page_load_error_callback") });
+            }
+            return true;
+        }
+        if (!sessionId) {
+            await ctx.answerCallbackQuery({ text: t("callback.processing_error") });
+            return true;
+        }
         const { data: session, error } = await opencodeClient.session.get({
             sessionID: sessionId,
             directory: currentProject.worktree,

package/dist/bot/commands/status.js

@@ -8,6 +8,7 @@ import { formatModelForDisplay } from "../../model/types.js";
 import { processManager } from "../../process/manager.js";
 import { logger } from "../../utils/logger.js";
 import { t } from "../../i18n/index.js";
+import { sendMessageWithMarkdownFallback } from "../utils/send-with-markdown-fallback.js";
 export async function statusCommand(ctx) {
     try {
         const { data, error } = await opencodeClient.global.health();
@@ -58,7 +59,17 @@ export async function statusCommand(ctx) {
             message += `\n${t("status.session_not_selected")}\n`;
             message += t("status.session_hint");
         }
-        await ctx.reply(message, { parse_mode: "Markdown" });
+        if (ctx.chat) {
+            await sendMessageWithMarkdownFallback({
+                api: ctx.api,
+                chatId: ctx.chat.id,
+                text: message,
+                parseMode: "Markdown",
+            });
+        }
+        else {
+            await ctx.reply(message);
+        }
     }
     catch (error) {
         logger.error("[Bot] Error checking server status:", error);

package/dist/bot/handlers/model.js

@@ -1,5 +1,5 @@
 import { InlineKeyboard } from "grammy";
-import { selectModel, getFavoriteModels, fetchCurrentModel } from "../../model/manager.js";
+import { selectModel, fetchCurrentModel, getModelSelectionLists } from "../../model/manager.js";
 import { formatModelForDisplay } from "../../model/types.js";
 import { formatVariantForButton } from "../../variant/manager.js";
 import { logger } from "../../utils/logger.js";
@@ -7,19 +7,18 @@ import { createMainKeyboard } from "../utils/keyboard.js";
 import { getStoredAgent } from "../../agent/manager.js";
 import { pinnedMessageManager } from "../../pinned/manager.js";
 import { keyboardManager } from "../../keyboard/manager.js";
-import { config } from "../../config.js";
 import { clearActiveInlineMenu, ensureActiveInlineMenu, replyWithInlineMenu, } from "./inline-menu.js";
 import { t } from "../../i18n/index.js";
-function isOnlyConfigDefaultModel(models) {
-    if (models.length !== 1) {
-        return false;
+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"));
     }
-    const defaultProviderID = config.opencode.model.provider;
-    const defaultModelID = config.opencode.model.modelId;
-    if (!defaultProviderID || !defaultModelID) {
-        return false;
+    lines.push(t("model.menu.recent_title"));
+    if (modelLists.recent.length === 0) {
+        lines.push(t("model.menu.recent_empty"));
     }
-    return models[0].providerID === defaultProviderID && models[0].modelID === defaultModelID;
+    return lines.join("\n");
 }
 /**
  * Handle model selection callback
@@ -91,27 +90,30 @@ export async function handleModelSelect(ctx) {
     }
 }
 /**
- * Build inline keyboard with favorite models
+ * Build inline keyboard with favorite and recent models
  * @param currentModel Current model for highlighting
  * @returns InlineKeyboard with model selection buttons
  */
-export async function buildModelSelectionMenu(currentModel, favoriteModels) {
+export async function buildModelSelectionMenu(currentModel, modelLists) {
     const keyboard = new InlineKeyboard();
-    const favorites = favoriteModels ?? (await getFavoriteModels());
-    if (favorites.length === 0) {
-        logger.warn("[ModelHandler] No favorite models found");
+    const lists = modelLists ?? (await getModelSelectionLists());
+    const favorites = lists.favorites;
+    const recent = lists.recent;
+    if (favorites.length === 0 && recent.length === 0) {
+        logger.warn("[ModelHandler] No model choices found in favorites/recent");
         return keyboard;
     }
-    // Add button for each favorite model
-    favorites.forEach((model) => {
+    const addButton = (model, prefix) => {
         const isActive = currentModel &&
             model.providerID === currentModel.providerID &&
             model.modelID === currentModel.modelID;
         // Inline buttons use full model ID without truncation
-        const label = `${model.providerID}/${model.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;
 }
 /**
@@ -121,22 +123,18 @@ export async function buildModelSelectionMenu(currentModel, favoriteModels) {
 export async function showModelSelectionMenu(ctx) {
     try {
         const currentModel = fetchCurrentModel();
-        const favorites = await getFavoriteModels();
-        const keyboard = await buildModelSelectionMenu(currentModel, favorites);
+        const modelLists = await getModelSelectionLists();
+        const keyboard = await buildModelSelectionMenu(currentModel, modelLists);
         if (keyboard.inline_keyboard.length === 0) {
             await ctx.reply(t("model.menu.empty"));
             return;
         }
-        const displayName = formatModelForDisplay(currentModel.providerID, currentModel.modelID);
-        const text = t("model.menu.current", { name: displayName });
+        const text = buildModelSelectionMenuText(modelLists);
         await replyWithInlineMenu(ctx, {
             menuKind: "model",
             text,
             keyboard,
         });
-        if (isOnlyConfigDefaultModel(favorites)) {
-            await ctx.reply(t("model.menu.favorites_hint"));
-        }
     }
     catch (err) {
         logger.error("[ModelHandler] Error showing model menu:", err);

package/dist/bot/handlers/voice.js

@@ -80,7 +80,10 @@ async function downloadTelegramFile(ctx, fileId) {
         logger.debug(`[Voice] Downloading file: ${file.file_path} (${file.file_size ?? "?"} bytes)`);
         const buffer = await downloadTelegramFileByUrl(fileUrl);
         // Extract filename from file_path (e.g., "voice/file_123.oga" -> "file_123.oga")
-        const filename = file.file_path.split("/").pop() || "audio.ogg";
+        let filename = file.file_path.split("/").pop() || "audio.ogg";
+        if (filename.endsWith(".oga")) {
+            filename = filename.slice(0, -4) + ".ogg";
+        }
         logger.debug(`[Voice] Downloaded file: ${filename} (${buffer.length} bytes)`);
         return { buffer, filename };
     }

package/dist/bot/index.js

@@ -19,8 +19,6 @@ import { projectsCommand, handleProjectSelect } from "./commands/projects.js";
 import { stopCommand } from "./commands/stop.js";
 import { opencodeStartCommand } from "./commands/opencode-start.js";
 import { opencodeStopCommand } from "./commands/opencode-stop.js";
-import { handleAgentCommand } from "./commands/agent.js";
-import { handleModelCommand } from "./commands/model.js";
 import { renameCommand, handleRenameCancel, handleRenameTextAnswer } from "./commands/rename.js";
 import { handleQuestionCallback, showCurrentQuestion, handleQuestionTextAnswer, } from "./handlers/question.js";
 import { handlePermissionCallback, showPermissionRequest } from "./handlers/permission.js";
@@ -53,6 +51,7 @@ let botInstance = null;
 let chatIdInstance = null;
 let commandsInitialized = false;
 const TELEGRAM_DOCUMENT_CAPTION_MAX_LENGTH = 1024;
+const SESSION_RETRY_PREFIX = "🔁";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const TEMP_DIR = path.join(__dirname, "..", ".tmp");
@@ -323,6 +322,21 @@ async function ensureEventSubscription(directory) {
             logger.error("[Bot] Failed to send session.error message:", err);
         });
     });
+    summaryAggregator.setOnSessionRetry(async ({ sessionId, message }) => {
+        if (!botInstance || !chatIdInstance) {
+            return;
+        }
+        const currentSession = getCurrentSession();
+        if (!currentSession || currentSession.id !== sessionId) {
+            return;
+        }
+        const normalizedMessage = message.trim() || t("common.unknown_error");
+        const truncatedMessage = normalizedMessage.length > 3500
+            ? `${normalizedMessage.slice(0, 3497)}...`
+            : normalizedMessage;
+        const retryMessage = t("bot.session_retry", { message: truncatedMessage });
+        toolMessageBatcher.enqueueUniqueByPrefix(sessionId, retryMessage, SESSION_RETRY_PREFIX);
+    });
     summaryAggregator.setOnSessionDiff(async (_sessionId, diffs) => {
         if (!pinnedMessageManager.isInitialized()) {
             return;
@@ -440,8 +454,6 @@ export function createBot() {
     bot.command("projects", projectsCommand);
     bot.command("sessions", sessionsCommand);
     bot.command("new", newCommand);
-    bot.command("agent", handleAgentCommand);
-    bot.command("model", handleModelCommand);
     bot.command("stop", stopCommand);
     bot.command("rename", renameCommand);
     bot.on("message:text", unknownCommandMiddleware);

package/dist/bot/utils/send-with-markdown-fallback.js

@@ -52,7 +52,7 @@ export async function sendMessageWithMarkdownFallback({ api, chatId, text, optio
         if (!isTelegramMarkdownParseError(error)) {
             throw error;
         }
-        logger.warn("[Bot] MarkdownV2 parse failed, retrying assistant message in raw mode", error);
+        logger.warn("[Bot] Markdown parse failed, retrying assistant message in raw mode", error);
         await api.sendMessage(chatId, text, options);
     }
 }

package/dist/i18n/de.js

@@ -4,8 +4,6 @@ export const de = {
     "cmd.description.stop": "Aktuelle Aktion stoppen",
     "cmd.description.sessions": "Sitzungen auflisten",
     "cmd.description.projects": "Projekte auflisten",
-    "cmd.description.model": "Modell auswählen",
-    "cmd.description.agent": "Modus auswählen",
     "cmd.description.opencode_start": "OpenCode-Server starten",
     "cmd.description.opencode_stop": "OpenCode-Server stoppen",
     "cmd.description.help": "Hilfe",
@@ -31,7 +29,8 @@ export const de = {
     "inline.cancelled_callback": "Abgebrochen",
     "common.unknown": "unbekannt",
     "common.unknown_error": "unbekannter Fehler",
-    "start.welcome": "👋 Willkommen beim OpenCode Telegram Bot!\n\nNutze Befehle:\n/projects — Projekt auswählen\n/sessions — Sitzungsliste\n/new — neue Sitzung\n/agent — Modus wechseln\n/model — Modell auswählen\n/status — Status\n/help — Hilfe",
+    "start.welcome": "👋 Willkommen beim OpenCode Telegram Bot!\n\nNutze Befehle:\n/projects — Projekt auswählen\n/sessions — Sitzungsliste\n/new — neue Sitzung\n/status — Status\n/help — Hilfe\n\nNutze die unteren Buttons, um Modus, Modell und Variante zu wählen.",
+    "help.keyboard_hint": "💡 Nutze die unteren Buttons für Modus, Modell, Variante und Kontextaktionen.",
     "help.text": "📖 **Hilfe**\n\n/status - Serverstatus prüfen\n/sessions - Sitzungsliste\n/new - Neue Sitzung erstellen\n/help - Hilfe",
     "bot.thinking": "💭 Denke...",
     "bot.project_not_selected": "🏗 Projekt ist nicht ausgewählt.\n\nWähle zuerst ein Projekt mit /projects.",
@@ -42,6 +41,7 @@ export const de = {
     "bot.session_reset_project_mismatch": "⚠️ Die aktive Sitzung passt nicht zum ausgewählten Projekt und wurde daher zurückgesetzt. Nutze /sessions zur Auswahl oder /new, um eine neue Sitzung zu erstellen.",
     "bot.prompt_send_error": "Anfrage konnte nicht an OpenCode gesendet werden.",
     "bot.session_error": "🔴 OpenCode meldete einen Fehler: {message}",
+    "bot.session_retry": "🔁 {message}\n\nDer Provider liefert bei wiederholten Versuchen immer wieder denselben Fehler. Mit /stop abbrechen.",
     "bot.unknown_command": "⚠️ Unbekannter Befehl: {command}. Nutze /help, um verfügbare Befehle zu sehen.",
     "bot.photo_downloading": "⏳ Lade Foto herunter...",
     "bot.photo_too_large": "⚠️ Foto ist zu groß (max. {maxSizeMb}MB)",
@@ -76,8 +76,13 @@ export const de = {
     "sessions.project_not_selected": "🏗 Projekt ist nicht ausgewählt.\n\nWähle zuerst ein Projekt mit /projects.",
     "sessions.empty": "📭 Keine Sitzungen gefunden.\n\nErstelle eine neue Sitzung mit /new.",
     "sessions.select": "Sitzung auswählen:",
+    "sessions.select_page": "Sitzung auswählen (Seite {page}):",
     "sessions.fetch_error": "🔴 OpenCode-Server ist nicht verfügbar oder beim Laden der Sitzungen ist ein Fehler aufgetreten.",
     "sessions.select_project_first": "🔴 Projekt ist nicht ausgewählt. Nutze /projects.",
+    "sessions.page_empty_callback": "Auf dieser Seite gibt es keine Sitzungen",
+    "sessions.page_load_error_callback": "Diese Seite kann nicht geladen werden. Bitte versuche es erneut.",
+    "sessions.button.prev_page": "⬅️ Zurück",
+    "sessions.button.next_page": "Weiter ➡️",
     "sessions.loading_context": "⏳ Lade Kontext und letzte Nachrichten...",
     "sessions.selected": "✅ Sitzung ausgewählt: {title}",
     "sessions.select_error": "🔴 Sitzung konnte nicht ausgewählt werden.",
@@ -119,8 +124,13 @@ export const de = {
     "model.changed_message": "✅ Modell geändert zu: {name}",
     "model.change_error_callback": "Modell konnte nicht geändert werden",
     "model.menu.empty": "⚠️ Keine verfügbaren Modelle",
+    "model.menu.select": "Modell auswählen:",
     "model.menu.current": "Aktuelles Modell: {name}\n\nModell auswählen:",
-    "model.menu.favorites_hint": "ℹ️ Die Modellliste wird aus Favoriten in OpenCode CLI erstellt.",
+    "model.menu.favorites_title": "⭐ Favoriten (Füge Modelle in OpenCode CLI zu den Favoriten hinzu)",
+    "model.menu.favorites_empty": "— Leer.",
+    "model.menu.recent_title": "🕘 Zuletzt verwendet",
+    "model.menu.recent_empty": "— Leer.",
+    "model.menu.favorites_hint": "ℹ️ Füge Modelle in OpenCode CLI zu den Favoriten hinzu, damit sie oben angezeigt werden.",
     "model.menu.error": "🔴 Modellliste konnte nicht geladen werden",
     "variant.model_not_selected_callback": "Fehler: Modell ist nicht ausgewählt",
     "variant.changed_callback": "Variante geändert: {name}",

package/dist/i18n/en.js

@@ -4,8 +4,6 @@ export const en = {
     "cmd.description.stop": "Stop current action",
     "cmd.description.sessions": "List sessions",
     "cmd.description.projects": "List projects",
-    "cmd.description.model": "Select model",
-    "cmd.description.agent": "Select mode",
     "cmd.description.opencode_start": "Start OpenCode server",
     "cmd.description.opencode_stop": "Stop OpenCode server",
     "cmd.description.help": "Help",
@@ -31,7 +29,8 @@ export const en = {
     "inline.cancelled_callback": "Cancelled",
     "common.unknown": "unknown",
     "common.unknown_error": "unknown error",
-    "start.welcome": "👋 Welcome to OpenCode Telegram Bot!\n\nUse commands:\n/projects — select project\n/sessions — session list\n/new — new session\n/agent — switch mode\n/model — select model\n/status — status\n/help — help",
+    "start.welcome": "👋 Welcome to OpenCode Telegram Bot!\n\nUse commands:\n/projects — select project\n/sessions — session list\n/new — new session\n/status — status\n/help — help\n\nUse the bottom buttons to select agent mode, model, and variant.",
+    "help.keyboard_hint": "💡 Use the bottom keyboard buttons for agent mode, model, variant, and context actions.",
     "help.text": "📖 **Help**\n\n/status - Check server status\n/sessions - Session list\n/new - Create new session\n/help - Help",
     "bot.thinking": "💭 Thinking...",
     "bot.project_not_selected": "🏗 Project is not selected.\n\nFirst select a project with /projects.",
@@ -42,6 +41,7 @@ export const en = {
     "bot.session_reset_project_mismatch": "⚠️ Active session does not match the selected project, so it was reset. Use /sessions to pick one or /new to create a new session.",
     "bot.prompt_send_error": "Failed to send request to OpenCode.",
     "bot.session_error": "🔴 OpenCode returned an error: {message}",
+    "bot.session_retry": "🔁 {message}\n\nProvider keeps returning the same error on repeated retries. Use /stop to abort.",
     "bot.unknown_command": "⚠️ Unknown command: {command}. Use /help to see available commands.",
     "bot.photo_downloading": "⏳ Downloading photo...",
     "bot.photo_too_large": "⚠️ Photo is too large (max {maxSizeMb}MB)",
@@ -76,8 +76,13 @@ export const en = {
     "sessions.project_not_selected": "🏗 Project is not selected.\n\nFirst select a project with /projects.",
     "sessions.empty": "📭 No sessions found.\n\nCreate a new session with /new.",
     "sessions.select": "Select a session:",
+    "sessions.select_page": "Select a session (page {page}):",
     "sessions.fetch_error": "🔴 OpenCode Server is unavailable or an error occurred while loading sessions.",
     "sessions.select_project_first": "🔴 Project is not selected. Use /projects.",
+    "sessions.page_empty_callback": "No sessions on this page",
+    "sessions.page_load_error_callback": "Cannot load this page. Please try again.",
+    "sessions.button.prev_page": "⬅️ Prev",
+    "sessions.button.next_page": "Next ➡️",
     "sessions.loading_context": "⏳ Loading context and latest messages...",
     "sessions.selected": "✅ Session selected: {title}",
     "sessions.select_error": "🔴 Failed to select session.",
@@ -119,8 +124,13 @@ export const en = {
     "model.changed_message": "✅ Model changed to: {name}",
     "model.change_error_callback": "Failed to change model",
     "model.menu.empty": "⚠️ No available models",
+    "model.menu.select": "Select model:",
     "model.menu.current": "Current model: {name}\n\nSelect model:",
-    "model.menu.favorites_hint": "ℹ️ The model list is built from favorites in OpenCode CLI.",
+    "model.menu.favorites_title": "⭐ Favorites (Add models to favorites in OpenCode CLI)",
+    "model.menu.favorites_empty": "— Empty.",
+    "model.menu.recent_title": "🕘 Recent",
+    "model.menu.recent_empty": "— Empty.",
+    "model.menu.favorites_hint": "ℹ️ Add models to favorites in OpenCode CLI to keep them at the top.",
     "model.menu.error": "🔴 Failed to get models list",
     "variant.model_not_selected_callback": "Error: model is not selected",
     "variant.changed_callback": "Variant changed: {name}",

package/dist/i18n/es.js

@@ -4,8 +4,6 @@ export const es = {
     "cmd.description.stop": "Detener la acción actual",
     "cmd.description.sessions": "Listar sesiones",
     "cmd.description.projects": "Listar proyectos",
-    "cmd.description.model": "Seleccionar modelo",
-    "cmd.description.agent": "Seleccionar modo",
     "cmd.description.opencode_start": "Iniciar servidor OpenCode",
     "cmd.description.opencode_stop": "Detener servidor OpenCode",
     "cmd.description.help": "Ayuda",
@@ -31,7 +29,8 @@ export const es = {
     "inline.cancelled_callback": "Cancelado",
     "common.unknown": "desconocido",
     "common.unknown_error": "error desconocido",
-    "start.welcome": "👋 ¡Bienvenido a OpenCode Telegram Bot!\n\nUsa los comandos:\n/projects — seleccionar proyecto\n/sessions — lista de sesiones\n/new — sesión nueva\n/agent — cambiar modo\n/model — seleccionar modelo\n/status — estado\n/help — ayuda",
+    "start.welcome": "👋 ¡Bienvenido a OpenCode Telegram Bot!\n\nUsa los comandos:\n/projects — seleccionar proyecto\n/sessions — lista de sesiones\n/new — sesión nueva\n/status — estado\n/help — ayuda\n\nUsa los botones inferiores para elegir modo, modelo y variante.",
+    "help.keyboard_hint": "💡 Usa los botones inferiores para modo del agente, modelo, variante y acciones de contexto.",
     "help.text": "📖 **Ayuda**\n\n/status - Ver estado del servidor\n/sessions - Lista de sesiones\n/new - Crear una sesión nueva\n/help - Ayuda",
     "bot.thinking": "💭 Pensando...",
     "bot.project_not_selected": "🏗 No hay un proyecto seleccionado.\n\nPrimero selecciona un proyecto con /projects.",
@@ -42,6 +41,7 @@ export const es = {
     "bot.session_reset_project_mismatch": "⚠️ La sesión activa no coincide con el proyecto seleccionado, así que se reinició. Usa /sessions para elegir una o /new para crear una nueva.",
     "bot.prompt_send_error": "No se pudo enviar la solicitud a OpenCode.",
     "bot.session_error": "🔴 OpenCode devolvió un error: {message}",
+    "bot.session_retry": "🔁 {message}\n\nEl proveedor devuelve el mismo error en intentos repetidos. Usa /stop para detenerlo.",
     "bot.unknown_command": "⚠️ Comando desconocido: {command}. Usa /help para ver los comandos disponibles.",
     "bot.photo_downloading": "⏳ Descargando foto...",
     "bot.photo_too_large": "⚠️ La foto es demasiado grande (max {maxSizeMb}MB)",
@@ -76,8 +76,13 @@ export const es = {
     "sessions.project_not_selected": "🏗 No hay un proyecto seleccionado.\n\nPrimero selecciona un proyecto con /projects.",
     "sessions.empty": "📭 No se encontraron sesiones.\n\nCrea una sesión nueva con /new.",
     "sessions.select": "Selecciona una sesión:",
+    "sessions.select_page": "Selecciona una sesión (página {page}):",
     "sessions.fetch_error": "🔴 OpenCode Server no está disponible u ocurrió un error al cargar las sesiones.",
     "sessions.select_project_first": "🔴 No hay un proyecto seleccionado. Usa /projects.",
+    "sessions.page_empty_callback": "No hay sesiones en esta página",
+    "sessions.page_load_error_callback": "No se puede cargar esta página. Inténtalo de nuevo.",
+    "sessions.button.prev_page": "⬅️ Anterior",
+    "sessions.button.next_page": "Siguiente ➡️",
     "sessions.loading_context": "⏳ Cargando contexto y los últimos mensajes...",
     "sessions.selected": "✅ Sesión seleccionada: {title}",
     "sessions.select_error": "🔴 No se pudo seleccionar la sesión.",
@@ -119,8 +124,13 @@ export const es = {
     "model.changed_message": "✅ Modelo cambiado a: {name}",
     "model.change_error_callback": "No se pudo cambiar el modelo",
     "model.menu.empty": "⚠️ No hay modelos disponibles",
+    "model.menu.select": "Selecciona el modelo:",
     "model.menu.current": "Modelo actual: {name}\n\nSelecciona el modelo:",
-    "model.menu.favorites_hint": "ℹ️ La lista de modelos se genera a partir de favoritos en OpenCode CLI.",
+    "model.menu.favorites_title": "⭐ Favoritos (Agrega modelos a favoritos en OpenCode CLI)",
+    "model.menu.favorites_empty": "— Vacío.",
+    "model.menu.recent_title": "🕘 Recientes",
+    "model.menu.recent_empty": "— Vacío.",
+    "model.menu.favorites_hint": "ℹ️ Agrega modelos a favoritos en OpenCode CLI para mantenerlos arriba de la lista.",
     "model.menu.error": "🔴 No se pudo obtener la lista de modelos",
     "variant.model_not_selected_callback": "Error: no hay un modelo seleccionado",
     "variant.changed_callback": "Variante cambiada: {name}",

package/dist/i18n/ru.js

@@ -4,8 +4,6 @@ export const ru = {
     "cmd.description.stop": "Прервать текущее действие",
     "cmd.description.sessions": "Список сессий",
     "cmd.description.projects": "Список проектов",
-    "cmd.description.model": "Выбрать модель",
-    "cmd.description.agent": "Выбрать режим работы",
     "cmd.description.opencode_start": "Запустить OpenCode сервер",
     "cmd.description.opencode_stop": "Остановить OpenCode сервер",
     "cmd.description.help": "Справка",
@@ -31,7 +29,8 @@ export const ru = {
     "inline.cancelled_callback": "Отменено",
     "common.unknown": "неизвестна",
     "common.unknown_error": "неизвестная ошибка",
-    "start.welcome": "👋 Добро пожаловать в OpenCode Telegram Bot!\n\nИспользуйте команды:\n/projects — выбрать проект\n/sessions — список сессий\n/new — новая сессия\n/agent — сменить режим\n/model — выбрать модель\n/status — статус\n/help — справка",
+    "start.welcome": "👋 Добро пожаловать в OpenCode Telegram Bot!\n\nИспользуйте команды:\n/projects — выбрать проект\n/sessions — список сессий\n/new — новая сессия\n/status — статус\n/help — справка\n\nРежим, модель и вариант выбираются кнопками внизу.",
+    "help.keyboard_hint": "💡 Режим, модель, вариант и действия с контекстом доступны через нижние кнопки клавиатуры.",
     "help.text": "📖 **Справка**\n\n/status - Проверить статус сервера\n/sessions - Список сессий\n/new - Создать новую сессию\n/help - Справка",
     "bot.thinking": "💭 Думаю...",
     "bot.project_not_selected": "🏗 Проект не выбран.\n\nСначала выберите проект командой /projects.",
@@ -42,6 +41,7 @@ export const ru = {
     "bot.session_reset_project_mismatch": "⚠️ Активная сессия не соответствует выбранному проекту, поэтому была сброшена. Используйте /sessions для выбора или /new для создания новой сессии.",
     "bot.prompt_send_error": "Не удалось отправить запрос в OpenCode.",
     "bot.session_error": "🔴 OpenCode вернул ошибку: {message}",
+    "bot.session_retry": "🔁 {message}\n\nПровайдер возвращает одну и ту же ошибку при повторных запросах. Используйте /stop для остановки.",
     "bot.unknown_command": "⚠️ Неизвестная команда: {command}. Используйте /help для списка команд.",
     "bot.photo_downloading": "⏳ Скачиваю фото...",
     "bot.photo_too_large": "⚠️ Фото слишком большое (макс. {maxSizeMb}МБ)",
@@ -76,8 +76,13 @@ export const ru = {
     "sessions.project_not_selected": "🏗 Проект не выбран.\n\nСначала выберите проект командой /projects.",
     "sessions.empty": "📭 Сессий нет.\n\nСоздайте новую сессию командой /new.",
     "sessions.select": "Выберите сессию:",
+    "sessions.select_page": "Выберите сессию (страница {page}):",
     "sessions.fetch_error": "🔴 OpenCode Server недоступен или произошла ошибка при получении списка сессий.",
     "sessions.select_project_first": "🔴 Проект не выбран. Используйте /projects.",
+    "sessions.page_empty_callback": "На этой странице нет сессий",
+    "sessions.page_load_error_callback": "Не удалось загрузить эту страницу. Пожалуйста, попробуйте снова.",
+    "sessions.button.prev_page": "⬅️ Назад",
+    "sessions.button.next_page": "Вперёд ➡️",
     "sessions.loading_context": "⏳ Загружаю контекст и последние сообщения...",
     "sessions.selected": "✅ Сессия выбрана: {title}",
     "sessions.select_error": "🔴 Ошибка при выборе сессии.",
@@ -119,16 +124,21 @@ export const ru = {
     "model.changed_message": "✅ Модель изменена на: {name}",
     "model.change_error_callback": "Ошибка при смене модели",
     "model.menu.empty": "⚠️ Нет доступных моделей",
+    "model.menu.select": "Выберите модель:",
     "model.menu.current": "Текущая модель: {name}\n\nВыберите модель:",
-    "model.menu.favorites_hint": "ℹ️ Список моделей формируется из favorites в OpenCode CLI.",
+    "model.menu.favorites_title": "⭐ Избранное (Добавляйте модели в избранное через OpenCode CLI)",
+    "model.menu.favorites_empty": "— Список пуст.",
+    "model.menu.recent_title": "🕘 Недавние",
+    "model.menu.recent_empty": "— Список пуст.",
+    "model.menu.favorites_hint": "ℹ️ Добавляйте модели в избранное через OpenCode CLI, чтобы они были вверху списка.",
     "model.menu.error": "🔴 Не удалось получить список моделей",
     "variant.model_not_selected_callback": "Ошибка: модель не выбрана",
-    "variant.changed_callback": "Variant изменен: {name}",
-    "variant.changed_message": "✅ Variant изменен на: {name}",
-    "variant.change_error_callback": "Ошибка при смене variant",
+    "variant.changed_callback": "Вариант изменен: {name}",
+    "variant.changed_message": "✅ Вариант изменен на: {name}",
+    "variant.change_error_callback": "Ошибка при смене варианта",
     "variant.select_model_first": "⚠️ Сначала выберите модель",
     "variant.menu.empty": "⚠️ Нет доступных вариантов",
-    "variant.menu.current": "Текущий variant: {name}\n\nВыберите variant:",
+    "variant.menu.current": "Текущий вариант: {name}\n\nВыберите вариант:",
     "variant.menu.error": "🔴 Не удалось получить список вариантов",
     "context.button.confirm": "✅ Да, сжать контекст",
     "context.no_active_session": "⚠️ Нет активной сессии. Создайте сессию командой /new",

package/dist/i18n/zh.js

@@ -4,8 +4,6 @@ export const zh = {
     "cmd.description.stop": "停止当前操作",
     "cmd.description.sessions": "列出会话",
     "cmd.description.projects": "列出项目",
-    "cmd.description.model": "选择模型",
-    "cmd.description.agent": "选择模式",
     "cmd.description.opencode_start": "启动 OpenCode 服务器",
     "cmd.description.opencode_stop": "停止 OpenCode 服务器",
     "cmd.description.help": "帮助",
@@ -31,7 +29,8 @@ export const zh = {
     "inline.cancelled_callback": "已取消",
     "common.unknown": "未知",
     "common.unknown_error": "未知错误",
-    "start.welcome": "👋 欢迎使用 OpenCode Telegram Bot！\n\n可用命令：\n/projects — 选择项目\n/sessions — 会话列表\n/new — 新建会话\n/agent — 切换模式\n/model — 选择模型\n/status — 状态\n/help — 帮助",
+    "start.welcome": "👋 欢迎使用 OpenCode Telegram Bot！\n\n可用命令：\n/projects — 选择项目\n/sessions — 会话列表\n/new — 新建会话\n/status — 状态\n/help — 帮助\n\n请使用底部按钮选择模式、模型和变体。",
+    "help.keyboard_hint": "💡 代理模式、模型、变体和上下文操作请使用底部键盘按钮。",
     "help.text": "📖 **帮助**\n\n/status - 查看服务器状态\n/sessions - 会话列表\n/new - 创建新会话\n/help - 帮助",
     "bot.thinking": "💭 思考中...",
     "bot.project_not_selected": "🏗 未选择项目。\n\n请先使用 /projects 选择一个项目。",
@@ -42,6 +41,7 @@ export const zh = {
     "bot.session_reset_project_mismatch": "⚠️ 活动会话与所选项目不匹配，因此已重置。使用 /sessions 选择一个会话，或 /new 创建新会话。",
     "bot.prompt_send_error": "向 OpenCode 发送请求失败。",
     "bot.session_error": "🔴 OpenCode 返回错误：{message}",
+    "bot.session_retry": "🔁 {message}\n\n提供方在重复重试时持续返回同一错误。使用 /stop 可停止。",
     "bot.unknown_command": "⚠️ 未知命令：{command}。使用 /help 查看可用命令。",
     "bot.photo_downloading": "⏳ 正在下载照片...",
     "bot.photo_too_large": "⚠️ 照片过大（最大 {maxSizeMb}MB）",
@@ -76,8 +76,13 @@ export const zh = {
     "sessions.project_not_selected": "🏗 未选择项目。\n\n请先使用 /projects 选择一个项目。",
     "sessions.empty": "📭 未找到会话。\n\n使用 /new 创建新会话。",
     "sessions.select": "请选择一个会话：",
+    "sessions.select_page": "请选择一个会话（第 {page} 页）：",
     "sessions.fetch_error": "🔴 OpenCode 服务器不可用，或加载会话时发生错误。",
     "sessions.select_project_first": "🔴 未选择项目。使用 /projects。",
+    "sessions.page_empty_callback": "这一页没有会话",
+    "sessions.page_load_error_callback": "无法加载此页面。请重试。",
+    "sessions.button.prev_page": "⬅️ 上一页",
+    "sessions.button.next_page": "下一页 ➡️",
     "sessions.loading_context": "⏳ 正在加载上下文和最新消息...",
     "sessions.selected": "✅ 已选择会话：{title}",
     "sessions.select_error": "🔴 选择会话失败。",
@@ -119,8 +124,13 @@ export const zh = {
     "model.changed_message": "✅ 模型已切换为：{name}",
     "model.change_error_callback": "切换模型失败",
     "model.menu.empty": "⚠️ 没有可用模型",
+    "model.menu.select": "请选择模型：",
     "model.menu.current": "当前模型：{name}\n\n请选择模型：",
-    "model.menu.favorites_hint": "ℹ️ 模型列表来自 OpenCode CLI 的收藏（favorites）。",
+    "model.menu.favorites_title": "⭐ 收藏（可在 OpenCode CLI 中将模型加入收藏）",
+    "model.menu.favorites_empty": "— 列表为空。",
+    "model.menu.recent_title": "🕘 最近使用",
+    "model.menu.recent_empty": "— 列表为空。",
+    "model.menu.favorites_hint": "ℹ️ 可在 OpenCode CLI 中将模型加入收藏，使其显示在列表顶部。",
     "model.menu.error": "🔴 获取模型列表失败",
     "variant.model_not_selected_callback": "错误：未选择模型",
     "variant.changed_callback": "变体已更改：{name}",

package/dist/model/manager.js

@@ -34,6 +34,20 @@ function normalizeFavoriteModels(state) {
         modelID: model.modelID,
     }));
 }
+function normalizeRecentModels(state) {
+    if (!Array.isArray(state.recent)) {
+        return [];
+    }
+    return state.recent
+        .filter((model) => typeof model?.providerID === "string" &&
+        model.providerID.length > 0 &&
+        typeof model.modelID === "string" &&
+        model.modelID.length > 0)
+        .map((model) => ({
+        providerID: model.providerID,
+        modelID: model.modelID,
+    }));
+}
 function getOpenCodeModelStatePath() {
     const xdgStateHome = process.env.XDG_STATE_HOME;
     if (xdgStateHome && xdgStateHome.trim().length > 0) {
@@ -43,38 +57,54 @@ function getOpenCodeModelStatePath() {
     return path.join(homeDir, ".local", "state", "opencode", "model.json");
 }
 /**
- * Get list of favorite models from OpenCode local state file
- * Falls back to env default model if file is unavailable or empty
+ * Get favorite and recent models from OpenCode local state file.
+ * Config model is always treated as favorite.
  */
-export async function getFavoriteModels() {
+export async function getModelSelectionLists() {
     const envDefaultModel = getEnvDefaultModel();
     try {
         const fs = await import("fs/promises");
         const stateFilePath = getOpenCodeModelStatePath();
         const content = await fs.readFile(stateFilePath, "utf-8");
         const state = JSON.parse(content);
-        const favorites = normalizeFavoriteModels(state);
+        const rawFavorites = normalizeFavoriteModels(state);
+        const favorites = envDefaultModel
+            ? dedupeModels([...rawFavorites, envDefaultModel])
+            : rawFavorites;
+        if (rawFavorites.length === 0 && envDefaultModel) {
+            logger.info(`[ModelManager] No favorites in ${stateFilePath}, using config model as favorite`);
+        }
         if (favorites.length === 0) {
-            if (envDefaultModel) {
-                logger.info(`[ModelManager] No favorites in ${stateFilePath}, using env default model`);
-                return [envDefaultModel];
-            }
             logger.warn(`[ModelManager] No favorites in ${stateFilePath}`);
-            return [];
         }
-        const merged = envDefaultModel ? dedupeModels([...favorites, envDefaultModel]) : favorites;
-        logger.debug(`[ModelManager] Loaded ${merged.length} favorite models from ${stateFilePath}`);
-        return merged;
+        const favoriteKeys = new Set(favorites.map((model) => `${model.providerID}/${model.modelID}`));
+        const recent = dedupeModels(normalizeRecentModels(state)).filter((model) => !favoriteKeys.has(`${model.providerID}/${model.modelID}`));
+        logger.debug(`[ModelManager] Loaded model selection lists from ${stateFilePath}: favorites=${favorites.length}, recent=${recent.length}`);
+        return { favorites, recent };
     }
     catch (err) {
         if (envDefaultModel) {
-            logger.warn("[ModelManager] Failed to load OpenCode favorites, using env default model:", err);
-            return [envDefaultModel];
+            logger.warn("[ModelManager] Failed to load OpenCode model state, using config model as favorite:", err);
+            return {
+                favorites: [envDefaultModel],
+                recent: [],
+            };
         }
-        logger.error("[ModelManager] Failed to load OpenCode favorites:", err);
-        return [];
+        logger.error("[ModelManager] Failed to load OpenCode model state:", err);
+        return {
+            favorites: [],
+            recent: [],
+        };
     }
 }
+/**
+ * Get list of favorite models from OpenCode local state file
+ * Falls back to env default model if file is unavailable or empty
+ */
+export async function getFavoriteModels() {
+    const { favorites } = await getModelSelectionLists();
+    return favorites;
+}
 /**
  * Get current model from settings or fallback to config
  * @returns Current model info

package/dist/summary/aggregator.js

@@ -40,6 +40,7 @@ class SummaryAggregator {
     onTokensCallback = null;
     onSessionCompactedCallback = null;
     onSessionErrorCallback = null;
+    onSessionRetryCallback = null;
     onPermissionCallback = null;
     onSessionDiffCallback = null;
     onFileChangeCallback = null;
@@ -81,6 +82,9 @@ class SummaryAggregator {
     setOnSessionError(callback) {
         this.onSessionErrorCallback = callback;
     }
+    setOnSessionRetry(callback) {
+        this.onSessionRetryCallback = callback;
+    }
     setOnPermission(callback) {
         this.onPermissionCallback = callback;
     }
@@ -434,10 +438,24 @@ class SummaryAggregator {
         return hash.toString(36);
     }
     handleSessionStatus(event) {
-        const { sessionID } = event.properties;
+        const { sessionID, status } = event.properties;
         if (sessionID !== this.currentSessionId) {
             return;
         }
+        if (status?.type !== "retry" || !this.onSessionRetryCallback) {
+            return;
+        }
+        const callback = this.onSessionRetryCallback;
+        const message = status.message?.trim() || "Unknown retry error";
+        logger.warn(`[Aggregator] Session retry: session=${sessionID}, attempt=${status.attempt ?? "n/a"}, message=${message}`);
+        setImmediate(() => {
+            callback({
+                sessionId: sessionID,
+                attempt: status.attempt,
+                message,
+                next: status.next,
+            });
+        });
     }
     handleSessionIdle(event) {
         const { sessionID } = event.properties;

package/dist/summary/tool-message-batcher.js

@@ -44,21 +44,10 @@ export class ToolMessageBatcher {
         return this.intervalSeconds;
     }
     enqueue(sessionId, message) {
-        const normalizedMessage = message.trim();
-        if (!sessionId || normalizedMessage.length === 0) {
-            return;
-        }
-        if (this.intervalSeconds === 0) {
-            const expectedGeneration = this.generation;
-            logger.debug(`[ToolBatcher] Sending immediate text message: session=${sessionId}`);
-            void this.enqueueTask(sessionId, () => this.sendTextSafe(sessionId, normalizedMessage, "immediate", expectedGeneration));
-            return;
-        }
-        const queue = this.queues.get(sessionId) ?? [];
-        queue.push({ kind: "text", text: normalizedMessage });
-        this.queues.set(sessionId, queue);
-        logger.debug(`[ToolBatcher] Queued text message: session=${sessionId}, queueSize=${queue.length}, interval=${this.intervalSeconds}s`);
-        this.ensureTimer(sessionId);
+        this.enqueueTextInternal(sessionId, message);
+    }
+    enqueueUniqueByPrefix(sessionId, message, prefix) {
+        this.enqueueTextInternal(sessionId, message, prefix);
     }
     enqueueFile(sessionId, fileData) {
         if (!sessionId) {
@@ -142,6 +131,34 @@ export class ToolMessageBatcher {
         this.sessionTasks.set(sessionId, nextTask);
         return nextTask;
     }
+    enqueueTextInternal(sessionId, message, uniquePrefix) {
+        const normalizedMessage = message.trim();
+        if (!sessionId || normalizedMessage.length === 0) {
+            return;
+        }
+        if (this.intervalSeconds === 0) {
+            const expectedGeneration = this.generation;
+            logger.debug(`[ToolBatcher] Sending immediate text message: session=${sessionId}`);
+            void this.enqueueTask(sessionId, () => this.sendTextSafe(sessionId, normalizedMessage, "immediate", expectedGeneration));
+            return;
+        }
+        const normalizedPrefix = uniquePrefix?.trim();
+        const queue = this.queues.get(sessionId) ?? [];
+        if (normalizedPrefix) {
+            const existingUniqueMessage = queue.find((item) => item.kind === "text" && item.text.startsWith(normalizedPrefix));
+            if (existingUniqueMessage) {
+                existingUniqueMessage.text = normalizedMessage;
+                this.queues.set(sessionId, queue);
+                logger.debug(`[ToolBatcher] Updated queued unique text message: session=${sessionId}, prefix=${normalizedPrefix}, interval=${this.intervalSeconds}s`);
+                this.ensureTimer(sessionId);
+                return;
+            }
+        }
+        queue.push({ kind: "text", text: normalizedMessage });
+        this.queues.set(sessionId, queue);
+        logger.debug(`[ToolBatcher] Queued text message: session=${sessionId}, queueSize=${queue.length}, interval=${this.intervalSeconds}s`);
+        this.ensureTimer(sessionId);
+    }
     async flushSessionInternal(sessionId, reason) {
         const expectedGeneration = this.generation;
         this.clearTimer(sessionId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grinev/opencode-telegram-bot",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "Telegram bot client for OpenCode to run and monitor coding tasks from chat.",
   "type": "module",
   "main": "./dist/index.js",

package/dist/bot/commands/agent.js

@@ -1,17 +0,0 @@
-import { showAgentSelectionMenu } from "../handlers/agent.js";
-import { logger } from "../../utils/logger.js";
-import { t } from "../../i18n/index.js";
-/**
- * Handler for /agent command
- * Shows inline menu to select agent mode
- */
-export async function handleAgentCommand(ctx) {
-    logger.debug("[AgentCommand] /agent command received");
-    try {
-        await showAgentSelectionMenu(ctx);
-    }
-    catch (err) {
-        logger.error("[AgentCommand] Error showing agent menu:", err);
-        await ctx.reply(t("error.load_agents"));
-    }
-}

package/dist/bot/commands/model.js

@@ -1,17 +0,0 @@
-import { showModelSelectionMenu } from "../handlers/model.js";
-import { logger } from "../../utils/logger.js";
-import { t } from "../../i18n/index.js";
-/**
- * Handler for /model command
- * Shows inline menu to select model from favorites
- */
-export async function handleModelCommand(ctx) {
-    logger.debug("[ModelCommand] /model command received");
-    try {
-        await showModelSelectionMenu(ctx);
-    }
-    catch (err) {
-        logger.error("[ModelCommand] Error showing model menu:", err);
-        await ctx.reply(t("error.load_models"));
-    }
-}