@songsid/agend 2.0.8-beta.9 → 2.0.9-beta.1

package/dist/cli.js

@@ -131,12 +131,40 @@ fleet
     .argument("[instance]", "Specific instance to stop")
     .action(async (instance) => {
     if (instance) {
-        const { FleetManager } = await import("./fleet-manager.js");
-        const fm = new FleetManager(DATA_DIR);
-        await fm.stopInstance(instance);
-        console.log("Stopped");
+        // Stop a single instance via the RUNNING fleet's HTTP API. Do NOT spawn a
+        // detached FleetManager and call stopInstance(): its in-memory daemons map
+        // is empty, so lifecycle.stop falls back to reading the instance's
+        // daemon.pid — which is the shared fleet process pid (daemons run
+        // in-process) — and SIGTERMs the whole fleet.
+        const { loadFleetConfig } = await import("./config.js");
+        const fleet = loadFleetConfig(FLEET_CONFIG_PATH);
+        const port = fleet.health_port ?? 19280;
+        let token = "";
+        try {
+            token = readFileSync(join(DATA_DIR, "web.token"), "utf-8").trim();
+        }
+        catch { /* fleet may not be running */ }
+        try {
+            const resp = await fetch(`http://127.0.0.1:${port}/stop/${encodeURIComponent(instance)}`, {
+                method: "POST",
+                headers: token ? { "X-Agend-Token": token } : {},
+            });
+            const body = await resp.json().catch(() => ({}));
+            if (resp.ok) {
+                console.log(`Instance "${instance}" stopped`);
+            }
+            else {
+                console.error(`Stop failed: ${body.error ?? resp.statusText}`);
+                process.exit(1);
+            }
+        }
+        catch {
+            console.error(`Cannot connect to fleet (port ${port}). Is the fleet running?`);
+            process.exit(1);
+        }
+        return;
     }
-    else {
+    {
         const pidPath = join(DATA_DIR, "fleet.pid");
         if (!existsSync(pidPath)) {
             console.error("Fleet is not running (no PID file found)");
@@ -185,8 +213,16 @@ fleet
         const { loadFleetConfig } = await import("./config.js");
         const fleet = loadFleetConfig(FLEET_CONFIG_PATH);
         const port = fleet.health_port ?? 19280;
+        let token = "";
+        try {
+            token = readFileSync(join(DATA_DIR, "web.token"), "utf-8").trim();
+        }
+        catch { /* fleet may not be running */ }
         try {
-            const resp = await fetch(`http://127.0.0.1:${port}/restart/${encodeURIComponent(instance)}`, { method: "POST" });
+            const resp = await fetch(`http://127.0.0.1:${port}/restart/${encodeURIComponent(instance)}`, {
+                method: "POST",
+                headers: token ? { "X-Agend-Token": token } : {},
+            });
             const body = await resp.json();
             if (resp.ok) {
                 console.log(`Instance "${instance}" restarted (immediate)`);
@@ -1046,8 +1082,7 @@ program
     .option("--version <ver>", "Specific version to install")
     .option("--beta", "Install beta version")
     .action(async (opts) => {
-    const { installService, activateService, detectPlatform } = await import("./service-installer.js");
-    const { spawnSync, spawn: spawnAsync } = await import("node:child_process");
+    const { spawnSync } = await import("node:child_process");
     const tag = opts.version ? opts.version : (opts.beta ? "beta" : "latest");
     const pkg = `@songsid/agend@${tag}`;
     console.log(`\n  Updating AgEnD to ${tag}...\n`);
@@ -1139,7 +1174,6 @@ program
     const newVersion = (verifyResult.stdout ?? "").trim();
     console.log(`  ✓ Installed: ${newVersion}`);
     // ── Update service file ──
-    const plat = detectPlatform();
     if (agendPath) {
         try {
             // Use the NEW binary to install service (old binary's templates may be deleted)
@@ -1156,69 +1190,19 @@ program
         }
     }
     // ── Restart fleet ──
-    const pidPath = join(DATA_DIR, "fleet.pid");
-    if (!existsSync(pidPath)) {
-        console.log("\n  Fleet not running. Start with: agend start\n");
-        return;
-    }
-    // Kill old fleet process first to prevent duplicate
-    const oldPid = parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
-    if (oldPid) {
-        try {
-            process.kill(oldPid, "SIGTERM");
-        }
-        catch { /* already gone */ }
-        // Wait up to 10s for old process to exit
-        for (let i = 0; i < 20; i++) {
-            try {
-                process.kill(oldPid, 0);
-            }
-            catch {
-                break;
-            }
-            spawnSync("sleep", ["0.5"]);
-        }
-        // Force kill if still alive
-        try {
-            process.kill(oldPid, "SIGKILL");
-        }
-        catch { /* already gone */ }
-        try {
-            unlinkSync(pidPath);
-        }
-        catch { /* best effort */ }
-    }
+    // Run the restart through the NEWLY-INSTALLED binary (agendPath), not inline.
+    // The inline restart would execute the OLD binary's code — exactly the logic
+    // that may be missing or buggy on the version being upgraded from. `agend
+    // restart` (new binary) does the 4-environment service detection (system
+    // systemd → user systemd → launchd → detached pid).
     console.log("  Restarting fleet...");
-    if (plat === "macos") {
-        const uid = process.getuid?.() ?? 501;
-        const label = "com.agend.fleet";
-        try {
-            execSync(`launchctl kickstart -k gui/${uid}/${label}`, { stdio: "inherit", timeout: 15000 });
-            console.log("  ✓ Service restarted\n");
-            return;
-        }
-        catch { /* fall through to manual restart */ }
+    const restartResult = spawnSync(agendPath, ["restart"], { encoding: "utf-8", timeout: 30000, stdio: "inherit" });
+    if (restartResult.status === 0) {
+        console.log("  ✓ Service restarted");
     }
     else {
-        try {
-            execSync("systemctl --user daemon-reload", { stdio: "pipe", timeout: 5000 });
-            // Reset failed state in case the kill above left systemd confused
-            try {
-                execSync("systemctl --user reset-failed com.agend.fleet", { stdio: "pipe", timeout: 5000 });
-            }
-            catch { }
-            execSync("systemctl --user start com.agend.fleet", { stdio: "inherit", timeout: 15000 });
-            console.log("  ✓ Service restarted\n");
-            return;
-        }
-        catch { /* fall through */ }
+        console.log("  ⚠ Auto-restart failed. Run: agend start");
     }
-    // Fallback: start directly using new binary
-    const child = spawnAsync(agendPath, ["fleet", "start"], {
-        detached: true, stdio: "ignore",
-    });
-    child.unref();
-    console.log("  ✓ Fleet restarting in background\n");
 });
 program
     .command("reload")
@@ -1354,43 +1338,114 @@ program
 });
 program
     .command("restart")
-    .description("Restart the AgEnD service")
+    .description("Restart the AgEnD service (auto-detects systemd/launchd/detached)")
     .action(async () => {
-    const { getServicePath, stopService, startService } = await import("./service-installer.js");
-    if (!getServicePath()) {
-        console.log("No service installed. Run: agend install");
-        return;
-    }
+    // Try each runtime environment in order and stop at the first that succeeds.
+    // Don't gate on fleet.pid: a fleet under systemd/launchd writes its pid in the
+    // service's own HOME, which may differ from what this command resolves (sudo,
+    // AGEND_HOME) — an absent pid file does NOT mean it's stopped. Ask the service
+    // manager first. This is the canonical restart the `update` flow spawns.
+    const { detectPlatform } = await import("./service-installer.js");
+    const { spawn, spawnSync } = await import("node:child_process");
+    const plat = detectPlatform();
     const pidPath = join(DATA_DIR, "fleet.pid");
-    let oldPid = null;
-    try {
-        oldPid = parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
-    }
-    catch { }
-    stopService();
-    // Wait for old process to exit (up to 30s)
-    const deadline = Date.now() + 30_000;
-    while (Date.now() < deadline) {
-        // Check if process is still alive
+    const isActive = (cmd) => {
+        try {
+            return spawnSync("sh", ["-c", cmd], { encoding: "utf-8", timeout: 5000 }).stdout?.trim() === "active";
+        }
+        catch {
+            return false;
+        }
+    };
+    const run = (cmd) => {
+        try {
+            execSync(cmd, { stdio: "inherit", timeout: 15000 });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    };
+    // 1. System-level systemd service "agend"
+    if (plat !== "macos" && isActive("systemctl is-active agend 2>/dev/null")) {
+        run("systemctl daemon-reload");
+        if (run("systemctl restart agend")) {
+            console.log("Service restarted (system).");
+            return;
+        }
+    }
+    // 2. User-level systemd service "com.agend.fleet"
+    if (plat !== "macos" && isActive("systemctl --user is-active com.agend.fleet 2>/dev/null")) {
+        run("systemctl --user daemon-reload");
+        try {
+            execSync("systemctl --user reset-failed com.agend.fleet", { stdio: "pipe", timeout: 5000 });
+        }
+        catch { /* best effort */ }
+        if (run("systemctl --user restart com.agend.fleet")) {
+            console.log("Service restarted (user).");
+            return;
+        }
+    }
+    // 3. launchd (macOS)
+    if (plat === "macos") {
+        const uid = process.getuid?.() ?? 501;
+        const label = "com.agend.fleet";
+        try {
+            // print succeeds only if the service is loaded in launchd
+            execSync(`launchctl print gui/${uid}/${label}`, { stdio: "pipe", timeout: 5000 });
+            if (run(`launchctl kickstart -k gui/${uid}/${label}`)) {
+                console.log("Service restarted.");
+                return;
+            }
+        }
+        catch { /* not loaded — fall through */ }
+    }
+    // 4. Detached process tracked by fleet.pid (no service manager)
+    if (existsSync(pidPath)) {
+        const oldPid = parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
+        let alive = false;
         if (oldPid) {
             try {
                 process.kill(oldPid, 0);
+                alive = true;
             }
-            catch {
-                break;
+            catch { /* dead or not ours */ }
+        }
+        if (alive) {
+            try {
+                process.kill(oldPid, "SIGTERM");
+            }
+            catch { /* already gone */ }
+            for (let i = 0; i < 20; i++) {
+                try {
+                    process.kill(oldPid, 0);
+                }
+                catch {
+                    break;
+                }
+                spawnSync("sleep", ["0.5"]);
             }
+            try {
+                process.kill(oldPid, "SIGKILL");
+            }
+            catch { /* already gone */ }
+            try {
+                unlinkSync(pidPath);
+            }
+            catch { /* best effort */ }
+            const child = spawn("sh", ["-c", "agend fleet start"], { detached: true, stdio: "ignore" });
+            child.unref();
+            console.log("Fleet restarting in background.");
+            return;
         }
-        else if (!existsSync(pidPath)) {
-            break;
+        // Stale pid file (process gone) — clean it up before declaring stopped.
+        try {
+            unlinkSync(pidPath);
         }
-        await new Promise(r => setTimeout(r, 500));
-    }
-    if (startService()) {
-        console.log("Service restarted.");
-    }
-    else {
-        console.log("Failed to restart service.");
+        catch { /* best effort */ }
     }
+    // 5. Nothing running anywhere
+    console.log("Fleet not running. Start with: agend start");
 });
 program
     .command("quickstart")