orchestrix-yuri 2.2.1 → 2.3.1

package/bin/install.js

@@ -13,8 +13,11 @@ if (command === 'install') {
   const projectRoot = args[1] || process.cwd();
   migrate(projectRoot);
 } else if (command === 'start' || command === 'serve') {
-  // Delegate to serve.js with remaining args
   require('./serve');
+} else if (command === 'stop') {
+  require('./stop');
+} else if (command === 'status') {
+  require('./status');
 } else if (command === '--version' || command === '-v' || command === '-V') {
   const { version } = require('../package.json');
   console.log(version);
@@ -26,6 +29,8 @@ if (command === 'install') {
     orchestrix-yuri install                    Install Yuri skill + global memory
     orchestrix-yuri start                      Start the Channel Gateway
     orchestrix-yuri start --token TOKEN        Start & save Telegram Bot token (first time only)
+    orchestrix-yuri stop                       Stop the running gateway
+    orchestrix-yuri status                     Show gateway status
     orchestrix-yuri migrate [path]             Migrate legacy memory.yaml
     orchestrix-yuri --version                  Show version
     orchestrix-yuri --help                     Show this help message

package/bin/status.js

@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+
+const PID_FILE = path.join(os.homedir(), '.yuri', 'gateway.pid');
+
+function status() {
+  // Check PID
+  let pid = null;
+  let running = false;
+
+  if (fs.existsSync(PID_FILE)) {
+    pid = parseInt(fs.readFileSync(PID_FILE, 'utf8').trim(), 10);
+    try {
+      process.kill(pid, 0);
+      running = true;
+    } catch {
+      running = false;
+    }
+  }
+
+  // Check tmux session
+  let tmuxAlive = false;
+  try {
+    execSync('tmux has-session -t yuri-gateway 2>/dev/null');
+    tmuxAlive = true;
+  } catch {
+    tmuxAlive = false;
+  }
+
+  console.log('');
+  console.log('  Yuri Gateway Status');
+  console.log('  ───────────────────');
+  console.log(`  Gateway process:  ${running ? `\x1b[32mrunning\x1b[0m (PID ${pid})` : '\x1b[90mnot running\x1b[0m'}`);
+  console.log(`  tmux session:     ${tmuxAlive ? '\x1b[32myuri-gateway (active)\x1b[0m' : '\x1b[90mnone\x1b[0m'}`);
+
+  // Check config
+  const configPath = path.join(os.homedir(), '.yuri', 'config', 'channels.yaml');
+  if (fs.existsSync(configPath)) {
+    const content = fs.readFileSync(configPath, 'utf8');
+    const hasToken = /token:\s*".+"/.test(content) || /token:\s*'.+'/.test(content);
+    console.log(`  Telegram token:   ${hasToken ? '\x1b[32mconfigured\x1b[0m' : '\x1b[90mnot set\x1b[0m'}`);
+  } else {
+    console.log('  Config:           \x1b[90mnot found\x1b[0m');
+  }
+
+  console.log('');
+}
+
+status();

package/bin/stop.js

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+
+const PID_FILE = path.join(os.homedir(), '.yuri', 'gateway.pid');
+
+function stop() {
+  if (!fs.existsSync(PID_FILE)) {
+    console.log('  No gateway is running (no PID file found).');
+    process.exit(0);
+  }
+
+  const pid = parseInt(fs.readFileSync(PID_FILE, 'utf8').trim(), 10);
+
+  // Check if process is alive
+  try {
+    process.kill(pid, 0); // signal 0 = just check existence
+  } catch {
+    console.log(`  Gateway PID ${pid} is not running. Cleaning up stale PID file.`);
+    fs.unlinkSync(PID_FILE);
+    cleanupTmux();
+    process.exit(0);
+  }
+
+  // Send SIGTERM for graceful shutdown
+  console.log(`  Stopping gateway (PID ${pid})...`);
+  try {
+    process.kill(pid, 'SIGTERM');
+  } catch (err) {
+    console.error(`  ❌ Failed to stop: ${err.message}`);
+    process.exit(1);
+  }
+
+  // Wait briefly then verify
+  setTimeout(() => {
+    try {
+      process.kill(pid, 0);
+      // Still alive, force kill
+      console.log('  Process did not exit gracefully, sending SIGKILL...');
+      process.kill(pid, 'SIGKILL');
+    } catch {
+      // Dead, good
+    }
+    cleanupTmux();
+    try { fs.unlinkSync(PID_FILE); } catch {}
+    console.log('  ✅ Gateway stopped.');
+  }, 2000);
+}
+
+function cleanupTmux() {
+  try {
+    execSync('tmux kill-session -t yuri-gateway 2>/dev/null');
+  } catch {
+    // no session to kill
+  }
+}
+
+stop();

package/lib/gateway/channels/telegram.js

@@ -82,12 +82,16 @@ class TelegramAdapter {
       log.warn(`Bot error: ${msg}`);
     });
 
-    // Clear any stale webhook/polling before starting
+    // Force-disconnect any stale polling connection before starting.
+    // deleteWebhook clears webhooks but does NOT terminate existing
+    // long-polling getUpdates connections. A short getUpdates call
+    // with timeout=0 "steals" the connection, terminating the old one.
     log.telegram('Connecting...');
     try {
       await this.bot.api.deleteWebhook({ drop_pending_updates: true });
+      await this.bot.api.raw.getUpdates({ offset: -1, limit: 1, timeout: 0 });
     } catch {
-      // ignore — not critical
+      // ignore — best effort cleanup
     }
 
     // Start polling

package/lib/gateway/index.js

@@ -1,10 +1,15 @@
 'use strict';
 
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 const { loadConfig, applyCliOverrides } = require('./config');
 const { Router } = require('./router');
 const { TelegramAdapter } = require('./channels/telegram');
 const { log, c } = require('./log');
 
+const PID_FILE = path.join(os.homedir(), '.yuri', 'gateway.pid');
+
 /**
  * Start the Yuri Gateway.
  *
@@ -39,7 +44,7 @@ async function startGateway(opts = {}) {
     } catch (err) {
       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.');
+        log.info('Run: orchestrix-yuri stop');
       } else {
         log.error(`Telegram failed to start: ${err.message}`);
       }
@@ -66,6 +71,9 @@ async function startGateway(opts = {}) {
     process.exit(1);
   }
 
+  // Write PID file for `orchestrix-yuri stop`
+  fs.writeFileSync(PID_FILE, String(process.pid));
+
   log.banner('Yuri Gateway is running. Press Ctrl+C to stop.');
 
   // Graceful shutdown
@@ -76,6 +84,7 @@ async function startGateway(opts = {}) {
     for (const adapter of adapters) {
       await adapter.stop().catch(() => {});
     }
+    try { fs.unlinkSync(PID_FILE); } catch {}
     process.exit(0);
   };
 

package/package.json

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