@inetafrica/open-claudia 2.2.17 → 2.2.18

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.2.18
+- Fix the legacy Telegram send/edit path so replies default to Telegram HTML parse mode and go through the shared formatter, preventing raw `<b>`, `<a>`, and related tags from leaking in chat.
+- Preserve safe Telegram HTML tags before Markdown conversion, so underscores inside link URLs such as Higgsfield `wan2_2_video` are not misread as italics and do not break rendered links.
+
 ## v2.2.17
 - Telegram output now uses `parse_mode: "HTML"` instead of legacy Markdown. The Telegram adapter normalizes both model-authored Telegram HTML and ordinary Markdown/CommonMark into Telegram's safe HTML subset before sending, so `<b>...</b>`, `**bold**`, backticks, links, headings, code blocks, strikethrough, and spoilers render cleanly instead of leaking literal markup or being rejected by Telegram. Messages still fall back to plain text if Telegram rejects the markup.
 - Updated the Telegram system prompt to ask agents for short mobile-readable Telegram HTML (`<b>`, `<code>`, `<pre>`, `<a>`) with bullet-style layout. Relay sends and slash-command responses now use the same HTML parse mode as normal assistant replies.

package/bot-agent.js

@@ -6,6 +6,7 @@ const https = require("https");
 const cron = require("node-cron");
 const Vault = require("./vault");
 const CONFIG_DIR = require("./config-dir");
+const { telegramHtml } = require("./channels/telegram/format");
 
 // ── Graceful shutdown & error handling ─────────────────────────────
 process.on("SIGINT", () => process.exit(0));
@@ -653,14 +654,17 @@ function projectKeyboard() {
 }
 
 async function send(text, opts = {}) {
+  const parseMode = opts.parseMode || "HTML";
+  const body = parseMode === "HTML" ? telegramHtml(text) : text;
+  const fallbackBody = String(text ?? "");
   const o = {};
-  if (opts.parseMode) o.parse_mode = opts.parseMode;
+  if (parseMode) o.parse_mode = parseMode;
   if (opts.keyboard) o.reply_markup = opts.keyboard;
   if (opts.replyTo) o.reply_to_message_id = opts.replyTo;
 
   for (let attempt = 0; attempt < 3; attempt++) {
     try {
-      const msg = await bot.sendMessage(CHAT_ID, text, o);
+      const msg = await bot.sendMessage(CHAT_ID, body, o);
       return msg.message_id;
     } catch (e) {
       const errMsg = e.message || "";
@@ -680,10 +684,17 @@ async function send(text, opts = {}) {
         continue;
       }
 
-      // Parse mode failed — retry without it
-      if (opts.parseMode && o.parse_mode) {
+      // Parse mode failed — retry once as plain text, but do not leak raw HTML tags.
+      if (parseMode && o.parse_mode) {
+        console.error("Send parse-mode failed, retrying plain text:", errMsg);
         delete o.parse_mode;
-        continue;
+        try {
+          const msg = await bot.sendMessage(CHAT_ID, fallbackBody, o);
+          return msg.message_id;
+        } catch (plainErr) {
+          console.error("Send plain-text fallback error:", plainErr.message || plainErr);
+          return null;
+        }
       }
 
       console.error("Send error:", errMsg);
@@ -695,16 +706,28 @@ async function send(text, opts = {}) {
 }
 
 async function editMessage(messageId, text, opts = {}) {
+  const parseMode = opts.parseMode || "HTML";
+  const body = parseMode === "HTML" ? telegramHtml(text) : text;
+  const fallbackBody = String(text ?? "");
   try {
     const o = { chat_id: CHAT_ID, message_id: messageId };
+    if (parseMode) o.parse_mode = parseMode;
     if (opts.keyboard) o.reply_markup = opts.keyboard;
-    await bot.editMessageText(text, o);
+    await bot.editMessageText(body, o);
   } catch (e) {
     const errMsg = e.message || "";
     // Rate limited — skip this update (next interval will catch up)
     if (errMsg.includes("retry after")) return;
     // Message unchanged — ignore
     if (errMsg.includes("message is not modified")) return;
+    if (parseMode) {
+      try {
+        const fallback = { chat_id: CHAT_ID, message_id: messageId };
+        if (opts.keyboard) fallback.reply_markup = opts.keyboard;
+        await bot.editMessageText(fallbackBody, fallback);
+        return;
+      } catch (e2) {}
+    }
     // Log anything unexpected
     if (!errMsg.includes("message to edit not found")) {
       console.error("Edit error:", errMsg);

package/channels/telegram/format.js

@@ -39,29 +39,33 @@ function stashCode(text) {
   return { text: out, blocks };
 }
 
-function restoreAllowedHtmlTags(text) {
+function stashAllowedHtmlTags(text) {
+  const tags = [];
+  const stash = (html) => {
+    const token = `\u0000OCTGHTML${tags.length}\u0000`;
+    tags.push(html);
+    return token;
+  };
   let out = text;
 
-  // Allow model-authored Telegram HTML tags after escaping the rest of the text.
+  // 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"]) {
     const open = new RegExp(`&lt;${tag}&gt;`, "gi");
     const close = new RegExp(`&lt;/${tag}&gt;`, "gi");
-    out = out.replace(open, `<${tag}>`).replace(close, `</${tag}>`);
+    out = out.replace(open, () => stash(`<${tag}>`)).replace(close, () => stash(`</${tag}>`));
   }
 
-  // Telegram spoiler HTML.
   out = out
-    .replace(/&lt;span class="tg-spoiler"&gt;/gi, '<span class="tg-spoiler">')
-    .replace(/&lt;\/span&gt;/gi, "</span>");
+    .replace(/&lt;span class="tg-spoiler"&gt;/gi, () => stash('<span class="tg-spoiler">'))
+    .replace(/&lt;\/span&gt;/gi, () => stash("</span>"));
 
-  // Safe links only. Quotes are not escaped by escapeHtml(), but href content
-  // is still constrained to http(s)/mailto/tg schemes to avoid broken markup.
   out = out.replace(/&lt;a href="([^"<>]+)"&gt;/gi, (_, href) => {
     if (!/^(https?:|mailto:|tg:)/i.test(href)) return "";
-    return `<a href="${href}">`;
-  }).replace(/&lt;\/a&gt;/gi, "</a>");
+    return stash(`<a href="${href}">`);
+  }).replace(/&lt;\/a&gt;/gi, () => stash("</a>"));
 
-  return out;
+  return { text: out, tags };
 }
 
 function convertMarkdownToHtml(text) {
@@ -92,8 +96,12 @@ function convertMarkdownToHtml(text) {
 function telegramHtml(text) {
   const { text: withoutCode, blocks } = stashCode(text);
   let out = escapeHtml(withoutCode);
-  out = restoreAllowedHtmlTags(out);
-  out = convertMarkdownToHtml(out);
+  const { text: withoutHtmlTags, tags } = stashAllowedHtmlTags(out);
+  out = convertMarkdownToHtml(withoutHtmlTags);
+
+  tags.forEach((html, i) => {
+    out = out.replace(`\u0000OCTGHTML${i}\u0000`, html);
+  });
 
   blocks.forEach((html, i) => {
     out = out.replace(`\u0000OCTGCODE${i}\u0000`, html);

package/package.json

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