obol-ai 0.2.26 → 0.2.28

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.28
+- fix telegram 429 rate limiting with auto-retry, slower timers, verbose batching
+
 ## 0.2.26
 - show cleaning status instead of processing during /clean
 - fix ask deadlock, clean writes tests and audits secrets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obol-ai",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "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": {
@@ -25,6 +25,7 @@
   "license": "MIT",
   "dependencies": {
     "@anthropic-ai/sdk": "^0.78.0",
+    "@grammyjs/auto-retry": "^2.0.2",
     "@grammyjs/runner": "^2.0.3",
     "@supabase/supabase-js": "^2.49.1",
     "@xenova/transformers": "^2.17.2",

package/src/background.js

@@ -60,7 +60,7 @@ class BackgroundRunner {
         const elapsed = Math.round((Date.now() - statusStart) / 1000);
         const html = buildStatusHtml({ route: routeInfo, elapsed, toolStatus: statusText, title });
         ctx.api.editMessageText(ctx.chat.id, statusMsgId, html, { parse_mode: 'HTML' }).catch(() => {});
-      }, 1000);
+      }, 5000);
     };
 
     startStatusTimer();

package/src/clean.js

@@ -10,6 +10,7 @@ const ALLOWED_ROOT_FILES = new Set([
   '.first-run-done',
   '.post-setup-done',
 ]);
+const TEMP_DOTDIRS = new Set(['.typst', '.cache', '.tmp']);
 
 // Extensions that belong in scripts/
 const SCRIPT_EXTS = new Set(['.js', '.ts', '.sh', '.py', '.rb', '.php', '.go', '.rs', '.pl', '.lua']);
@@ -56,8 +57,9 @@ function scanWorkspace(userDir) {
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      if (!ALLOWED_DIRS.has(entry.name) && !entry.name.startsWith('.')) {
-        // Unknown root dir — move to apps/ (likely a project/repo)
+      if (TEMP_DOTDIRS.has(entry.name)) {
+        issues.push({ type: 'dir', name: entry.name, dest: null, children: [] });
+      } else if (!ALLOWED_DIRS.has(entry.name) && !entry.name.startsWith('.')) {
         issues.push({ type: 'dir', name: entry.name, dest: 'apps', children: safeReaddirAll(path.join(userDir, entry.name)) });
       }
     } else if (entry.isFile()) {
@@ -96,7 +98,7 @@ function applyIssues(baseDir, issues) {
   for (const item of issues) {
     if (item.type === 'dir') {
       const src = path.join(baseDir, item.name);
-      if (item.children.length === 0) {
+      if (!item.dest || item.children.length === 0) {
         try {
           fs.rmSync(src, { recursive: true, force: true });
           applied.push({ path: item.name + '/', action: 'deleted (empty dir)' });

package/src/telegram/bot.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { Bot, GrammyError, HttpError, InlineKeyboard } = require('grammy');
 const { run, sequentialize } = require('@grammyjs/runner');
+const { autoRetry } = require('@grammyjs/auto-retry');
 const { getTenant } = require('../tenant');
 const { DEDUP_TTL_MS, DEDUP_MAX_SIZE } = require('./constants');
 const { sendHtml } = require('./utils');
@@ -20,6 +21,7 @@ const { registerCallbackHandler } = require('./handlers/callbacks');
 
 function createBot(telegramConfig, config) {
   const bot = new Bot(telegramConfig.token);
+  bot.api.config.use(autoRetry());
   const allowedUsers = new Set(telegramConfig.allowedUsers || []);
   const pendingAsks = new Map();
   const processedUpdates = new Map();
@@ -133,6 +135,7 @@ function createBot(telegramConfig, config) {
       console.error(`  Unknown error:`, e?.message || e);
     }
 
+    if (e instanceof GrammyError && e.description?.includes('Too Many Requests')) return;
     ctx?.reply?.('⚠️ Something went wrong. I\'m still alive though.').catch(() => {});
   });
 

package/src/telegram/commands/admin.js

@@ -78,9 +78,7 @@ Read every script in ${plan.baseDir}/scripts/. If any script has hardcoded API k
    \`\`\`
 3. Never leave plaintext secrets in script files
 
-## Tests
-Check the tests/ folder at ${plan.baseDir}/tests/. If it has test files, run them — fix any failures and re-run until all pass. If tests/ is empty or missing, read the scripts in ${plan.baseDir}/scripts/ and write a test file for each script, then run them all.
-Summarize what was cleaned, secrets migrated, and final test results.`);
+Summarize what was cleaned and secrets migrated.`);
 
       const taskPrompt = promptParts.join('\n\n');
 
@@ -109,6 +107,33 @@ Summarize what was cleaned, secrets migrated, and final test results.`);
         stopTyping();
         await ctx.reply(`⚠️ Clean failed: ${e.message}`).catch(() => {});
       }
+
+      // Phase 2: write and run tests (separate chat so it can't be skipped)
+      const testsAfter = fs.existsSync(testsDir) && fs.readdirSync(testsDir).filter(f => !f.startsWith('.')).length > 0;
+      if (!testsAfter && hasScripts) {
+        const testPrompt = `Read every script in ${plan.baseDir}/scripts/. For each script, write a corresponding test file in ${plan.baseDir}/tests/. Name each test file test-<script-name> (e.g. scripts/gmail-send.py → tests/test-gmail-send.py). After writing all tests, run them and fix any failures until they all pass. Summarize the test results.`;
+        const testStatus = createStatusTracker(ctx);
+        const testCtx = createChatContext(ctx, tenant, config, { allowedUsers: new Set(), bot, createAsk });
+        testCtx._model = 'claude-sonnet-4-6';
+        testCtx._onRouteDecision = (info) => { testStatus.setRouteInfo(info); testStatus.start(); };
+        testCtx._onToolStart = () => { testStatus.setStatusText('Writing tests'); testStatus.start(); };
+        const testTyping = startTyping(ctx);
+        try {
+          const { text: testResponse } = await tenant.claude.chat(testPrompt, testCtx);
+          testStatus.stopTimer();
+          testStatus.updateFormatting();
+          testTyping();
+          testStatus.deleteMsg();
+          if (testResponse?.trim()) {
+            const chunks = splitMessage(testResponse, 4096);
+            for (const chunk of chunks) await sendHtml(ctx, chunk).catch(() => {});
+          }
+        } catch (e) {
+          testStatus.clear();
+          testTyping();
+          await ctx.reply(`⚠️ Test writing failed: ${e.message}`).catch(() => {});
+        }
+      }
     } catch (e) {
       await ctx.reply(`⚠️ Clean failed: ${e.message}`);
     }
@@ -136,7 +161,7 @@ Summarize what was cleaned, secrets migrated, and final test results.`);
       const { OBOL_DIR } = require('../../config');
       const notifyPath = path.join(OBOL_DIR, '.upgrade-notify.json');
       fs.writeFileSync(notifyPath, JSON.stringify({ chatId: ctx.chat.id, version: latest }));
-      execSync('pm2 restart obol', { encoding: 'utf-8', timeout: 15000 });
+      try { execSync('pm2 restart obol', { encoding: 'utf-8', timeout: 15000 }); } catch {}
     } catch (e) {
       await ctx.reply(`Upgrade failed: ${e.message.substring(0, 200)}`);
     }

package/src/telegram/handlers/text.js

@@ -7,6 +7,29 @@ const { EVOLUTION_IDLE_MS, TEXT_BUFFER_GAP_MS, TEXT_BUFFER_MAX_PARTS, TEXT_BUFFE
 
 const _evolutionTimers = new Map();
 const textBuffers = new Map();
+const VERBOSE_FLUSH_MS = 2000;
+
+function createVerboseBatcher(ctx) {
+  /** @type {string[]} */
+  let buffer = [];
+  /** @type {ReturnType<typeof setTimeout> | null} */
+  let timer = null;
+
+  const flush = () => {
+    if (timer) { clearTimeout(timer); timer = null; }
+    if (buffer.length === 0) return;
+    const combined = buffer.join('\n');
+    buffer = [];
+    sendHtml(ctx, `<code>${combined}</code>`).catch(() => {});
+  };
+
+  const notify = (/** @type {string} */ msg) => {
+    buffer.push(msg);
+    if (!timer) timer = setTimeout(flush, VERBOSE_FLUSH_MS);
+  };
+
+  return { notify, flush };
+}
 
 function createChatContext(ctx, tenant, config, { allowedUsers, bot, createAsk }) {
   const userId = ctx.from.id;
@@ -23,9 +46,8 @@ function createChatContext(ctx, tenant, config, { allowedUsers, bot, createAsk }
     toolPrefs: tenant.toolPrefs,
     config,
     verbose: tenant.verbose,
-    _verboseNotify: tenant.verbose ? (msg) => {
-      sendHtml(ctx, `\`${msg}\``).catch(() => {});
-    } : undefined,
+    _verboseBatcher: null,
+    _verboseNotify: undefined,
     telegramAsk: (message, options, timeout) => createAsk(ctx, message, options, timeout),
     _notifyFn: (targetUserId, message, opts = {}) => {
       if (!allowedUsers.has(targetUserId)) throw new Error('Cannot notify user outside allowed list');
@@ -61,7 +83,7 @@ function createStatusTracker(ctx) {
       const elapsed = Math.round((Date.now() - statusStart) / 1000);
       const html = buildStatusHtml({ route: routeInfo, elapsed, toolStatus: statusText });
       ctx.api.editMessageText(ctx.chat.id, statusMsgId, html, { parse_mode: 'HTML', reply_markup: stopBtn }).catch(() => {});
-    }, 1000);
+    }, 5000);
   };
 
   return {
@@ -111,10 +133,11 @@ async function processTextMessage(ctx, fullMessage, { config, allowedUsers, bot,
   const stopTyping = startTyping(ctx);
   const status = createStatusTracker(ctx);
 
+  const batcher = tenant.verbose ? createVerboseBatcher(ctx) : null;
   try {
     if (tenant.messageLog) {
-      if (tenant.verbose) {
-        tenant.messageLog._verboseCallbacks.set(ctx.chat.id, (msg) => sendHtml(ctx, `\`${msg}\``).catch(() => {}));
+      if (batcher) {
+        tenant.messageLog._verboseCallbacks.set(ctx.chat.id, batcher.notify);
       } else {
         tenant.messageLog._verboseCallbacks.delete(ctx.chat.id);
       }
@@ -122,6 +145,10 @@ async function processTextMessage(ctx, fullMessage, { config, allowedUsers, bot,
     tenant.messageLog?.log(ctx.chat.id, 'user', chatMessage);
 
     const chatContext = createChatContext(ctx, tenant, config, { allowedUsers, bot, createAsk });
+    if (batcher) {
+      chatContext._verboseNotify = batcher.notify;
+      chatContext._verboseBatcher = batcher;
+    }
     chatContext._onRouteDecision = (info) => {
       status.setRouteInfo(info);
       status.start();
@@ -146,6 +173,7 @@ async function processTextMessage(ctx, fullMessage, { config, allowedUsers, bot,
 
     const { text: response, usage, model } = await tenant.claude.chat(chatMessage, chatContext);
 
+    batcher?.flush();
     status.stopTimer();
     status.updateFormatting();
 
@@ -230,6 +258,7 @@ async function processTextMessage(ctx, fullMessage, { config, allowedUsers, bot,
 
     status.deleteMsg();
   } catch (e) {
+    batcher?.flush();
     status.clear();
     stopTyping();
     console.error('Message handling error:', e.message);

package/src/telegram/utils.js

@@ -50,7 +50,7 @@ function startTyping(ctx) {
   ctx.replyWithChatAction('typing').catch(() => {});
   const interval = setInterval(() => {
     ctx.replyWithChatAction('typing').catch(() => {});
-  }, 4000);
+  }, 8000);
   return () => clearInterval(interval);
 }