@songsid/agend 2.3.2-beta.14 → 2.3.2-beta.15

package/dist/cli.js

@@ -25,7 +25,7 @@ import { homedir, totalmem, freemem, userInfo } from "node:os";
 import { fileURLToPath } from "node:url";
 import { spawnSync, execSync, execFileSync } from "node:child_process";
 import { spawn } from "./child-process.js";
-import { getAgendHome, getTmuxSocketName, isDefaultAgendHome } from "./paths.js";
+import { getAgendHome, getTmuxSocketName, isDefaultAgendHome, realDefaultAgendHome } from "./paths.js";
 import { hasPausedMarker } from "./pause-marker.js";
 import { COMPLETION_SHELLS, completionScript } from "./completion.js";
 import { getUpdateSelector, isExactVersion, isUnrequestedDowngrade, lookupTargetVersion, reportUpdateRestart, shouldSkipUpdate, runningFleetPredatesInstall, fleetProvenStopped, readFleetPidEvidence, pidAlive, processStartMs, } from "./update-check.js";
@@ -34,7 +34,7 @@ import { describeSignalSource, forceAllowed, gateFleetControl, recordInstanceCon
 import { FLEET_STOP_TIMEOUT_MS, stopDetachedOwner, systemdStopTimeoutMs, detachedProcessStart, detachedProcessExited } from "./fleet-stop-budget.js";
 import { acquireFleetLock, isFleetStartCommandLine, readProcessCommandLine, releaseProcessFleetLock, setProcessFleetLock } from "./fleet-lock.js";
 import { limitFleetCoreDumps } from "./coredump-filter.js";
-import { SYSTEMD_RESTART_TIMEOUT_MS, getServicePath, getSystemServicePath } from "./service-installer.js";
+import { SYSTEMD_RESTART_TIMEOUT_MS, getServicePath, getSystemServicePath, serviceDefinitionHome } from "./service-installer.js";
 import { withFsPlanLock } from "./service-plan.js";
 import { selectSystemdRestartTarget, SYSTEMD_RESTART_INDETERMINATE_EXIT_CODE, } from "./service-restart-selection.js";
 import { loadRawFleetConfig } from "./config.js";
@@ -45,7 +45,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 { DIRECT_FLEET_START_ENV, redirectsToService, startedByServiceManager } from "./service-owner.js";
+import { DIRECT_FLEET_START_ENV, redirectsToService, serviceRunsHome, startedByServiceManager } from "./service-owner.js";
 import { handOff, shouldHandOff } from "./launchd-handoff.js";
 /** Prefix tmux args with -L when socket isolation is active. */
 function tmuxArgs(args) {
@@ -2142,9 +2142,22 @@ function redirectToService(command, extra, directMarker) {
     catch { /* not Linux */ }
     const byServiceManager = startedByServiceManager({ platform: process.platform, env: process.env, ownCgroup, ppid: process.ppid, launchdLabel: "com.agend.fleet" });
     const installed = getSystemServicePath() ?? getServicePath();
-    if (!redirectsToService({ command, directMarker, byServiceManager, installedServicePath: installed }))
+    // #2741: only a service of this AgEnD home takes the start or stop over.
+    let definition = null;
+    try {
+        if (installed)
+            definition = readFileSync(installed, "utf-8");
+    }
+    catch { /* unreadable: as before */ }
+    const told = definition === null ? null : serviceDefinitionHome(definition);
+    const sameHome = serviceRunsHome({ serviceHome: told?.known ? told.home : null,
+        defaultHome: realDefaultAgendHome(), ownHome: getAgendHome(), definitionRead: !!told?.known });
+    if (!redirectsToService({ command, directMarker, byServiceManager, installedServicePath: installed, sameHome }))
         return false;
     console.error(t("cli.service_redirect", String(installed), [command, ...extra].join(" ")));
+    // #2741: a unit waiting for READY that hands over exits before it — say so, with the way out, never silently.
+    if (process.env.NOTIFY_SOCKET)
+        console.error(t("cli.service_redirect_notify"));
     const self = selfCommand([command, ...extra]);
     const result = spawnSync(self.command, self.args, { stdio: "inherit" });
     process.exit(result.status ?? 1);