Merge pull request #11 from grinev/release/0.6.1

Release/0.6.1

Author: grinev

package-lock.json

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

package.json

@@ -59,9 +59,27 @@ let botInstance: Bot<Context> | null = null;
 let chatIdInstance: number | null = null;
 let commandsInitialized = false;
 
+const TELEGRAM_DOCUMENT_CAPTION_MAX_LENGTH = 1024;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const TEMP_DIR = path.join(__dirname, "..", ".tmp");
+
+function prepareDocumentCaption(caption: string): string {
+  const normalizedCaption = caption.trim();
+  if (!normalizedCaption) {
+    return "";
+  }
+
+  if (normalizedCaption.length <= TELEGRAM_DOCUMENT_CAPTION_MAX_LENGTH) {
+    return normalizedCaption;
+  }
+
+  return `${normalizedCaption.slice(0, TELEGRAM_DOCUMENT_CAPTION_MAX_LENGTH - 3)}...`;
+}
+
 const toolMessageBatcher = new ToolMessageBatcher({
   intervalSeconds: 5,
-  sendMessage: async (sessionId, text) => {
+  sendText: async (sessionId, text) => {
     if (!botInstance || !chatIdInstance) {
       return;
     }
@@ -75,6 +93,34 @@ const toolMessageBatcher = new ToolMessageBatcher({
       disable_notification: true,
     });
   },
+  sendFile: async (sessionId, fileData) => {
+    if (!botInstance || !chatIdInstance) {
+      return;
+    }
+
+    const currentSession = getCurrentSession();
+    if (!currentSession || currentSession.id !== sessionId) {
+      return;
+    }
+
+    const tempFilePath = path.join(TEMP_DIR, fileData.filename);
+
+    try {
+      logger.debug(
+        `[Bot] Sending code file: ${fileData.filename} (${fileData.buffer.length} bytes, session=${sessionId})`,
+      );
+
+      await fs.mkdir(TEMP_DIR, { recursive: true });
+      await fs.writeFile(tempFilePath, fileData.buffer);
+
+      await botInstance.api.sendDocument(chatIdInstance, new InputFile(tempFilePath), {
+        caption: fileData.caption,
+        disable_notification: true,
+      });
+    } finally {
+      await fs.unlink(tempFilePath).catch(() => {});
+    }
+  },
 });
 
 async function ensureCommandsInitialized(ctx: Context, next: NextFunction): Promise<void> {
@@ -161,10 +207,6 @@ async function ensureEventSubscription(directory: string): Promise<void> {
   });
 
   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;
@@ -175,6 +217,14 @@ async function ensureEventSubscription(directory: string): Promise<void> {
       return;
     }
 
+    const shouldIncludeToolInfoInFileCaption =
+      toolInfo.hasFileAttachment &&
+      (toolInfo.tool === "write" || toolInfo.tool === "edit" || toolInfo.tool === "apply_patch");
+
+    if (config.bot.hideToolCallMessages || shouldIncludeToolInfoInFileCaption) {
+      return;
+    }
+
     try {
       const message = formatToolInfo(toolInfo);
       if (message) {
@@ -185,38 +235,25 @@ async function ensureEventSubscription(directory: string): Promise<void> {
     }
   });
 
-  summaryAggregator.setOnToolFile(async (fileData) => {
+  summaryAggregator.setOnToolFile(async (fileInfo) => {
     if (!botInstance || !chatIdInstance) {
       logger.error("Bot or chat ID not available for sending file");
       return;
     }
 
     const currentSession = getCurrentSession();
-    if (!currentSession) {
+    if (!currentSession || currentSession.id !== fileInfo.sessionId) {
       return;
     }
 
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = path.dirname(__filename);
-    const tempDir = path.join(__dirname, "..", ".tmp");
-
     try {
-      logger.debug(
-        `[Bot] Sending code file: ${fileData.filename} (${fileData.buffer.length} bytes)`,
-      );
-
-      await fs.mkdir(tempDir, { recursive: true });
+      const toolMessage = formatToolInfo(fileInfo);
+      const caption = prepareDocumentCaption(toolMessage || fileInfo.fileData.caption);
 
-      const tempFilePath = path.join(tempDir, fileData.filename);
-      await fs.writeFile(tempFilePath, fileData.buffer);
-
-      await botInstance.api.sendDocument(chatIdInstance, new InputFile(tempFilePath), {
-        caption: fileData.caption,
-        disable_notification: true,
+      toolMessageBatcher.enqueueFile(fileInfo.sessionId, {
+        ...fileInfo.fileData,
+        caption,
       });
-
-      await fs.unlink(tempFilePath);
-      logger.debug(`[Bot] Temporary file deleted: ${fileData.filename}`);
     } catch (err) {
       logger.error("Failed to send file to Telegram:", err);
     }
@@ -813,6 +850,16 @@ export function createBot(): Bot<Context> {
         }
       }
 
+      const promptErrorLogContext = {
+        sessionId: currentSession.id,
+        directory: currentSession.directory,
+        agent: currentAgent || "default",
+        modelProvider: storedModel.providerID || "default",
+        modelId: storedModel.modelID || "default",
+        variant: storedModel.variant || "default",
+        promptLength: text.length,
+      };
+
       logger.info(`[Bot] Calling session.prompt (fire-and-forget) with agent=${currentAgent}...`);
 
       // CRITICAL: DO NOT wait for session.prompt to complete.
@@ -824,24 +871,26 @@ export function createBot(): Bot<Context> {
         task: () => opencodeClient.session.prompt(promptOptions),
         onSuccess: ({ error }) => {
           if (error) {
-            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,
-                }),
-              )
-              .catch(() => {});
+            const details = formatErrorDetails(error, 6000);
+            logger.error(
+              "[Bot] OpenCode API returned an error for session.prompt",
+              promptErrorLogContext,
+            );
+            logger.error("[Bot] session.prompt error details:", details);
+            logger.error("[Bot] session.prompt raw API error object:", error);
+
+            // Send user-friendly error via API directly because ctx is no longer available
+            void bot.api.sendMessage(ctx.chat.id, t("bot.prompt_send_error")).catch(() => {});
             return;
           }
 
           logger.info("[Bot] session.prompt completed");
         },
         onError: (error) => {
-          logger.error("[Bot] session.prompt background task failed:", error);
+          const details = formatErrorDetails(error, 6000);
+          logger.error("[Bot] session.prompt background task failed", promptErrorLogContext);
+          logger.error("[Bot] session.prompt background failure details:", details);
+          logger.error("[Bot] session.prompt raw background error object:", error);
           void bot.api.sendMessage(ctx.chat.id, t("bot.prompt_send_error")).catch(() => {});
         },
       });

src/bot/index.ts

@@ -61,8 +61,7 @@ export const en = {
     "⏳ 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.",
+  "bot.prompt_send_error": "Failed to send request to OpenCode.",
   "bot.unknown_command": "⚠️ Unknown command: {command}. Use /help to see available commands.",
 
   "status.header_running": "🟢 **OpenCode Server is running**",

src/i18n/en.ts

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