@iletai/nzb 1.3.5 → 1.3.6

package/dist/copilot/orchestrator.js

@@ -395,14 +395,14 @@ export async function sendToOrchestrator(prompt, source, callback, onToolEvent,
                     processQueue();
                 });
                 // Deliver response to user FIRST, then log best-effort
-                callback(finalContent, true);
                 try {
                     logMessage("out", sourceLabel, finalContent);
                 }
                 catch {
                     /* best-effort */
                 }
-                // Log both sides of the conversation after delivery
+                // Log both sides of the conversation before delivery so we have the row ID
+                let assistantLogId;
                 try {
                     const telegramMsgId = source.type === "telegram" ? source.messageId : undefined;
                     logConversation(logRole, prompt, sourceLabel, telegramMsgId);
@@ -411,11 +411,12 @@ export async function sendToOrchestrator(prompt, source, callback, onToolEvent,
                     /* best-effort */
                 }
                 try {
-                    logConversation("assistant", finalContent, sourceLabel);
+                    assistantLogId = logConversation("assistant", finalContent, sourceLabel);
                 }
                 catch {
                     /* best-effort */
                 }
+                callback(finalContent, true, { assistantLogId });
                 // Auto-continue: if the response was cut short by timeout, automatically
                 // send a follow-up "Continue" message so the user doesn't have to
                 if (finalContent.includes("⏱ Response was cut short (timeout)")) {

package/dist/store/db.js

@@ -100,7 +100,6 @@ export function getDb() {
             removeMemory: db.prepare(`DELETE FROM memories WHERE id = ?`),
             memorySummary: db.prepare(`SELECT id, category, content FROM memories ORDER BY category, last_accessed DESC`),
             getConversationByMsgId: db.prepare(`SELECT id FROM conversation_log WHERE telegram_msg_id = ? LIMIT 1`),
-            getConversationAround: db.prepare(`SELECT role, content, source, ts FROM conversation_log WHERE id BETWEEN ? - 4 AND ? + 4 ORDER BY id ASC`),
         };
     }
     return db;
@@ -119,23 +118,35 @@ export function deleteState(key) {
     getDb(); // ensure init
     stmtCache.deleteState.run(key);
 }
-/** Log a conversation turn (user, assistant, or system) with optional Telegram message ID. */
+/** Log a conversation turn (user, assistant, or system) with optional Telegram message ID. Returns the row ID. */
 export function logConversation(role, content, source, telegramMsgId) {
     getDb(); // ensure init
-    stmtCache.logConversation.run(role, content, source, telegramMsgId ?? null);
+    const result = stmtCache.logConversation.run(role, content, source, telegramMsgId ?? null);
     // Keep last 200 entries to support context recovery after session loss
     logInsertCount++;
     if (logInsertCount % 50 === 0) {
         stmtCache.pruneConversation.run();
     }
+    return result.lastInsertRowid;
 }
-/** Get conversation context around a Telegram message ID (±2 turns). */
+/** Get conversation context around a Telegram message ID (±4 rows using proper subquery). */
 export function getConversationContext(telegramMsgId) {
-    getDb(); // ensure init
+    const db = getDb();
     const row = stmtCache.getConversationByMsgId.get(telegramMsgId);
     if (!row)
         return undefined;
-    const rows = stmtCache.getConversationAround.all(row.id, row.id);
+    // Fetch 4 rows before + the target + 4 rows after (handles ID gaps from pruning)
+    const rows = db.prepare(`
+		SELECT role, content, source, ts FROM (
+			SELECT * FROM conversation_log WHERE id < ? ORDER BY id DESC LIMIT 4
+		)
+		UNION ALL
+		SELECT role, content, source, ts FROM conversation_log WHERE id = ?
+		UNION ALL
+		SELECT role, content, source, ts FROM (
+			SELECT * FROM conversation_log WHERE id > ? ORDER BY id ASC LIMIT 4
+		)
+	`).all(row.id, row.id, row.id);
     if (rows.length === 0)
         return undefined;
     return rows
@@ -146,10 +157,10 @@ export function getConversationContext(telegramMsgId) {
     })
         .join("\n");
 }
-/** Update the most recent assistant log entry with its Telegram message ID (for reply-to lookups). */
-export function updateLastAssistantTelegramMsgId(telegramMsgId) {
+/** Set Telegram message ID on a specific conversation_log row (race-free). */
+export function setConversationTelegramMsgId(rowId, telegramMsgId) {
     const db = getDb();
-    db.prepare(`UPDATE conversation_log SET telegram_msg_id = ? WHERE id = (SELECT id FROM conversation_log WHERE role = 'assistant' ORDER BY id DESC LIMIT 1)`).run(telegramMsgId);
+    db.prepare(`UPDATE conversation_log SET telegram_msg_id = ? WHERE id = ?`).run(telegramMsgId, rowId);
 }
 /** Get recent conversation history formatted for injection into system message. */
 export function getRecentConversation(limit = 20) {

package/dist/telegram/bot.js

@@ -454,10 +454,11 @@ export function createBot() {
                 userPrompt = `[Replying to: "${quoted}"]\n\n${userPrompt}`;
             }
         }
-        sendToOrchestrator(userPrompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done) => {
+        sendToOrchestrator(userPrompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done, meta) => {
             if (done) {
                 finalized = true;
                 stopTyping();
+                const assistantLogId = meta?.assistantLogId;
                 const elapsed = ((Date.now() - handlerStartTime) / 1000).toFixed(1);
                 void logInfo(`✅ Response done (${elapsed}s, ${toolHistory.length} tools, ${text.length} chars)`);
                 // Wait for in-flight edits to finish before sending the final response
@@ -513,11 +514,13 @@ export function createBot() {
                                 await bot.api.setMessageReaction(chatId, userMessageId, [{ type: "emoji", emoji: "👍" }]);
                             }
                             catch { }
-                            try {
-                                const { updateLastAssistantTelegramMsgId } = await import("../store/db.js");
-                                updateLastAssistantTelegramMsgId(placeholderMsgId);
+                            if (assistantLogId) {
+                                try {
+                                    const { setConversationTelegramMsgId } = await import("../store/db.js");
+                                    setConversationTelegramMsgId(assistantLogId, placeholderMsgId);
+                                }
+                                catch { }
                             }
-                            catch { }
                             return;
                         }
                         catch {
@@ -527,11 +530,13 @@ export function createBot() {
                                     await bot.api.setMessageReaction(chatId, userMessageId, [{ type: "emoji", emoji: "👍" }]);
                                 }
                                 catch { }
-                                try {
-                                    const { updateLastAssistantTelegramMsgId } = await import("../store/db.js");
-                                    updateLastAssistantTelegramMsgId(placeholderMsgId);
+                                if (assistantLogId) {
+                                    try {
+                                        const { setConversationTelegramMsgId } = await import("../store/db.js");
+                                        setConversationTelegramMsgId(assistantLogId, placeholderMsgId);
+                                    }
+                                    catch { }
                                 }
-                                catch { }
                                 return;
                             }
                             catch {
@@ -541,6 +546,7 @@ export function createBot() {
                     }
                     // Multi-chunk or edit fallthrough: send new chunks FIRST, then delete placeholder
                     const totalChunks = chunks.length;
+                    let firstSentMsgId;
                     const sendChunk = async (chunk, fallback, index) => {
                         const isFirst = index === 0 && !placeholderMsgId;
                         // Pagination header for multi-chunk messages
@@ -548,9 +554,11 @@ export function createBot() {
                         const opts = isFirst
                             ? { parse_mode: "MarkdownV2", reply_parameters: replyParams }
                             : { parse_mode: "MarkdownV2" };
-                        await ctx
+                        const sent = await ctx
                             .reply(pageTag + chunk, opts)
                             .catch(() => ctx.reply(pageTag + fallback, isFirst ? { reply_parameters: replyParams } : {}));
+                        if (index === 0 && sent)
+                            firstSentMsgId = sent.message_id;
                     };
                     let sendSucceeded = false;
                     try {
@@ -567,7 +575,9 @@ export function createBot() {
                                 if (i > 0)
                                     await new Promise((r) => setTimeout(r, 300));
                                 const pageTag = fallbackChunks.length > 1 ? `📄 ${i + 1}/${fallbackChunks.length}\n` : "";
-                                await ctx.reply(pageTag + fallbackChunks[i], i === 0 ? { reply_parameters: replyParams } : {});
+                                const sent = await ctx.reply(pageTag + fallbackChunks[i], i === 0 ? { reply_parameters: replyParams } : {});
+                                if (i === 0 && sent)
+                                    firstSentMsgId = sent.message_id;
                             }
                             sendSucceeded = true;
                         }
@@ -584,6 +594,15 @@ export function createBot() {
                             /* ignore — placeholder stays but user has the real message */
                         }
                     }
+                    // Track bot message ID for reply-to context lookups
+                    const botMsgId = firstSentMsgId ?? placeholderMsgId;
+                    if (assistantLogId && botMsgId) {
+                        try {
+                            const { setConversationTelegramMsgId } = await import("../store/db.js");
+                            setConversationTelegramMsgId(assistantLogId, botMsgId);
+                        }
+                        catch { }
+                    }
                     // React ✅ on the user's original message to signal completion
                     try {
                         await bot.api.setMessageReaction(chatId, userMessageId, [{ type: "emoji", emoji: "👍" }]);
@@ -769,6 +788,20 @@ export function createBot() {
             await ctx.reply("❌ Voice too long (max 5 min).", { reply_parameters: { message_id: userMessageId } });
             return;
         }
+        // If voice is a reply, include context
+        let voiceReplyContext = "";
+        const voiceReplyMsg = ctx.message.reply_to_message;
+        if (voiceReplyMsg && "text" in voiceReplyMsg && voiceReplyMsg.text) {
+            const { getConversationContext } = await import("../store/db.js");
+            const context = getConversationContext(voiceReplyMsg.message_id);
+            if (context) {
+                voiceReplyContext = `[Continuing from earlier conversation:]\n---\n${context}\n---\n\n`;
+            }
+            else {
+                const quoted = voiceReplyMsg.text.length > 500 ? voiceReplyMsg.text.slice(0, 500) + "…" : voiceReplyMsg.text;
+                voiceReplyContext = `[Replying to: "${quoted}"]\n\n`;
+            }
+        }
         try {
             const file = await ctx.api.getFile(ctx.message.voice.file_id);
             const filePath = file.file_path;
@@ -819,31 +852,44 @@ export function createBot() {
             else {
                 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(prompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done) => {
+            sendToOrchestrator(voiceReplyContext + prompt, { type: "telegram", chatId, messageId: userMessageId }, (text, done, meta) => {
                 if (done) {
+                    const assistantLogId = meta?.assistantLogId;
                     const formatted = toTelegramMarkdown(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 {
-                                await ctx.api.sendMessage(chatId, pageTag + chunks[i], {
+                                const sent = await ctx.api.sendMessage(chatId, pageTag + chunks[i], {
                                     parse_mode: "MarkdownV2",
                                     reply_parameters: i === 0 ? { message_id: userMessageId } : undefined,
                                 });
+                                if (i === 0)
+                                    firstMsgId = sent.message_id;
                             }
                             catch {
                                 try {
-                                    await ctx.api.sendMessage(chatId, pageTag + (fallbackChunks[i] ?? chunks[i]), {
+                                    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: "👍" }]);
                         }

package/package.json

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