@aliwey/bmo 2.1.1 → 2.1.3

package/bin/bmo.js

@@ -58,6 +58,34 @@ async function isPortOpen(port, host = '127.0.0.1') {
   });
 }
 
+function killProcessByPort(port) {
+  try {
+    if (os.platform() === 'win32') {
+      const output = execSync(`netstat -ano`, { encoding: 'utf8' });
+      const lines = output.split('\n');
+      for (const line of lines) {
+        if (line.includes(`:${port}`) && line.includes('LISTENING')) {
+          const parts = line.trim().split(/\s+/);
+          const pid = parts[parts.length - 1];
+          if (pid && pid !== '0') {
+            try {
+              execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+            } catch (e) {}
+          }
+        }
+      }
+    } else {
+      try {
+        execSync(`fuser -k ${port}/tcp`, { stdio: 'ignore' });
+      } catch {
+        try {
+          execSync(`kill -9 $(lsof -t -i:${port})`, { stdio: 'ignore' });
+        } catch {}
+      }
+    }
+  } catch (e) {}
+}
+
 /** Resolve the embedded or system Python executable */
 function getPython() {
   const embeddedWin = path.join(BMO_HOME, 'python', 'python.exe');
@@ -152,31 +180,51 @@ Data lives in: ${BMO_HOME_DISPLAY}
   // ── bmo --update [version] ────────────────────────────────────────────────
   if (cmd === '--update' || cmd === '-update' || cmd === 'update') {
     const ver = args[0] ? `@${args[0]}` : '@latest';
-    console.log(`Stopping any running BMO background processes to release file locks...`);
+    console.log(`Stopping any running BMO processes and freeing ports...`);
+    
+    // Kill processes on ports 3456 and 4097
+    killProcessByPort(3456);
+    killProcessByPort(4097);
+
     try {
       if (os.platform() === 'win32') {
-        execSync(`powershell -Command "Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -like '*main.py*' -or $_.CommandLine -like '*cli.py*' -or $_.CommandLine -like '*bmo*' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }"`, { stdio: 'ignore' });
+        execSync(`powershell -Command "Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -like '*main.py*' -or $_.CommandLine -like '*cli.py*' -or $_.CommandLine -like '*bmo*' -or $_.CommandLine -like '*cloudflared*' -or $_.CommandLine -like '*server.js*' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }"`, { stdio: 'ignore' });
       } else {
-        execSync(`pkill -f "main.py|cli.py|bmo" || true`, { stdio: 'ignore' });
+        execSync(`pkill -f "main.py|cli.py|bmo|cloudflared|server.js" || true`, { stdio: 'ignore' });
       }
     } catch (e) {
       // Ignore failures
     }
 
-    console.log(`🗑️ Uninstalling old version of @aliwey/bmo...`);
-    try {
-      execSync('npm uninstall -g @aliwey/bmo', { stdio: 'inherit' });
-    } catch (e) {
-      // Ignore uninstall failures if it wasn't already installed
-    }
-    console.log(`🔄 Installing @aliwey/bmo${ver}...`);
-    try {
-      execSync(`npm install -g @aliwey/bmo${ver}`, { stdio: 'inherit' });
-    } catch {
-      console.error('❌ Update failed. Try manually: npm install -g @aliwey/bmo');
-      process.exit(1);
+    if (os.platform() === 'win32') {
+      console.log('Launching updater in a new window to release folder/file locks...');
+      
+      const psKillCmd = `powershell -Command \\"Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -like '*main.py*' -or $_.CommandLine -like '*cli.py*' -or $_.CommandLine -like '*bmo*' -or $_.CommandLine -like '*cloudflared*' -or $_.CommandLine -like '*server.js*' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }\\"`;
+      const cmdStr = `timeout /t 2 /nobreak >nul && ${psKillCmd} && echo [BMO Updater] Upgrading to @aliwey/bmo${ver}... && npm install -g @aliwey/bmo${ver} && echo [OK] BMO updated successfully! Press any key to close. && pause`;
+      
+      spawn('cmd.exe', ['/c', 'start', 'cmd.exe', '/c', cmdStr], {
+        detached: true,
+        stdio: 'ignore'
+      });
+      
+      console.log('Updater launched. This window will now close to release file locks.');
+      process.exit(0);
+    } else {
+      console.log(`Uninstalling old version of @aliwey/bmo...`);
+      try {
+        execSync('npm uninstall -g @aliwey/bmo', { stdio: 'inherit' });
+      } catch (e) {
+        // Ignore uninstall failures if it wasn't already installed
+      }
+      console.log(`Installing @aliwey/bmo${ver}...`);
+      try {
+        execSync(`npm install -g @aliwey/bmo${ver}`, { stdio: 'inherit' });
+      } catch {
+        console.error('Update failed. Try manually: npm install -g @aliwey/bmo');
+        process.exit(1);
+      }
+      process.exit(0);
     }
-    process.exit(0);
   }
 
   // ── bmo init ──────────────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aliwey/bmo",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "BMO — AI coding assistant with Telegram, CLI & Web sync. One command, all frontends.",
   "keywords": ["ai", "coding-assistant", "telegram-bot", "cli", "opencode", "bfp"],
   "homepage": "https://github.com/aliwey/bmo",

package/scripts/web_cmd.js

@@ -37,10 +37,38 @@ function getCloudflaredExe() {
     : path.join(BMO_BIN, 'cloudflared');
   if (fs.existsSync(embedded)) return embedded;
   try { execSync('cloudflared --version', { stdio: 'ignore' }); return 'cloudflared'; } catch {}
-  console.error('❌ cloudflared not found. Run: bmo init');
+  console.error('[Error] cloudflared not found. Run: bmo init');
   process.exit(1);
 }
 
+function killProcessByPort(port) {
+  try {
+    if (os.platform() === 'win32') {
+      const output = execSync(`netstat -ano`, { encoding: 'utf8' });
+      const lines = output.split('\n');
+      for (const line of lines) {
+        if (line.includes(`:${port}`) && line.includes('LISTENING')) {
+          const parts = line.trim().split(/\s+/);
+          const pid = parts[parts.length - 1];
+          if (pid && pid !== '0') {
+            try {
+              execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+            } catch (e) {}
+          }
+        }
+      }
+    } else {
+      try {
+        execSync(`fuser -k ${port}/tcp`, { stdio: 'ignore' });
+      } catch {
+        try {
+          execSync(`kill -9 $(lsof -t -i:${port})`, { stdio: 'ignore' });
+        } catch {}
+      }
+    }
+  } catch (e) {}
+}
+
 function loadTasks() {
   try { return JSON.parse(fs.readFileSync(TASKS_FILE, 'utf8')); } catch { return {}; }
 }
@@ -70,19 +98,30 @@ function waitForTunnelUrl(proc) {
     const tasks = loadTasks();
     const existing = tasks.webchat_tunnel_url;
     if (existing) {
-      console.log(`\n💬 Webchat already running!`);
+      console.log(`\n[Info] Webchat already running!`);
       console.log(`   Local:  http://127.0.0.1:${WEBCHAT_PORT}`);
       console.log(`   Public: ${existing}\n`);
       process.exit(0);
+    } else {
+      console.log(`[Info] Port ${WEBCHAT_PORT} is in use by an unrecognized process. Freeing port...`);
+      killProcessByPort(WEBCHAT_PORT);
+      await sleep(1000); // Wait for the port to release
     }
   }
 
   // Start webchat server
-  console.log('⏳ Starting webchat server...');
+  console.log('Starting webchat server...');
   const webchatDir = path.join(PKG_DIR, 'webchat');
+  
+  // Ensure logs directory exists
+  const logDir = path.join(BMO_HOME, 'logs');
+  fs.mkdirSync(logDir, { recursive: true });
+  const webchatLogPath = path.join(logDir, 'webchat.log');
+  const logStream = fs.openSync(webchatLogPath, 'a');
+
   const webchat = spawn('node', ['server.js'], {
     cwd: webchatDir,
-    stdio: 'ignore',
+    stdio: ['ignore', logStream, logStream],
     detached: true,
     env: {
       ...process.env,
@@ -94,15 +133,32 @@ function waitForTunnelUrl(proc) {
   webchat.unref();
 
   // Wait for webchat to be ready
+  let started = false;
   for (let i = 0; i < 20; i++) {
     await sleep(500);
-    if (await isPortOpen(WEBCHAT_PORT)) break;
-    if (i === 19) { console.error('❌ Webchat failed to start'); process.exit(1); }
+    if (await isPortOpen(WEBCHAT_PORT)) {
+      started = true;
+      break;
+    }
+  }
+
+  if (!started) {
+    console.error('[Error] Webchat failed to start');
+    try {
+      const logContent = fs.readFileSync(webchatLogPath, 'utf8').trim();
+      const lines = logContent.split('\n');
+      const lastLines = lines.slice(-15).join('\n');
+      console.error('\nLast log output:');
+      console.error(lastLines);
+    } catch (e) {
+      console.error('Could not read webchat log file.');
+    }
+    process.exit(1);
   }
-  console.log('✓ Webchat server running on port', WEBCHAT_PORT);
+  console.log('[OK] Webchat server running on port', WEBCHAT_PORT);
 
   // Start cloudflared tunnel
-  console.log('⏳ Starting cloudflared tunnel...');
+  console.log('Starting cloudflared tunnel...');
   const cfExe = getCloudflaredExe();
   const cf = spawn(cfExe, ['tunnel', '--url', `http://localhost:${WEBCHAT_PORT}`], {
     stdio: ['ignore', 'pipe', 'pipe'],
@@ -114,7 +170,7 @@ function waitForTunnelUrl(proc) {
   try {
     tunnelUrl = await waitForTunnelUrl(cf);
   } catch {
-    console.error('❌ Could not get tunnel URL from cloudflared');
+    console.error('[Error] Could not get tunnel URL from cloudflared');
     process.exit(1);
   }
 
@@ -127,7 +183,7 @@ function waitForTunnelUrl(proc) {
   saveTasks(tasks);
 
   console.log('\n╭────────────────────────────────────────────╮');
-  console.log('│  💬 BMO Webchat is live!                   │');
+  console.log('│  [OK] BMO Webchat is live!                 │');
   console.log(`│  Local:  http://127.0.0.1:${WEBCHAT_PORT}             │`);
   console.log(`│  Public: ${tunnelUrl.padEnd(34)} │`);
   console.log('╰────────────────────────────────────────────╯\n');