@songsid/agend 2.1.10 → 2.1.11-beta.1

package/dist/cli.js

@@ -17,6 +17,7 @@ import { hasPausedMarker } from "./pause-marker.js";
 import { COMPLETION_SHELLS, completionScript } from "./completion.js";
 import { getUpdateSelector, lookupTargetVersion, reportUpdateRestart, shouldSkipUpdate, runningFleetPredatesInstall, processStartMs, } from "./update-check.js";
 import { clearUpdateMarker, markUpdateInProgress, setUpdateProgressStage } from "./update-marker.js";
+import { describeSignalSource, gateFleetControl, recordInstanceControl, withOrigin } from "./fleet-control-audit.js";
 import { acquireFleetLock, isFleetStartCommandLine, readProcessCommandLine, releaseProcessFleetLock, setProcessFleetLock } from "./fleet-lock.js";
 import { limitFleetCoreDumps } from "./coredump-filter.js";
 import { SYSTEMD_RESTART_TIMEOUT_MS } from "./service-installer.js";
@@ -158,7 +159,11 @@ fleet
         process.exit(0);
     };
     process.on("SIGINT", shutdown);
-    process.on("SIGTERM", shutdown);
+    process.on("SIGTERM", () => {
+        // The restart that interrupted a fleet used to leave no trace of who asked.
+        console.log(describeSignalSource(DATA_DIR, "SIGTERM"));
+        void shutdown();
+    });
     process.on("uncaughtException", (err) => {
         // An uncaught exception leaves unknown state — still the one case worth
         // tearing down for.
@@ -221,7 +226,12 @@ fleet
     .command("stop")
     .description("Stop fleet or specific instance")
     .argument("[instance]", "Specific instance to stop")
-    .action(async (instance) => {
+    .option("-y, --yes", "Confirm when run from a fleet agent session (this affects every instance)")
+    .action(async (instance, opts) => {
+    if (instance)
+        recordInstanceControl(DATA_DIR, "instance-stop", instance);
+    else if (!gateFleetControl(DATA_DIR, "fleet-stop", { yes: opts?.yes }))
+        process.exit(1);
     if (instance) {
         // 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
@@ -295,11 +305,16 @@ fleet
     .description("Graceful restart: wait for instances to idle, then restart")
     .argument("[instance]", "Specific instance to restart (immediate, no idle wait)")
     .option("--reload", "Full process restart to load new code")
+    .option("-y, --yes", "Confirm when run from a fleet agent session (this affects every instance)")
     .action(async (instance, opts) => {
     if (instance && opts?.reload) {
         console.error("--reload restarts the entire fleet process. Cannot combine with instance name.");
         process.exit(1);
     }
+    if (instance)
+        recordInstanceControl(DATA_DIR, "instance-restart", instance);
+    else if (!gateFleetControl(DATA_DIR, opts?.reload ? "fleet-restart-reload" : "fleet-restart", { yes: opts?.yes }))
+        process.exit(1);
     if (instance) {
         // Single instance restart via fleet's HTTP API
         const { loadFleetConfig } = await import("./config.js");
@@ -446,11 +461,11 @@ fleet
 });
 fleet
     .command("status")
-    .description("Show fleet status (alias for `agend ls`)")
+    .description("Show fleet status, workspace disk usage, unregistered instance directories, and host memory/swap")
     .option("--json", "Output as JSON")
     .action(async (opts) => {
     // Delegate to the `ls` command implementation
-    await lsAction(opts);
+    await lsAction({ ...opts, resources: true });
 });
 fleet
     .command("logs")
@@ -1334,7 +1349,10 @@ program
     .option("--version <ver>", "Specific version to install")
     .option("--beta", "Install beta version")
     .option("--force", "Force reinstall and restart even when already up to date")
+    .option("-y, --yes", "Confirm when run from a fleet agent session (this affects every instance)")
     .action(async (opts) => {
+    if (!gateFleetControl(DATA_DIR, "update", { yes: opts.yes }))
+        process.exit(1);
     const { spawnSync } = await import("node:child_process");
     const tag = getUpdateSelector(opts);
     const pkg = `@songsid/agend@${tag}`;
@@ -1350,6 +1368,9 @@ program
             encoding: "utf-8",
             timeout: SYSTEMD_RESTART_TIMEOUT_MS + 60_000,
             stdio: "inherit",
+            // This update was already confirmed (or interactive); its own restart is
+            // part of it, not a second command for the agent-session guard.
+            env: withOrigin("agend-update"),
         });
         if (!reportUpdateRestart(restartResult.status)) {
             // No new fleet is coming up to clear the marker — do it here, or the next
@@ -1655,7 +1676,10 @@ program
 program
     .command("stop")
     .description("Stop the AgEnD service or detached fleet")
-    .action(async () => {
+    .option("-y, --yes", "Confirm when run from a fleet agent session (this affects every instance)")
+    .action(async (opts) => {
+    if (!gateFleetControl(DATA_DIR, "stop", { yes: opts.yes }))
+        process.exit(1);
     const { getServicePath, stopService } = await import("./service-installer.js");
     if (!getServicePath()) {
         // No service — try killing by PID
@@ -1726,7 +1750,10 @@ program
 program
     .command("restart")
     .description("Restart the AgEnD service (auto-detects systemd/launchd/detached)")
-    .action(async () => {
+    .option("-y, --yes", "Confirm when run from a fleet agent session (this affects every instance)")
+    .action(async (opts) => {
+    if (!gateFleetControl(DATA_DIR, "restart", { yes: opts.yes }))
+        process.exit(1);
     // 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,
@@ -2535,6 +2562,18 @@ async function lsAction(opts) {
             console.log(n);
         return;
     }
+    // Keep the existing JSON row-array contract and the fast completion path.
+    const printResources = async () => {
+        if (!opts.resources || opts.json)
+            return;
+        try {
+            const { collectResourceReport, formatResourceReport } = await import("./resource-report.js");
+            console.log(formatResourceReport(await collectResourceReport(DATA_DIR)));
+        }
+        catch {
+            console.log(t("resources.report_unknown"));
+        }
+    };
     // Load classic channels from classicBot.yaml (keyed by channelId)
     const classicPath = join(DATA_DIR, "classicBot.yaml");
     let classicConfig = null;
@@ -2565,6 +2604,7 @@ async function lsAction(opts) {
     }
     if (allNames.length === 0) {
         console.log("No instances configured.");
+        await printResources();
         return;
     }
     // Resolve tmux pane PIDs for memory measurement (concurrently — one
@@ -2718,6 +2758,7 @@ async function lsAction(opts) {
     const totalGB = totalmem() / (1024 ** 3);
     const usedGB = (totalmem() - freemem()) / (1024 ** 3);
     console.log(`\nInstances: ${runningCount} running, ${pausedCount} paused | Fleet Mem: ${(totalMemMb / 1024).toFixed(1)} GB | System Memory: ${usedGB.toFixed(1)} / ${totalGB.toFixed(1)} GB`);
+    await printResources();
     // #1003: a working completion nobody knew to install. Tell the person at
     // the terminal once per `ls` while nothing is installed — file checks only,
     // no shell spawned, so ls stays fast.
@@ -2732,6 +2773,7 @@ program
     .description("List all instances with status, backend, team, and last activity")
     .option("--json", "Output as JSON")
     .option("--names-only", "Print instance names one per line (for shell completion)")
+    .option("--resources", "Also report workspace disk usage, unregistered instance directories, and host memory/swap (text only)")
     .action(async (opts) => {
     await lsAction(opts);
 });