@songsid/agend 2.2.0-beta.14 → 2.2.0-beta.16

package/dist/cli.js

@@ -16,7 +16,7 @@ import { Command } from "commander";
 import { join, dirname } from "node:path";
 import { SchedulerDb } from "./scheduler/db.js";
 import { Cron } from "croner";
-import { existsSync, readFileSync, writeFileSync, appendFileSync, unlinkSync, mkdirSync, chmodSync, readdirSync, rmSync, statSync, realpathSync, } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, appendFileSync, unlinkSync, mkdirSync, chmodSync, readdirSync, rmSync, statSync, realpathSync, openSync, writeSync, closeSync, } from "node:fs";
 import { homedir, totalmem, freemem, userInfo } from "node:os";
 import { fileURLToPath } from "node:url";
 import { spawn, spawnSync, execSync, execFileSync } from "node:child_process";
@@ -38,6 +38,7 @@ import { DeliveryStatusArgs } from "./outbound-schemas.js";
 import { requestCpuProfile } from "./profile-control.js";
 import { requestSettingsConfirmation } from "./settings-control.js";
 import { canonicalCliEntry, selfCommand } from "./cli-entry.js";
+import { handOff, shouldHandOff } from "./launchd-handoff.js";
 /** Prefix tmux args with -L when socket isolation is active. */
 function tmuxArgs(args) {
     const socket = getTmuxSocketName();
@@ -79,6 +80,28 @@ function planDeps() {
         now: () => new Date(),
     };
 }
+/**
+ * #1871: hand this command to a detached copy that outlives the fleet's stop (see launchd-handoff.ts). True when it
+ * did; false to carry on here (not an agent session, or the copy could not be started — said so).
+ */
+async function handOffLaunchdActivation(action) {
+    if (!shouldHandOff(process.env))
+        return false;
+    const handed = await handOff({ agendHome: DATA_DIR, self: selfCommand(process.argv.slice(2)), env: process.env, action }, {
+        open: path => openSync(path, "a", 0o600),
+        write: (fd, text) => writeSync(fd, text),
+        close: fd => closeSync(fd),
+        spawn: (command, args, options) => spawn(command, args, options),
+        now: () => new Date(),
+    });
+    if (handed.ok) {
+        console.log(`  ↪ This session belongs to the fleet that launchd is about to stop, so \`agend ${action}\` goes on in the background.`);
+        console.log(`  Its output: ${handed.log}`);
+        return true;
+    }
+    console.log(`  ⚠ Could not continue in the background (${handed.reason}); going on in this session.`);
+    return false;
+}
 const FLEET_CONFIG_PATH = join(DATA_DIR, "fleet.yaml");
 // CLI commands run outside FleetManager. Honor an explicit fleet locale while
 // keeping the historical English CLI default when config is missing/unset.
@@ -1446,6 +1469,12 @@ program
     }
     if (!gateFleetControl(DATA_DIR, "update", { yes: opts.yes }))
         process.exit(1);
+    // #1871: on launchd the activation boots out the fleet this agent session runs in; the update must outlive that.
+    {
+        const { getServicePath, getSystemServicePath, detectPlatform } = await import("./service-installer.js");
+        if (detectPlatform() === "macos" && !getSystemServicePath() && getServicePath() && await handOffLaunchdActivation("update"))
+            return;
+    }
     const { spawnSync } = await import("node:child_process");
     // The channel follows the version being replaced — this CLI's own package — so an alpha or beta stays on its channel.
     const tag = getUpdateSelector(opts, pkgVersion);
@@ -1937,6 +1966,25 @@ program
         console.log(`  ${outcome.message}`);
         return;
     }
+    // #1884: a legacy system unit is the service a root fleet runs under; the refresh brings its ExecStart to this
+    // install's selection too, or `agend restart` refuses it after an update (see refreshSystemUnitExecStart).
+    const systemUnit = opts.activate === false && detectPlatform() !== "macos" ? getSystemServicePath() : null;
+    if (systemUnit) {
+        const { refreshSystemUnitExecStart } = await import("./service-installer.js");
+        try {
+            const refreshed = refreshSystemUnitExecStart(systemUnit, serviceVars, dirname(dirname(execPath)));
+            if (refreshed.kind === "updated")
+                console.log(`  ✓ ${systemUnit}: ExecStart=${refreshed.execStart}`);
+            else if (refreshed.kind === "foreign")
+                console.log(`  ℹ ${systemUnit} left as it is: ${refreshed.reason}.`);
+            else if (refreshed.kind === "unreadable")
+                console.log(`  ⚠ ${systemUnit} could not be read; left as it is.`);
+        }
+        catch (err) {
+            console.error(`  ✗ ${systemUnit} could not be updated (${err.message}); \`agend restart\` will refuse until its ExecStart starts this install. Run the update as root, or: sudo agend install --no-activate`);
+            process.exitCode = 1;
+        }
+    }
     const svcPath = installService(serviceVars);
     console.log(t("install.path", svcPath));
     if (opts.activate !== false) {
@@ -2347,8 +2395,13 @@ program
         if (printed.status === 0) {
             const plistPath = getServicePath() ?? join(homedir(), "Library", "LaunchAgents", `${label}.plist`);
             // Path 2 (#1450 C6): a proven new plist waits on disk with its plan — exactly one bootout + bootstrap.
-            const { readPlan, admitPlan, planPath } = await import("./service-plan.js");
-            const plan = opts.force ? null : readPlan(DATA_DIR, deps);
+            const { readPlan, admitPlan, planPath, planCarriedOut } = await import("./service-plan.js");
+            const recorded = opts.force ? null : readPlan(DATA_DIR, deps);
+            // #1871: an interrupted update's plan whose job launchd already runs (after `agend start`) is done: restart that
+            // job as an unchanged one (path 1) instead of refusing it for its new pid.
+            const plan = recorded && planCarriedOut(recorded, target, deps) ? null : recorded;
+            if (recorded && !plan)
+                console.log("  ℹ launchd already runs the job an interrupted update planned; restarting it as it is.");
             if (plan && expectation.ok) {
                 const pkgDir = dirname(dirname(expectation.expected.entry));
                 const admitted = admitPlan(plan, { target, expected: expectation.expected, pkgDir }, deps);
@@ -2357,6 +2410,8 @@ program
                     process.exitCode = 1;
                     return;
                 }
+                if (await handOffLaunchdActivation("restart"))
+                    return;
                 const { activateService } = await import("./service-activation.js");
                 const outcome = activateService({ kind: "launchd", label, plistPath: plan.plistPath, domain: `gui/${uid}` }, { bin: expectation.expected.entry, entry: expectation.expected.entry, node: expectation.expected.node, dir: pkgDir }, {
                     ...deps,