@songsid/agend 2.3.5-alpha.5 → 2.3.5-beta.1

package/dist/cli.js

@@ -16,8 +16,6 @@ applyNetworkReliabilityDefaults();
 import { checkNodeVersion } from "./node-version-guard.js";
 checkNodeVersion();
 import { Command, Option } from "commander";
-import { registerBuildInfoCommand } from "./build-provenance-cli.js";
-import { launchdServiceDomain } from "./launchd-service-domain.js";
 import { registerBugReportCommand } from "./bug-report-cli.js";
 import { join, dirname } from "node:path";
 import { SchedulerDb } from "./scheduler/db.js";
@@ -27,8 +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, isDefaultAgendHome, realDefaultAgendHome } from "./paths.js";
-import { tmuxArgs as tmuxArgsFor, tmuxBinary as tmuxBin, tmuxEnvOption as tmuxEnvOpt } from "./tmux-binary.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, downgradeRefusal, lookupTargetVersion, reportUpdateRestart, shouldSkipUpdate, runningFleetPredatesInstall, fleetProvenStopped, readFleetPidEvidence, pidAlive, processStartMs, } from "./update-check.js";
@@ -41,7 +38,7 @@ import { limitFleetCoreDumps } from "./coredump-filter.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 { getTmuxSession, loadRawFleetConfig } from "./config.js";
+import { loadRawFleetConfig } from "./config.js";
 import { detectLocale, setLocale, getLocale, t } from "./locale.js";
 import { settingsSourceLabel } from "./settings-confirmation.js";
 import { DeliveryOutbox, deliveryStatusSelector } from "./delivery-outbox.js";
@@ -51,8 +48,11 @@ import { requestSettingsConfirmation } from "./settings-control.js";
 import { canonicalCliEntry, selfCommand } from "./cli-entry.js";
 import { DIRECT_FLEET_START_ENV, redirectsToService, serviceRunsHome, startedByServiceManager } from "./service-owner.js";
 import { handOff, shouldHandOff } from "./launchd-handoff.js";
-/** This fleet's tmux socket (and, with the bundled tmux, its config) in front of `args` (tmux-binary.ts). */
-const tmuxArgs = (args) => tmuxArgsFor(args);
+/** Prefix tmux args with -L when socket isolation is active. */
+function tmuxArgs(args) {
+    const socket = getTmuxSocketName();
+    return socket ? ["-L", socket, ...args] : args;
+}
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const DATA_DIR = getAgendHome();
@@ -178,7 +178,6 @@ program
     // `agend --version`, prints this version and installs nothing.
     .enablePositionalOptions();
 registerBugReportCommand(program, pkgVersion);
-registerBuildInfoCommand(program);
 function signalFleetReload() {
     const pidPath = join(DATA_DIR, "fleet.pid");
     try {
@@ -213,9 +212,6 @@ settingsCommand.command("confirm <id>").option("--yes", "Explicit noninteractive
         }
         const result = await requestSettingsConfirmation(DATA_DIR, { action: confirmed ? "confirm" : "reject", ticket: inspected.ticket });
         console.log(result.pending_change.outcome?.message ?? result.pending_change.state);
-        // S-35: the reason a confirmed change failed, on its own line.
-        if (result.pending_change.outcome?.detail)
-            console.log(`  ${result.pending_change.outcome.detail}`);
         if (result.pending_change.state !== "applied" && confirmed)
             process.exitCode = 1;
     }
@@ -313,23 +309,6 @@ fleet
         }
         catch { /* fleet not running, fall through */ }
     }
-    // A service manager owns stop/start sequencing. Before this replacement claims any shared fleet state,
-    // an enabled Hub waits for the previous process and both old listener endpoints to close.
-    if (loadRawFleetConfig(FLEET_CONFIG_PATH).hub?.enabled === true) {
-        const [{ waitForHubServiceStart, HubServiceStartError }, { ht }] = await Promise.all([
-            import("./hub/service-start.js"), import("./hub/init/text.js"),
-        ]);
-        console.log(ht("service_drain_wait"));
-        try {
-            await waitForHubServiceStart(DATA_DIR);
-        }
-        catch (err) {
-            const reason = err instanceof HubServiceStartError ? err.reason : "config";
-            console.error(ht(`service_drain_${reason}`));
-            process.exitCode = 1;
-            return;
-        }
-    }
     // Claim the singleton before constructing FleetManager: its constructor and
     // startAll path touch shared tmux, sockets, state files and adapters.
     if (!claimFleetSingleton())
@@ -870,9 +849,7 @@ backend
     // tmux
     try {
         const { execSync } = await import("node:child_process");
-        const { tmuxBinary, tmuxEnvOption } = await import("./tmux-binary.js");
-        const { execFileSync: run } = await import("node:child_process");
-        const ver = run(tmuxBinary(), ["-V"], { stdio: "pipe", ...tmuxEnvOption() }).toString().trim();
+        const ver = execSync("tmux -V", { stdio: "pipe" }).toString().trim();
         ok(`tmux${" ".repeat(16)} ${ver}`);
     }
     catch {
@@ -1448,7 +1425,7 @@ program
         const systemUnit = getSystemServicePath();
         const ownService = systemUnit ? null : getServicePath();
         const manager = systemUnit ? { kind: "systemd", unit: "agend", user: false, unitPath: systemUnit }
-            : ownService && detectPlatform() === "macos" ? { kind: "launchd", label: "com.agend.fleet", plistPath: ownService, domain: launchdServiceDomain() }
+            : ownService && detectPlatform() === "macos" ? { kind: "launchd", label: "com.agend.fleet", plistPath: ownService, domain: `gui/${process.getuid?.() ?? 501}` }
                 : ownService ? { kind: "systemd", unit: "com.agend.fleet", user: true, unitPath: ownService }
                     : { kind: "detached" };
         // C6: a failure before the fleet runs the new install puts the previous package back too (taken before npm).
@@ -1584,7 +1561,8 @@ program
         // delete so a newer plan published during the slow bootout is left (#2376 / #2439).
         if (manager.kind === "launchd") {
             const { consumeCarriedOutPlan } = await import("./service-plan.js");
-            consumeCarriedOutPlan(DATA_DIR, `${launchdServiceDomain()}/com.agend.fleet`, planDeps());
+            const uid = process.getuid?.() ?? 501;
+            consumeCarriedOutPlan(DATA_DIR, `gui/${uid}/com.agend.fleet`, planDeps());
         }
         // #1853: in a WSL terminal without the Windows desktop shortcuts, say once how to make them (never makes them).
         if (outcome.ok)
@@ -1908,20 +1886,7 @@ program
         } })() : null,
         isDefault: isDefaultAgendHome,
     });
-    const isHub = loadRawFleetConfig(FLEET_CONFIG_PATH).hub?.enabled === true;
-    if (isHub && opts.activate !== false) {
-        const [{ assertHubServiceInstallIdle }, { ht }] = await Promise.all([import("./hub/service-start.js"), import("./hub/init/text.js")]);
-        try {
-            assertHubServiceInstallIdle(service.workingDirectory);
-        }
-        catch {
-            console.error(ht("service_install_idle"));
-            process.exitCode = 1;
-            return;
-        }
-    }
-    const serviceVars = { label: "com.agend.fleet", execPath, path: process.env.PATH, ...service,
-        ...(!existingPath && isHub ? { launchdSessionType: "Background" } : {}) };
+    const serviceVars = { label: "com.agend.fleet", execPath, path: process.env.PATH, ...service };
     // #1450 C6: on launchd, writing a new plist without activating is a PLANNED activation — proven, recorded, and
     // left for `agend restart` (a reload there would itself start the job). See service-plan.ts.
     if (opts.activate === false && detectPlatform() === "macos") {
@@ -1937,10 +1902,9 @@ program
         }
         const uid = process.getuid?.() ?? 501;
         const plistPath = launchdPlistPath(serviceVars.label);
-        const domain = serviceVars.launchdSessionType === "Background" ? `user/${uid}` : launchdServiceDomain(serviceVars.label);
         mkdirSync(dirname(plistPath), { recursive: true });
         const outcome = refreshLaunchdWithoutActivating({
-            label: serviceVars.label, target: `${domain}/${serviceVars.label}`, plistPath, newPlist: renderLaunchdPlist(serviceVars),
+            label: serviceVars.label, target: `gui/${uid}/${serviceVars.label}`, plistPath, newPlist: renderLaunchdPlist(serviceVars),
             expected: expectation.expected, pkgDir: dirname(dirname(execPath)), agendHome: DATA_DIR,
         }, planDeps());
         if (!outcome.ok) {
@@ -1987,16 +1951,8 @@ program
     if (opts.activate !== false) {
         const pidPath = join(DATA_DIR, "fleet.pid");
         try {
-            if (isHub)
-                activateService(svcPath, pidPath, { preservePidFile: true });
-            else
-                activateService(svcPath, pidPath);
-            if (isHub) {
-                const { ht } = await import("./hub/init/text.js");
-                console.log(ht("service_ok"));
-            }
-            else
-                console.log(t("install.running"));
+            activateService(svcPath, pidPath);
+            console.log(t("install.running"));
         }
         catch (err) {
             console.error(t("install.start_failed", err.message));
@@ -2171,7 +2127,7 @@ 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(t("cli.service_retry", process.platform === "darwin" ? `launchctl print ${launchdServiceDomain()}/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(t("cli.service_direct_hint"));
         process.exitCode = 1;
@@ -2513,8 +2469,7 @@ program
     if (plat === "macos") {
         const uid = process.getuid?.() ?? 501;
         const label = "com.agend.fleet";
-        const domain = launchdServiceDomain(label, { uid });
-        const target = `${domain}/${label}`;
+        const target = `gui/${uid}/${label}`;
         const deps = planDeps();
         const printed = deps.run("launchctl", ["print", target]);
         if (printed.status === 0) {
@@ -2536,7 +2491,7 @@ program
                 if (await handOffLaunchdActivation("restart"))
                     return;
                 const { activateService } = await import("./service-activation.js");
-                const outcome = activateService({ kind: "launchd", label, plistPath: plan.plistPath, domain }, { bin: expectation.expected.entry, entry: expectation.expected.entry, node: expectation.expected.node, dir: pkgDir }, {
+                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,
                     readFirstLine: path => deps.readFile(path)?.split("\n", 1)[0] ?? null,
                     isExecutable: path => { try {
@@ -2565,12 +2520,7 @@ program
             if (expectation.ok && refuses(guard.guardLaunchd(captureRun, target, plistPath, deps.readFile, expectation.expected, guardDeps)))
                 return;
             if (run(`launchctl kickstart -k ${target}`)) {
-                if (loadRawFleetConfig(FLEET_CONFIG_PATH).hub?.enabled === true) {
-                    const { ht } = await import("./hub/init/text.js");
-                    console.log(ht("service_restart_requested"));
-                }
-                else
-                    console.log("Service restarted.");
+                console.log("Service restarted.");
                 return;
             }
             console.error(`  ✗ launchctl kickstart -k ${target} failed.`);
@@ -2820,19 +2770,6 @@ program
     const { runQuickstart } = await import("./quickstart.js");
     await runQuickstart();
 });
-// #3095 Hub (experimental, off by default): `agend hub init` sets up a team Hub on this machine. Nothing Hub-related
-// loads unless this command runs.
-const hub = program.command("hub").description("AgEnD Hub (experimental): a team Hub where colleagues sign in with the directory");
-hub.command("handoff")
-    .description("Show this Hub's installation record, pairing steps and stop/uninstall guidance")
-    .action(async () => { const { runHubHandoffCommand } = await import("./hub/init/handoff.js"); await runHubHandoffCommand(); });
-hub
-    .command("init")
-    .description("Set up this machine as a team Hub: addresses, browser certificate, directory (LDAPS), administrator, service")
-    .action(async () => {
-    const { runHubInitCommand } = await import("./hub/init/cli.js");
-    await runHubInitCommand();
-});
 program
     .command("init")
     .description("Interactive advanced wizard (setup-wizard); for first-run use `agend quickstart` or `agend setup`")
@@ -3512,11 +3449,7 @@ async function lsAction(opts) {
     const typeByAdapter = new Map(channelList.map((ch) => [ch.id ?? ch.type, ch.type]));
     const firstAdapter = channelList[0] ? (channelList[0].id ?? channelList[0].type) : undefined;
     const sourceOfType = (type) => (type === "telegram" ? "TG" : type === "discord" ? "DC" : "—");
-    const { isNativeExecInstance } = await import("./native-instance-registry.js");
     const getSource = (name, inst) => {
-        // A Windows exec agent has no chat binding (getInstanceAdapterId gives none): no source, in any fleet. A pane keeps its own.
-        if (inst && isNativeExecInstance(inst))
-            return "—";
         if (singleSource)
             return singleSource;
         if (classicNames.has(name)) {
@@ -3530,8 +3463,8 @@ async function lsAction(opts) {
     // Row collection runs concurrently (see ls-rows.ts): the per-instance
     // tmux captures overlap instead of stacking their 2s bounds serially.
     const { collectLsRows, capturePaneAsync, formatTimeSince, lsStatusIcon, lsStatusLabel, displayWidth, computeLsNameWidth, padToDisplayWidth } = await import("./ls-rows.js");
-    const { tmuxSocket } = await import("./tmux-binary.js");
-    const socketName = tmuxSocket();
+    const { getTmuxSocketName } = await import("./paths.js");
+    const socketName = getTmuxSocketName();
     const rows = await collectLsRows(allNames.map(name => {
         const isClassic = classicNames.has(name);
         const inst = config.instances[name];
@@ -3929,32 +3862,6 @@ program
     console.log(`\n${classIcon} Fleet: ${classification}`);
     process.exit(exitCode);
 });
-program
-    .command("tmux")
-    .description("Run a tmux command on this fleet's own tmux server — its tmux binary and socket — e.g. `agend tmux ls`, `agend tmux capture-pane -p -t <window>`.")
-    .argument("[args...]", "tmux's own command and arguments")
-    .allowUnknownOption(true)
-    .helpOption(false)
-    .action(async (rest = []) => {
-    // Everything after the command goes to tmux as typed (its own options and a `--` included: commander keeps them in
-    // order, with allowUnknownOption), with this fleet's -L socket (and, with AgEnD's bundled tmux, its binary and -f
-    // config) in front: M-2457 §5.
-    let bin;
-    try {
-        bin = tmuxBin();
-    }
-    catch (e) {
-        console.error(e.message);
-        process.exit(1);
-    }
-    const { spawnSync } = await import("node:child_process");
-    const r = spawnSync(bin, tmuxArgs(rest), { stdio: "inherit", ...tmuxEnvOpt() });
-    if (r.error) {
-        console.error(`tmux could not run: ${r.error.message}`);
-        process.exit(1);
-    }
-    process.exit(r.status ?? 1);
-});
 program
     .command("attach")
     .description("Attach to an instance's tmux window. Accepts display name, instance name, row number from ls, or a substring. No argument: interactive picker.")
@@ -3977,11 +3884,10 @@ program
         }
     }
     catch { /* ignore */ }
-    // The fleet's session (AGEND_TMUX_SESSION, else per AGEND_HOME), not a hardcoded "agend" (M-2457 §5).
-    const session = getTmuxSession();
+    const session = "agend";
     // Verify tmux session exists
     try {
-        execFileSync(tmuxBin(), tmuxArgs(["has-session", "-t", session]), { stdio: "pipe" });
+        execFileSync("tmux", tmuxArgs(["has-session", "-t", session]), { stdio: "pipe" });
     }
     catch {
         console.error(`tmux session "${session}" not found. Is the fleet running?`);
@@ -3994,7 +3900,7 @@ program
     let selected = false;
     for (const t of targets) {
         try {
-            execFileSync(tmuxBin(), tmuxArgs(["select-window", "-t", t]), { stdio: "pipe" });
+            execFileSync("tmux", tmuxArgs(["select-window", "-t", t]), { stdio: "pipe" });
             selected = true;
             break;
         }
@@ -4003,13 +3909,13 @@ program
     // Fallback: search tmux windows for a partial name match (handles CJK truncation)
     if (!selected) {
         try {
-            const winList = execFileSync(tmuxBin(), tmuxArgs(["list-windows", "-t", session, "-F", "#{window_id} #{window_name}"]), { stdio: "pipe" }).toString().trim();
+            const winList = execFileSync("tmux", tmuxArgs(["list-windows", "-t", session, "-F", "#{window_id} #{window_name}"]), { stdio: "pipe" }).toString().trim();
             for (const line of winList.split("\n")) {
                 const [wid, ...rest] = line.split(" ");
                 const wname = rest.join(" ").replace(/-?\*?$/, ""); // strip trailing -/* markers
                 if (wname === name || name.startsWith(wname) || wname.startsWith(name)) {
                     try {
-                        execFileSync(tmuxBin(), tmuxArgs(["select-window", "-t", `${session}:${wid}`]), { stdio: "pipe" });
+                        execFileSync("tmux", tmuxArgs(["select-window", "-t", `${session}:${wid}`]), { stdio: "pipe" });
                         selected = true;
                         break;
                     }
@@ -4023,14 +3929,11 @@ program
         console.error(`Cannot find tmux window for "${name}". The instance may need to be restarted.`);
         process.exit(1);
     }
-    // Attach or switch-client depending on whether we're already in tmux — in THIS fleet's tmux: with the bundled tmux,
-    // $TMUX naming another server (the user's own, on its own socket) is not "inside"; that is an ordinary attach.
-    const { bundledTmuxEnabled, insideFleetTmux, tmuxSocket } = await import("./tmux-binary.js");
-    const insideOurs = insideFleetTmux(process.env.TMUX, bundledTmuxEnabled(), tmuxSocket());
-    if (insideOurs) {
+    // Attach or switch-client depending on whether we're already in tmux
+    if (process.env.TMUX) {
         // Already inside tmux — switch client
         try {
-            execFileSync(tmuxBin(), tmuxArgs(["switch-client", "-t", session]), { stdio: "inherit", ...tmuxEnvOpt() });
+            execFileSync("tmux", tmuxArgs(["switch-client", "-t", session]), { stdio: "inherit" });
         }
         catch {
             console.error("Failed to switch tmux client.");
@@ -4040,7 +3943,7 @@ program
     else {
         // Outside tmux — attach
         try {
-            execFileSync(tmuxBin(), tmuxArgs(["attach-session", "-t", session]), { stdio: "inherit", ...tmuxEnvOpt() });
+            execFileSync("tmux", tmuxArgs(["attach-session", "-t", session]), { stdio: "inherit" });
         }
         catch {
             console.error("Failed to attach to tmux session.");