@iletai/nzb 1.4.0 → 1.4.2

package/dist/telegram/bot.js

@@ -2,6 +2,7 @@ import { autoRetry } from "@grammyjs/auto-retry";
 import { Menu } from "@grammyjs/menu";
 import { Bot, InlineKeyboard, Keyboard } from "grammy";
 import { Agent as HttpsAgent } from "https";
+import { rmSync } from "fs";
 import { config, persistEnvVar, persistModel } from "../config.js";
 import { cancelCurrentMessage, getQueueSize, getWorkers, sendToOrchestrator } from "../copilot/orchestrator.js";
 import { listSkills } from "../copilot/skills.js";
@@ -19,6 +20,61 @@ function getUptimeStr() {
     const seconds = uptime % 60;
     return hours > 0 ? `${hours}h ${minutes}m ${seconds}s` : minutes > 0 ? `${minutes}m ${seconds}s` : `${seconds}s`;
 }
+/**
+ * Send a formatted HTML reply with multi-chunk support and fallback to plain text.
+ * Consolidates the repeated toTelegramHTML → chunkMessage → fallback → send pattern.
+ */
+async function sendFormattedReply(botInstance, chatId, text, opts) {
+    const formatted = toTelegramHTML(text);
+    const chunks = chunkMessage(formatted);
+    const fallbackChunks = chunkMessage(text);
+    let firstMsgId;
+    for (let i = 0; i < chunks.length; i++) {
+        if (i > 0)
+            await new Promise((r) => setTimeout(r, 300));
+        const pageTag = chunks.length > 1 ? `📄 ${i + 1}/${chunks.length}\n` : "";
+        const replyParams = i === 0 && opts?.replyTo ? { message_id: opts.replyTo } : undefined;
+        try {
+            const sent = await botInstance.api.sendMessage(chatId, pageTag + chunks[i], {
+                parse_mode: "HTML",
+                reply_parameters: replyParams,
+            });
+            if (i === 0)
+                firstMsgId = sent.message_id;
+        }
+        catch {
+            try {
+                const sent = await botInstance.api.sendMessage(chatId, pageTag + (fallbackChunks[i] ?? chunks[i]), {
+                    reply_parameters: replyParams,
+                });
+                if (i === 0)
+                    firstMsgId = sent.message_id;
+            }
+            catch { }
+        }
+    }
+    if (opts?.assistantLogId && firstMsgId) {
+        try {
+            const { setConversationTelegramMsgId } = await import("../store/db.js");
+            setConversationTelegramMsgId(opts.assistantLogId, firstMsgId);
+        }
+        catch { }
+    }
+    try {
+        await botInstance.api.setMessageReaction(chatId, opts?.replyTo ?? 0, [{ type: "emoji", emoji: "👍" }]);
+    }
+    catch { }
+    return firstMsgId;
+}
+/** Remove a temp directory after a delay (gives orchestrator time to use the file). */
+function scheduleTempCleanup(dirPath, delayMs = 5 * 60_000) {
+    setTimeout(() => {
+        try {
+            rmSync(dirPath, { recursive: true, force: true });
+        }
+        catch { }
+    }, delayMs);
+}
 // Settings sub-menu
 const settingsMenu = new Menu("settings-menu")
     .text((ctx) => `${config.showReasoning ? "✅" : "❌"} Show Reasoning`, async (ctx) => {
@@ -164,10 +220,10 @@ export function createBot() {
             const chatId = ctx.chat.id;
             sendToOrchestrator(retryPrompt, { type: "telegram", chatId, messageId: originalMsg.message_id }, (text, done) => {
                 if (done) {
-                    const formatted = toTelegramHTML(text);
-                    const chunks = chunkMessage(formatted);
                     void (async () => {
                         try {
+                            const formatted = toTelegramHTML(text);
+                            const chunks = chunkMessage(formatted);
                             await bot.api.editMessageText(chatId, originalMsg.message_id, chunks[0], { parse_mode: "HTML" });
                         }
                         catch {
@@ -187,21 +243,8 @@ export function createBot() {
         if (originalMsg && "text" in originalMsg && originalMsg.text) {
             const chatId = ctx.chat.id;
             sendToOrchestrator(`Explain this error in simple terms and suggest a fix:\n${originalMsg.text}`, { type: "telegram", chatId, messageId: originalMsg.message_id }, (text, done) => {
-                if (done) {
-                    const formatted = toTelegramHTML(text);
-                    const chunks = chunkMessage(formatted);
-                    void (async () => {
-                        try {
-                            await ctx.reply(chunks[0], { parse_mode: "HTML" });
-                        }
-                        catch {
-                            try {
-                                await ctx.reply(text);
-                            }
-                            catch { }
-                        }
-                    })();
-                }
+                if (done)
+                    void sendFormattedReply(bot, chatId, text);
             });
         }
     });
@@ -698,7 +741,6 @@ export function createBot() {
             await ctx.react("👀");
         }
         catch { }
-        // Get the largest photo (last in array)
         const photo = ctx.message.photo[ctx.message.photo.length - 1];
         try {
             const file = await ctx.api.getFile(photo.file_id);
@@ -708,7 +750,6 @@ export function createBot() {
                 return;
             }
             const url = `https://api.telegram.org/file/bot${config.telegramBotToken}/${filePath}`;
-            // Download to temp file
             const { mkdtempSync, writeFileSync } = await import("fs");
             const { join } = await import("path");
             const { tmpdir } = await import("os");
@@ -718,39 +759,11 @@ export function createBot() {
             const response = await fetch(url);
             const buffer = Buffer.from(await response.arrayBuffer());
             writeFileSync(localPath, buffer);
-            // Send to orchestrator with image context
+            scheduleTempCleanup(tmpDir);
             const prompt = `[User sent a photo saved at: ${localPath}]\n\nCaption: ${caption}\n\nPlease analyze this image. The file is at ${localPath} — you can use bash to view it with tools if needed.`;
             sendToOrchestrator(prompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done) => {
-                if (done) {
-                    const formatted = toTelegramHTML(text);
-                    const chunks = chunkMessage(formatted);
-                    const fallbackChunks = chunkMessage(text);
-                    void (async () => {
-                        for (let i = 0; i < chunks.length; i++) {
-                            if (i > 0)
-                                await new Promise((r) => setTimeout(r, 300));
-                            const pageTag = chunks.length > 1 ? `📄 ${i + 1}/${chunks.length}\n` : "";
-                            try {
-                                await ctx.api.sendMessage(chatId, pageTag + chunks[i], {
-                                    parse_mode: "HTML",
-                                    reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
-                                });
-                            }
-                            catch {
-                                try {
-                                    await ctx.api.sendMessage(chatId, pageTag + (fallbackChunks[i] ?? chunks[i]), {
-                                        reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
-                                    });
-                                }
-                                catch { }
-                            }
-                        }
-                        try {
-                            await ctx.api.setMessageReaction(chatId, userMessageId, [{ type: "emoji", emoji: "👍" }]);
-                        }
-                        catch { }
-                    })();
-                }
+                if (done)
+                    void sendFormattedReply(bot, chatId, text, { replyTo: userMessageId });
             });
         }
         catch (err) {
@@ -791,38 +804,11 @@ export function createBot() {
             const response = await fetch(url);
             const buffer = Buffer.from(await response.arrayBuffer());
             writeFileSync(localPath, buffer);
+            scheduleTempCleanup(tmpDir);
             const prompt = `[User sent a file: ${doc.file_name || "unknown"} (${doc.file_size || 0} bytes), saved at: ${localPath}]\n\nCaption: ${caption}\n\nPlease analyze this file. You can read it with bash tools.`;
             sendToOrchestrator(prompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done) => {
-                if (done) {
-                    const formatted = toTelegramHTML(text);
-                    const chunks = chunkMessage(formatted);
-                    const fallbackChunks = chunkMessage(text);
-                    void (async () => {
-                        for (let i = 0; i < chunks.length; i++) {
-                            if (i > 0)
-                                await new Promise((r) => setTimeout(r, 300));
-                            const pageTag = chunks.length > 1 ? `📄 ${i + 1}/${chunks.length}\n` : "";
-                            try {
-                                await ctx.api.sendMessage(chatId, pageTag + chunks[i], {
-                                    parse_mode: "HTML",
-                                    reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
-                                });
-                            }
-                            catch {
-                                try {
-                                    await ctx.api.sendMessage(chatId, pageTag + (fallbackChunks[i] ?? chunks[i]), {
-                                        reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
-                                    });
-                                }
-                                catch { }
-                            }
-                        }
-                        try {
-                            await ctx.api.setMessageReaction(chatId, userMessageId, [{ type: "emoji", emoji: "👍" }]);
-                        }
-                        catch { }
-                    })();
-                }
+                if (done)
+                    void sendFormattedReply(bot, chatId, text, { replyTo: userMessageId });
             });
         }
         catch (err) {
@@ -877,6 +863,7 @@ export function createBot() {
             const response = await fetch(url);
             const buffer = Buffer.from(await response.arrayBuffer());
             writeFileSync(localPath, buffer);
+            scheduleTempCleanup(tmpDir);
             let prompt;
             if (config.openaiApiKey) {
                 // Transcribe using OpenAI Whisper API
@@ -911,49 +898,8 @@ export function createBot() {
                 prompt = `[User sent a voice message (${duration}s), saved at: ${localPath}. No OPENAI_API_KEY configured for transcription. You can tell the user to set it up in ~/.nzb/.env]`;
             }
             sendToOrchestrator(voiceReplyContext + prompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done, meta) => {
-                if (done) {
-                    const assistantLogId = meta?.assistantLogId;
-                    const formatted = toTelegramHTML(text);
-                    const chunks = chunkMessage(formatted);
-                    const fallbackChunks = chunkMessage(text);
-                    void (async () => {
-                        let firstMsgId;
-                        for (let i = 0; i < chunks.length; i++) {
-                            if (i > 0)
-                                await new Promise((r) => setTimeout(r, 300));
-                            const pageTag = chunks.length > 1 ? `📄 ${i + 1}/${chunks.length}\n` : "";
-                            try {
-                                const sent = await ctx.api.sendMessage(chatId, pageTag + chunks[i], {
-                                    parse_mode: "HTML",
-                                    reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
-                                });
-                                if (i === 0)
-                                    firstMsgId = sent.message_id;
-                            }
-                            catch {
-                                try {
-                                    const sent = await ctx.api.sendMessage(chatId, pageTag + (fallbackChunks[i] ?? chunks[i]), {
-                                        reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
-                                    });
-                                    if (i === 0)
-                                        firstMsgId = sent.message_id;
-                                }
-                                catch { }
-                            }
-                        }
-                        if (assistantLogId && firstMsgId) {
-                            try {
-                                const { setConversationTelegramMsgId } = await import("../store/db.js");
-                                setConversationTelegramMsgId(assistantLogId, firstMsgId);
-                            }
-                            catch { }
-                        }
-                        try {
-                            await ctx.api.setMessageReaction(chatId, userMessageId, [{ type: "emoji", emoji: "👍" }]);
-                        }
-                        catch { }
-                    })();
-                }
+                if (done)
+                    void sendFormattedReply(bot, chatId, text, { replyTo: userMessageId, assistantLogId: meta?.assistantLogId });
             });
         }
         catch (err) {
@@ -962,6 +908,14 @@ export function createBot() {
             });
         }
     });
+    // Global error handler — prevents unhandled errors from crashing the bot
+    bot.catch((err) => {
+        const ctx = err.ctx;
+        const e = err.error;
+        const msg = e instanceof Error ? e.message : String(e);
+        console.error(`[nzb] Bot error for ${ctx?.update?.update_id}: ${msg}`);
+        void logError(`Bot error: ${msg.slice(0, 200)}`);
+    });
     return bot;
 }
 export async function startBot() {
@@ -1015,25 +969,7 @@ export async function stopBot() {
 export async function sendProactiveMessage(text) {
     if (!bot || config.authorizedUserId === undefined)
         return;
-    const formatted = toTelegramHTML(text);
-    const chunks = chunkMessage(formatted);
-    const fallbackChunks = chunkMessage(text);
-    for (let i = 0; i < chunks.length; i++) {
-        if (i > 0)
-            await new Promise((r) => setTimeout(r, 300));
-        const pageTag = chunks.length > 1 ? `📄 ${i + 1}/${chunks.length}\n` : "";
-        try {
-            await bot.api.sendMessage(config.authorizedUserId, pageTag + chunks[i], { parse_mode: "HTML" });
-        }
-        catch {
-            try {
-                await bot.api.sendMessage(config.authorizedUserId, pageTag + (fallbackChunks[i] ?? chunks[i]));
-            }
-            catch {
-                // Bot may not be connected yet
-            }
-        }
-    }
+    await sendFormattedReply(bot, config.authorizedUserId, text);
 }
 /** Send a worker lifecycle notification to the authorized user. */
 export async function sendWorkerNotification(message) {

package/dist/telegram/formatter.js

@@ -107,19 +107,27 @@ export function toTelegramHTML(text) {
     out = out.replace(/^(\s*)[-*]\s+/gm, "$1• ");
     // 9. Ordered lists: keep as-is (1. 2. 3.)
     // 10. Strikethrough ~~text~~ → <s>
-    out = out.replace(/~~(.+?)~~/g, (_m, inner) => stashToken(`<s>\x00ESC${inner}\x00ESC</s>`));
-    // 11. Bold **text** → <b>
-    out = out.replace(/\*\*(.+?)\*\*/g, (_m, inner) => stashToken(`<b>\x00ESC${inner}\x00ESC</b>`));
-    // 12. Italic *text* → <i>
-    out = out.replace(/\*(.+?)\*/g, (_m, inner) => stashToken(`<i>\x00ESC${inner}\x00ESC</i>`));
-    // 13. Underline __text__ → <u>
-    out = out.replace(/__(.+?)__/g, (_m, inner) => stashToken(`<u>\x00ESC${inner}\x00ESC</u>`));
-    // 14. Escape remaining plain text
+    out = out.replace(/~~(.+?)~~/g, (_m, inner) => stashToken(`<s>${escapeHtml(inner)}</s>`));
+    // 11. Bold+italic ***text*** → <b><i>text</i></b>
+    out = out.replace(/\*\*\*(.+?)\*\*\*/g, (_m, inner) => stashToken(`<b><i>${escapeHtml(inner)}</i></b>`));
+    // 12. Bold **text** → <b> (inner may contain stash tokens, preserve them)
+    out = out.replace(/\*\*(.+?)\*\*/g, (_m, inner) => {
+        const escaped = escapeHtml(inner.replace(/\x00S\d+\x00/g, (tok) => `\x00KEEP${tok}\x00KEEP`));
+        const restored = escaped.replace(/\x00KEEP\x00S(\d+)\x00\x00KEEP/g, (_m2, i) => stash[+i]);
+        return stashToken(`<b>${restored}</b>`);
+    });
+    // 13. Italic *text* → <i>
+    out = out.replace(/\*(.+?)\*/g, (_m, inner) => {
+        const escaped = escapeHtml(inner.replace(/\x00S\d+\x00/g, (tok) => `\x00KEEP${tok}\x00KEEP`));
+        const restored = escaped.replace(/\x00KEEP\x00S(\d+)\x00\x00KEEP/g, (_m2, i) => stash[+i]);
+        return stashToken(`<i>${restored}</i>`);
+    });
+    // 14. Underline __text__ → <u>
+    out = out.replace(/__(.+?)__/g, (_m, inner) => stashToken(`<u>${escapeHtml(inner)}</u>`));
+    // 15. Escape remaining plain text
     out = escapeHtml(out);
-    // 15. Restore stashed tokens
+    // 16. Restore stashed tokens
     out = out.replace(/\x00S(\d+)\x00/g, (_m, i) => stash[+i]);
-    // 16. Escape inner text of formatting tags (marked with ESC)
-    out = out.replace(/\x00ESC([\s\S]*?)\x00ESC/g, (_m, inner) => escapeHtml(inner));
     // 17. Clean up excessive blank lines
     out = out.replace(/\n{3,}/g, "\n\n");
     return out.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@iletai/nzb",
-	"version": "1.4.0",
+	"version": "1.4.2",
 	"description": "NZB — a personal AI assistant for developers, built on the GitHub Copilot SDK",
 	"bin": {
 		"nzb": "dist/cli.js"