@inetafrica/open-claudia 2.2.16 → 2.2.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/channels/telegram/adapter.js +5 -2
- package/channels/telegram/format.js +98 -5
- package/core/handlers.js +2 -2
- package/core/relay.js +1 -1
- package/core/runner.js +7 -7
- package/core/system-prompt.js +13 -13
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## v2.2.17
|
|
4
|
+
- 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.
|
|
5
|
+
- 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.
|
|
6
|
+
|
|
3
7
|
## v2.2.16
|
|
4
8
|
- New `/compactwindow` slash command (alias `/autocompact`) lets each user override the auto-compact token threshold from chat instead of editing `AUTO_COMPACT_TOKENS` in `.env` and restarting. Quick-pick buttons for 200k / 300k / 380k / 500k / Off / Default, or free-form `/compactwindow 250k` / `/compactwindow 0.5m` / `/compactwindow off` / `/compactwindow default`. Stored per-user as `settings.compactWindow` (persists across restarts via `state.json`); `null` falls back to the env default, `0` disables auto-compact entirely (manual `/compact` still works). `/status` now reports the effective window, and `/usage`'s "context is large" tip reflects the user's override.
|
|
5
9
|
|
|
@@ -10,6 +10,7 @@ const TelegramBot = require("node-telegram-bot-api");
|
|
|
10
10
|
const { TEMP_DIR, FILES_DIR, CONFIG_DIR } = require("../../core/config");
|
|
11
11
|
const { canonicalForChannel } = require("../../core/identity");
|
|
12
12
|
const { portableToInlineKeyboard } = require("../types");
|
|
13
|
+
const { telegramHtml } = require("./format");
|
|
13
14
|
|
|
14
15
|
class TelegramAdapter {
|
|
15
16
|
constructor({ id = "telegram", token, ownerChatId, chatIds }) {
|
|
@@ -204,6 +205,7 @@ class TelegramAdapter {
|
|
|
204
205
|
|
|
205
206
|
async send(channelId, text, opts = {}) {
|
|
206
207
|
const o = {};
|
|
208
|
+
const body = opts.parseMode === "HTML" ? telegramHtml(text) : text;
|
|
207
209
|
if (opts.parseMode) o.parse_mode = opts.parseMode;
|
|
208
210
|
const kb = this._normalizeKeyboard(opts.keyboard);
|
|
209
211
|
if (kb) o.reply_markup = kb;
|
|
@@ -211,7 +213,7 @@ class TelegramAdapter {
|
|
|
211
213
|
|
|
212
214
|
for (let attempt = 0; attempt < 3; attempt++) {
|
|
213
215
|
try {
|
|
214
|
-
const msg = await this.bot.sendMessage(channelId,
|
|
216
|
+
const msg = await this.bot.sendMessage(channelId, body, o);
|
|
215
217
|
return msg.message_id;
|
|
216
218
|
} catch (e) {
|
|
217
219
|
const errMsg = e.message || "";
|
|
@@ -239,13 +241,14 @@ class TelegramAdapter {
|
|
|
239
241
|
}
|
|
240
242
|
|
|
241
243
|
async edit(channelId, messageId, text, opts = {}) {
|
|
244
|
+
const body = opts.parseMode === "HTML" ? telegramHtml(text) : text;
|
|
242
245
|
const o = { chat_id: channelId, message_id: messageId };
|
|
243
246
|
if (opts.parseMode) o.parse_mode = opts.parseMode;
|
|
244
247
|
const kb = this._normalizeKeyboard(opts.keyboard);
|
|
245
248
|
if (kb) o.reply_markup = kb;
|
|
246
249
|
|
|
247
250
|
try {
|
|
248
|
-
await this.bot.editMessageText(
|
|
251
|
+
await this.bot.editMessageText(body, o);
|
|
249
252
|
} catch (e) {
|
|
250
253
|
const errMsg = e.message || "";
|
|
251
254
|
if (errMsg.includes("retry after")) return;
|
|
@@ -1,7 +1,18 @@
|
|
|
1
|
-
// Telegram
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
//
|
|
1
|
+
// Telegram formatting helpers.
|
|
2
|
+
//
|
|
3
|
+
// Telegram's legacy Markdown parser is too fragile for LLM output:
|
|
4
|
+
// CommonMark `**bold**`, underscores in identifiers, unescaped dots in
|
|
5
|
+
// MarkdownV2, and angle brackets in logs all commonly make Telegram reject
|
|
6
|
+
// the message or render markup literally. The bot now sends Telegram HTML and
|
|
7
|
+
// normalizes both model-authored Telegram HTML and ordinary Markdown into the
|
|
8
|
+
// safe subset Telegram accepts.
|
|
9
|
+
|
|
10
|
+
function escapeHtml(text) {
|
|
11
|
+
return String(text || "")
|
|
12
|
+
.replace(/&/g, "&")
|
|
13
|
+
.replace(/</g, "<")
|
|
14
|
+
.replace(/>/g, ">");
|
|
15
|
+
}
|
|
5
16
|
|
|
6
17
|
function stripMarkdown(text) {
|
|
7
18
|
return String(text || "")
|
|
@@ -9,4 +20,86 @@ function stripMarkdown(text) {
|
|
|
9
20
|
.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1");
|
|
10
21
|
}
|
|
11
22
|
|
|
12
|
-
|
|
23
|
+
function stashCode(text) {
|
|
24
|
+
const blocks = [];
|
|
25
|
+
const stash = (html) => {
|
|
26
|
+
const token = `\u0000OCTGCODE${blocks.length}\u0000`;
|
|
27
|
+
blocks.push(html);
|
|
28
|
+
return token;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
let out = String(text || "").replace(/```(?:[^\n`]*)\n?([\s\S]*?)```/g, (_, code) => {
|
|
32
|
+
return stash(`<pre>${escapeHtml(code.trimEnd())}</pre>`);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
out = out.replace(/`([^`\n]+)`/g, (_, code) => {
|
|
36
|
+
return stash(`<code>${escapeHtml(code)}</code>`);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
return { text: out, blocks };
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function restoreAllowedHtmlTags(text) {
|
|
43
|
+
let out = text;
|
|
44
|
+
|
|
45
|
+
// Allow model-authored Telegram HTML tags after escaping the rest of the text.
|
|
46
|
+
for (const tag of ["b", "strong", "i", "em", "u", "s", "strike", "del", "code", "pre", "blockquote"]) {
|
|
47
|
+
const open = new RegExp(`<${tag}>`, "gi");
|
|
48
|
+
const close = new RegExp(`</${tag}>`, "gi");
|
|
49
|
+
out = out.replace(open, `<${tag}>`).replace(close, `</${tag}>`);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
// Telegram spoiler HTML.
|
|
53
|
+
out = out
|
|
54
|
+
.replace(/<span class="tg-spoiler">/gi, '<span class="tg-spoiler">')
|
|
55
|
+
.replace(/<\/span>/gi, "</span>");
|
|
56
|
+
|
|
57
|
+
// Safe links only. Quotes are not escaped by escapeHtml(), but href content
|
|
58
|
+
// is still constrained to http(s)/mailto/tg schemes to avoid broken markup.
|
|
59
|
+
out = out.replace(/<a href="([^"<>]+)">/gi, (_, href) => {
|
|
60
|
+
if (!/^(https?:|mailto:|tg:)/i.test(href)) return "";
|
|
61
|
+
return `<a href="${href}">`;
|
|
62
|
+
}).replace(/<\/a>/gi, "</a>");
|
|
63
|
+
|
|
64
|
+
return out;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function convertMarkdownToHtml(text) {
|
|
68
|
+
let out = text;
|
|
69
|
+
|
|
70
|
+
// Markdown links: [label](https://example.com)
|
|
71
|
+
out = out.replace(/\[([^\]\n]+)\]\((https?:\/\/[^\s)]+)\)/g, (_, label, url) => {
|
|
72
|
+
return `<a href="${url}">${label}</a>`;
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
// Headings become compact bold labels instead of literal # noise.
|
|
76
|
+
out = out.replace(/^\s{0,3}#{1,6}\s+(.+)$/gm, (_, title) => `<b>${title}</b>`);
|
|
77
|
+
|
|
78
|
+
// Bold. Handle CommonMark first, then Telegram Markdown v1 style.
|
|
79
|
+
out = out.replace(/\*\*([^*\n][\s\S]*?[^*\n])\*\*/g, "<b>$1</b>");
|
|
80
|
+
out = out.replace(/(?<!\*)\*([^*\n]+)\*(?!\*)/g, "<b>$1</b>");
|
|
81
|
+
|
|
82
|
+
// Italic. Keep conservative to avoid mangling snake_case identifiers.
|
|
83
|
+
out = out.replace(/(?<!_)_([^_\n]+)_(?!_)/g, "<i>$1</i>");
|
|
84
|
+
|
|
85
|
+
// Strikethrough and Telegram spoiler syntax.
|
|
86
|
+
out = out.replace(/~~([^~\n]+)~~/g, "<s>$1</s>");
|
|
87
|
+
out = out.replace(/\|\|([^|\n]+)\|\|/g, '<span class="tg-spoiler">$1</span>');
|
|
88
|
+
|
|
89
|
+
return out;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
function telegramHtml(text) {
|
|
93
|
+
const { text: withoutCode, blocks } = stashCode(text);
|
|
94
|
+
let out = escapeHtml(withoutCode);
|
|
95
|
+
out = restoreAllowedHtmlTags(out);
|
|
96
|
+
out = convertMarkdownToHtml(out);
|
|
97
|
+
|
|
98
|
+
blocks.forEach((html, i) => {
|
|
99
|
+
out = out.replace(`\u0000OCTGCODE${i}\u0000`, html);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
return out;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
module.exports = { escapeHtml, stripMarkdown, telegramHtml };
|
package/core/handlers.js
CHANGED
|
@@ -795,7 +795,7 @@ register({
|
|
|
795
795
|
handler: async (env) => {
|
|
796
796
|
if (!authorized(env)) return;
|
|
797
797
|
await send("Bot mode: *direct* (default)\n\nSwitch to agent mode for non-blocking execution.\nIn agent mode, heavy tasks run in the background and you can keep chatting.", {
|
|
798
|
-
parseMode: "
|
|
798
|
+
parseMode: "HTML",
|
|
799
799
|
keyboard: { inline_keyboard: [[{ text: "Switch to Agent Mode", callback_data: "mode:agent" }]] },
|
|
800
800
|
});
|
|
801
801
|
},
|
|
@@ -886,7 +886,7 @@ register({
|
|
|
886
886
|
lines.push(`\nTip: context is large. The bot auto-compacts after the next reply at ${fmt(threshold)} tokens (/compactwindow); /compact does it now.`);
|
|
887
887
|
}
|
|
888
888
|
}
|
|
889
|
-
send(lines.join("\n"), { parseMode: "
|
|
889
|
+
send(lines.join("\n"), { parseMode: "HTML" });
|
|
890
890
|
},
|
|
891
891
|
});
|
|
892
892
|
|
package/core/relay.js
CHANGED
|
@@ -35,7 +35,7 @@ async function send({ text, target, from = null, kind = "relay" }) {
|
|
|
35
35
|
let messageId = null;
|
|
36
36
|
let errorMsg = null;
|
|
37
37
|
try {
|
|
38
|
-
const sendOpts = adapter.type === "telegram" ? { parseMode: "
|
|
38
|
+
const sendOpts = adapter.type === "telegram" ? { parseMode: "HTML" } : {};
|
|
39
39
|
const result = await adapter.send(resolved.channelId, String(text), sendOpts);
|
|
40
40
|
if (typeof result === "object" && result && "messageId" in result) { messageId = result.messageId; ok = !!messageId; }
|
|
41
41
|
else { messageId = result; ok = !!result; }
|
package/core/runner.js
CHANGED
|
@@ -22,9 +22,9 @@ const {
|
|
|
22
22
|
const { getClaudeOAuthToken, claudeAuthRecoveryMessage, isClaudeAuthErrorText, claudeUsageLimitMessage, isClaudeUsageLimitText, runClaudeAuthStatusDiagnostic, claudeSubprocessEnv } = require("./auth-flow");
|
|
23
23
|
const loopback = require("./loopback");
|
|
24
24
|
|
|
25
|
-
function
|
|
25
|
+
function telegramHtmlOpts(extra = {}) {
|
|
26
26
|
const adapter = currentAdapter();
|
|
27
|
-
return adapter?.type === "telegram" ? { ...extra, parseMode: "
|
|
27
|
+
return adapter?.type === "telegram" ? { ...extra, parseMode: "HTML" } : extra;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
function chatEnvOverlay() {
|
|
@@ -476,9 +476,9 @@ async function runClaude(prompt, cwd, replyToMsgId, opts = {}) {
|
|
|
476
476
|
const display = formatProgress(assistantText, toolUses, currentTool, elapsed, currentToolDetail);
|
|
477
477
|
if (display && display !== lastUpdate) {
|
|
478
478
|
if (!state.statusMessageId && assistantText) {
|
|
479
|
-
state.statusMessageId = await send(display.length > 4000 ? display.slice(-4000) : display,
|
|
479
|
+
state.statusMessageId = await send(display.length > 4000 ? display.slice(-4000) : display, telegramHtmlOpts({ replyTo: replyToMsgId }));
|
|
480
480
|
} else if (state.statusMessageId) {
|
|
481
|
-
await editMessage(state.statusMessageId, display.length > 4000 ? display.slice(-4000) : display,
|
|
481
|
+
await editMessage(state.statusMessageId, display.length > 4000 ? display.slice(-4000) : display, telegramHtmlOpts());
|
|
482
482
|
}
|
|
483
483
|
lastUpdate = display;
|
|
484
484
|
}
|
|
@@ -665,12 +665,12 @@ async function runClaude(prompt, cwd, replyToMsgId, opts = {}) {
|
|
|
665
665
|
const firstChunk = chunks[0];
|
|
666
666
|
|
|
667
667
|
if (state.statusMessageId && chunks.length === 1) {
|
|
668
|
-
await editMessage(state.statusMessageId, firstChunk,
|
|
668
|
+
await editMessage(state.statusMessageId, firstChunk, telegramHtmlOpts());
|
|
669
669
|
} else {
|
|
670
|
-
const sent = await send(firstChunk,
|
|
670
|
+
const sent = await send(firstChunk, telegramHtmlOpts({ replyTo: replyToMsgId }));
|
|
671
671
|
if (!sent) await send(firstChunk);
|
|
672
672
|
for (let i = 1; i < chunks.length; i++) {
|
|
673
|
-
await send(chunks[i],
|
|
673
|
+
await send(chunks[i], telegramHtmlOpts());
|
|
674
674
|
}
|
|
675
675
|
}
|
|
676
676
|
if (code !== 0 && code !== null) await send(`Exit code: ${code}`);
|
package/core/system-prompt.js
CHANGED
|
@@ -78,28 +78,28 @@ function buildSystemPrompt() {
|
|
|
78
78
|
## Telegram formatting
|
|
79
79
|
Telegram is mobile-first and narrow. Optimize for readability in a small chat bubble.
|
|
80
80
|
|
|
81
|
-
Use Telegram
|
|
82
|
-
- Bold labels with
|
|
83
|
-
- Italic with
|
|
84
|
-
- Inline code with
|
|
85
|
-
-
|
|
81
|
+
Use Telegram HTML, not raw Markdown:
|
|
82
|
+
- Bold labels with <b>Status:</b> / <b>Done:</b> / <b>Blocked:</b> / <b>Next:</b>
|
|
83
|
+
- Italic with <i>...</i> only when genuinely useful.
|
|
84
|
+
- Inline code with <code>...</code> only for commands, file paths, IDs, short field names, and exact errors.
|
|
85
|
+
- Code blocks with <pre>...</pre> only for short commands or snippets. Do not paste long logs; save/send a file instead.
|
|
86
|
+
- Links may use <a href="https://example.com">label</a>, or just paste the URL.
|
|
86
87
|
|
|
87
88
|
Avoid formatting that renders badly or noisily in Telegram:
|
|
88
89
|
- No Markdown tables.
|
|
89
90
|
- No Markdown headings like #, ##, ###.
|
|
90
|
-
- No
|
|
91
|
-
-
|
|
92
|
-
- Do not wrap ordinary business words in backticks or quote marks. For example, write Payments completed, not \`Payments\` completed or 'Payments' completed.
|
|
91
|
+
- No raw **bold** / *bold* as your preferred output, even though the bot has a fallback converter.
|
|
92
|
+
- Do not wrap ordinary business words in backticks, <code>, or quote marks. For example, write Payments completed, not <code>Payments</code> completed or 'Payments' completed.
|
|
93
93
|
- Avoid large paragraphs. Use short sections, blank lines, and 3-7 concise bullets.
|
|
94
94
|
|
|
95
95
|
Good Telegram pattern:
|
|
96
|
-
|
|
96
|
+
<b>Status:</b> CRM sync is still running cleanly.
|
|
97
97
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
• Bills and Calls completed.
|
|
99
|
+
• Leads completed with 20 rows.
|
|
100
|
+
• Payments advanced to <code>2026-05-17 10:50</code>.
|
|
101
101
|
|
|
102
|
-
|
|
102
|
+
<b>Issue:</b> JSON parse error after Retention. I’m checking that stream next.
|
|
103
103
|
`
|
|
104
104
|
: adapter?.type === "kazee"
|
|
105
105
|
? `
|
package/package.json
CHANGED