morpheus-cli 0.4.9 → 0.4.11

package/dist/channels/telegram.js

@@ -5,6 +5,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import os from 'os';
 import { spawn } from 'child_process';
+import { convert } from 'telegram-markdown-v2';
 import { ConfigManager } from '../config/manager.js';
 import { DisplayManager } from '../runtime/display.js';
 import { createTelephonist } from '../runtime/telephonist.js';
@@ -13,6 +14,18 @@ import { SQLiteChatMessageHistory } from '../runtime/memory/sqlite.js';
 import { SatiRepository } from '../runtime/memory/sati/repository.js';
 import { MCPManager } from '../config/mcp-manager.js';
 import { Construtor } from '../runtime/tools/factory.js';
+/**
+ * Converts standard Markdown (as produced by LLMs) to Telegram MarkdownV2.
+ * Unsupported tags (e.g. tables) have their special chars escaped so they
+ * render as plain text instead of breaking the parse.
+ * Truncates to Telegram's 4096-char hard limit.
+ */
+function toMd(text) {
+    const MAX = 4096;
+    const converted = convert(text, 'escape');
+    const safe = converted.length > MAX ? converted.slice(0, MAX - 3) + '\\.\\.\\.' : converted;
+    return { text: safe, parse_mode: 'MarkdownV2' };
+}
 export class TelegramAdapter {
     bot = null;
     isConnected = false;
@@ -87,7 +100,12 @@ export class TelegramAdapter {
                     // Process with Agent
                     const response = await this.oracle.chat(text);
                     if (response) {
-                        await ctx.reply(response);
+                        try {
+                            await ctx.reply(toMd(response).text, { parse_mode: 'MarkdownV2' });
+                        }
+                        catch {
+                            await ctx.reply(response);
+                        }
                         this.display.log(`Responded to @${user}: ${response}`, { source: 'Telegram' });
                     }
                 }
@@ -154,7 +172,7 @@ export class TelegramAdapter {
                     // The prompt says "reply with the answer".
                     // "Transcribe them... and process the resulting text as a standard user prompt."
                     // So I should treat 'text' as if it was a text message.
-                    await ctx.reply(`🎤 *Transcription*: _"${text}"_`, { parse_mode: 'Markdown' });
+                    await ctx.reply(`🎤 Transcription: "${text}"`);
                     await ctx.sendChatAction('typing');
                     // Process with Agent
                     const response = await this.oracle.chat(text, usage, true);
@@ -166,7 +184,12 @@ export class TelegramAdapter {
                     //   }
                     // }
                     if (response) {
-                        await ctx.reply(response);
+                        try {
+                            await ctx.reply(toMd(response).text, { parse_mode: 'MarkdownV2' });
+                        }
+                        catch {
+                            await ctx.reply(response);
+                        }
                         this.display.log(`Responded to @${user} (via audio)`, { source: 'Telegram' });
                     }
                 }
@@ -227,7 +250,7 @@ export class TelegramAdapter {
                 const sessionId = data.replace('ask_archive_session_', '');
                 // Fetch session title for better UX (optional, but nice) - for now just use ID
                 await ctx.reply(`⚠️ **ARCHIVE SESSION?**\n\nAre you sure you want to archive session \`${sessionId}\`?\n\nIt will be moved to long-term memory (SATI) and removed from the active list. This action cannot be easily undone via Telegram.`, {
-                    parse_mode: 'Markdown',
+                    parse_mode: 'MarkdownV2',
                     reply_markup: {
                         inline_keyboard: [
                             [
@@ -249,7 +272,7 @@ export class TelegramAdapter {
                     if (ctx.updateType === 'callback_query') {
                         ctx.deleteMessage().catch(() => { });
                     }
-                    await ctx.reply(`✅ Session \`${sessionId}\` has been archived and moved to long-term memory.`, { parse_mode: 'Markdown' });
+                    await ctx.reply(`✅ Session \`${sessionId}\` has been archived and moved to long-term memory.`, { parse_mode: 'MarkdownV2' });
                 }
                 catch (error) {
                     await ctx.answerCbQuery(`Error archiving: ${error.message}`, { show_alert: true });
@@ -260,7 +283,7 @@ export class TelegramAdapter {
                 const data = ctx.callbackQuery.data;
                 const sessionId = data.replace('ask_delete_session_', '');
                 await ctx.reply(`🚫 **DELETE SESSION?**\n\nAre you sure you want to PERMANENTLY DELETE session \`${sessionId}\`?\n\nThis action is **IRREVERSIBLE**. All data will be lost.`, {
-                    parse_mode: 'Markdown',
+                    parse_mode: 'MarkdownV2',
                     reply_markup: {
                         inline_keyboard: [
                             [
@@ -282,7 +305,7 @@ export class TelegramAdapter {
                     if (ctx.updateType === 'callback_query') {
                         ctx.deleteMessage().catch(() => { });
                     }
-                    await ctx.reply(`🗑️ Session \`${sessionId}\` has been permanently deleted.`, { parse_mode: 'Markdown' });
+                    await ctx.reply(`🗑️ Session \`${sessionId}\` has been permanently deleted.`, { parse_mode: 'MarkdownV2' });
                 }
                 catch (error) {
                     await ctx.answerCbQuery(`Error deleting: ${error.message}`, { show_alert: true });
@@ -385,7 +408,7 @@ export class TelegramAdapter {
         for (const userId of allowedUsers) {
             try {
                 // Send as plain text — LLM output often has unbalanced markdown that
-                // causes "Can't find end of entity" errors with parse_mode: 'Markdown'.
+                // causes "Can't find end of entity" errors with parse_mode: 'MarkdownV2'.
                 await this.bot.telegram.sendMessage(userId, safeText);
             }
             catch (err) {
@@ -464,7 +487,7 @@ export class TelegramAdapter {
     async handleNewSessionCommand(ctx, user) {
         try {
             await ctx.reply("Are you ready to start a new session? Please confirm.", {
-                parse_mode: 'Markdown', reply_markup: {
+                parse_mode: 'MarkdownV2', reply_markup: {
                     inline_keyboard: [
                         [{ text: 'Yes, start new session', callback_data: 'confirm_new_session' }, { text: 'No, cancel', callback_data: 'cancel_new_session' }]
                     ]
@@ -490,7 +513,7 @@ export class TelegramAdapter {
             const history = new SQLiteChatMessageHistory({ sessionId: "" });
             const sessions = await history.listSessions();
             if (sessions.length === 0) {
-                await ctx.reply('No active or paused sessions found.', { parse_mode: 'Markdown' });
+                await ctx.reply('No active or paused sessions found.', { parse_mode: 'MarkdownV2' });
                 return;
             }
             let response = '*Sessions:*\n\n';
@@ -521,7 +544,7 @@ export class TelegramAdapter {
                 keyboard.push(sessionButtons);
             }
             await ctx.reply(response, {
-                parse_mode: 'Markdown',
+                parse_mode: 'MarkdownV2',
                 reply_markup: {
                     inline_keyboard: keyboard
                 }
@@ -642,7 +665,7 @@ How can I assist you today?`;
         else {
             response += '⚠️ Configuration: Missing\n';
         }
-        await ctx.reply(response, { parse_mode: 'Markdown' });
+        await ctx.reply(response, { parse_mode: 'MarkdownV2' });
     }
     async handleStatsCommand(ctx, user) {
         try {
@@ -685,7 +708,7 @@ How can I assist you today?`;
             else {
                 response += 'No detailed usage statistics available.';
             }
-            await ctx.reply(response, { parse_mode: 'Markdown' });
+            await ctx.reply(response, { parse_mode: 'MarkdownV2' });
             history.close();
         }
         catch (error) {
@@ -702,7 +725,7 @@ How can I assist you today?`;
         let response = await this.oracle.chat(prompt);
         if (response) {
             try {
-                await ctx.reply(response, { parse_mode: 'Markdown' });
+                await ctx.reply(response, { parse_mode: 'MarkdownV2' });
             }
             catch {
                 await ctx.reply(response);
@@ -717,7 +740,7 @@ How can I assist you today?`;
 ${this.HELP_MESSAGE}
 
 How can I assist you today?`;
-        await ctx.reply(helpMessage, { parse_mode: 'Markdown' });
+        await ctx.reply(helpMessage, { parse_mode: 'MarkdownV2' });
     }
     async handleZaionCommand(ctx, user) {
         const config = this.config.get();
@@ -767,7 +790,7 @@ How can I assist you today?`;
         response += `*Audio:*\n`;
         response += `- Enabled: ${config.audio.enabled}\n`;
         response += `- Max Duration: ${config.audio.maxDurationSeconds}s\n`;
-        await ctx.reply(response, { parse_mode: 'Markdown' });
+        await ctx.reply(response, { parse_mode: 'MarkdownV2' });
     }
     async handleSatiCommand(ctx, user, args) {
         let limit = null;
@@ -797,7 +820,7 @@ How can I assist you today?`;
                 const truncatedSummary = memory.summary.length > 200 ? memory.summary.substring(0, 200) + '...' : memory.summary;
                 response += `*${memory.category} (${memory.importance}):* ${truncatedSummary}\n\n`;
             }
-            await ctx.reply(response, { parse_mode: 'Markdown' });
+            await ctx.reply(response, { parse_mode: 'MarkdownV2' });
         }
         catch (error) {
             await ctx.reply(`Failed to retrieve memories: ${error.message}`);
@@ -891,7 +914,7 @@ How can I assist you today?`;
                 Construtor.probe(),
             ]);
             if (servers.length === 0) {
-                await ctx.reply('*No MCP Servers Configured*\n\nThere are currently no MCP servers configured in the system.', { parse_mode: 'Markdown' });
+                await ctx.reply('*No MCP Servers Configured*\n\nThere are currently no MCP servers configured in the system.', { parse_mode: 'MarkdownV2' });
                 return;
             }
             const probeMap = new Map(probeResults.map(r => [r.name, r]));
@@ -932,13 +955,13 @@ How can I assist you today?`;
                 }
             });
             await ctx.reply(response, {
-                parse_mode: 'Markdown',
+                parse_mode: 'MarkdownV2',
                 reply_markup: { inline_keyboard: keyboard },
             });
         }
         catch (error) {
             this.display.log('Error listing MCP servers: ' + (error instanceof Error ? error.message : String(error)), { source: 'Telegram', level: 'error' });
-            await ctx.reply('An error occurred while retrieving the list of MCP servers. Please check the logs for more details.', { parse_mode: 'Markdown' });
+            await ctx.reply('An error occurred while retrieving the list of MCP servers. Please check the logs for more details.', { parse_mode: 'MarkdownV2' });
         }
     }
 }

package/dist/runtime/apoc.js

@@ -4,6 +4,7 @@ import { ProviderFactory } from "./providers/factory.js";
 import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
 import { buildDevKit } from "../devkit/index.js";
+import { SQLiteChatMessageHistory } from "./memory/sqlite.js";
 /**
  * Apoc is a subagent of Oracle specialized in devtools operations.
  * It receives delegated tasks from Oracle and executes them using DevKit tools
@@ -15,12 +16,20 @@ import { buildDevKit } from "../devkit/index.js";
  */
 export class Apoc {
     static instance = null;
+    static currentSessionId = undefined;
     agent;
     config;
     display = DisplayManager.getInstance();
     constructor(config) {
         this.config = config || ConfigManager.getInstance().get();
     }
+    /**
+     * Called by Oracle before each chat() so Apoc knows which session to
+     * attribute its token usage to.
+     */
+    static setSessionId(sessionId) {
+        Apoc.currentSessionId = sessionId;
+    }
     static getInstance(config) {
         if (!Apoc.instance) {
             Apoc.instance = new Apoc(config);
@@ -54,8 +63,9 @@ export class Apoc {
      * Execute a devtools task delegated by Oracle.
      * @param task Natural language task description
      * @param context Optional additional context from the ongoing conversation
+     * @param sessionId Session to attribute token usage to (defaults to 'apoc')
      */
-    async execute(task, context) {
+    async execute(task, context, sessionId) {
         if (!this.agent) {
             await this.initialize();
         }
@@ -90,6 +100,23 @@ ${context ? `CONTEXT FROM ORACLE:\n${context}` : ""}
         const messages = [systemMessage, userMessage];
         try {
             const response = await this.agent.invoke({ messages });
+            // Persist Apoc-generated messages so token usage is tracked in short-memory.db.
+            // Use the caller's session when provided, then the static session set by Oracle,
+            // otherwise fall back to 'apoc'.
+            const apocConfig = this.config.apoc || this.config.llm;
+            const newMessages = response.messages.slice(messages.length);
+            if (newMessages.length > 0) {
+                const targetSession = sessionId ?? Apoc.currentSessionId ?? 'apoc';
+                const history = new SQLiteChatMessageHistory({ sessionId: targetSession });
+                for (const msg of newMessages) {
+                    msg.provider_metadata = {
+                        provider: apocConfig.provider,
+                        model: apocConfig.model,
+                    };
+                }
+                await history.addMessages(newMessages);
+                history.close();
+            }
             const lastMessage = response.messages[response.messages.length - 1];
             const content = typeof lastMessage.content === "string"
                 ? lastMessage.content

package/dist/runtime/oracle.js

@@ -6,6 +6,7 @@ import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
 import { SQLiteChatMessageHistory } from "./memory/sqlite.js";
 import { SatiMemoryMiddleware } from "./memory/sati/index.js";
+import { Apoc } from "./apoc.js";
 export class Oracle {
     provider;
     config;
@@ -208,6 +209,11 @@ You maintain intent until resolution.
             }
             messages.push(...previousMessages);
             messages.push(userMessage);
+            // Propagate current session to Apoc so its token usage lands in the right session
+            const currentSessionId = (this.history instanceof SQLiteChatMessageHistory)
+                ? this.history.currentSessionId
+                : undefined;
+            Apoc.setSessionId(currentSessionId);
             const response = await this.provider.invoke({ messages });
             // Identify new messages generated during the interaction
             // The `messages` array passed to invoke had length `messages.length`
@@ -229,9 +235,6 @@ You maintain intent until resolution.
             const lastMessage = response.messages[response.messages.length - 1];
             const responseContent = (typeof lastMessage.content === 'string') ? lastMessage.content : JSON.stringify(lastMessage.content);
             // Sati Middleware: Evaluation (Fire and forget)
-            const currentSessionId = (this.history instanceof SQLiteChatMessageHistory)
-                ? this.history.currentSessionId
-                : undefined;
             this.satiMiddleware.afterAgent(responseContent, [...previousMessages, userMessage], currentSessionId)
                 .catch((e) => this.display.log(`Sati memory evaluation failed: ${e.message}`, { source: 'Sati' }));
             return responseContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morpheus-cli",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "Morpheus is a local AI agent for developers, running as a CLI daemon that connects to LLMs, local tools, and MCPs, enabling interaction via Terminal, Telegram, and Discord. Inspired by the character Morpheus from *The Matrix*, the project acts as an intelligent orchestrator, bridging the gap between the developer and complex systems.",
   "bin": {
     "morpheus": "./bin/morpheus.js"
@@ -47,14 +47,15 @@
     "fs-extra": "^11.3.3",
     "js-yaml": "^4.1.1",
     "langchain": "^1.2.16",
+    "mcp-remote": "^0.1.38",
     "open": "^11.0.0",
     "ora": "^9.1.0",
     "sqlite-vec": "^0.1.7-alpha.2",
     "telegraf": "^4.16.3",
+    "telegram-markdown-v2": "^0.0.4",
     "winston": "^3.19.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "zod": "^4.3.6",
-    "mcp-remote": "^0.1.38"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.6",