obol-ai 0.3.22 → 0.3.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obol-ai",
-  "version": "0.3.22",
+  "version": "0.3.24",
   "description": "Self-evolving AI assistant that learns, remembers, and acts on its own. Persistent vector memory, self-rewriting personality, proactive heartbeats.",
   "main": "src/index.js",
   "bin": {

package/src/cli/manage-users.js

@@ -188,6 +188,7 @@ async function manageUsers(cfg, saveConfig) {
       if (removeId !== null) {
         const idx = currentUsers.indexOf(removeId);
         if (idx !== -1) currentUsers.splice(idx, 1);
+        if (cfg.users) delete cfg.users[String(removeId)];
         console.log(`  ✅ Removed ${removeId}`);
         console.log(`  ⚠️  Workspace at ${getUserDir(removeId)} was NOT deleted (remove manually if needed)`);
       }

package/src/runtime/background.js

@@ -1,4 +1,5 @@
 const { buildStatusHtml, formatToolCall } = require('../status');
+const { markdownToTelegramHtml } = require('../telegram/utils');
 
 const MAX_CONCURRENT_TASKS = 3;
 
@@ -30,7 +31,20 @@ class BackgroundRunner {
     const verbose = parentContext?.verbose || false;
     const verboseNotify = parentContext?._verboseNotify;
 
-    const promise = this._runTask(claude, task, taskState, ctx, memory, verbose, verboseNotify, opts.model, opts.extraContext || extraContext, opts.silent || false);
+    const inherited = parentContext ? {
+      toolPrefs: parentContext.toolPrefs,
+      config: parentContext.config,
+      scheduler: parentContext.scheduler,
+      messageLog: parentContext.messageLog,
+      userId: parentContext.userId,
+      userDir: parentContext.userDir,
+      telegramAsk: parentContext.telegramAsk,
+      _notifyFn: parentContext._notifyFn,
+    } : {};
+
+    const mergedExtra = { ...inherited, ...(opts.extraContext || extraContext) };
+
+    const promise = this._runTask(claude, task, taskState, ctx, memory, verbose, verboseNotify, opts.model, mergedExtra, opts.silent || false);
     taskState.promise = promise;
 
     return taskId;
@@ -93,18 +107,25 @@ TASK: ${task}`;
         },
       });
 
-      taskState.status = 'done';
-      taskState.result = result;
       claude.clearHistory(`bg-${taskState.id}`);
-
       clearStatus();
 
-      const elapsed = Math.floor((Date.now() - taskState.startedAt) / 1000);
-      if (silent) {
-        await sendLong(ctx, result);
+      if (!result?.trim()) {
+        taskState.status = 'error';
+        taskState.error = 'No result returned';
+        if (!silent) {
+          await ctx.reply(`⚠️ BG #${taskState.id} finished but produced no result.`).catch(() => {});
+        }
       } else {
-        const header = `✅ <b>BG #${taskState.id}</b> done (${formatDuration(elapsed)})\n\n`;
-        await sendLong(ctx, header + result);
+        taskState.status = 'done';
+        taskState.result = result;
+        const elapsed = Math.floor((Date.now() - taskState.startedAt) / 1000);
+        if (silent) {
+          await sendLong(ctx, result);
+        } else {
+          const header = `✅ <b>BG #${taskState.id}</b> done (${formatDuration(elapsed)})\n\n`;
+          await sendLong(ctx, header + result);
+        }
       }
 
       if (memory) {
@@ -160,27 +181,22 @@ function formatDuration(seconds) {
 
 async function sendLong(ctx, text) {
   if (!text?.trim()) return;
-  if (text.length <= 4096) {
-    await ctx.reply(text, { parse_mode: 'HTML' }).catch(() =>
-      ctx.reply(text)
-    );
+  const html = markdownToTelegramHtml(text);
+  if (html.length <= 4096) {
+    await ctx.reply(html, { parse_mode: 'HTML' }).catch(() => ctx.reply(text));
     return;
   }
 
-  let remaining = text;
+  let remaining = html;
   while (remaining.length > 0) {
     if (remaining.length <= 4096) {
-      await ctx.reply(remaining, { parse_mode: 'HTML' }).catch(() =>
-        ctx.reply(remaining)
-      );
+      await ctx.reply(remaining, { parse_mode: 'HTML' }).catch(() => ctx.reply(remaining));
       break;
     }
     let splitAt = remaining.lastIndexOf('\n', 4096);
     if (splitAt === -1 || splitAt < 2000) splitAt = 4096;
     const chunk = remaining.substring(0, splitAt);
-    await ctx.reply(chunk, { parse_mode: 'HTML' }).catch(() =>
-      ctx.reply(chunk)
-    );
+    await ctx.reply(chunk, { parse_mode: 'HTML' }).catch(() => ctx.reply(chunk));
     remaining = remaining.substring(splitAt).trimStart();
   }
 }

package/src/status.js

@@ -33,4 +33,19 @@ function formatToolCall(toolName, inputSummary) {
   return `${toolName} "${truncated}"`;
 }
 
-module.exports = { buildStatusHtml, formatToolCall, TERM_WIDTH };
+/**
+ * @param {{ model: string, usage: { input_tokens: number, output_tokens: number }, startTime: number | null }} params
+ * @returns {string | null}
+ */
+function formatTokenStats({ model, usage, startTime }) {
+  if (!usage || !model) return null;
+  const tag = model.includes('opus') ? 'opus' : model.includes('haiku') ? 'haiku' : 'sonnet';
+  const tokIn = usage.input_tokens >= 1000 ? `${(usage.input_tokens / 1000).toFixed(1)}k` : usage.input_tokens;
+  const tokOut = usage.output_tokens >= 1000 ? `${(usage.output_tokens / 1000).toFixed(1)}k` : usage.output_tokens;
+  const dur = startTime ? ((Date.now() - startTime) / 1000).toFixed(1) : null;
+  const parts = [`◈ ${tag}`, `${tokIn} in`, `${tokOut} out`];
+  if (dur) parts.push(`${dur}s`);
+  return `<code>${parts.join(' ▪ ')}</code>`;
+}
+
+module.exports = { buildStatusHtml, formatToolCall, formatTokenStats, TERM_WIDTH };

package/src/telegram/bot.js

@@ -103,6 +103,7 @@ function createBot(telegramConfig, config) {
     { command: 'options', description: 'Toggle optional features on/off' },
     { command: 'topics', description: 'Edit news topics' },
     { command: 'stop', description: 'Stop the current request' },
+    { command: 'restart', description: 'Restart the bot (pm2)' },
     { command: 'upgrade', description: 'Check for updates and upgrade' },
     { command: 'help', description: 'Show available commands' },
   ]).catch(() => {});

package/src/telegram/commands/admin.js

@@ -168,6 +168,16 @@ Summarize what was cleaned and secrets migrated.`);
     }
   });
 
+  bot.command('restart', async (ctx) => {
+    if (!ctx.from) return;
+    await ctx.reply('🔄 Restarting...');
+    try {
+      execSync('pm2 restart obol', { encoding: 'utf-8', timeout: 15000 });
+    } catch (e) {
+      await ctx.reply(`⚠️ Restart failed: ${e.message.substring(0, 200)}`);
+    }
+  });
+
   bot.command('toolimit', async (ctx) => {
     if (!ctx.from) return;
     const args = ctx.message.text.split(' ').slice(1);

package/src/telegram/commands/conversation.js

@@ -54,6 +54,7 @@ function register(bot, config) {
 /verbose — Toggle verbose mode on/off
 /toolimit — View or set max tool iterations
 /stop — Stop the current request
+/restart — Restart the bot
 /upgrade — Check for updates and upgrade
 /help — This message`);
   });

package/src/telegram/handlers/media.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const { getTenant } = require('../../tenant');
-const { buildStatusHtml, formatToolCall } = require('../../status');
+const { buildStatusHtml, formatToolCall, formatTokenStats } = require('../../status');
 const media = require('../../media');
 const { sendHtml, startTyping, splitMessage } = require('../utils');
 const { MAX_MEDIA_SIZE, MEDIA_GROUP_DELAY_MS } = require('../constants');
@@ -124,17 +124,8 @@ async function processMediaItems(ctx, items, { config, allowedUsers, bot, create
 
     const statsPref = tenant.toolPrefs?.get('model_stats');
     const showStats = statsPref ? statsPref.enabled : true;
-    if (showStats && usage && model) {
-      const tag = model.includes('opus') ? 'opus' : model.includes('haiku') ? 'haiku' : 'sonnet';
-      const tokIn = usage.input_tokens >= 1000 ? `${(usage.input_tokens/1000).toFixed(1)}k` : usage.input_tokens;
-      const tokOut = usage.output_tokens >= 1000 ? `${(usage.output_tokens/1000).toFixed(1)}k` : usage.output_tokens;
-      const dur = status.statusStart ? ((Date.now() - status.statusStart)/1000).toFixed(1) : null;
-      const parts = [`◈ ${tag}`, `${tokIn} in`, `${tokOut} out`];
-      if (dur) parts.push(`${dur}s`);
-      await ctx.reply(`<code>${parts.join(' ▪ ')}</code>`, { parse_mode: 'HTML' }).catch(() => {});
-    }
-
-    status.deleteMsg();
+    const statsHtml = showStats ? formatTokenStats({ model, usage, startTime: status.statusStart }) : null;
+    status.finalize(statsHtml);
   } catch (e) {
     status.clear();
     stopTyping();

package/src/telegram/handlers/special.js

@@ -1,5 +1,5 @@
 const { getTenant } = require('../../tenant');
-const { formatToolCall } = require('../../status');
+const { formatToolCall, formatTokenStats } = require('../../status');
 const { sendHtml, startTyping, splitMessage } = require('../utils');
 const { createChatContext, createStatusTracker } = require('./text');
 
@@ -120,17 +120,8 @@ async function processSpecial(ctx, prompt, deps) {
 
     const statsPref = tenant.toolPrefs?.get('model_stats');
     const showStats = statsPref ? statsPref.enabled : true;
-    if (showStats && usage && model) {
-      const tag = model.includes('opus') ? 'opus' : model.includes('haiku') ? 'haiku' : 'sonnet';
-      const tokIn = usage.input_tokens >= 1000 ? `${(usage.input_tokens / 1000).toFixed(1)}k` : usage.input_tokens;
-      const tokOut = usage.output_tokens >= 1000 ? `${(usage.output_tokens / 1000).toFixed(1)}k` : usage.output_tokens;
-      const dur = status.statusStart ? ((Date.now() - status.statusStart) / 1000).toFixed(1) : null;
-      const parts = [`◈ ${tag}`, `${tokIn} in`, `${tokOut} out`];
-      if (dur) parts.push(`${dur}s`);
-      await ctx.reply(`<code>${parts.join(' ▪ ')}</code>`, { parse_mode: 'HTML' }).catch(() => {});
-    }
-
-    status.deleteMsg();
+    const statsHtml = showStats ? formatTokenStats({ model, usage, startTime: status.statusStart }) : null;
+    status.finalize(statsHtml);
   } catch (e) {
     status.clear();
     stopTyping();

package/src/telegram/handlers/text.js

@@ -1,6 +1,6 @@
 const { InlineKeyboard } = require('grammy');
 const { getTenant } = require('../../tenant');
-const { buildStatusHtml, formatToolCall } = require('../../status');
+const { buildStatusHtml, formatToolCall, formatTokenStats } = require('../../status');
 const { sendHtml, startTyping, splitMessage } = require('../utils');
 const { TEXT_BUFFER_GAP_MS, TEXT_BUFFER_MAX_PARTS, TEXT_BUFFER_MAX_CHARS, TEXT_BUFFER_THRESHOLD } = require('../constants');
 
@@ -10,7 +10,7 @@ const VERBOSE_FLUSH_MS = 2000;
 async function sendTtsVoiceSummary(ctx, tenant, responseText) {
   const fs = require('fs');
   const { InputFile } = require('grammy');
-  const tts = require('../../tts');
+  const tts = require('../../media/tts');
 
   const ttsConfig = tenant.toolPrefs.get('text_to_speech')?.config || {};
   const voice = ttsConfig.voice || 'en-US-JennyNeural';
@@ -142,6 +142,18 @@ function createStatusTracker(ctx, botName) {
     deleteMsg() {
       if (statusMsgId) ctx.api.deleteMessage(ctx.chat.id, statusMsgId).catch(() => {});
     },
+    finalize(statsHtml) {
+      if (statusTimer) { clearInterval(statusTimer); statusTimer = null; }
+      if (statsHtml && statusMsgId) {
+        ctx.api.editMessageText(ctx.chat.id, statusMsgId, statsHtml, { parse_mode: 'HTML' }).catch(() => {
+          ctx.api.deleteMessage(ctx.chat.id, statusMsgId).catch(() => {});
+        });
+        statusMsgId = null;
+      } else {
+        if (statusMsgId) { ctx.api.deleteMessage(ctx.chat.id, statusMsgId).catch(() => {}); statusMsgId = null; }
+        if (statsHtml) ctx.reply(statsHtml, { parse_mode: 'HTML' }).catch(() => {});
+      }
+    },
   };
 }
 
@@ -233,17 +245,8 @@ async function processTextMessage(ctx, fullMessage, { config, allowedUsers, bot,
 
     const statsPref = tenant.toolPrefs?.get('model_stats');
     const showStats = statsPref ? statsPref.enabled : true;
-    if (showStats && usage && model) {
-      const tag = model.includes('opus') ? 'opus' : model.includes('haiku') ? 'haiku' : 'sonnet';
-      const tokIn = usage.input_tokens >= 1000 ? `${(usage.input_tokens/1000).toFixed(1)}k` : usage.input_tokens;
-      const tokOut = usage.output_tokens >= 1000 ? `${(usage.output_tokens/1000).toFixed(1)}k` : usage.output_tokens;
-      const dur = status.statusStart ? ((Date.now() - status.statusStart)/1000).toFixed(1) : null;
-      const parts = [`◈ ${tag}`, `${tokIn} in`, `${tokOut} out`];
-      if (dur) parts.push(`${dur}s`);
-      await ctx.reply(`<code>${parts.join(' ▪ ')}</code>`, { parse_mode: 'HTML' }).catch(() => {});
-    }
-
-    status.deleteMsg();
+    const statsHtml = showStats ? formatTokenStats({ model, usage, startTime: status.statusStart }) : null;
+    status.finalize(statsHtml);
   } catch (e) {
     batcher?.flush();
     status.clear();