@songsid/agend 2.3.0-beta.23 → 2.3.0-beta.24

package/dist/cli.js

@@ -35,7 +35,8 @@ import { limitFleetCoreDumps } from "./coredump-filter.js";
 import { SYSTEMD_RESTART_TIMEOUT_MS, getServicePath, getSystemServicePath } from "./service-installer.js";
 import { selectSystemdRestartTarget, SYSTEMD_RESTART_INDETERMINATE_EXIT_CODE, } from "./service-restart-selection.js";
 import { loadRawFleetConfig } from "./config.js";
-import { setLocale, t } from "./locale.js";
+import { detectLocale, setLocale, t } from "./locale.js";
+import { settingsSourceLabel } from "./settings-confirmation.js";
 import { DeliveryOutbox, deliveryStatusSelector } from "./delivery-outbox.js";
 import { DeliveryStatusArgs } from "./outbound-schemas.js";
 import { requestCpuProfile } from "./profile-control.js";
@@ -107,14 +108,15 @@ async function handOffLaunchdActivation(action) {
     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.
+// CLI commands run outside FleetManager, in the fleet's language as the fleet decides it (#2390 follow-up): an explicit
+// defaults.locale, else the host's zone (UTC+8 → zh-TW), else English. A line another program reads (the updater, the
+// Windows installer and shortcuts, the rehearsal scripts) is never a locale string: tests/cli-machine-lines-2390 pins them.
+let configForLocale;
 try {
-    const configuredLocale = loadRawFleetConfig(FLEET_CONFIG_PATH).defaults?.locale;
-    if (configuredLocale === "en" || configuredLocale === "zh-TW")
-        setLocale(configuredLocale);
+    configForLocale = loadRawFleetConfig(FLEET_CONFIG_PATH);
 }
-catch { /* malformed or missing config: keep the English CLI default */ }
+catch { /* malformed or missing config: the zone decides */ }
+setLocale(detectLocale(configForLocale));
 const program = new Command();
 function claimFleetSingleton() {
     try {
@@ -167,15 +169,15 @@ settingsCommand.command("confirm <id>").option("--yes", "Explicit noninteractive
     .action(async (id, options) => {
     try {
         const inspected = await requestSettingsConfirmation(DATA_DIR, { action: "inspect", id });
-        console.log(`Source: ${inspected.pending_change.source}\nRequester: ${inspected.pending_change.requested_by}\n${inspected.pending_change.summary.join("\n")}`);
+        console.log([t("settings_confirm.source", settingsSourceLabel(inspected.pending_change.source)), t("settings_confirm.requester", inspected.pending_change.requested_by), ...inspected.pending_change.summary].join("\n"));
         let confirmed = options.yes === true;
         if (!confirmed) {
             if (!process.stdin.isTTY)
-                throw new Error("Interactive confirmation required; --yes explicitly confirms the printed diff.");
+                throw new Error(t("settings_confirm.cli_interactive"));
             const { createInterface } = await import("node:readline/promises");
             const input = createInterface({ input: process.stdin, output: process.stdout });
             try {
-                confirmed = (await input.question("Apply this exact change? [y/N] ")).trim().toLowerCase() === "y";
+                confirmed = (await input.question(t("settings_confirm.cli_question"))).trim().toLowerCase() === "y";
             }
             finally {
                 input.close();
@@ -194,7 +196,7 @@ settingsCommand.command("confirm <id>").option("--yes", "Explicit noninteractive
 settingsCommand.command("reject <id>").description("Reject a pending Settings change on this host").action(async (id) => {
     try {
         const inspected = await requestSettingsConfirmation(DATA_DIR, { action: "inspect", id });
-        console.log(`Source: ${inspected.pending_change.source}\nRequester: ${inspected.pending_change.requested_by}\n${inspected.pending_change.summary.join("\n")}`);
+        console.log([t("settings_confirm.source", settingsSourceLabel(inspected.pending_change.source)), t("settings_confirm.requester", inspected.pending_change.requested_by), ...inspected.pending_change.summary].join("\n"));
         const result = await requestSettingsConfirmation(DATA_DIR, { action: "reject", ticket: inspected.ticket });
         console.log(result.pending_change.outcome?.message ?? result.pending_change.state);
     }
@@ -232,7 +234,7 @@ fleet
     // #2356: the way out when the installed service cannot run here (never activated, no GUI session for launchd) — an
     // operator's own decision, as `restart --force` is; the fleet's singleton lock still refuses a second fleet.
     if (opts?.direct && !forceAllowed()) {
-        console.error("  ✗ --direct is for an operator's own shell, not a fleet agent session or the fleet's own commands. Nothing was started.");
+        console.error(t("cli.direct_refused"));
         process.exit(1);
     }
     const direct = marked || !!opts?.direct;
@@ -367,7 +369,7 @@ fleet
             }
         }
         catch {
-            console.error(`Cannot connect to fleet (port ${port}). Is the fleet running?`);
+            console.error(t("cli.fleet_unreachable", port));
             process.exit(1);
         }
         return;
@@ -421,7 +423,7 @@ fleet
     // under a Restart=on-failure unit the fleet stayed down (and this process, in an agent pane, died with the unit's
     // cgroup). It runs `agend restart` itself — this Node, this CLI — with the same gate, guard and exit code.
     const args = instance ? ["restart", instance] : ["restart", ...(opts?.yes ? ["--yes"] : [])];
-    console.error(`⚠ \`agend fleet restart\` is deprecated and goes away in 2.4 — running \`agend ${args.join(" ")}\`.`);
+    console.error(t("cli.fleet_restart_deprecated", args.join(" ")));
     const self = selfCommand(args);
     const result = spawnSync(self.command, self.args, { stdio: "inherit" });
     process.exit(result.status ?? 1);
@@ -437,7 +439,7 @@ fleet
     .command("logs", { hidden: true })
     .description("Removed; use `agend logs`")
     .action(() => {
-    console.error("`agend fleet logs` was removed. Use `agend logs`.");
+    console.error(t("cli.fleet_logs_removed"));
     process.exitCode = 1;
 });
 fleet
@@ -1381,7 +1383,7 @@ program
         // #2264 review: the old system copy is retired only for a confirmed 2.1-era layout — the copy this updater runs
         // from is a 2.1.x release (2.1's updater left it there). Never from "nvm" or "root" alone: a 2.2+ copy stays.
         if (verified.retireSystemCopy && !/^2\.1\./.test(pkgVersion)) {
-            console.log(`  Note: the system install (v${pkgVersion}) is kept; only a 2.1-era copy is retired after a move to nvm.`);
+            console.log(t("cli.system_install_kept", pkgVersion));
             delete verified.retireSystemCopy;
         }
         if (verified.retireSystemCopy) {
@@ -1654,7 +1656,7 @@ program
     };
     const viaInstaller = !needsSudo && targetVersion !== null && shipsInstaller();
     if (!needsSudo && !viaInstaller)
-        console.log(`  ℹ ${pkg} has no installer of its own (a release from before #2264); this updater installs it.`);
+        console.log(t("cli.no_own_installer", pkg));
     if (viaInstaller) {
         console.log(`\n  Updating AgEnD v${pkgVersion} → v${targetVersion} (its own installer)...\n`);
         markUpdateInProgress(DATA_DIR);
@@ -1789,7 +1791,7 @@ program
     .option("--no-activate", "Write the service file without activating it")
     .action(async (opts) => {
     if (process.argv.includes("--activate")) {
-        console.error("`agend install --activate` was removed; service activation is the default.");
+        console.error(t("cli.install_activate_removed"));
     }
     const { installService, activateService, detectPlatform, renderLaunchdPlist, launchdPlistPath, getServicePath, getSystemServicePath, serviceHomeFor } = await import("./service-installer.js");
     // #1631 B: an older updater (2.2.0-beta.1 and before) refreshes a hand-started fleet's service too, through this
@@ -1980,10 +1982,10 @@ program
     // #2356: the system unit first, as `agend start` and `agend restart` choose it; a SIGTERM would only stop the process.
     if (getSystemServicePath()) {
         if (stopSystemService()) {
-            console.log("Service stopped (system).");
+            console.log(t("cli.system_service_stopped"));
             return;
         }
-        console.error("Failed to stop the system service: systemctl stop agend (run it as root).");
+        console.error(t("cli.system_service_stop_failed"));
         process.exitCode = 1;
         return;
     }
@@ -2051,9 +2053,9 @@ program
         // 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: ${process.platform === "darwin" ? "launchctl print gui/$(id -u)/com.agend.fleet" : systemServicePath ? "systemctl status agend" : "systemctl --user status com.agend.fleet"}`);
+        console.error(t("cli.service_retry", process.platform === "darwin" ? "launchctl print gui/$(id -u)/com.agend.fleet" : systemServicePath ? "systemctl status agend" : "systemctl --user status com.agend.fleet"));
         // #2356: a service file that cannot run here (never activated, no session for it) would otherwise leave no start.
-        console.error("If the service cannot run on this host, start the fleet without it: agend fleet start --direct");
+        console.error(t("cli.service_direct_hint"));
         process.exitCode = 1;
     }
 });
@@ -2074,7 +2076,7 @@ function redirectToService(command, extra, directMarker) {
     const installed = getSystemServicePath() ?? getServicePath();
     if (!redirectsToService({ command, directMarker, byServiceManager, installedServicePath: installed }))
         return false;
-    console.error(`ℹ An AgEnD service is installed here (${installed}): running \`agend ${[command, ...extra].join(" ")}\` so the service manager owns the fleet.`);
+    console.error(t("cli.service_redirect", String(installed), [command, ...extra].join(" ")));
     const self = selfCommand([command, ...extra]);
     const result = spawnSync(self.command, self.args, { stdio: "inherit" });
     process.exit(result.status ?? 1);
@@ -2097,15 +2099,15 @@ async function restartOneInstance(instance) {
         });
         const body = await resp.json();
         if (resp.ok) {
-            console.log(`Instance "${instance}" restarted (immediate)`);
+            console.log(t("cli.instance_restarted", instance));
         }
         else {
-            console.error(`Restart failed: ${body.error ?? resp.statusText}`);
+            console.error(t("cli.restart_failed", String(body.error ?? resp.statusText)));
             process.exit(1);
         }
     }
     catch {
-        console.error(`Cannot connect to fleet (port ${port}). Is the fleet running?`);
+        console.error(t("cli.fleet_unreachable", port));
         process.exit(1);
     }
 }
@@ -2118,7 +2120,7 @@ program
     .action(async (instance, opts) => {
     if (instance) {
         if (opts.force) {
-            console.error("--force applies to the whole service, not one instance.");
+            console.error(t("cli.force_whole_service"));
             process.exit(1);
         }
         await restartOneInstance(instance);
@@ -2304,7 +2306,7 @@ program
             .filter(([key, state]) => key !== "KillMode" && (state === "added" || state === "upgraded"))
             .map(([key]) => key);
         if (updated.length > 0)
-            console.log(`  ✓ ${unitPath}: updated ${updated.join(", ")} (#908/#1071/#1113/#2331: graceful stop, small crash dumps, bounded start, start limit, the fleet's ready signal)`);
+            console.log(t("cli.unit_updated", String(unitPath), updated.join(", ")));
         // #2331: what systemd LOADED — a drop-in that refuses the fleet's READY is overridden by AgEnD's own, leftovers
         // are named. Not a gate: the fleet still restarts, and the line says what will happen and what to remove.
         for (const line of loadedUnitCheck({ user: systemdTarget.user, unit: systemdTarget.unit, unitPath }))
@@ -2379,13 +2381,10 @@ 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, 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.");
+            const { pendingPlan, admitPlan, planPath } = await import("./service-plan.js");
+            // #1871: a plan whose job launchd already runs (an interrupted update, then `agend start`) is done: restart that
+            // job as an unchanged one (path 1) instead of refusing it for its new pid. #2375: quietly (no note on every restart).
+            const plan = opts.force ? null : pendingPlan(DATA_DIR, target, deps);
             if (plan && expectation.ok) {
                 const pkgDir = dirname(dirname(expectation.expected.entry));
                 const admitted = admitPlan(plan, { target, expected: expectation.expected, pkgDir }, deps);
@@ -2713,7 +2712,7 @@ program
         minutes = Math.max(1, Math.round(((body.expiresAt ?? Date.now()) - Date.now()) / 60_000));
     }
     catch {
-        console.error(`Cannot connect to fleet (port ${port}). Is the fleet running?`);
+        console.error(t("cli.fleet_unreachable", port));
         process.exit(1);
     }
     const signin = `http://localhost:${port}/signin`;
@@ -2988,7 +2987,7 @@ schedule
     .command("trigger", { hidden: true })
     .argument("[id]", "Schedule ID")
     .action(() => {
-    console.error("`agend schedule trigger` was removed. There is no Telegram trigger; use `agend schedule enable` or the Task Board.");
+    console.error(t("cli.schedule_trigger_removed"));
     process.exitCode = 1;
 });
 // === Chat Export ===