appback-remoteagent 0.13.19 → 0.13.21

package/dist/bot.js

@@ -726,12 +726,12 @@ ${bridge.formatStatus(mapping)}`);
             return;
         }
         if (action === "main") {
-            const result = await botManagement.setMainBot(rest?.trim() ?? args[1]?.trim() ?? "");
+            const result = await botManagement.setMainBot(commandTarget(args, rest));
             await reply(ctx, result.message);
             return;
         }
         if (action === "remove") {
-            const result = await botManagement.removeBot(rest?.trim() ?? "", sourceBotId, sourceBotToken, ctx.chat.id);
+            const result = await botManagement.removeBot(commandTarget(args, rest), sourceBotId, sourceBotToken, ctx.chat.id);
             await reply(ctx, result.message);
             return;
         }
@@ -741,14 +741,14 @@ ${bridge.formatStatus(mapping)}`);
     bot.command("sleep", async (ctx) => {
         await ensureOwnerControlAccess(ctx);
         const sourceBotId = getBotId();
-        const { rest } = parseCommand(ctx.message?.text, 2);
-        const result = await botManagement.sleepBot(rest?.trim() ?? "", sourceBotId);
+        const { args, rest } = parseCommand(ctx.message?.text, 1);
+        const result = await botManagement.sleepBot(commandTarget(args, rest), sourceBotId);
         await reply(ctx, result.message);
     });
     bot.command("wake", async (ctx) => {
         await ensureOwnerControlAccess(ctx);
-        const { rest } = parseCommand(ctx.message?.text, 2);
-        const result = await botManagement.wakeBot(rest?.trim() ?? "");
+        const { args, rest } = parseCommand(ctx.message?.text, 1);
+        const result = await botManagement.wakeBot(commandTarget(args, rest));
         await reply(ctx, result.message);
     });
     bot.command("install", async (ctx) => {
@@ -1427,12 +1427,25 @@ function renderTelegramInlineHtml(line) {
     }).join("");
 }
 function renderTelegramTextLinks(value) {
-    return value.replace(/https?:\/\/[^\s<>"']+/g, (url) => {
-        const trailingMatch = /[),.;!?]+$/.exec(url);
+    const rendered = [];
+    let cursor = 0;
+    const urlPattern = /https?:\/\/[^\s<>"']+/g;
+    for (const match of value.matchAll(urlPattern)) {
+        const rawUrl = match[0];
+        const start = match.index ?? 0;
+        if (start > cursor) {
+            rendered.push(escapeTelegramHtml(value.slice(cursor, start)));
+        }
+        const trailingMatch = /[),.;!?]+$/.exec(rawUrl);
         const trailing = trailingMatch?.[0] ?? "";
-        const cleanUrl = trailing ? url.slice(0, -trailing.length) : url;
-        return `<a href="${escapeTelegramHtmlAttribute(cleanUrl)}">${escapeTelegramHtml(cleanUrl)}</a>${escapeTelegramHtml(trailing)}`;
-    });
+        const cleanUrl = trailing ? rawUrl.slice(0, -trailing.length) : rawUrl;
+        rendered.push(`<a href="${escapeTelegramHtmlAttribute(cleanUrl)}">${escapeTelegramHtml(cleanUrl)}</a>${escapeTelegramHtml(trailing)}`);
+        cursor = start + rawUrl.length;
+    }
+    if (cursor < value.length) {
+        rendered.push(escapeTelegramHtml(value.slice(cursor)));
+    }
+    return rendered.join("");
 }
 function containsUrl(value) {
     return /https?:\/\/[^\s<>"']+/.test(value);
@@ -1657,6 +1670,9 @@ function parseCommand(text, headCount) {
         rest: remaining || undefined,
     };
 }
+function commandTarget(args, rest) {
+    return (rest?.trim() || args.slice(1).join(" ").trim() || args[0]?.trim() || "");
+}
 function formatSecretHelp() {
     return [
         "Secret command guide",
@@ -2223,11 +2239,23 @@ async function sendTelegramDocument(botToken, chatId, document) {
 async function sendTelegramMessage(botToken, chatId, text, extra) {
     const startedAt = Date.now();
     try {
-        return await callTelegramApi(botToken, "sendMessage", {
-            chat_id: String(chatId),
-            text,
-            parse_mode: extra?.parse_mode,
-        });
+        try {
+            return await callTelegramApi(botToken, "sendMessage", {
+                chat_id: String(chatId),
+                text,
+                parse_mode: extra?.parse_mode,
+            });
+        }
+        catch (error) {
+            if (!extra?.parse_mode || !isTelegramEntityParseError(error)) {
+                throw error;
+            }
+            console.warn(`[telegram-sendMessage-fallback] chat=${chatId} parseMode=${extra.parse_mode}: ${error instanceof Error ? error.message : String(error)}`);
+            return await callTelegramApi(botToken, "sendMessage", {
+                chat_id: String(chatId),
+                text: stripTelegramHtml(text),
+            });
+        }
     }
     finally {
         const elapsedMs = Date.now() - startedAt;
@@ -2236,6 +2264,19 @@ async function sendTelegramMessage(botToken, chatId, text, extra) {
         }
     }
 }
+function isTelegramEntityParseError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return /can'?t parse entities|can't parse entities|Unsupported start tag|Bad Request/i.test(message);
+}
+function stripTelegramHtml(value) {
+    return value
+        .replace(/<a\s+href="[^"]*">([\s\S]*?)<\/a>/gi, "$1")
+        .replace(/<\/?(?:b|strong|i|em|u|s|strike|del|code|pre|blockquote)(?:\s[^>]*)?>/gi, "")
+        .replace(/&lt;/g, "<")
+        .replace(/&gt;/g, ">")
+        .replace(/&quot;/g, '"')
+        .replace(/&amp;/g, "&");
+}
 async function sendTelegramChatAction(botToken, chatId, action) {
     await callTelegramApi(botToken, "sendChatAction", {
         chat_id: String(chatId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appback-remoteagent",
-  "version": "0.13.19",
+  "version": "0.13.21",
   "description": "Personal installable session server for continuing local AI work across PC and Telegram",
   "license": "MIT",
   "type": "module",