@songsid/agend 2.1.4-beta.2 → 2.1.4-beta.21

package/dist/cli.js

@@ -16,9 +16,11 @@ import { hasPausedMarker } from "./pause-marker.js";
 import { clampContextPercent, parseContextPercent } from "./context-percent.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 { clearUpdateMarker, markUpdateInProgress, setUpdateProgressStage } from "./update-marker.js";
 import { acquireFleetLock, releaseProcessFleetLock, setProcessFleetLock } from "./fleet-lock.js";
 import { SYSTEMD_RESTART_TIMEOUT_MS } from "./service-installer.js";
+import { loadRawFleetConfig } from "./config.js";
+import { setLocale, t } from "./locale.js";
 /** Prefix tmux args with -L when socket isolation is active. */
 function tmuxArgs(args) {
     const socket = getTmuxSocketName();
@@ -28,6 +30,14 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const DATA_DIR = getAgendHome();
 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.
+try {
+    const configuredLocale = loadRawFleetConfig(FLEET_CONFIG_PATH).defaults?.locale;
+    if (configuredLocale === "en" || configuredLocale === "zh-TW")
+        setLocale(configuredLocale);
+}
+catch { /* malformed or missing config: keep the English CLI default */ }
 const program = new Command();
 function claimFleetSingleton() {
     try {
@@ -824,9 +834,18 @@ program
     if (check === "mcp") {
         await doctorMcp();
     }
-    else {
+    else if (check) {
         console.log("Usage: agend doctor mcp");
         console.log("  mcp  — Check fleet MCP health (IPC sockets, MCP configs, backends)");
+        process.exitCode = 2;
+    }
+    else {
+        const { inspectService } = await import("./service-installer.js");
+        const { collectDoctorReport, formatDoctorReport } = await import("./doctor.js");
+        const report = await collectDoctorReport(DATA_DIR, inspectService());
+        console.log(formatDoctorReport(report));
+        if (report.errors > 0)
+            process.exitCode = 1;
     }
 });
 async function doctorMcp() {
@@ -1157,6 +1176,7 @@ program
     const targetVersion = lookupTargetVersion(tag);
     if (shouldSkipUpdate(pkgVersion, targetVersion, opts.force)) {
         console.log(`\n  ✓ Already up to date (v${pkgVersion})\n`);
+        setUpdateProgressStage(DATA_DIR, "complete", { version: pkgVersion });
         return;
     }
     if (targetVersion) {
@@ -1173,10 +1193,13 @@ program
     // dies here does not silence real alerts.
     markUpdateInProgress(DATA_DIR);
     const failUpdate = (message) => {
-        clearUpdateMarker(DATA_DIR);
+        if (!setUpdateProgressStage(DATA_DIR, "failed", { error: message.trim() })) {
+            clearUpdateMarker(DATA_DIR);
+        }
         console.error(message);
         process.exit(1);
     };
+    setUpdateProgressStage(DATA_DIR, "downloading");
     // Detect and remove stale npm link (local build that shadows global install)
     try {
         const agendPath = execSync("which agend", { encoding: "utf-8", stdio: "pipe" }).trim();
@@ -1264,11 +1287,15 @@ program
     }
     const newVersion = (verifyResult.stdout ?? "").trim();
     console.log(`  ✓ Installed: ${newVersion}`);
+    setUpdateProgressStage(DATA_DIR, "installed", { version: newVersion.replace(/^v/, "") });
     // ── Update service file ──
     if (agendPath) {
         try {
             // Use the NEW binary to install service (old binary's templates may be deleted)
-            const installResult = spawnSync(agendPath, ["install"], { encoding: "utf-8", timeout: 15000 });
+            // `agend install` activates by default. During update the existing
+            // restart stage owns stop/start and progress reporting, so only refresh
+            // the service file here to avoid restarting the fleet twice.
+            const installResult = spawnSync(agendPath, ["install", "--no-activate"], { encoding: "utf-8", timeout: 15000 });
             if (installResult.status === 0) {
                 console.log(`  ✓ Service updated`);
             }
@@ -1280,6 +1307,20 @@ program
             console.log(`  ⚠ Service file update failed (non-fatal): ${e.message}`);
         }
     }
+    // ── Refresh installed shell completions ──
+    // The completion script embeds this version's subcommand names, so a
+    // previously installed static file goes stale on update. --refresh only
+    // rewrites artifacts that already exist — an update never starts
+    // installing completions the user didn't ask for. Run through the NEW
+    // binary so the regenerated names are the new version's.
+    try {
+        spawnSync(agendPath, ["completion", "install", "--refresh"], {
+            encoding: "utf-8",
+            timeout: 15_000,
+            stdio: "ignore",
+        });
+    }
+    catch { /* cosmetic — never block an update on completion refresh */ }
     // ── Restart fleet ──
     // Run the restart through the NEWLY-INSTALLED binary (agendPath), not inline.
     // The inline restart would execute the OLD binary's code — exactly the logic
@@ -1287,6 +1328,7 @@ program
     // restart` (new binary) does the 4-environment service detection (system
     // systemd → user systemd → launchd → detached pid).
     console.log("  Restarting fleet...");
+    setUpdateProgressStage(DATA_DIR, "stopping", { version: newVersion.replace(/^v/, "") });
     // `agend restart` may synchronously wait for a Type=notify service to finish
     // a multi-minute stop/start and send READY=1. Keep this parent wrapper alive
     // longer than the restart command's own bounded wait.
@@ -1298,7 +1340,9 @@ program
     if (!reportUpdateRestart(restartResult.status)) {
         // No new fleet is coming up to clear the marker — do it here, or the next
         // 15 minutes of genuine crashes would go unreported.
-        clearUpdateMarker(DATA_DIR);
+        if (!setUpdateProgressStage(DATA_DIR, "failed", { error: "fleet restart failed" })) {
+            clearUpdateMarker(DATA_DIR);
+        }
         process.exitCode = 1;
     }
 });
@@ -1324,8 +1368,9 @@ program
 // === Install/Uninstall ===
 program
     .command("install")
-    .description("Install as system service")
-    .option("--activate", "Stop manual fleet and load the service immediately")
+    .description(t("install.description"))
+    .option("--activate", "Deprecated; service activation is now the default")
+    .option("--no-activate", "Write the service file without activating it")
     .action(async (opts) => {
     const { installService, activateService, detectPlatform } = await import("./service-installer.js");
     const execPath = process.argv[1];
@@ -1336,33 +1381,81 @@ program
         workingDirectory: DATA_DIR,
         logPath: join(DATA_DIR, "fleet.log"),
     });
-    console.log(`Service installed at: ${svcPath}`);
-    if (opts.activate) {
+    console.log(t("install.path", svcPath));
+    if (opts.activate !== false) {
         const pidPath = join(DATA_DIR, "fleet.pid");
-        activateService(svcPath, pidPath);
-        console.log("Service activated.");
-    }
-    else {
-        const plat = detectPlatform();
-        if (plat === "macos") {
-            console.log(`Run: launchctl load ${svcPath}`);
+        try {
+            activateService(svcPath, pidPath);
+            console.log(t("install.running"));
         }
-        else {
-            console.log(`Run: systemctl --user enable --now com.agend.fleet`);
+        catch (err) {
+            console.error(t("install.start_failed", err.message));
+            const plat = detectPlatform();
+            if (plat === "macos") {
+                console.error(`Run manually: launchctl load ${svcPath}`);
+            }
+            else {
+                console.error("Run manually: systemctl --user daemon-reload && systemctl --user enable --now com.agend.fleet");
+            }
+            process.exitCode = 1;
         }
     }
+    else {
+        console.log(t("install.updated"));
+    }
 });
 program
     .command("uninstall")
-    .description("Remove system service")
-    .action(async () => {
-    const { uninstallService } = await import("./service-installer.js");
-    const removed = uninstallService("com.agend.fleet");
-    if (removed) {
-        console.log("Service uninstalled");
+    .description(t("uninstall.description"))
+    .option("-f, --force", t("uninstall.force_help"))
+    .action(async (opts) => {
+    const { inspectService, isServiceRemovalConfirmed, uninstallService } = await import("./service-installer.js");
+    const service = inspectService("com.agend.fleet");
+    if (!service.installed) {
+        console.log(t("uninstall.none"));
+        return;
     }
-    else {
-        console.log("No service found to uninstall");
+    const state = (value, yes, no) => value == null ? t("uninstall.unknown") : value ? yes : no;
+    console.log(t("uninstall.found"));
+    console.log(`  ${t("uninstall.manager", service.manager ?? t("uninstall.unknown"))}`);
+    console.log(`  ${t("uninstall.path", service.path ?? t("uninstall.unknown"))}`);
+    console.log(`  ${t("uninstall.enabled", state(service.enabled, t("uninstall.yes"), t("uninstall.no")))}`);
+    console.log(`  ${t("uninstall.active", state(service.active, t("uninstall.running"), t("uninstall.inactive")))}`);
+    if (!opts.force && !process.stdin.isTTY) {
+        console.log(t("uninstall.non_interactive"));
+        process.exitCode = 1;
+        return;
+    }
+    if (!opts.force) {
+        const { createInterface } = await import("node:readline/promises");
+        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        let answer = "";
+        try {
+            answer = await rl.question(t("uninstall.confirm"));
+        }
+        catch {
+            console.log(t("uninstall.cancelled_force"));
+            return;
+        }
+        finally {
+            rl.close();
+        }
+        if (!isServiceRemovalConfirmed(answer)) {
+            console.log(t("uninstall.cancelled"));
+            return;
+        }
+    }
+    try {
+        if (uninstallService("com.agend.fleet")) {
+            console.log(t("uninstall.removed"));
+        }
+        else {
+            console.log(t("uninstall.none"));
+        }
+    }
+    catch (err) {
+        console.error(t("uninstall.failed", err.message));
+        process.exitCode = 1;
     }
 });
 program
@@ -2380,29 +2473,59 @@ program
 });
 program
     .command("completion")
-    .description("Print a shell completion script (bash or zsh)")
-    .argument("<shell>", `Shell to generate for (${COMPLETION_SHELLS.join(", ")})`)
+    .description("Print a shell completion script, or install it (bash or zsh)")
+    .argument("<target>", `"install", or a shell to print for (${COMPLETION_SHELLS.join(", ")})`)
+    .argument("[shell]", "with install: limit to one shell (default: detect)")
+    .option("--modify-rc", "with install: authorize adding the zsh eval line to ~/.zshrc")
+    .option("--refresh", "with install: only rewrite artifacts that already exist (used by agend update)")
     .addHelpText("after", `
-Install:
+Recommended:
+  agend completion install          # bash: static file, no rc edit; zsh: prints what to do
+  agend completion install --modify-rc   # also add the zsh line to ~/.zshrc
+
+Manual (fallback):
   bash   echo 'eval "$(agend completion bash)"' >> ~/.bashrc
   zsh    echo 'eval "$(agend completion zsh)"'  >> ~/.zshrc
 
 Then reload the shell. Tab-completes instance names for \`agend attach\` and
 \`agend fleet start|stop|restart\`, and subcommands elsewhere.`)
-    .action((shell) => {
-    if (!COMPLETION_SHELLS.includes(shell)) {
-        console.error(`Unsupported shell: ${shell}. Supported: ${COMPLETION_SHELLS.join(", ")}`);
-        process.exit(2);
-    }
+    .action(async (target, shellArg, opts) => {
     // Subcommand names come from commander itself, so the script can't drift
     // out of sync with the CLI the way a hardcoded list would.
     const fleetCmd = program.commands.find(c => c.name() === "fleet");
-    console.log(completionScript(shell, {
+    const spec = {
         topLevel: program.commands.map(c => c.name()),
         fleetSub: fleetCmd?.commands.map(c => c.name()) ?? [],
         instanceCommands: ["attach"],
         fleetInstanceCommands: ["start", "stop", "restart"],
-    }));
+    };
+    if (target === "install") {
+        const { detectShells, installCompletions } = await import("./completion-install.js");
+        const { zshCompletion } = await import("./completion.js");
+        if (shellArg && !COMPLETION_SHELLS.includes(shellArg)) {
+            console.error(`Unsupported shell: ${shellArg}. Supported: ${COMPLETION_SHELLS.join(", ")}`);
+            process.exit(2);
+        }
+        const shells = shellArg ? [shellArg] : detectShells();
+        if (shells.length === 0) {
+            console.log("  No bash or zsh detected — nothing to install.");
+            return;
+        }
+        const results = installCompletions({ bash: completionScript("bash", spec), zshFpath: zshCompletion(spec, "fpath") }, shells, { modifyRc: opts.modifyRc, refresh: opts.refresh });
+        for (const r of results) {
+            if (r.status === "hint")
+                console.log(`  ${r.shell}: ${r.hint}`);
+            else if (r.status === "skipped") { /* refresh mode, nothing was installed before */ }
+            else
+                console.log(`  ${r.shell}: completion ${r.status}${r.path ? ` (${r.path})` : ""}`);
+        }
+        return;
+    }
+    if (!COMPLETION_SHELLS.includes(target)) {
+        console.error(`Unsupported target: ${target}. Supported: install, ${COMPLETION_SHELLS.join(", ")}`);
+        process.exit(2);
+    }
+    console.log(completionScript(target, spec));
 });
 program
     .command("health").description("Fleet health check — shows problems and diagnostics")