@grinev/opencode-telegram-bot 0.4.0 → 0.6.0

package/dist/bot/index.js

@@ -6,6 +6,8 @@ import { SocksProxyAgent } from "socks-proxy-agent";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { config } from "../config.js";
 import { authMiddleware } from "./middleware/auth.js";
+import { interactionGuardMiddleware } from "./middleware/interaction-guard.js";
+import { unknownCommandMiddleware } from "./middleware/unknown-command.js";
 import { BOT_COMMANDS } from "./commands/definitions.js";
 import { startCommand } from "./commands/start.js";
 import { helpCommand } from "./commands/help.js";
@@ -25,13 +27,16 @@ import { handlePermissionCallback, showPermissionRequest } from "./handlers/perm
 import { handleAgentSelect, showAgentSelectionMenu } from "./handlers/agent.js";
 import { handleModelSelect, showModelSelectionMenu } from "./handlers/model.js";
 import { handleVariantSelect, showVariantSelectionMenu } from "./handlers/variant.js";
-import { handleContextButtonPress, handleCompactConfirm, handleCompactCancel, } from "./handlers/context.js";
+import { handleContextButtonPress, handleCompactConfirm } from "./handlers/context.js";
+import { handleInlineMenuCancel } from "./handlers/inline-menu.js";
 import { questionManager } from "../question/manager.js";
-import { permissionManager } from "../permission/manager.js";
+import { interactionManager } from "../interaction/manager.js";
+import { clearAllInteractionState } from "../interaction/cleanup.js";
 import { keyboardManager } from "../keyboard/manager.js";
 import { stopEventListening, subscribeToEvents } from "../opencode/events.js";
 import { summaryAggregator } from "../summary/aggregator.js";
 import { formatSummary, formatToolInfo } from "../summary/formatter.js";
+import { ToolMessageBatcher } from "../summary/tool-message-batcher.js";
 import { opencodeClient } from "../opencode/client.js";
 import { clearSession, getCurrentSession, setCurrentSession } from "../session/manager.js";
 import { ingestSessionInfoForCache } from "../session/cache-manager.js";
@@ -48,6 +53,21 @@ import { t } from "../i18n/index.js";
 let botInstance = null;
 let chatIdInstance = null;
 let commandsInitialized = false;
+const toolMessageBatcher = new ToolMessageBatcher({
+    intervalSeconds: 5,
+    sendMessage: async (sessionId, text) => {
+        if (!botInstance || !chatIdInstance) {
+            return;
+        }
+        const currentSession = getCurrentSession();
+        if (!currentSession || currentSession.id !== sessionId) {
+            return;
+        }
+        await botInstance.api.sendMessage(chatIdInstance, text, {
+            disable_notification: true,
+        });
+    },
+});
 async function ensureCommandsInitialized(ctx, next) {
     if (commandsInitialized || !ctx.from || ctx.from.id !== config.telegram.allowedUserId) {
         await next();
@@ -78,6 +98,10 @@ async function ensureEventSubscription(directory) {
         logger.error("No directory found for event subscription");
         return;
     }
+    toolMessageBatcher.setIntervalSeconds(config.bot.serviceMessagesIntervalSec);
+    summaryAggregator.setOnCleared(() => {
+        toolMessageBatcher.clearAll("summary_aggregator_clear");
+    });
     summaryAggregator.setOnComplete(async (sessionId, messageText) => {
         if (!botInstance || !chatIdInstance) {
             logger.error("Bot or chat ID not available for sending message");
@@ -87,6 +111,7 @@ async function ensureEventSubscription(directory) {
         if (currentSession?.id !== sessionId) {
             return;
         }
+        await toolMessageBatcher.flushSession(sessionId, "assistant_message_completed");
         try {
             const parts = formatSummary(messageText);
             logger.debug(`[Bot] Sending completed message to Telegram (chatId=${chatIdInstance}, parts=${parts.length})`);
@@ -117,19 +142,21 @@ async function ensureEventSubscription(directory) {
         }
     });
     summaryAggregator.setOnTool(async (toolInfo) => {
+        if (config.bot.hideToolCallMessages) {
+            return;
+        }
         if (!botInstance || !chatIdInstance) {
             logger.error("Bot or chat ID not available for sending tool notification");
             return;
         }
         const currentSession = getCurrentSession();
-        const sessionId = summaryAggregator["currentSessionId"];
-        if (!currentSession || currentSession.id !== sessionId) {
+        if (!currentSession || currentSession.id !== toolInfo.sessionId) {
             return;
         }
         try {
             const message = formatToolInfo(toolInfo);
             if (message) {
-                await botInstance.api.sendMessage(chatIdInstance, message);
+                toolMessageBatcher.enqueue(toolInfo.sessionId, message);
             }
         }
         catch (err) {
@@ -155,6 +182,7 @@ async function ensureEventSubscription(directory) {
             await fs.writeFile(tempFilePath, fileData.buffer);
             await botInstance.api.sendDocument(chatIdInstance, new InputFile(tempFilePath), {
                 caption: fileData.caption,
+                disable_notification: true,
             });
             await fs.unlink(tempFilePath);
             logger.debug(`[Bot] Temporary file deleted: ${fileData.filename}`);
@@ -168,6 +196,18 @@ async function ensureEventSubscription(directory) {
             logger.error("Bot or chat ID not available for showing questions");
             return;
         }
+        const currentSession = getCurrentSession();
+        if (currentSession) {
+            await toolMessageBatcher.flushSession(currentSession.id, "question_asked");
+        }
+        if (questionManager.isActive()) {
+            logger.warn("[Bot] Replacing active poll with a new one");
+            const previousMessageIds = questionManager.getMessageIds();
+            for (const messageId of previousMessageIds) {
+                await botInstance.api.deleteMessage(chatIdInstance, messageId).catch(() => { });
+            }
+            clearAllInteractionState("question_replaced_by_new_poll");
+        }
         logger.info(`[Bot] Received ${questions.length} questions from agent, requestID=${requestID}`);
         questionManager.startQuestions(questions, requestID);
         await showCurrentQuestion(botInstance.api, chatIdInstance);
@@ -183,24 +223,30 @@ async function ensureEventSubscription(directory) {
                 });
             }
         }
-        questionManager.clear();
+        clearAllInteractionState("question_error");
     });
     summaryAggregator.setOnPermission(async (request) => {
         if (!botInstance || !chatIdInstance) {
             logger.error("Bot or chat ID not available for showing permission request");
             return;
         }
+        await toolMessageBatcher.flushSession(request.sessionID, "permission_asked");
         logger.info(`[Bot] Received permission request from agent: type=${request.permission}, requestID=${request.id}`);
         await showPermissionRequest(botInstance.api, chatIdInstance, request);
     });
-    summaryAggregator.setOnThinking(async () => {
+    summaryAggregator.setOnThinking(async (sessionId) => {
+        if (config.bot.hideThinkingMessages) {
+            return;
+        }
         if (!botInstance || !chatIdInstance) {
             return;
         }
+        const currentSession = getCurrentSession();
+        if (!currentSession || currentSession.id !== sessionId) {
+            return;
+        }
         logger.debug("[Bot] Agent started thinking");
-        await botInstance.api.sendMessage(chatIdInstance, t("bot.thinking")).catch((err) => {
-            logger.error("[Bot] Failed to send thinking message:", err);
-        });
+        toolMessageBatcher.enqueue(sessionId, t("bot.thinking"));
     });
     summaryAggregator.setOnTokens(async (tokens) => {
         if (!pinnedMessageManager.isInitialized()) {
@@ -298,8 +344,7 @@ async function isSessionBusy(sessionId, directory) {
 async function resetMismatchedSessionContext() {
     stopEventListening();
     summaryAggregator.clear();
-    questionManager.clear();
-    permissionManager.clear();
+    clearAllInteractionState("session_mismatch_reset");
     clearSession();
     keyboardManager.clearContext();
     if (!pinnedMessageManager.isInitialized()) {
@@ -313,6 +358,9 @@ async function resetMismatchedSessionContext() {
     }
 }
 export function createBot() {
+    clearAllInteractionState("bot_startup");
+    toolMessageBatcher.setIntervalSeconds(config.bot.serviceMessagesIntervalSec);
+    logger.info(`[ToolBatcher] Service messages interval: ${config.bot.serviceMessagesIntervalSec}s`);
     const botOptions = {};
     if (config.telegram.proxyUrl) {
         const proxyUrl = config.telegram.proxyUrl;
@@ -365,6 +413,16 @@ export function createBot() {
     });
     bot.use(authMiddleware);
     bot.use(ensureCommandsInitialized);
+    bot.use(interactionGuardMiddleware);
+    const blockMenuWhileInteractionActive = async (ctx) => {
+        const activeInteraction = interactionManager.getSnapshot();
+        if (!activeInteraction) {
+            return false;
+        }
+        logger.debug(`[Bot] Blocking menu open while interaction active: kind=${activeInteraction.kind}, expectedInput=${activeInteraction.expectedInput}`);
+        await ctx.reply(t("interaction.blocked.finish_current"));
+        return true;
+    };
     bot.command("start", startCommand);
     bot.command("help", helpCommand);
     bot.command("status", statusCommand);
@@ -377,10 +435,12 @@ export function createBot() {
     bot.command("model", handleModelCommand);
     bot.command("stop", stopCommand);
     bot.command("rename", renameCommand);
+    bot.on("message:text", unknownCommandMiddleware);
     bot.on("callback_query:data", async (ctx) => {
         logger.debug(`[Bot] Received callback_query:data: ${ctx.callbackQuery?.data}`);
         logger.debug(`[Bot] Callback context: from=${ctx.from?.id}, chat=${ctx.chat?.id}`);
         try {
+            const handledInlineCancel = await handleInlineMenuCancel(ctx);
             const handledSession = await handleSessionSelect(ctx);
             const handledProject = await handleProjectSelect(ctx);
             const handledQuestion = await handleQuestionCallback(ctx);
@@ -389,10 +449,10 @@ export function createBot() {
             const handledModel = await handleModelSelect(ctx);
             const handledVariant = await handleVariantSelect(ctx);
             const handledCompactConfirm = await handleCompactConfirm(ctx);
-            const handledCompactCancel = await handleCompactCancel(ctx);
             const handledRenameCancel = await handleRenameCancel(ctx);
-            logger.debug(`[Bot] Callback handled: session=${handledSession}, project=${handledProject}, question=${handledQuestion}, permission=${handledPermission}, agent=${handledAgent}, model=${handledModel}, variant=${handledVariant}, compact=${handledCompactConfirm || handledCompactCancel}, rename=${handledRenameCancel}`);
-            if (!handledSession &&
+            logger.debug(`[Bot] Callback handled: inlineCancel=${handledInlineCancel}, session=${handledSession}, project=${handledProject}, question=${handledQuestion}, permission=${handledPermission}, agent=${handledAgent}, model=${handledModel}, variant=${handledVariant}, compactConfirm=${handledCompactConfirm}, rename=${handledRenameCancel}`);
+            if (!handledInlineCancel &&
+                !handledSession &&
                 !handledProject &&
                 !handledQuestion &&
                 !handledPermission &&
@@ -400,7 +460,6 @@ export function createBot() {
                 !handledModel &&
                 !handledVariant &&
                 !handledCompactConfirm &&
-                !handledCompactCancel &&
                 !handledRenameCancel) {
                 logger.debug("Unknown callback query:", ctx.callbackQuery?.data);
                 await ctx.answerCallbackQuery({ text: t("callback.unknown_command") });
@@ -408,6 +467,7 @@ export function createBot() {
         }
         catch (err) {
             logger.error("[Bot] Error handling callback:", err);
+            clearAllInteractionState("callback_handler_error");
             await ctx.answerCallbackQuery({ text: t("callback.processing_error") }).catch(() => { });
         }
     });
@@ -415,6 +475,9 @@ export function createBot() {
     bot.hears(/^(📋|🛠️|💬|🔍|📝|📄|📦|🤖) \w+ Mode$/, async (ctx) => {
         logger.debug(`[Bot] Agent mode button pressed: ${ctx.message?.text}`);
         try {
+            if (await blockMenuWhileInteractionActive(ctx)) {
+                return;
+            }
             await showAgentSelectionMenu(ctx);
         }
         catch (err) {
@@ -427,6 +490,9 @@ export function createBot() {
     bot.hears(MODEL_BUTTON_TEXT_PATTERN, async (ctx) => {
         logger.debug(`[Bot] Model button pressed: ${ctx.message?.text}`);
         try {
+            if (await blockMenuWhileInteractionActive(ctx)) {
+                return;
+            }
             await showModelSelectionMenu(ctx);
         }
         catch (err) {
@@ -438,6 +504,9 @@ export function createBot() {
     bot.hears(/^📊(?:\s|$)/, async (ctx) => {
         logger.debug(`[Bot] Context button pressed: ${ctx.message?.text}`);
         try {
+            if (await blockMenuWhileInteractionActive(ctx)) {
+                return;
+            }
             await handleContextButtonPress(ctx);
         }
         catch (err) {
@@ -450,6 +519,9 @@ export function createBot() {
     bot.hears(VARIANT_BUTTON_TEXT_PATTERN, async (ctx) => {
         logger.debug(`[Bot] Variant button pressed: ${ctx.message?.text}`);
         try {
+            if (await blockMenuWhileInteractionActive(ctx)) {
+                return;
+            }
             await showVariantSelectionMenu(ctx);
         }
         catch (err) {
@@ -628,12 +700,16 @@ export function createBot() {
         }
         catch (err) {
             logger.error("Error in prompt handler:", err);
+            if (interactionManager.getSnapshot()) {
+                clearAllInteractionState("message_handler_error");
+            }
             await ctx.reply(t("error.generic"));
         }
         logger.debug("[Bot] message:text handler completed (prompt sent in background)");
     });
     bot.catch((err) => {
         logger.error("[Bot] Unhandled error in bot:", err);
+        clearAllInteractionState("bot_unhandled_error");
         if (err.ctx) {
             logger.error("[Bot] Error context - update type:", err.ctx.update ? Object.keys(err.ctx.update) : "unknown");
         }

package/dist/bot/middleware/interaction-guard.js

@@ -0,0 +1,80 @@
+import { resolveInteractionGuardDecision } from "../../interaction/guard.js";
+import { logger } from "../../utils/logger.js";
+import { t } from "../../i18n/index.js";
+function getInteractionBlockedMessage(reason, interactionKind) {
+    if (interactionKind === "permission") {
+        switch (reason) {
+            case "command_not_allowed":
+                return t("permission.blocked.command_not_allowed");
+            case "expected_callback":
+            case "expected_command":
+            case "expected_text":
+            default:
+                return t("permission.blocked.expected_reply");
+        }
+    }
+    if (interactionKind === "inline") {
+        switch (reason) {
+            case "command_not_allowed":
+                return t("inline.blocked.command_not_allowed");
+            case "expected_callback":
+            case "expected_command":
+            case "expected_text":
+            default:
+                return t("inline.blocked.expected_choice");
+        }
+    }
+    if (interactionKind === "question") {
+        switch (reason) {
+            case "command_not_allowed":
+                return t("question.blocked.command_not_allowed");
+            case "expected_callback":
+            case "expected_command":
+            case "expected_text":
+            default:
+                return t("question.blocked.expected_answer");
+        }
+    }
+    if (interactionKind === "rename") {
+        switch (reason) {
+            case "command_not_allowed":
+                return t("rename.blocked.command_not_allowed");
+            case "expected_callback":
+            case "expected_command":
+            case "expected_text":
+            default:
+                return t("rename.blocked.expected_name");
+        }
+    }
+    switch (reason) {
+        case "expired":
+            return t("interaction.blocked.expired");
+        case "expected_callback":
+            return t("interaction.blocked.expected_callback");
+        case "expected_command":
+            return t("interaction.blocked.expected_command");
+        case "command_not_allowed":
+            return t("interaction.blocked.command_not_allowed");
+        case "expected_text":
+        default:
+            return t("interaction.blocked.expected_text");
+    }
+}
+export async function interactionGuardMiddleware(ctx, next) {
+    const decision = resolveInteractionGuardDecision(ctx);
+    if (decision.allow) {
+        await next();
+        return;
+    }
+    const message = getInteractionBlockedMessage(decision.reason, decision.state?.kind);
+    logger.debug(`[InteractionGuard] Blocked input: interactionKind=${decision.state?.kind || "none"}, inputType=${decision.inputType}, reason=${decision.reason || "unknown"}, command=${decision.command || "-"}`);
+    if (ctx.callbackQuery) {
+        await ctx.answerCallbackQuery({ text: message }).catch(() => { });
+        return;
+    }
+    if (ctx.chat) {
+        await ctx.reply(message).catch((err) => {
+            logger.error("[InteractionGuard] Failed to send blocked input message:", err);
+        });
+    }
+}

package/dist/bot/middleware/unknown-command.js

@@ -0,0 +1,22 @@
+import { extractCommandName, isKnownCommand } from "../utils/commands.js";
+import { logger } from "../../utils/logger.js";
+import { t } from "../../i18n/index.js";
+export async function unknownCommandMiddleware(ctx, next) {
+    const text = ctx.message?.text;
+    if (!text) {
+        await next();
+        return;
+    }
+    const commandName = extractCommandName(text);
+    if (!commandName) {
+        await next();
+        return;
+    }
+    if (isKnownCommand(commandName)) {
+        await next();
+        return;
+    }
+    const commandToken = text.trim().split(/\s+/)[0];
+    logger.debug(`[Bot] Unknown slash command received: ${commandToken}`);
+    await ctx.reply(t("bot.unknown_command", { command: commandToken }));
+}

package/dist/bot/utils/commands.js

@@ -0,0 +1,21 @@
+import { BOT_COMMANDS } from "../commands/definitions.js";
+const KNOWN_COMMANDS = new Set(["start", ...BOT_COMMANDS.map((item) => item.command)]);
+export function extractCommandName(text) {
+    const trimmed = text.trim();
+    if (!trimmed.startsWith("/")) {
+        return null;
+    }
+    const token = trimmed.split(/\s+/)[0];
+    const withoutSlash = token.slice(1);
+    if (!withoutSlash) {
+        return null;
+    }
+    const withoutMention = withoutSlash.split("@")[0].toLowerCase();
+    if (!withoutMention) {
+        return null;
+    }
+    return withoutMention;
+}
+export function isKnownCommand(commandName) {
+    return KNOWN_COMMANDS.has(commandName);
+}

package/dist/config.js

@@ -20,6 +20,20 @@ function getOptionalPositiveIntEnvVar(key, defaultValue) {
     }
     return parsedValue;
 }
+function getOptionalNonNegativeIntEnvVarFromKeys(keys, defaultValue) {
+    for (const key of keys) {
+        const value = getEnvVar(key, false);
+        if (!value) {
+            continue;
+        }
+        const parsedValue = Number.parseInt(value, 10);
+        if (Number.isNaN(parsedValue) || parsedValue < 0) {
+            return defaultValue;
+        }
+        return parsedValue;
+    }
+    return defaultValue;
+}
 function getOptionalLocaleEnvVar(key, defaultValue) {
     const value = getEnvVar(key, false);
     if (!value) {
@@ -34,6 +48,20 @@ function getOptionalLocaleEnvVar(key, defaultValue) {
     }
     return defaultValue;
 }
+function getOptionalBooleanEnvVar(key, defaultValue) {
+    const value = getEnvVar(key, false);
+    if (!value) {
+        return defaultValue;
+    }
+    const normalized = value.trim().toLowerCase();
+    if (["1", "true", "yes", "on"].includes(normalized)) {
+        return true;
+    }
+    if (["0", "false", "no", "off"].includes(normalized)) {
+        return false;
+    }
+    return defaultValue;
+}
 export const config = {
     telegram: {
         token: getEnvVar("TELEGRAM_BOT_TOKEN"),
@@ -55,6 +83,9 @@ export const config = {
     bot: {
         sessionsListLimit: getOptionalPositiveIntEnvVar("SESSIONS_LIST_LIMIT", 10),
         locale: getOptionalLocaleEnvVar("BOT_LOCALE", "en"),
+        serviceMessagesIntervalSec: getOptionalNonNegativeIntEnvVarFromKeys(["SERVICE_MESSAGES_INTERVAL_SEC", "TOOL_MESSAGES_INTERVAL_SEC"], 5),
+        hideThinkingMessages: getOptionalBooleanEnvVar("HIDE_THINKING_MESSAGES", false),
+        hideToolCallMessages: getOptionalBooleanEnvVar("HIDE_TOOL_CALL_MESSAGES", false),
     },
     files: {
         maxFileSizeKb: parseInt(getEnvVar("CODE_FILE_MAX_SIZE_KB", false) || "100", 10),

package/dist/i18n/en.js

@@ -16,6 +16,19 @@ export const en = {
     "error.load_variants": "❌ Failed to load variants list",
     "error.context_button": "❌ Failed to process context button",
     "error.generic": "🔴 Something went wrong.",
+    "interaction.blocked.expired": "⚠️ This interaction has expired. Please start it again.",
+    "interaction.blocked.expected_callback": "⚠️ Please use the inline buttons for this step or tap Cancel.",
+    "interaction.blocked.expected_text": "⚠️ Please send a text message for this step.",
+    "interaction.blocked.expected_command": "⚠️ Please send a command for this step.",
+    "interaction.blocked.command_not_allowed": "⚠️ This command is not available in the current step.",
+    "interaction.blocked.finish_current": "⚠️ Finish the current interaction first (answer or cancel), then open another menu.",
+    "inline.blocked.expected_choice": "⚠️ Choose an option using the inline buttons or tap Cancel.",
+    "inline.blocked.command_not_allowed": "⚠️ This command is not available while inline menu is active.",
+    "question.blocked.expected_answer": "⚠️ Answer the current question using buttons, Custom answer, or Cancel.",
+    "question.blocked.command_not_allowed": "⚠️ This command is not available until current question flow is completed.",
+    "inline.button.cancel": "❌ Cancel",
+    "inline.inactive_callback": "This menu is inactive",
+    "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",
@@ -29,6 +42,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_detailed": "🔴 Failed to send request.\n\nDetails: {details}",
     "bot.prompt_send_error": "🔴 An error occurred while sending request to OpenCode.",
+    "bot.unknown_command": "⚠️ Unknown command: {command}. Use /help to see available commands.",
     "status.header_running": "🟢 **OpenCode Server is running**",
     "status.health.healthy": "Healthy",
     "status.health.unhealthy": "Unhealthy",
@@ -111,7 +125,6 @@ export const en = {
     "variant.menu.current": "Current variant: {name}\n\nSelect variant:",
     "variant.menu.error": "🔴 Failed to get variants list",
     "context.button.confirm": "✅ Yes, compact context",
-    "context.button.cancel": "❌ Cancel",
     "context.no_active_session": "⚠️ No active session. Create a session with /new",
     "context.confirm_text": '📊 Context compaction for session "{title}"\n\nThis will reduce context usage by removing old messages from history. Current task will not be interrupted.\n\nContinue?',
     "context.callback_session_not_found": "Session not found",
@@ -119,7 +132,6 @@ export const en = {
     "context.progress": "⏳ Compacting context...",
     "context.error": "❌ Context compaction failed",
     "context.success": "✅ Context compacted successfully",
-    "context.callback_cancelled": "Cancelled",
     "permission.inactive_callback": "Permission request is inactive",
     "permission.processing_error_callback": "Processing error",
     "permission.no_active_request_callback": "Error: no active request",
@@ -127,9 +139,11 @@ export const en = {
     "permission.reply.always": "Always allowed",
     "permission.reply.reject": "Rejected",
     "permission.send_reply_error": "❌ Failed to send permission reply",
+    "permission.blocked.expected_reply": "⚠️ Please answer the permission request first using the buttons above.",
+    "permission.blocked.command_not_allowed": "⚠️ This command is not available until you answer the permission request.",
     "permission.header": "{emoji} **Permission request: {name}**\n\n",
-    "permission.button.allow": "✅ Allow",
-    "permission.button.always": "🔓 Always",
+    "permission.button.allow": "✅ Allow once",
+    "permission.button.always": "🔓 Allow always",
     "permission.button.reject": "❌ Reject",
     "permission.name.bash": "Bash",
     "permission.name.edit": "Edit",
@@ -156,6 +170,7 @@ export const en = {
     "question.button.submit": "✅ Done",
     "question.button.custom": "🔤 Custom answer",
     "question.button.cancel": "❌ Cancel",
+    "question.use_custom_button_first": '⚠️ To send text, tap "Custom answer" for the current question first.',
     "question.summary.title": "✅ Poll completed!\n\n",
     "question.summary.question": "Question {index}:\n{question}\n\n",
     "question.summary.answer": "Answer:\n{answer}\n\n",
@@ -193,6 +208,10 @@ export const en = {
     "rename.success": "✅ Session renamed to: {title}",
     "rename.error": "🔴 Failed to rename session.",
     "rename.cancelled": "❌ Rename cancelled.",
+    "rename.inactive_callback": "Rename request is inactive",
+    "rename.inactive": "⚠️ Rename request is not active. Run /rename again.",
+    "rename.blocked.expected_name": "⚠️ Enter a new session name as text or tap Cancel in rename message.",
+    "rename.blocked.command_not_allowed": "⚠️ This command is not available while rename is waiting for a new name.",
     "rename.button.cancel": "❌ Cancel",
     "cmd.description.rename": "Rename current session",
     "cli.usage": "Usage:\n  opencode-telegram [start] [--mode sources|installed]\n  opencode-telegram status\n  opencode-telegram stop\n  opencode-telegram config\n\nNotes:\n  - No command defaults to `start`\n  - `--mode` is currently supported for `start` only",

package/dist/i18n/ru.js

@@ -16,6 +16,19 @@ export const ru = {
     "error.load_variants": "❌ Ошибка при загрузке списка вариантов",
     "error.context_button": "❌ Ошибка при обработке кнопки контекста",
     "error.generic": "🔴 Произошла ошибка.",
+    "interaction.blocked.expired": "⚠️ Текущая интеракция устарела. Запустите ее снова.",
+    "interaction.blocked.expected_callback": "⚠️ Для этого шага используйте inline-кнопки или нажмите Отмена.",
+    "interaction.blocked.expected_text": "⚠️ Для этого шага отправьте текстовое сообщение.",
+    "interaction.blocked.expected_command": "⚠️ Для этого шага отправьте команду.",
+    "interaction.blocked.command_not_allowed": "⚠️ Эта команда недоступна на текущем шаге.",
+    "interaction.blocked.finish_current": "⚠️ Сначала завершите текущую интеракцию (ответьте или отмените), затем откройте другое меню.",
+    "inline.blocked.expected_choice": "⚠️ Выберите вариант через inline-кнопки или нажмите Отмена.",
+    "inline.blocked.command_not_allowed": "⚠️ Эта команда недоступна, пока активно inline-меню.",
+    "question.blocked.expected_answer": "⚠️ Ответьте на текущий вопрос кнопками, через Свой ответ, или нажмите Отмена.",
+    "question.blocked.command_not_allowed": "⚠️ Эта команда недоступна, пока не завершен текущий опрос.",
+    "inline.button.cancel": "❌ Отмена",
+    "inline.inactive_callback": "Это меню уже неактивно",
+    "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 — справка",
@@ -29,6 +42,7 @@ export const ru = {
     "bot.session_reset_project_mismatch": "⚠️ Активная сессия не соответствует выбранному проекту, поэтому была сброшена. Используйте /sessions для выбора или /new для создания новой сессии.",
     "bot.prompt_send_error_detailed": "🔴 Ошибка при отправке запроса.\n\nДетали: {details}",
     "bot.prompt_send_error": "🔴 Произошла ошибка при отправке запроса в OpenCode.",
+    "bot.unknown_command": "⚠️ Неизвестная команда: {command}. Используйте /help для списка команд.",
     "status.header_running": "🟢 **OpenCode Server запущен**",
     "status.health.healthy": "Healthy",
     "status.health.unhealthy": "Unhealthy",
@@ -111,7 +125,6 @@ export const ru = {
     "variant.menu.current": "Текущий variant: {name}\n\nВыберите variant:",
     "variant.menu.error": "🔴 Не удалось получить список вариантов",
     "context.button.confirm": "✅ Да, сжать контекст",
-    "context.button.cancel": "❌ Отмена",
     "context.no_active_session": "⚠️ Нет активной сессии. Создайте сессию командой /new",
     "context.confirm_text": '📊 Сжатие контекста для сессии "{title}"\n\nЭто уменьшит использование контекста, удалив старые сообщения из истории. Текущая задача не будет прервана.\n\nПродолжить?',
     "context.callback_session_not_found": "Сессия не найдена",
@@ -119,7 +132,6 @@ export const ru = {
     "context.progress": "⏳ Сжимаю контекст...",
     "context.error": "❌ Ошибка при сжатии контекста",
     "context.success": "✅ Контекст успешно сжат",
-    "context.callback_cancelled": "Отменено",
     "permission.inactive_callback": "Запрос разрешения неактивен",
     "permission.processing_error_callback": "Ошибка при обработке",
     "permission.no_active_request_callback": "Ошибка: нет активного запроса",
@@ -127,9 +139,11 @@ export const ru = {
     "permission.reply.always": "Разрешено всегда",
     "permission.reply.reject": "Отклонено",
     "permission.send_reply_error": "❌ Не удалось отправить ответ на запрос разрешения",
+    "permission.blocked.expected_reply": "⚠️ Сначала ответьте на запрос разрешения кнопками выше.",
+    "permission.blocked.command_not_allowed": "⚠️ Эта команда недоступна, пока вы не ответите на запрос разрешения.",
     "permission.header": "{emoji} **Запрос разрешения: {name}**\n\n",
-    "permission.button.allow": "✅ Разрешить",
-    "permission.button.always": "🔓 Всегда",
+    "permission.button.allow": "✅ Разрешить один раз",
+    "permission.button.always": "🔓 Разрешить всегда",
     "permission.button.reject": "❌ Отклонить",
     "permission.name.bash": "Bash",
     "permission.name.edit": "Edit",
@@ -156,6 +170,7 @@ export const ru = {
     "question.button.submit": "✅ Готово",
     "question.button.custom": "🔤 Свой ответ",
     "question.button.cancel": "❌ Отмена",
+    "question.use_custom_button_first": '⚠️ Чтобы отправить текст, сначала нажмите кнопку "Свой ответ" для текущего вопроса.',
     "question.summary.title": "✅ Опрос завершен!\n\n",
     "question.summary.question": "Вопрос {index}:\n{question}\n\n",
     "question.summary.answer": "Ответ:\n{answer}\n\n",
@@ -193,6 +208,10 @@ export const ru = {
     "rename.success": "✅ Сессия переименована в: {title}",
     "rename.error": "🔴 Не удалось переименовать сессию.",
     "rename.cancelled": "❌ Переименование отменено.",
+    "rename.inactive_callback": "Запрос переименования неактивен",
+    "rename.inactive": "⚠️ Запрос переименования неактивен. Выполните /rename снова.",
+    "rename.blocked.expected_name": "⚠️ Введите новое название текстом или нажмите Отмена в сообщении переименования.",
+    "rename.blocked.command_not_allowed": "⚠️ Эта команда недоступна, пока ожидается новое название сессии.",
     "rename.button.cancel": "❌ Отмена",
     "cmd.description.rename": "Переименовать текущую сессию",
     "cli.usage": "Использование:\n  opencode-telegram [start] [--mode sources|installed]\n  opencode-telegram status\n  opencode-telegram stop\n  opencode-telegram config\n\nЗаметки:\n  - Без команды по умолчанию используется `start`\n  - `--mode` сейчас поддерживается только для `start`",

package/dist/interaction/cleanup.js

@@ -0,0 +1,24 @@
+import { permissionManager } from "../permission/manager.js";
+import { questionManager } from "../question/manager.js";
+import { renameManager } from "../rename/manager.js";
+import { interactionManager } from "./manager.js";
+import { logger } from "../utils/logger.js";
+export function clearAllInteractionState(reason) {
+    const questionActive = questionManager.isActive();
+    const permissionActive = permissionManager.isActive();
+    const renameActive = renameManager.isWaitingForName();
+    const interactionSnapshot = interactionManager.getSnapshot();
+    questionManager.clear();
+    permissionManager.clear();
+    renameManager.clear();
+    interactionManager.clear(reason);
+    const hasAnyActiveState = questionActive || permissionActive || renameActive || interactionSnapshot !== null;
+    const message = `[InteractionCleanup] Cleared state: reason=${reason}, ` +
+        `questionActive=${questionActive}, permissionActive=${permissionActive}, ` +
+        `renameActive=${renameActive}, interactionKind=${interactionSnapshot?.kind || "none"}`;
+    if (hasAnyActiveState) {
+        logger.info(message);
+        return;
+    }
+    logger.debug(message);
+}