@songsid/agend 2.1.2-beta.39 → 2.1.2-beta.40

package/dist/cli.js

@@ -17,6 +17,7 @@ import { PIE_PERCENT_RE } from "./tui-glyphs.js";
 import { COMPLETION_SHELLS, completionScript } from "./completion.js";
 import { getUpdateSelector, lookupTargetVersion, reportUpdateRestart, shouldSkipUpdate, } from "./update-check.js";
 import { clearUpdateMarker, markUpdateInProgress } from "./update-marker.js";
+import { acquireFleetLock, releaseProcessFleetLock, setProcessFleetLock } from "./fleet-lock.js";
 /** Prefix tmux args with -L when socket isolation is active. */
 function tmuxArgs(args) {
     const socket = getTmuxSocketName();
@@ -27,6 +28,18 @@ const __dirname = dirname(__filename);
 const DATA_DIR = getAgendHome();
 const FLEET_CONFIG_PATH = join(DATA_DIR, "fleet.yaml");
 const program = new Command();
+function claimFleetSingleton() {
+    try {
+        setProcessFleetLock(acquireFleetLock(DATA_DIR));
+        process.once("exit", () => { releaseProcessFleetLock(); });
+        return true;
+    }
+    catch (err) {
+        console.error(err.message);
+        process.exitCode = 1;
+        return false;
+    }
+}
 // Read version from package.json at build time
 const pkgVersion = (() => {
     try {
@@ -98,6 +111,10 @@ fleet
         }
         catch { /* fleet not running, fall through */ }
     }
+    // Claim the singleton before constructing FleetManager: its constructor and
+    // startAll path touch shared tmux, sockets, state files and adapters.
+    if (!claimFleetSingleton())
+        return;
     const { FleetManager } = await import("./fleet-manager.js");
     const fm = new FleetManager(DATA_DIR);
     // Register crash/signal handlers BEFORE startAll(). Startup routinely takes
@@ -356,6 +373,8 @@ fleet
         }
         console.log("Old fleet stopped. Starting with new code...");
         // Start new fleet in this process (new Node.js process = new code loaded)
+        if (!claimFleetSingleton())
+            return;
         const { FleetManager } = await import("./fleet-manager.js");
         const fm = new FleetManager(DATA_DIR);
         await fm.startAll(FLEET_CONFIG_PATH);
@@ -1379,8 +1398,10 @@ program
     .command("start")
     .description("Start the AgEnD service (must be installed first)")
     .action(async () => {
-    const { getServicePath, startService } = await import("./service-installer.js");
-    if (!getServicePath()) {
+    const { getServicePath, getSystemServicePath, startService, startSystemService } = await import("./service-installer.js");
+    const userServicePath = getServicePath();
+    const systemServicePath = getSystemServicePath();
+    if (!userServicePath && !systemServicePath) {
         console.log("No service installed. Starting fleet directly...");
         const { spawn } = await import("node:child_process");
         const child = spawn("sh", ["-c", "agend fleet start"], { detached: true, stdio: "ignore" });
@@ -1388,16 +1409,16 @@ program
         console.log("Fleet starting in background.");
         return;
     }
-    if (startService()) {
+    const started = systemServicePath ? startSystemService() : startService();
+    if (started) {
         console.log("Service started.");
     }
     else {
-        // systemd/launchd failed — fallback to direct start
-        console.log("Service manager unavailable. Starting fleet directly...");
-        const { spawn } = await import("node:child_process");
-        const child = spawn("sh", ["-c", "agend fleet start"], { detached: true, stdio: "ignore" });
-        child.unref();
-        console.log("Fleet starting in background.");
+        // A service file means the service manager owns this fleet. Falling back
+        // to a detached process here creates a second fleet when the bus recovers.
+        console.error("Failed to start the installed AgEnD service; refusing to start a detached duplicate.");
+        console.error("Check your service manager, then retry: systemctl --user status com.agend.fleet");
+        process.exitCode = 1;
     }
 });
 program
@@ -1409,18 +1430,10 @@ program
     // 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 { detectPlatform, getServicePath, getSystemServicePath, getSystemdServiceState } = await import("./service-installer.js");
     const { spawn, spawnSync } = await import("node:child_process");
     const plat = detectPlatform();
     const pidPath = join(DATA_DIR, "fleet.pid");
-    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 });
@@ -1431,7 +1444,15 @@ program
         }
     };
     // 1. System-level systemd service "agend"
-    if (plat !== "macos" && isActive("systemctl is-active agend 2>/dev/null")) {
+    const systemServiceInstalled = plat !== "macos" && getSystemServicePath() !== null;
+    const systemState = plat !== "macos" ? getSystemdServiceState("agend", false) : "stopped";
+    if (systemServiceInstalled && systemState === "unavailable") {
+        console.error("Cannot reach the system service manager; refusing a detached restart that could duplicate the fleet.");
+        console.error("Check: systemctl status agend");
+        process.exitCode = 1;
+        return;
+    }
+    if (systemServiceInstalled && (systemState === "running" || systemState === "stopped")) {
         run("systemctl daemon-reload");
         if (run("systemctl restart agend")) {
             console.log("Service restarted (system).");
@@ -1443,7 +1464,17 @@ program
         return;
     }
     // 2. User-level systemd service "com.agend.fleet"
-    if (plat !== "macos" && isActive("systemctl --user is-active com.agend.fleet 2>/dev/null")) {
+    const userServiceInstalled = plat !== "macos" && getServicePath() !== null;
+    const userState = plat !== "macos"
+        ? getSystemdServiceState("com.agend.fleet", true)
+        : "stopped";
+    if (userServiceInstalled && userState === "unavailable") {
+        console.error("Cannot reach the user service manager; refusing a detached restart that could duplicate the fleet.");
+        console.error("Check: systemctl --user status com.agend.fleet");
+        process.exitCode = 1;
+        return;
+    }
+    if (userServiceInstalled && (userState === "running" || userState === "stopped")) {
         run("systemctl --user daemon-reload");
         try {
             execSync("systemctl --user reset-failed com.agend.fleet", { stdio: "pipe", timeout: 5000 });