orchestrix-yuri 2.2.0 → 2.2.1

package/lib/gateway/channels/telegram.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { Bot } = require('grammy');
+const { log } = require('../log');
 
 /**
  * Telegram channel adapter using grammy (polling mode).
@@ -19,7 +20,7 @@ class TelegramAdapter {
 
   async start() {
     if (!this.token) {
-      throw new Error('Telegram bot token is required. Set it in ~/.yuri/config/channels.yaml or pass --telegram-token');
+      throw new Error('Telegram bot token is required. Run: orchestrix-yuri start --token YOUR_TOKEN');
     }
 
     this.bot = new Bot(this.token);
@@ -47,7 +48,7 @@ class TelegramAdapter {
           }
         }
       } catch (err) {
-        console.error('[telegram] Error handling message:', err.message);
+        log.error(`Message handling failed: ${err.message}`);
         await ctx.reply('❌ Internal error. Check Yuri Gateway logs.').catch(() => {});
       }
     });
@@ -72,14 +73,28 @@ class TelegramAdapter {
 
     // Error handler
     this.bot.catch((err) => {
-      console.error('[telegram] Bot error:', err.message);
+      const msg = err.message || String(err);
+      if (msg.includes('409') || msg.includes('Conflict')) {
+        log.error('Polling conflict — another instance is using this token.');
+        log.info('This instance will exit. Stop the other process and restart.');
+        process.exit(1);
+      }
+      log.warn(`Bot error: ${msg}`);
     });
 
+    // Clear any stale webhook/polling before starting
+    log.telegram('Connecting...');
+    try {
+      await this.bot.api.deleteWebhook({ drop_pending_updates: true });
+    } catch {
+      // ignore — not critical
+    }
+
     // Start polling
-    console.log('[telegram] Starting bot polling...');
     await this.bot.start({
+      drop_pending_updates: true,
       onStart: (botInfo) => {
-        console.log(`[telegram] Bot @${botInfo.username} is running (polling mode)`);
+        log.telegram(`Bot @${botInfo.username} is live (polling mode)`);
       },
     });
   }
@@ -87,7 +102,7 @@ class TelegramAdapter {
   async stop() {
     if (this.bot) {
       await this.bot.stop();
-      console.log('[telegram] Bot stopped');
+      log.telegram('Bot stopped');
     }
   }
 }

package/lib/gateway/config.js

@@ -80,8 +80,9 @@ function applyCliOverrides(config, opts) {
   // Persist token to channels.yaml so user only needs to pass it once
   if (shouldSave) {
     saveConfig(config);
-    console.log('  ✅ Token saved to ~/.yuri/config/channels.yaml');
-    console.log('     Next time just run: orchestrix-yuri start');
+    const { log } = require('./log');
+    log.ok('Token saved to ~/.yuri/config/channels.yaml');
+    log.info('Next time just run: orchestrix-yuri start');
     console.log('');
   }
 

package/lib/gateway/engine/claude-tmux.js

@@ -8,6 +8,7 @@ const crypto = require('crypto');
 const yaml = require('js-yaml');
 
 const YURI_GLOBAL = path.join(os.homedir(), '.yuri');
+const { log } = require('../log');
 
 // ── Shared Utilities (formerly in claude-cli.js) ───────────────────────────────
 
@@ -108,7 +109,7 @@ let _claudeBinary = null;
 function getClaudeBinary() {
   if (!_claudeBinary) {
     _claudeBinary = findClaudeBinary();
-    console.log(`[claude-tmux] Using binary: ${_claudeBinary}`);
+    log.tmux(`Using binary: ${_claudeBinary}`);
   }
   return _claudeBinary;
 }
@@ -308,7 +309,7 @@ function ensureClaudeMd(projectRoot) {
   // Append channel mode instructions
   const separator = content.trim() ? '\n\n' : '';
   fs.writeFileSync(claudeMdPath, content + separator + CHANNEL_MODE_INSTRUCTIONS + '\n');
-  console.log(`[claude-tmux] Channel Mode Instructions written to ${claudeMdPath}`);
+  log.tmux(`Channel Mode Instructions written to ${claudeMdPath}`);
 }
 
 /**
@@ -316,15 +317,15 @@ function ensureClaudeMd(projectRoot) {
  * Returns true if compact completed successfully.
  */
 async function proactiveCompact(name) {
-  console.log('[claude-tmux] Proactive /compact triggered');
+  log.tmux('Proactive /compact triggered');
   injectMessage(name, '/compact focus on the most recent user conversation and any pending operations');
 
   const ok = await waitForIdle(name, 120000); // compact can take up to 2min
   if (ok) {
     _messageCount = 0;
-    console.log('[claude-tmux] Proactive /compact completed');
+    log.tmux('Proactive /compact completed');
   } else {
-    console.warn('[claude-tmux] Proactive /compact timed out');
+    log.warn('Proactive /compact timed out');
   }
   return ok;
 }
@@ -378,7 +379,7 @@ async function createSession(engineConfig) {
   }
 
   _sessionReady = true;
-  console.log(`[claude-tmux] Session "${sessionName}" ready (cwd: ${projectRoot})`);
+  log.tmux(`Session "${sessionName}" ready (cwd: ${projectRoot})`);
 }
 
 /**
@@ -450,7 +451,7 @@ async function captureResponse(name, marker, engineConfig) {
     const poll = () => {
       // Timeout: return whatever we have
       if (Date.now() > deadline) {
-        console.warn('[claude-tmux] Response capture timed out');
+        log.warn('Response capture timed out');
         const raw = capturePaneRaw(name, 500);
         return resolve(extractResponse(raw, marker));
       }
@@ -503,7 +504,7 @@ async function captureResponse(name, marker, engineConfig) {
       }
 
       if (stableCount >= stableThreshold && sawProcessing) {
-        console.log('[claude-tmux] Response detected via content stability');
+        log.tmux('Response detected via content stability');
         return resolve(extractResponse(raw, marker));
       }
 
@@ -575,7 +576,7 @@ async function ensureSession(engineConfig) {
         await createSession(engineConfig);
         return;
       } catch (err) {
-        console.error(`[claude-tmux] Session init attempt ${attempt}/${maxRetries} failed: ${err.message}`);
+        log.warn(`Session init attempt ${attempt}/${maxRetries} failed: ${err.message}`);
         if (attempt === maxRetries) throw err;
         // Brief pause before retry
         await new Promise((r) => setTimeout(r, 3000));
@@ -627,7 +628,7 @@ async function callClaude(opts) {
         _messageCount++;
         resolve(result);
       } catch (err) {
-        console.error('[claude-tmux] callClaude error:', err.message);
+        log.error(`callClaude error: ${err.message}`);
 
         // Mark session as not ready so it gets recreated next time
         _sessionReady = false;
@@ -656,7 +657,7 @@ function composePrompt(userMessage, _chatHistory) {
 function destroySession() {
   if (_sessionName && hasSession(_sessionName)) {
     tmuxSafe(`kill-session -t ${_sessionName}`);
-    console.log(`[claude-tmux] Session "${_sessionName}" destroyed.`);
+    log.tmux(`Session "${_sessionName}" destroyed.`);
   }
   _sessionName = null;
   _sessionReady = false;

package/lib/gateway/index.js

@@ -3,6 +3,7 @@
 const { loadConfig, applyCliOverrides } = require('./config');
 const { Router } = require('./router');
 const { TelegramAdapter } = require('./channels/telegram');
+const { log, c } = require('./log');
 
 /**
  * Start the Yuri Gateway.
@@ -12,9 +13,7 @@ const { TelegramAdapter } = require('./channels/telegram');
  * @param {string} [opts.port] - Override server port
  */
 async function startGateway(opts = {}) {
-  console.log('');
-  console.log('  🚀 Yuri Gateway starting...');
-  console.log('');
+  log.banner('🚀 Yuri Gateway starting...');
 
   // Load and merge config
   let config = loadConfig();
@@ -38,37 +37,41 @@ async function startGateway(opts = {}) {
     try {
       await telegram.start();
     } catch (err) {
-      console.error(`  ❌ Telegram failed to start: ${err.message}`);
+      if (err.message.includes('409') || err.message.includes('Conflict')) {
+        log.error('Another bot instance is already running with this token.');
+        log.info('Stop the other instance first, or wait a moment and retry.');
+      } else {
+        log.error(`Telegram failed to start: ${err.message}`);
+      }
       process.exit(1);
     }
   }
 
   // Start Feishu adapter if enabled (placeholder)
   if (config.channels.feishu.enabled) {
-    console.log('  ⚠️  Feishu adapter not yet implemented. Skipping.');
+    log.warn('Feishu adapter not yet implemented. Skipping.');
   }
 
   // Check if any channel is active
   if (adapters.length === 0) {
     console.error('');
-    console.error('  ❌ No channels enabled. Set up your Telegram bot token:');
+    log.error('No channels enabled. Set up your Telegram bot token:');
     console.error('');
-    console.error('    orchestrix-yuri start --token YOUR_BOT_TOKEN');
+    console.error(`    ${c.cyan}orchestrix-yuri start --token YOUR_BOT_TOKEN${c.reset}`);
     console.error('');
-    console.error('  The token is saved automatically. After that, just run:');
+    log.info('The token is saved automatically. After that, just run:');
     console.error('');
-    console.error('    orchestrix-yuri start');
+    console.error(`    ${c.cyan}orchestrix-yuri start${c.reset}`);
     console.error('');
     process.exit(1);
   }
 
-  console.log('');
-  console.log('  Yuri Gateway is running. Press Ctrl+C to stop.');
-  console.log('');
+  log.banner('Yuri Gateway is running. Press Ctrl+C to stop.');
 
   // Graceful shutdown
   const shutdown = async () => {
-    console.log('\n  Shutting down Yuri Gateway...');
+    console.log('');
+    log.info('Shutting down Yuri Gateway...');
     await router.shutdown();
     for (const adapter of adapters) {
       await adapter.stop().catch(() => {});

package/lib/gateway/log.js

@@ -0,0 +1,42 @@
+'use strict';
+
+// ── ANSI Color Helpers ─────────────────────────────────────────────────────────
+// No dependencies — raw escape codes for terminal coloring.
+
+const c = {
+  reset:   '\x1b[0m',
+  bold:    '\x1b[1m',
+  dim:     '\x1b[2m',
+  red:     '\x1b[31m',
+  green:   '\x1b[32m',
+  yellow:  '\x1b[33m',
+  blue:    '\x1b[34m',
+  magenta: '\x1b[35m',
+  cyan:    '\x1b[36m',
+  white:   '\x1b[37m',
+  gray:    '\x1b[90m',
+  bgRed:   '\x1b[41m',
+  bgGreen: '\x1b[42m',
+  bgBlue:  '\x1b[44m',
+};
+
+const tag = (color, label) => `${color}${c.bold}[${label}]${c.reset}`;
+
+const log = {
+  // Tagged module loggers
+  gateway: (msg) => console.log(`${tag(c.magenta, 'gateway')} ${msg}`),
+  router:  (msg) => console.log(`${tag(c.blue, 'router')} ${msg}`),
+  tmux:    (msg) => console.log(`${tag(c.cyan, 'tmux')} ${msg}`),
+  telegram:(msg) => console.log(`${tag(c.green, 'telegram')} ${msg}`),
+
+  // Levels
+  ok:    (msg) => console.log(`  ${c.green}✅ ${msg}${c.reset}`),
+  warn:  (msg) => console.warn(`  ${c.yellow}⚠️  ${msg}${c.reset}`),
+  error: (msg) => console.error(`  ${c.red}❌ ${msg}${c.reset}`),
+  info:  (msg) => console.log(`  ${c.dim}${msg}${c.reset}`),
+
+  // Banner
+  banner: (msg) => console.log(`\n  ${c.bold}${c.magenta}${msg}${c.reset}\n`),
+};
+
+module.exports = { log, c };

package/lib/gateway/router.js

@@ -8,6 +8,7 @@ const yaml = require('js-yaml');
 const { ChatHistory } = require('./history');
 const { OwnerBinding } = require('./binding');
 const engine = require('./engine/claude-tmux');
+const { log } = require('./log');
 
 const YURI_GLOBAL = path.join(os.homedir(), '.yuri');
 
@@ -52,7 +53,7 @@ class Router {
     }
 
     if (authResult.firstBind) {
-      console.log(`[router] First bind: ${msg.channelType} chat ${msg.chatId} (${msg.userName})`);
+      log.router(`First bind: ${msg.channelType} chat ${msg.chatId} (${msg.userName})`);
     }
 
     // Handle /start command
@@ -94,7 +95,7 @@ class Router {
     const prompt = engine.composePrompt(msg.text, chatHistory);
 
     // ═══ WORK: Call Claude engine ═══
-    console.log(`[router] Processing: "${msg.text.slice(0, 80)}..." → cwd: ${projectRoot || '~'}`);
+    log.router(`Processing: "${msg.text.slice(0, 80)}..." → cwd: ${projectRoot || '~'}`);
     const result = await engine.callClaude({
       prompt,
       cwd: projectRoot,
@@ -114,7 +115,7 @@ class Router {
     // ═══ ENGINE: Update Focus (code-enforced) ═══
     this._updateGlobalFocus(msg, projectRoot);
 
-    console.log(`[router] Reply: "${result.reply.slice(0, 80)}..."`);
+    log.router(`Reply: "${result.reply.slice(0, 80)}..."`);
     return { text: result.reply };
   }
 
@@ -132,7 +133,7 @@ class Router {
     const ONE_HOUR = 3600_000;
 
     if (gap > ONE_HOUR) {
-      console.log(`[router] Catch-up: ${Math.round(gap / 60000)}min since last active. Refreshing portfolio.`);
+      log.router(`Catch-up: ${Math.round(gap / 60000)}min since last active. Refreshing portfolio.`);
       this._refreshPortfolioPulse();
     }
   }
@@ -215,7 +216,7 @@ class Router {
       focus.updated_at = new Date().toISOString();
       fs.writeFileSync(focusPath, yaml.dump(focus, { lineWidth: -1 }));
     } catch (err) {
-      console.error('[router] Failed to update focus:', err.message);
+      log.warn(`Failed to update focus: ${err.message}`);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrix-yuri",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Yuri — Meta-Orchestrator for Orchestrix. Drive your entire project lifecycle with natural language.",
   "main": "lib/installer.js",
   "bin": {