fluxy-bot 0.5.39 → 0.5.41

package/bin/cli.js

@@ -81,6 +81,19 @@ WantedBy=multi-user.target
 `;
 }
 
+function killAndWait(child, timeout = 10_000) {
+  return new Promise((resolve) => {
+    child.removeAllListeners('exit');
+    child.on('exit', () => resolve());
+    child.kill('SIGTERM');
+    // Force kill after timeout if SIGTERM doesn't work
+    setTimeout(() => {
+      try { child.kill('SIGKILL'); } catch {}
+      setTimeout(resolve, 500);
+    }, timeout);
+  });
+}
+
 // ── UI helpers ──
 
 const c = {
@@ -433,9 +446,7 @@ async function init() {
 
   // Install systemd daemon on Linux
   if (hasSystemd) {
-    child.removeAllListeners('exit');
-    child.kill('SIGTERM');
-    await new Promise((r) => setTimeout(r, 4000));
+    await killAndWait(child);
     const nodePath = process.execPath;
     const realHome = os.homedir();
     const res = spawnSync(process.execPath, [process.argv[1], 'daemon', 'install'], {
@@ -472,6 +483,21 @@ async function start() {
     return init();
   }
 
+  // If daemon is already running, don't start a second instance
+  if (os.platform() === 'linux' && isServiceInstalled() && isServiceActive()) {
+    banner();
+    const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
+    console.log(`\n  ${c.blue}●${c.reset} Fluxy is already running as a daemon.\n`);
+    if (config.relay?.url) {
+      console.log(`  ${c.dim}URL:${c.reset}       ${c.pink}${link(config.relay.url)}${c.reset}`);
+    }
+    console.log(`  ${c.dim}Status:${c.reset}    ${c.pink}fluxy daemon status${c.reset}`);
+    console.log(`  ${c.dim}Logs:${c.reset}      ${c.pink}fluxy daemon logs${c.reset}`);
+    console.log(`  ${c.dim}Restart:${c.reset}   ${c.pink}fluxy daemon restart${c.reset}`);
+    console.log(`  ${c.dim}Stop:${c.reset}      ${c.pink}fluxy daemon stop${c.reset}\n`);
+    return;
+  }
+
   const isLinux = os.platform() === 'linux';
   const hasSystemd = isLinux && (() => { try { execSync('systemctl --version', { stdio: 'ignore' }); return true; } catch { return false; } })();
   const needsDaemon = hasSystemd && !isServiceInstalled();
@@ -511,9 +537,7 @@ async function start() {
 
   // Install systemd daemon on Linux if not already installed
   if (needsDaemon) {
-    child.removeAllListeners('exit');
-    child.kill('SIGTERM');
-    await new Promise((r) => setTimeout(r, 4000));
+    await killAndWait(child);
     const nodePath = process.execPath;
     const realHome = os.homedir();
     const res = spawnSync(process.execPath, [process.argv[1], 'daemon', 'install'], {
@@ -546,17 +570,33 @@ async function start() {
 }
 
 async function status() {
-  try {
-    const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
-    const res = await fetch(`http://localhost:${config.port}/api/health`);
-    const data = await res.json();
-    console.log(`\n  ${c.blue}●${c.reset} Fluxy is running`);
-    console.log(`  ${c.dim}Uptime: ${data.uptime}s${c.reset}`);
-    if (config.relay?.url) {
+  const config = fs.existsSync(CONFIG_PATH) ? JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8')) : null;
+  const daemonRunning = os.platform() === 'linux' && isServiceInstalled() && isServiceActive();
+
+  // Try health endpoint
+  let healthOk = false;
+  let uptime = null;
+  if (config) {
+    try {
+      const res = await fetch(`http://localhost:${config.port}/api/health`);
+      const data = await res.json();
+      healthOk = true;
+      uptime = data.uptime;
+    } catch {}
+  }
+
+  if (healthOk) {
+    console.log(`\n  ${c.blue}●${c.reset} Fluxy is running${daemonRunning ? ` ${c.dim}(daemon)${c.reset}` : ''}`);
+    if (uptime != null) console.log(`  ${c.dim}Uptime: ${uptime}s${c.reset}`);
+    if (config?.relay?.url) {
       console.log(`  ${c.dim}URL: ${c.reset}${c.pink}${link(config.relay.url)}${c.reset}`);
     }
     console.log(`  ${c.dim}Config: ${CONFIG_PATH}${c.reset}\n`);
-  } catch {
+  } else if (daemonRunning) {
+    console.log(`\n  ${c.yellow}●${c.reset} Fluxy daemon is running but not responding yet.`);
+    console.log(`  ${c.dim}It may still be starting up. Check logs:${c.reset}`);
+    console.log(`  ${c.pink}fluxy daemon logs${c.reset}\n`);
+  } else {
     console.log(`\n  ${c.dim}●${c.reset} Fluxy is not running.\n`);
   }
 }
@@ -586,16 +626,29 @@ async function update() {
 
   console.log(`  ${c.dim}v${currentVersion} → v${latest.version}${c.reset}\n`);
 
+  const daemonWasRunning = os.platform() === 'linux' && isServiceInstalled() && isServiceActive();
+
   const steps = [
+    ...(daemonWasRunning ? ['Stopping daemon'] : []),
     'Downloading update',
     'Updating files',
     'Installing dependencies',
     'Building interface',
+    ...(daemonWasRunning ? ['Restarting daemon'] : []),
   ];
 
   const stepper = new Stepper(steps);
   stepper.start();
 
+  // Stop daemon before updating files
+  if (daemonWasRunning) {
+    try {
+      const cmd = needsSudo() ? `sudo systemctl stop ${SERVICE_NAME}` : `systemctl stop ${SERVICE_NAME}`;
+      execSync(cmd, { stdio: 'ignore' });
+    } catch {}
+    stepper.advance();
+  }
+
   // Download tarball
   const tarballUrl = latest.dist.tarball;
   const tmpDir = path.join(os.tmpdir(), `fluxy-update-${Date.now()}`);
@@ -670,17 +723,32 @@ async function update() {
   // Clean up
   fs.rmSync(tmpDir, { recursive: true, force: true });
 
+  // Restart daemon if it was running
+  if (daemonWasRunning) {
+    try {
+      const cmd = needsSudo() ? `sudo systemctl start ${SERVICE_NAME}` : `systemctl start ${SERVICE_NAME}`;
+      execSync(cmd, { stdio: 'ignore' });
+    } catch {}
+    stepper.advance();
+  }
+
   stepper.finish();
 
   console.log(`\n  ${c.blue}${c.bold}✔  Updated to v${latest.version}${c.reset}\n`);
 
-  // Auto-restart daemon if installed
-  if (os.platform() === 'linux' && isServiceInstalled()) {
-    try {
-      execSync(`systemctl restart ${SERVICE_NAME}`, { stdio: 'ignore' });
+  if (daemonWasRunning) {
+    if (isServiceActive()) {
       console.log(`  ${c.blue}✔${c.reset}  Daemon restarted with new version.\n`);
+    } else {
+      console.log(`  ${c.yellow}⚠${c.reset}  Daemon may still be starting. Check ${c.pink}fluxy daemon status${c.reset}\n`);
+    }
+  } else if (os.platform() === 'linux' && isServiceInstalled()) {
+    try {
+      const cmd = needsSudo() ? `sudo systemctl start ${SERVICE_NAME}` : `systemctl start ${SERVICE_NAME}`;
+      execSync(cmd, { stdio: 'ignore' });
+      console.log(`  ${c.blue}✔${c.reset}  Daemon started with new version.\n`);
     } catch {
-      console.log(`  ${c.yellow}⚠${c.reset}  Could not restart daemon. Run ${c.pink}fluxy daemon restart${c.reset} manually.\n`);
+      console.log(`  ${c.dim}Run ${c.reset}${c.pink}fluxy daemon start${c.reset}${c.dim} to launch.${c.reset}\n`);
     }
   } else {
     console.log(`  ${c.dim}Run ${c.reset}${c.pink}fluxy start${c.reset}${c.dim} to launch.${c.reset}\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.5.39",
+  "version": "0.5.41",
   "description": "Self-hosted, self-evolving AI agent with its own dashboard.",
   "type": "module",
   "license": "MIT",