@grinev/opencode-telegram-bot 0.2.0 → 0.2.1

package/dist/bot/handlers/permission.js

@@ -2,6 +2,7 @@ import { InlineKeyboard } from "grammy";
 import { permissionManager } from "../../permission/manager.js";
 import { opencodeClient } from "../../opencode/client.js";
 import { getCurrentProject } from "../../settings/manager.js";
+import { getCurrentSession } from "../../session/manager.js";
 import { summaryAggregator } from "../../summary/aggregator.js";
 import { logger } from "../../utils/logger.js";
 import { safeBackgroundTask } from "../../utils/safe-background-task.js";
@@ -69,8 +70,10 @@ export async function handlePermissionCallback(ctx) {
 async function handlePermissionReply(ctx, reply) {
     const requestID = permissionManager.getRequestID();
     const currentProject = getCurrentProject();
+    const currentSession = getCurrentSession();
     const chatId = ctx.chat?.id;
-    if (!requestID || !currentProject || !chatId) {
+    const directory = currentSession?.directory ?? currentProject?.worktree;
+    if (!requestID || !directory || !chatId) {
         await ctx.answerCallbackQuery({
             text: t("permission.no_active_request_callback"),
             show_alert: true,
@@ -94,7 +97,7 @@ async function handlePermissionReply(ctx, reply) {
         taskName: "permission.reply",
         task: () => opencodeClient.permission.reply({
             requestID,
-            directory: currentProject.worktree,
+            directory,
             reply,
         }),
         onSuccess: ({ error }) => {

package/dist/bot/handlers/question.js

@@ -2,6 +2,7 @@ import { InlineKeyboard } from "grammy";
 import { questionManager } from "../../question/manager.js";
 import { opencodeClient } from "../../opencode/client.js";
 import { getCurrentProject } from "../../settings/manager.js";
+import { getCurrentSession } from "../../session/manager.js";
 import { summaryAggregator } from "../../summary/aggregator.js";
 import { logger } from "../../utils/logger.js";
 import { safeBackgroundTask } from "../../utils/safe-background-task.js";
@@ -194,9 +195,11 @@ async function showPollSummary(bot, chatId) {
 }
 async function sendAllAnswersToAgent(bot, chatId) {
     const currentProject = getCurrentProject();
+    const currentSession = getCurrentSession();
     const requestID = questionManager.getRequestID();
     const totalQuestions = questionManager.getTotalQuestions();
-    if (!currentProject) {
+    const directory = currentSession?.directory ?? currentProject?.worktree;
+    if (!directory) {
         logger.error("[QuestionHandler] No project for sending answers");
         await bot.sendMessage(chatId, t("question.no_active_project"));
         return;
@@ -233,7 +236,7 @@ async function sendAllAnswersToAgent(bot, chatId) {
         taskName: "question.reply",
         task: () => opencodeClient.question.reply({
             requestID,
-            directory: currentProject.worktree,
+            directory,
             answers: allAnswers,
         }),
         onSuccess: ({ error }) => {

package/dist/bot/index.js

@@ -24,12 +24,13 @@ import { handleModelSelect, showModelSelectionMenu } from "./handlers/model.js";
 import { handleVariantSelect, showVariantSelectionMenu } from "./handlers/variant.js";
 import { handleContextButtonPress, handleCompactConfirm, handleCompactCancel, } from "./handlers/context.js";
 import { questionManager } from "../question/manager.js";
+import { permissionManager } from "../permission/manager.js";
 import { keyboardManager } from "../keyboard/manager.js";
-import { subscribeToEvents } from "../opencode/events.js";
+import { stopEventListening, subscribeToEvents } from "../opencode/events.js";
 import { summaryAggregator } from "../summary/aggregator.js";
 import { formatSummary, formatToolInfo } from "../summary/formatter.js";
 import { opencodeClient } from "../opencode/client.js";
-import { getCurrentSession, setCurrentSession } from "../session/manager.js";
+import { clearSession, getCurrentSession, setCurrentSession } from "../session/manager.js";
 import { ingestSessionInfoForCache } from "../session/cache-manager.js";
 import { getCurrentProject } from "../settings/manager.js";
 import { getStoredAgent } from "../agent/manager.js";
@@ -38,6 +39,7 @@ import { formatVariantForButton } from "../variant/manager.js";
 import { createMainKeyboard } from "./utils/keyboard.js";
 import { logger } from "../utils/logger.js";
 import { safeBackgroundTask } from "../utils/safe-background-task.js";
+import { formatErrorDetails } from "../utils/error-format.js";
 import { pinnedMessageManager } from "../pinned/manager.js";
 import { t } from "../i18n/index.js";
 let botInstance = null;
@@ -68,10 +70,9 @@ async function ensureCommandsInitialized(ctx, next) {
     }
     await next();
 }
-async function ensureEventSubscription() {
-    const currentProject = getCurrentProject();
-    if (!currentProject) {
-        logger.error("No current project found for event subscription");
+async function ensureEventSubscription(directory) {
+    if (!directory) {
+        logger.error("No directory found for event subscription");
         return;
     }
     summaryAggregator.setOnComplete(async (sessionId, messageText) => {
@@ -256,8 +257,8 @@ async function ensureEventSubscription() {
             logger.error("[Bot] Error updating keyboard context:", err);
         }
     });
-    logger.info(`[Bot] Subscribing to OpenCode events for project: ${currentProject.worktree}`);
-    subscribeToEvents(currentProject.worktree, (event) => {
+    logger.info(`[Bot] Subscribing to OpenCode events for project: ${directory}`);
+    subscribeToEvents(directory, (event) => {
         if (event.type === "session.created" || event.type === "session.updated") {
             const info = event.properties.info;
             if (info?.directory) {
@@ -291,6 +292,23 @@ async function isSessionBusy(sessionId, directory) {
         return false;
     }
 }
+async function resetMismatchedSessionContext() {
+    stopEventListening();
+    summaryAggregator.clear();
+    questionManager.clear();
+    permissionManager.clear();
+    clearSession();
+    keyboardManager.clearContext();
+    if (!pinnedMessageManager.isInitialized()) {
+        return;
+    }
+    try {
+        await pinnedMessageManager.clear();
+    }
+    catch (err) {
+        logger.error("[Bot] Failed to clear pinned message during session reset:", err);
+    }
+}
 export function createBot() {
     const bot = new Bot(config.telegram.token);
     // Heartbeat for diagnostics: verify the event loop is not blocked
@@ -462,7 +480,6 @@ export function createBot() {
             await ctx.reply(t("bot.project_not_selected"));
             return;
         }
-        await ensureEventSubscription();
         botInstance = bot;
         chatIdInstance = ctx.chat.id;
         // Initialize pinned message manager if not already
@@ -472,6 +489,12 @@ export function createBot() {
         // Initialize keyboard manager if not already
         keyboardManager.initialize(bot.api, ctx.chat.id);
         let currentSession = getCurrentSession();
+        if (currentSession && currentSession.directory !== currentProject.worktree) {
+            logger.warn(`[Bot] Session/project mismatch detected. sessionDirectory=${currentSession.directory}, projectDirectory=${currentProject.worktree}. Resetting session context.`);
+            await resetMismatchedSessionContext();
+            await ctx.reply(t("bot.session_reset_project_mismatch"));
+            return;
+        }
         if (!currentSession) {
             await ctx.reply(t("bot.creating_session"));
             const { data: session, error } = await opencodeClient.session.create({
@@ -517,6 +540,7 @@ export function createBot() {
                 }
             }
         }
+        await ensureEventSubscription(currentSession.directory);
         summaryAggregator.setSession(currentSession.id);
         summaryAggregator.setBotAndChatId(bot, ctx.chat.id);
         const sessionIsBusy = await isSessionBusy(currentSession.id, currentSession.directory);
@@ -530,7 +554,7 @@ export function createBot() {
             const storedModel = getStoredModel();
             const promptOptions = {
                 sessionID: currentSession.id,
-                directory: currentProject.worktree,
+                directory: currentSession.directory,
                 parts: [{ type: "text", text }],
                 agent: currentAgent,
             };
@@ -555,18 +579,20 @@ export function createBot() {
                 task: () => opencodeClient.session.prompt(promptOptions),
                 onSuccess: ({ error }) => {
                     if (error) {
-                        logger.error("OpenCode API error:", JSON.stringify(error, null, 2));
+                        const details = formatErrorDetails(error);
+                        logger.error("OpenCode API error:", error);
                         // Send the error via API directly because ctx is no longer available
                         void bot.api
                             .sendMessage(ctx.chat.id, t("bot.prompt_send_error_detailed", {
-                            details: JSON.stringify(error),
+                            details,
                         }))
                             .catch(() => { });
                         return;
                     }
                     logger.info("[Bot] session.prompt completed");
                 },
-                onError: () => {
+                onError: (error) => {
+                    logger.error("[Bot] session.prompt background task failed:", error);
                     void bot.api.sendMessage(ctx.chat.id, t("bot.prompt_send_error")).catch(() => { });
                 },
             });

package/dist/i18n/en.js

@@ -26,6 +26,7 @@ export const en = {
     "bot.create_session_error": "🔴 Failed to create session. Try /new or check server status with /status.",
     "bot.session_created": "✅ Session created: {title}",
     "bot.session_busy": "⏳ Agent is already running a task. Wait for completion or use /stop to interrupt current run.",
+    "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.",
     "status.header_running": "🟢 **OpenCode Server is running**",

package/dist/i18n/ru.js

@@ -26,6 +26,7 @@ export const ru = {
     "bot.create_session_error": "🔴 Не удалось создать сессию. Попробуйте команду /new или проверьте статус сервера /status.",
     "bot.session_created": "✅ Сессия создана: {title}",
     "bot.session_busy": "⏳ Агент уже выполняет задачу. Дождитесь завершения или используйте /stop, чтобы прервать текущий запуск.",
+    "bot.session_reset_project_mismatch": "⚠️ Активная сессия не соответствует выбранному проекту, поэтому была сброшена. Используйте /sessions для выбора или /new для создания новой сессии.",
     "bot.prompt_send_error_detailed": "🔴 Ошибка при отправке запроса.\n\nДетали: {details}",
     "bot.prompt_send_error": "🔴 Произошла ошибка при отправке запроса в OpenCode.",
     "status.header_running": "🟢 **OpenCode Server запущен**",

package/dist/opencode/events.js

@@ -1,12 +1,38 @@
 import { opencodeClient } from "./client.js";
 import { logger } from "../utils/logger.js";
+const RECONNECT_BASE_DELAY_MS = 1000;
+const RECONNECT_MAX_DELAY_MS = 15000;
+const FATAL_NO_STREAM_ERROR = "No stream returned from event subscription";
 let eventStream = null;
 let eventCallback = null;
 let isListening = false;
 let activeDirectory = null;
 let streamAbortController = null;
+function getReconnectDelayMs(attempt) {
+    const exponentialDelay = RECONNECT_BASE_DELAY_MS * Math.pow(2, Math.max(0, attempt - 1));
+    return Math.min(exponentialDelay, RECONNECT_MAX_DELAY_MS);
+}
+function waitWithAbort(ms, signal) {
+    return new Promise((resolve) => {
+        if (signal.aborted) {
+            resolve(false);
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timeout);
+            signal.removeEventListener("abort", onAbort);
+            resolve(false);
+        };
+        const timeout = setTimeout(() => {
+            signal.removeEventListener("abort", onAbort);
+            resolve(true);
+        }, ms);
+        signal.addEventListener("abort", onAbort, { once: true });
+    });
+}
 export async function subscribeToEvents(directory, callback) {
     if (isListening && activeDirectory === directory) {
+        eventCallback = callback;
         logger.debug(`Event listener already running for ${directory}`);
         return;
     }
@@ -23,24 +49,59 @@ export async function subscribeToEvents(directory, callback) {
     isListening = true;
     streamAbortController = controller;
     try {
-        const result = await opencodeClient.event.subscribe({ directory }, { signal: controller.signal });
-        if (!result.stream) {
-            throw new Error("No stream returned from event subscription");
-        }
-        eventStream = result.stream;
-        for await (const event of eventStream) {
-            if (!isListening || activeDirectory !== directory) {
-                logger.debug(`Event listener stopped or changed directory, breaking loop`);
-                break;
+        let reconnectAttempt = 0;
+        while (isListening && activeDirectory === directory && !controller.signal.aborted) {
+            try {
+                const result = await opencodeClient.event.subscribe({ directory }, { signal: controller.signal });
+                if (!result.stream) {
+                    throw new Error(FATAL_NO_STREAM_ERROR);
+                }
+                reconnectAttempt = 0;
+                eventStream = result.stream;
+                for await (const event of eventStream) {
+                    if (!isListening || activeDirectory !== directory || controller.signal.aborted) {
+                        logger.debug(`Event listener stopped or changed directory, breaking loop`);
+                        break;
+                    }
+                    // CRITICAL: Explicitly yield to the event loop BEFORE processing the event
+                    // This allows grammY to handle getUpdates between SSE events
+                    await new Promise((resolve) => setImmediate(resolve));
+                    if (eventCallback) {
+                        // Use setImmediate to avoid blocking the event loop
+                        // and let grammY process incoming Telegram updates
+                        const callbackSnapshot = eventCallback;
+                        setImmediate(() => callbackSnapshot(event));
+                    }
+                }
+                eventStream = null;
+                if (!isListening || activeDirectory !== directory || controller.signal.aborted) {
+                    break;
+                }
+                reconnectAttempt++;
+                const reconnectDelay = getReconnectDelayMs(reconnectAttempt);
+                logger.warn(`Event stream ended for ${directory}, reconnecting in ${reconnectDelay}ms (attempt=${reconnectAttempt})`);
+                const shouldContinue = await waitWithAbort(reconnectDelay, controller.signal);
+                if (!shouldContinue) {
+                    break;
+                }
             }
-            // CRITICAL: Explicitly yield to the event loop BEFORE processing the event
-            // This allows grammY to handle getUpdates between SSE events
-            await new Promise((resolve) => setImmediate(resolve));
-            if (eventCallback) {
-                // Use setImmediate to avoid blocking the event loop
-                // and let grammY process incoming Telegram updates
-                const callback = eventCallback;
-                setImmediate(() => callback(event));
+            catch (error) {
+                eventStream = null;
+                if (controller.signal.aborted || !isListening || activeDirectory !== directory) {
+                    logger.info("Event listener aborted");
+                    return;
+                }
+                if (error instanceof Error && error.message === FATAL_NO_STREAM_ERROR) {
+                    logger.error("Event stream fatal error:", error);
+                    throw error;
+                }
+                reconnectAttempt++;
+                const reconnectDelay = getReconnectDelayMs(reconnectAttempt);
+                logger.error(`Event stream error for ${directory}, reconnecting in ${reconnectDelay}ms (attempt=${reconnectAttempt})`, error);
+                const shouldContinue = await waitWithAbort(reconnectDelay, controller.signal);
+                if (!shouldContinue) {
+                    break;
+                }
             }
         }
     }

package/dist/utils/error-format.js

@@ -0,0 +1,29 @@
+const DEFAULT_MAX_ERROR_DETAILS_LENGTH = 1500;
+function clipText(value, maxLength) {
+    if (value.length <= maxLength) {
+        return value;
+    }
+    return `${value.slice(0, Math.max(0, maxLength - 3))}...`;
+}
+export function formatErrorDetails(error, maxLength = DEFAULT_MAX_ERROR_DETAILS_LENGTH) {
+    let details = "";
+    if (error instanceof Error) {
+        details = error.stack ?? `${error.name}: ${error.message}`;
+    }
+    else if (typeof error === "string") {
+        details = error;
+    }
+    else {
+        try {
+            details = JSON.stringify(error, null, 2);
+        }
+        catch {
+            details = String(error);
+        }
+    }
+    const normalized = details.trim();
+    if (!normalized || normalized === "{}" || normalized === "[object Object]") {
+        return "unknown error";
+    }
+    return clipText(normalized, maxLength);
+}

package/package.json

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