@inetafrica/open-claudia 2.4.0 → 2.4.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v2.4.2
+- Fix replies losing everything written before tool calls. The backend's final `result` event carries only the LAST text segment of a turn, but the stream parser assigned it over the accumulated `assistantText` — so a turn shaped "long explanation → tool calls → short closing line" delivered only the closing line, which read as nonsense without its context. `evt.result` is now a fallback used only when nothing was accumulated (some Cursor turns). Fixed in both `runClaude` and the auxiliary runner.
+
+## v2.4.1
+- Fix Telegram messages occasionally arriving as raw HTML (`<b>`, `<code>` shown literally). Root cause: the Markdown→HTML pass could inject `<i>` tags *inside* model-authored `<code>` spans (two snake_case identifiers on one line pair their underscores as italics), producing unbalanced HTML that Telegram rejects — and the parse-failure fallback then resent the converted body verbatim, tags and all.
+  - `<code>`/`<pre>` spans are now stashed whole (content included) before Markdown conversion, so nothing can be injected inside them.
+  - The italic `_..._` rule only fires at word boundaries, so snake_case identifiers anywhere in the text can no longer pair up.
+  - Model-authored entities (`&lt;`, `&amp;`, `&#…;`) are preserved instead of double-escaped — `<code>&lt;name&gt;</code>` now renders as `<name>` instead of `&lt;name&gt;`.
+  - Last-resort fallback (send + edit) now strips tags and decodes entities (`htmlToPlain`) so a rejected message degrades to clean plain text, never raw markup.
+
 ## v2.4.0
 - **FTS5 transcript index (cross-session recall).** Project transcripts are now indexed in SQLite FTS5 via Node's built-in `node:sqlite` (no new dependency), turning "did we discuss X last week?" into a ~50ms ranked lookup instead of a linear grep over JSONL.
   - `core/transcript-index.js`: WAL-mode DB at `~/.open-claudia/transcripts/index.db` (0600), FTS5 table with porter tokenizer, per-file byte offsets for idempotent incremental indexing. Partial trailing lines wait for the next pass; a replaced/truncated transcript drops its stale rows and reindexes. Fail-soft: without `node:sqlite` every call no-ops and transcript-window remains the path.

package/channels/telegram/adapter.js

@@ -10,7 +10,7 @@ const TelegramBot = require("node-telegram-bot-api");
 const { TEMP_DIR, FILES_DIR, CONFIG_DIR } = require("../../core/config");
 const { canonicalForChannel } = require("../../core/identity");
 const { portableToInlineKeyboard } = require("../types");
-const { telegramHtml } = require("./format");
+const { telegramHtml, htmlToPlain } = require("./format");
 
 class TelegramAdapter {
   constructor({ id = "telegram", token, ownerChatId, chatIds }) {
@@ -205,7 +205,7 @@ class TelegramAdapter {
 
   async send(channelId, text, opts = {}) {
     const o = {};
-    const body = opts.parseMode === "HTML" ? telegramHtml(text) : text;
+    let body = opts.parseMode === "HTML" ? telegramHtml(text) : text;
     if (opts.parseMode) o.parse_mode = opts.parseMode;
     const kb = this._normalizeKeyboard(opts.keyboard);
     if (kb) o.reply_markup = kb;
@@ -229,7 +229,9 @@ class TelegramAdapter {
           continue;
         }
         if (opts.parseMode && o.parse_mode) {
+          console.error("Send: HTML rejected, falling back to plain:", errMsg);
           delete o.parse_mode;
+          body = htmlToPlain(body);
           continue;
         }
         console.error("Send error:", errMsg);
@@ -255,7 +257,7 @@ class TelegramAdapter {
       if (errMsg.includes("message is not modified")) return;
       if (opts.parseMode && o.parse_mode) {
         delete o.parse_mode;
-        try { await this.bot.editMessageText(text, o); return; } catch (e2) {}
+        try { await this.bot.editMessageText(htmlToPlain(body), o); return; } catch (e2) {}
       }
       if (!errMsg.includes("message to edit not found")) console.error("Edit error:", errMsg);
     }

package/channels/telegram/format.js

@@ -14,6 +14,15 @@ function escapeHtml(text) {
     .replace(/>/g, ">");
 }
 
+// Like escapeHtml, but keeps entities the model already wrote (< & {)
+// instead of double-escaping them into visible "<" text.
+function escapeHtmlPreservingEntities(text) {
+  return String(text || "")
+    .replace(/&(?!(?:amp|lt|gt|quot|#\d+|#x[0-9a-fA-F]+);)/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+}
+
 function stripMarkdown(text) {
   return String(text || "")
     .replace(/[*_`~]/g, "")
@@ -48,6 +57,13 @@ function stashAllowedHtmlTags(text) {
   };
   let out = text;
 
+  // Stash whole model-authored <code>/<pre> spans, content included, so
+  // Markdown conversion can never inject tags inside them (e.g. two
+  // snake_case identifiers on one line becoming a stray <i> pair).
+  out = out.replace(/&lt;(code|pre)&gt;([\s\S]*?)&lt;\/\1&gt;/gi, (_, tag, inner) => {
+    return stash(`<${tag.toLowerCase()}>${inner}</${tag.toLowerCase()}>`);
+  });
+
   // Hide model-authored Telegram HTML tags from Markdown conversion. This keeps
   // underscores in hrefs such as wan2_2_video from becoming bogus <i> tags.
   for (const tag of ["b", "strong", "i", "em", "u", "s", "strike", "del", "code", "pre", "blockquote"]) {
@@ -83,8 +99,9 @@ function convertMarkdownToHtml(text) {
   out = out.replace(/\*\*([^*\n][\s\S]*?[^*\n])\*\*/g, "<b>$1</b>");
   out = out.replace(/(?<!\*)\*([^*\n]+)\*(?!\*)/g, "<b>$1</b>");
 
-  // Italic. Keep conservative to avoid mangling snake_case identifiers.
-  out = out.replace(/(?<!_)_([^_\n]+)_(?!_)/g, "<i>$1</i>");
+  // Italic. Only fire when the underscores sit at word boundaries, so
+  // snake_case identifiers (skill_manage ... skill_manage) never pair up.
+  out = out.replace(/(?<![A-Za-z0-9_])_([^_\n]+)_(?![A-Za-z0-9_])/g, "<i>$1</i>");
 
   // Strikethrough and Telegram spoiler syntax.
   out = out.replace(/~~([^~\n]+)~~/g, "<s>$1</s>");
@@ -95,7 +112,7 @@ function convertMarkdownToHtml(text) {
 
 function telegramHtml(text) {
   const { text: withoutCode, blocks } = stashCode(text);
-  let out = escapeHtml(withoutCode);
+  let out = escapeHtmlPreservingEntities(withoutCode);
   const { text: withoutHtmlTags, tags } = stashAllowedHtmlTags(out);
   out = convertMarkdownToHtml(withoutHtmlTags);
 
@@ -110,4 +127,16 @@ function telegramHtml(text) {
   return out;
 }
 
-module.exports = { escapeHtml, stripMarkdown, telegramHtml };
+// Last-resort plain text for when Telegram rejects the HTML: drop tags,
+// decode entities, so the user never sees raw <b>/<code> markup.
+function htmlToPlain(html) {
+  return String(html || "")
+    .replace(/<\/?[a-zA-Z][^>]*>/g, "")
+    .replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&quot;/g, '"')
+    .replace(/&#(\d+);/g, (_, n) => String.fromCodePoint(Number(n)))
+    .replace(/&amp;/g, "&");
+}
+
+module.exports = { escapeHtml, stripMarkdown, telegramHtml, htmlToPlain };

package/core/runner.js

@@ -500,7 +500,10 @@ async function runClaudeCapture(prompt, cwd, opts = {}) {
           if (typeof evt.total_cost_usd === "number") state.sessionUsage.costUsd += evt.total_cost_usd;
           saveState();
         }
-        if (evt.type === "result" && evt.result) assistantText = evt.result;
+        // evt.result only carries the FINAL text segment of the turn. Using it
+        // as anything but a fallback would clobber text streamed before tool
+        // calls (the "long reply, then tools, then short closing line" shape).
+        if (evt.type === "result" && evt.result && !assistantText.trim()) assistantText = evt.result;
       }
     });
     proc.stderr.on("data", (d) => { stderrBuffer += d.toString(); });
@@ -803,7 +806,9 @@ async function runClaude(prompt, cwd, replyToMsgId, opts = {}) {
         if (typeof evt.total_cost_usd === "number") state.sessionUsage.costUsd += evt.total_cost_usd;
         saveState();
       }
-      if (evt.type === "result" && evt.result) assistantText = evt.result;
+      // Fallback only: evt.result is just the final text segment, and assigning
+      // it unconditionally wiped everything the model said before tool calls.
+      if (evt.type === "result" && evt.result && !assistantText.trim()) assistantText = evt.result;
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inetafrica/open-claudia",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Your always-on AI coding assistant — Claude Code, Cursor Agent, and OpenAI Codex via Telegram or Kazee Chat",
   "main": "bot.js",
   "bin": {