@messenger-agent/client 0.24.0-alpha.2 → 0.24.0-alpha.4

package/dist/service.js

@@ -1,208 +1,3 @@
-import { access, chmod, mkdir, unlink, writeFile } from "node:fs/promises";
-import { userInfo } from "node:os";
-import { dirname, join } from "node:path";
-import { runCommand } from "./exec.js";
-export const serviceName = "coding-agent-client";
-export const launchdLabel = "vip.elevo.coding-agent.client";
-export function shellEscape(value) {
-    return `'${value.replaceAll("'", "'\\''")}'`;
-}
-export function createSystemdService(options) {
-    return [
-        "[Unit]",
-        "Description=Coding Agent Client",
-        "After=network-online.target",
-        "",
-        "[Service]",
-        "Type=simple",
-        `ExecStart=${systemdEscape(options.serviceCommandPath)}`,
-        "Restart=always",
-        "RestartSec=5",
-        `WorkingDirectory=${systemdEscape(options.workspacePath)}`,
-        `Environment=${systemdEnv("AGENT_CONFIG_PATH", options.configPath)}`,
-        "",
-        "[Install]",
-        "WantedBy=default.target",
-        "",
-    ].join("\n");
-}
-function systemdEscape(value) {
-    return value.replaceAll("\\", "\\\\").replaceAll(" ", "\\x20");
-}
-function systemdEnv(name, value) {
-    return `${name}=${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}`;
-}
-function xmlEscape(value) {
-    return value
-        .replaceAll("&", "&")
-        .replaceAll("<", "&lt;")
-        .replaceAll(">", "&gt;")
-        .replaceAll('"', "&quot;")
-        .replaceAll("'", "&apos;");
-}
-export function createLaunchdPlist(options) {
-    const stdoutPath = join(options.dataDir, "logs", "client-service.out.log");
-    const stderrPath = join(options.dataDir, "logs", "client-service.err.log");
-    return [
-        '<?xml version="1.0" encoding="UTF-8"?>',
-        '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
-        '<plist version="1.0">',
-        "<dict>",
-        "  <key>Label</key>",
-        `  <string>${xmlEscape(launchdLabel)}</string>`,
-        "  <key>ProgramArguments</key>",
-        "  <array>",
-        `    <string>${xmlEscape(options.serviceCommandPath)}</string>`,
-        "  </array>",
-        "  <key>WorkingDirectory</key>",
-        `  <string>${xmlEscape(options.workspacePath)}</string>`,
-        "  <key>EnvironmentVariables</key>",
-        "  <dict>",
-        "    <key>AGENT_CONFIG_PATH</key>",
-        `    <string>${xmlEscape(options.configPath)}</string>`,
-        "  </dict>",
-        "  <key>RunAtLoad</key>",
-        "  <true/>",
-        "  <key>KeepAlive</key>",
-        "  <true/>",
-        "  <key>StandardOutPath</key>",
-        `  <string>${xmlEscape(stdoutPath)}</string>`,
-        "  <key>StandardErrorPath</key>",
-        `  <string>${xmlEscape(stderrPath)}</string>`,
-        "</dict>",
-        "</plist>",
-        "",
-    ].join("\n");
-}
-async function commandExists(command) {
-    const pathDirs = (process.env.PATH ?? "").split(":").filter(Boolean);
-    for (const pathDir of pathDirs) {
-        try {
-            await access(join(pathDir, command));
-            return true;
-        }
-        catch {
-            // continue
-        }
-    }
-    return false;
-}
-const defaultLingerDependencies = { commandExists, runCommand };
-export async function ensureSystemdUserLinger(user, dependencies = defaultLingerDependencies) {
-    if (!(await dependencies.commandExists("loginctl"))) {
-        throw new Error(`loginctl is required to keep the user service running after logout. Enable linger for ${user} and retry installation.`);
-    }
-    if (await isLingerEnabled(user, dependencies.runCommand))
-        return;
-    console.log(`Enabling login persistence for ${user}`);
-    const enable = await dependencies.runCommand("loginctl", ["enable-linger", user], {
-        allowFailure: true,
-        interactive: true,
-    });
-    if (enable.status !== 0) {
-        throw new Error(`Unable to enable login persistence for ${user}. Run 'sudo loginctl enable-linger ${user}' and retry installation.`);
-    }
-    if (!(await isLingerEnabled(user, dependencies.runCommand))) {
-        throw new Error(`Login persistence is still disabled for ${user}. Run 'sudo loginctl enable-linger ${user}' and retry installation.`);
-    }
-}
-async function isLingerEnabled(user, command) {
-    const result = await command("loginctl", ["show-user", user, "-p", "Linger"], { allowFailure: true });
-    return result.status === 0 && result.stdout.trim() === "Linger=yes";
-}
-export async function installService(options) {
-    const platform = options.platform ?? process.platform;
-    if (platform === "linux")
-        return installSystemdService(options);
-    if (platform === "darwin")
-        return installLaunchdService(options);
-    throw new Error("Only Linux and macOS are supported");
-}
-async function installSystemdService(options) {
-    if (!(await commandExists("systemctl"))) {
-        throw new Error("systemctl is required to install the user service");
-    }
-    const user = options.user ?? process.env.USER ?? userInfo().username;
-    await ensureSystemdUserLinger(user);
-    const servicePath = join(process.env.HOME ?? "", ".config", "systemd", "user", `${serviceName}.service`);
-    await mkdir(dirname(servicePath), { recursive: true, mode: 0o700 });
-    await writeFile(servicePath, createSystemdService(options), { mode: 0o600 });
-    await chmod(servicePath, 0o600);
-    await runCommand("systemctl", ["--user", "daemon-reload"]);
-    await runCommand("systemctl", ["--user", "enable", "--now", `${serviceName}.service`]);
-    await runCommand("systemctl", ["--user", "restart", `${serviceName}.service`]);
-    return {
-        servicePath,
-        commands: linuxCommands(),
-        warnings: [],
-    };
-}
-async function installLaunchdService(options) {
-    if (!(await commandExists("launchctl"))) {
-        throw new Error("launchctl is required to install the LaunchAgent");
-    }
-    const servicePath = join(process.env.HOME ?? "", "Library", "LaunchAgents", `${launchdLabel}.plist`);
-    await mkdir(dirname(servicePath), { recursive: true, mode: 0o700 });
-    await writeFile(servicePath, createLaunchdPlist(options), { mode: 0o600 });
-    await chmod(servicePath, 0o600);
-    const uid = options.uid ?? process.getuid?.();
-    if (uid === undefined) {
-        throw new Error("Unable to determine current uid for launchctl");
-    }
-    const domain = `gui/${uid}`;
-    await runCommand("launchctl", ["bootout", domain, servicePath], { allowFailure: true });
-    await runCommand("launchctl", ["bootstrap", domain, servicePath]);
-    await runCommand("launchctl", ["kickstart", "-k", `${domain}/${launchdLabel}`]);
-    return {
-        servicePath,
-        commands: darwinCommands(),
-        warnings: [],
-    };
-}
-export function linuxCommands() {
-    return {
-        status: `systemctl --user status ${serviceName}.service`,
-        logs: `journalctl --user -u ${serviceName}.service -n 100 -f`,
-        start: `systemctl --user start ${serviceName}.service`,
-        restart: `systemctl --user restart ${serviceName}.service`,
-        stop: `systemctl --user stop ${serviceName}.service`,
-        uninstall: `systemctl --user disable --now ${serviceName}.service && rm -f ~/.config/systemd/user/${serviceName}.service && systemctl --user daemon-reload`,
-    };
-}
-export function darwinCommands() {
-    const domain = "gui/$(id -u)";
-    const servicePath = `~/Library/LaunchAgents/${launchdLabel}.plist`;
-    return {
-        status: `launchctl print ${domain}/${launchdLabel}`,
-        logs: "tail -f ~/.coding-agent/data/logs/client-service.out.log ~/.coding-agent/data/logs/client-service.err.log",
-        start: `launchctl bootstrap ${domain} ${servicePath}`,
-        restart: `launchctl bootout ${domain} ${servicePath} 2>/dev/null || true; launchctl bootstrap ${domain} ${servicePath}`,
-        stop: `launchctl bootout ${domain} ${servicePath}`,
-        uninstall: `launchctl bootout ${domain} ${servicePath}; rm -f ${servicePath}`,
-    };
-}
-export async function uninstallService(platform = process.platform) {
-    if (platform === "linux") {
-        await runCommand("systemctl", ["--user", "disable", "--now", `${serviceName}.service`], { allowFailure: true });
-        await unlink(join(process.env.HOME ?? "", ".config", "systemd", "user", `${serviceName}.service`)).catch((err) => {
-            if (err.code !== "ENOENT")
-                throw err;
-        });
-        await runCommand("systemctl", ["--user", "daemon-reload"], { allowFailure: true });
-        return;
-    }
-    if (platform === "darwin") {
-        const uid = process.getuid?.();
-        if (uid === undefined) {
-            throw new Error("Unable to determine current uid for launchctl");
-        }
-        const servicePath = join(process.env.HOME ?? "", "Library", "LaunchAgents", `${launchdLabel}.plist`);
-        await runCommand("launchctl", ["bootout", `gui/${uid}`, servicePath], { allowFailure: true });
-        await unlink(servicePath).catch((err) => {
-            if (err.code !== "ENOENT")
-                throw err;
-        });
-        return;
-    }
-    throw new Error("Only Linux and macOS are supported");
-}
+import{access as f,chmod as u,mkdir as d,unlink as m,writeFile as g}from"node:fs/promises";import{userInfo as h}from"node:os";import{dirname as w,join as i}from"node:path";import{runCommand as a}from"./exec.js";const n="coding-agent-client",o="vip.elevo.coding-agent.client";function T(e){return`'${e.replaceAll("'","'\\''")}'`}function $(e){return["[Unit]","Description=Coding Agent Client","After=network-online.target","","[Service]","Type=simple",`ExecStart=${p(e.serviceCommandPath)}`,"Restart=always","RestartSec=5",`WorkingDirectory=${p(e.workspacePath)}`,`Environment=${v("AGENT_CONFIG_PATH",e.configPath)}`,"","[Install]","WantedBy=default.target",""].join(`
+`)}function p(e){return e.replaceAll("\\","\\\\").replaceAll(" ","\\x20")}function v(e,t){return`${e}=${t.replaceAll("\\","\\\\").replaceAll('"','\\"')}`}function l(e){return e.replaceAll("&","&amp;").replaceAll("<","&lt;").replaceAll(">","&gt;").replaceAll('"',"&quot;").replaceAll("'","&apos;")}function E(e){const t=i(e.dataDir,"logs","client-service.out.log"),r=i(e.dataDir,"logs","client-service.err.log");return['<?xml version="1.0" encoding="UTF-8"?>','<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">','<plist version="1.0">',"<dict>","  <key>Label</key>",`  <string>${l(o)}</string>`,"  <key>ProgramArguments</key>","  <array>",`    <string>${l(e.serviceCommandPath)}</string>`,"  </array>","  <key>WorkingDirectory</key>",`  <string>${l(e.workspacePath)}</string>`,"  <key>EnvironmentVariables</key>","  <dict>","    <key>AGENT_CONFIG_PATH</key>",`    <string>${l(e.configPath)}</string>`,"  </dict>","  <key>RunAtLoad</key>","  <true/>","  <key>KeepAlive</key>","  <true/>","  <key>StandardOutPath</key>",`  <string>${l(t)}</string>`,"  <key>StandardErrorPath</key>",`  <string>${l(r)}</string>`,"</dict>","</plist>",""].join(`
+`)}async function c(e){const t=(process.env.PATH??"").split(":").filter(Boolean);for(const r of t)try{return await f(i(r,e)),!0}catch{}return!1}const b={commandExists:c,runCommand:a};async function k(e,t=b){if(!await t.commandExists("loginctl"))throw new Error(`loginctl is required to keep the user service running after logout. Enable linger for ${e} and retry installation.`);if(await y(e,t.runCommand))return;if(console.log(`Enabling login persistence for ${e}`),(await t.runCommand("loginctl",["enable-linger",e],{allowFailure:!0,interactive:!0})).status!==0)throw new Error(`Unable to enable login persistence for ${e}. Run 'sudo loginctl enable-linger ${e}' and retry installation.`);if(!await y(e,t.runCommand))throw new Error(`Login persistence is still disabled for ${e}. Run 'sudo loginctl enable-linger ${e}' and retry installation.`)}async function y(e,t){const r=await t("loginctl",["show-user",e,"-p","Linger"],{allowFailure:!0});return r.status===0&&r.stdout.trim()==="Linger=yes"}async function F(e){const t=e.platform??process.platform;if(t==="linux")return A(e);if(t==="darwin")return L(e);throw new Error("Only Linux and macOS are supported")}async function A(e){if(!await c("systemctl"))throw new Error("systemctl is required to install the user service");const t=e.user??process.env.USER??h().username;await k(t);const r=i(process.env.HOME??"",".config","systemd","user",`${n}.service`);return await d(w(r),{recursive:!0,mode:448}),await g(r,$(e),{mode:384}),await u(r,384),await a("systemctl",["--user","daemon-reload"]),await a("systemctl",["--user","enable","--now",`${n}.service`]),await a("systemctl",["--user","restart",`${n}.service`]),{servicePath:r,commands:P(),warnings:[]}}async function L(e){if(!await c("launchctl"))throw new Error("launchctl is required to install the LaunchAgent");const t=i(process.env.HOME??"","Library","LaunchAgents",`${o}.plist`);await d(w(t),{recursive:!0,mode:448}),await g(t,E(e),{mode:384}),await u(t,384);const r=e.uid??process.getuid?.();if(r===void 0)throw new Error("Unable to determine current uid for launchctl");const s=`gui/${r}`;return await a("launchctl",["bootout",s,t],{allowFailure:!0}),await a("launchctl",["bootstrap",s,t]),await a("launchctl",["kickstart","-k",`${s}/${o}`]),{servicePath:t,commands:x(),warnings:[]}}function P(){return{status:`systemctl --user status ${n}.service`,logs:`journalctl --user -u ${n}.service -n 100 -f`,start:`systemctl --user start ${n}.service`,restart:`systemctl --user restart ${n}.service`,stop:`systemctl --user stop ${n}.service`,uninstall:`systemctl --user disable --now ${n}.service && rm -f ~/.config/systemd/user/${n}.service && systemctl --user daemon-reload`}}function x(){const e="gui/$(id -u)",t=`~/Library/LaunchAgents/${o}.plist`;return{status:`launchctl print ${e}/${o}`,logs:"tail -f ~/.coding-agent/data/logs/client-service.out.log ~/.coding-agent/data/logs/client-service.err.log",start:`launchctl bootstrap ${e} ${t}`,restart:`launchctl bootout ${e} ${t} 2>/dev/null || true; launchctl bootstrap ${e} ${t}`,stop:`launchctl bootout ${e} ${t}`,uninstall:`launchctl bootout ${e} ${t}; rm -f ${t}`}}async function N(e=process.platform){if(e==="linux"){await a("systemctl",["--user","disable","--now",`${n}.service`],{allowFailure:!0}),await m(i(process.env.HOME??"",".config","systemd","user",`${n}.service`)).catch(t=>{if(t.code!=="ENOENT")throw t}),await a("systemctl",["--user","daemon-reload"],{allowFailure:!0});return}if(e==="darwin"){const t=process.getuid?.();if(t===void 0)throw new Error("Unable to determine current uid for launchctl");const r=i(process.env.HOME??"","Library","LaunchAgents",`${o}.plist`);await a("launchctl",["bootout",`gui/${t}`,r],{allowFailure:!0}),await m(r).catch(s=>{if(s.code!=="ENOENT")throw s});return}throw new Error("Only Linux and macOS are supported")}export{E as createLaunchdPlist,$ as createSystemdService,x as darwinCommands,k as ensureSystemdUserLinger,F as installService,o as launchdLabel,P as linuxCommands,n as serviceName,T as shellEscape,N as uninstallService};

package/dist/supervisor.js

@@ -1,282 +1 @@
-import { spawn } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import { createRequire } from "node:module";
-import { dirname, join } from "node:path";
-import { parse } from "yaml";
-import { readFile, unlink } from "node:fs/promises";
-import { readControlSocketPath, startControlServer } from "./control.js";
-import { MaintenanceScheduler } from "./maintenance.js";
-import { readUpgradeChannel } from "./config-file.js";
-import { currentBundledSkillsDir, defaultAgentHomes, installRuntime, syncBundledSkills } from "./runtime.js";
-import { darwinCommands, launchdLabel, linuxCommands, serviceName } from "./service.js";
-import { runCommand } from "./exec.js";
-import { AutoUpgradeScheduler } from "./auto-upgrade.js";
-import { isAgentActivityResponse, } from "@messenger-agent/shared/agent-activity";
-const require = createRequire(import.meta.url);
-export function resolveAgentEntries() {
-    return [
-        { name: "codex", entry: require.resolve("@messenger-agent/codex-agent") },
-        { name: "claude", entry: require.resolve("@messenger-agent/claude-agent") },
-        { name: "workspace", entry: require.resolve("@messenger-agent/messenger-agent") },
-    ];
-}
-function getByPath(root, path) {
-    let value = root;
-    for (const key of path) {
-        if (!value || typeof value !== "object" || Array.isArray(value))
-            return undefined;
-        value = value[key];
-    }
-    return value;
-}
-export async function readWorkspacePathFromConfig(configPath) {
-    const config = parse(await readFile(configPath, "utf8"));
-    const workspaces = getByPath(config, ["workspaces"]);
-    if (Array.isArray(workspaces)) {
-        const firstWorkspace = workspaces.find((workspace) => !!workspace && typeof workspace === "object" && !Array.isArray(workspace) && typeof workspace.path === "string");
-        if (typeof firstWorkspace?.path === "string" && firstWorkspace.path.trim())
-            return firstWorkspace.path;
-    }
-    return dirname(configPath);
-}
-export class AgentSupervisor {
-    options;
-    stopping = false;
-    running;
-    restartBaseMs;
-    restartMaxMs;
-    constructor(options) {
-        this.options = options;
-        this.running = (options.agents ?? resolveAgentEntries()).map((definition) => ({
-            definition,
-            restartAttempts: 0,
-        }));
-        this.restartBaseMs = options.restartBaseMs ?? 1000;
-        this.restartMaxMs = options.restartMaxMs ?? 30000;
-    }
-    start() {
-        for (const agent of this.running)
-            this.startAgent(agent);
-    }
-    async stop() {
-        this.stopping = true;
-        for (const agent of this.running) {
-            if (agent.restartTimer)
-                clearTimeout(agent.restartTimer);
-            agent.process?.kill("SIGTERM");
-        }
-        await Promise.all(this.running
-            .map((agent) => agent.process)
-            .filter((child) => !!child && child.exitCode === null && !child.killed)
-            .map((child) => new Promise((resolve) => {
-            const timer = setTimeout(() => {
-                child.kill("SIGKILL");
-                resolve();
-            }, 8000);
-            child.once("exit", () => {
-                clearTimeout(timer);
-                resolve();
-            });
-        })));
-    }
-    restartAgent(name) {
-        const agent = this.running.find(({ definition }) => definition.name === name);
-        if (!agent)
-            return Promise.reject(new Error(`Agent is not managed by this client: ${name}`));
-        if (agent.restartPromise)
-            return agent.restartPromise;
-        agent.restartPromise = this.restartAgentProcess(agent).finally(() => {
-            agent.restartPromise = undefined;
-        });
-        return agent.restartPromise;
-    }
-    async activityStatus(timeoutMs = 1000) {
-        const [codex, claude] = await Promise.all([
-            this.agentActivityStatus("codex", timeoutMs),
-            this.agentActivityStatus("claude", timeoutMs),
-        ]);
-        const available = [codex, claude].filter((status) => status.available);
-        return {
-            active: available.reduce((sum, status) => sum + status.active, 0),
-            waiting: available.reduce((sum, status) => sum + status.waiting, 0),
-            agents: { codex, claude },
-        };
-    }
-    agentActivityStatus(name, timeoutMs) {
-        const child = this.running.find(({ definition }) => definition.name === name)?.process;
-        if (!child || !child.connected || !child.send) {
-            return Promise.resolve({ available: false, error: `${name} agent is not connected` });
-        }
-        return new Promise((resolve) => {
-            const requestId = randomUUID();
-            const request = { type: "client.activity.request", requestId };
-            let settled = false;
-            const finish = (status) => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(timer);
-                child.off("message", onMessage);
-                resolve(status);
-            };
-            const onMessage = (message) => {
-                if (!isAgentActivityResponse(message) || message.requestId !== requestId || message.agent !== name)
-                    return;
-                finish({ available: true, ...message.snapshot });
-            };
-            const timer = setTimeout(() => finish({ available: false, error: `${name} agent did not respond` }), timeoutMs);
-            child.on("message", onMessage);
-            child.send(request, (err) => {
-                if (err)
-                    finish({ available: false, error: err.message });
-            });
-        });
-    }
-    async restartAgentProcess(agent) {
-        if (agent.restartTimer) {
-            clearTimeout(agent.restartTimer);
-            agent.restartTimer = undefined;
-        }
-        const child = agent.process;
-        if (child && child.exitCode === null && !child.killed) {
-            child.kill("SIGTERM");
-            await waitForExit(child);
-        }
-        if (this.stopping)
-            throw new Error("Client service is stopping");
-        agent.restartAttempts = 0;
-        this.startAgent(agent);
-    }
-    startAgent(agent) {
-        const env = {
-            ...process.env,
-            AGENT_CONFIG_PATH: this.options.configPath,
-        };
-        if (agent.definition.name === "workspace") {
-            delete env.OPENAI_API_KEY;
-            delete env.CODEX_API_KEY;
-            delete env.ANTHROPIC_API_KEY;
-        }
-        const child = (this.options.spawnProcess ?? spawn)(process.execPath, [agent.definition.entry], {
-            cwd: this.options.workspacePath,
-            env,
-            stdio: ["inherit", "inherit", "inherit", "ipc"],
-        });
-        agent.process = child;
-        console.log(`[client] started ${agent.definition.name}-agent pid=${child.pid}`);
-        child.once("exit", (code, signal) => {
-            agent.process = undefined;
-            if (this.stopping || agent.restartPromise)
-                return;
-            const delay = Math.min(this.restartBaseMs * 2 ** agent.restartAttempts, this.restartMaxMs);
-            agent.restartAttempts += 1;
-            console.error(`[client] ${agent.definition.name}-agent exited with code=${code ?? "null"} signal=${signal ?? "null"}; restarting in ${delay}ms`);
-            agent.restartTimer = setTimeout(() => {
-                agent.restartTimer = undefined;
-                this.startAgent(agent);
-            }, delay);
-        });
-    }
-}
-export async function runSupervisor(configPath) {
-    await syncBundledSkills(currentBundledSkillsDir(), defaultAgentHomes());
-    const workspacePath = await readWorkspacePathFromConfig(configPath);
-    const supervisor = new AgentSupervisor({ configPath, workspacePath });
-    const socketPath = await readControlSocketPath(configPath);
-    const maintenance = new MaintenanceScheduler({
-        statePath: join(dirname(socketPath), "maintenance.json"),
-        getActivity: () => supervisor.activityStatus(),
-        execute: (operation, markServiceExit) => executeMaintenanceOperation(operation, configPath, supervisor, markServiceExit),
-    });
-    await maintenance.start();
-    const autoUpgrade = new AutoUpgradeScheduler({
-        statePath: join(dirname(socketPath), "auto-upgrade.json"),
-        maintenance,
-        getChannel: () => readUpgradeChannel(configPath),
-    });
-    await autoUpgrade.start();
-    const controlServer = await startControlServer(socketPath, {
-        restartAgent: (agent) => supervisor.restartAgent(agent),
-        getActivity: () => supervisor.activityStatus(),
-        maintenance,
-    });
-    supervisor.start();
-    const stop = async () => {
-        autoUpgrade.stop();
-        maintenance.stop();
-        await controlServer.close();
-        await supervisor.stop();
-        process.exit(0);
-    };
-    process.once("SIGINT", () => void stop());
-    process.once("SIGTERM", () => void stop());
-}
-async function executeMaintenanceOperation(operation, configPath, supervisor, markServiceExit) {
-    if (operation.type === "upgrade") {
-        await installRuntime({ version: operation.version, configPath });
-        await markServiceExit("restarting");
-        await runServiceCommand(serviceCommands().restart);
-        return;
-    }
-    if (operation.type === "restart" && operation.agent) {
-        await supervisor.restartAgent(operation.agent);
-        return;
-    }
-    if (operation.type === "restart") {
-        await markServiceExit("restarting");
-        await runServiceCommand(serviceCommands().restart);
-        return;
-    }
-    if (operation.type === "stop") {
-        await markServiceExit("stopping");
-        await runServiceCommand(serviceCommands().stop);
-        return;
-    }
-    await markServiceExit("stopping");
-    await uninstallRunningService();
-}
-function serviceCommands() {
-    return process.platform === "darwin" ? darwinCommands() : linuxCommands();
-}
-async function runServiceCommand(command) {
-    const result = await runCommand("/bin/sh", ["-lc", command], { allowFailure: true });
-    if (result.status !== 0)
-        throw new Error(result.stderr || result.stdout || `Service command failed: ${command}`);
-}
-async function uninstallRunningService() {
-    const home = process.env.HOME ?? "";
-    if (process.platform === "linux") {
-        await runCommand("systemctl", ["--user", "disable", `${serviceName}.service`], { allowFailure: true });
-        await unlink(join(home, ".config", "systemd", "user", `${serviceName}.service`)).catch((err) => {
-            if (err.code !== "ENOENT")
-                throw err;
-        });
-        await runCommand("systemctl", ["--user", "daemon-reload"], { allowFailure: true });
-        await runCommand("systemctl", ["--user", "stop", `${serviceName}.service`], { allowFailure: true });
-        return;
-    }
-    if (process.platform === "darwin") {
-        const uid = process.getuid?.();
-        if (uid === undefined)
-            throw new Error("Unable to determine current uid for launchctl");
-        const servicePath = join(home, "Library", "LaunchAgents", `${launchdLabel}.plist`);
-        await unlink(servicePath).catch((err) => {
-            if (err.code !== "ENOENT")
-                throw err;
-        });
-        await runCommand("launchctl", ["bootout", `gui/${uid}/${launchdLabel}`], { allowFailure: true });
-        return;
-    }
-    throw new Error("Only Linux and macOS are supported");
-}
-function waitForExit(child) {
-    return new Promise((resolve) => {
-        const timer = setTimeout(() => {
-            child.kill("SIGKILL");
-        }, 8000);
-        child.once("exit", () => {
-            clearTimeout(timer);
-            resolve();
-        });
-    });
-}
+import{spawn as P}from"node:child_process";import{randomUUID as T}from"node:crypto";import{createRequire as x}from"node:module";import{dirname as d,join as p}from"node:path";import{parse as S}from"yaml";import{readFile as M,unlink as y}from"node:fs/promises";import{readControlSocketPath as E,startControlServer as I}from"./control.js";import{MaintenanceScheduler as C}from"./maintenance.js";import{readUpgradeChannel as $}from"./config-file.js";import{currentBundledSkillsDir as b,defaultAgentHomes as k,installRuntime as N,syncBundledSkills as O}from"./runtime.js";import{darwinCommands as F,launchdLabel as v,linuxCommands as G,serviceName as f}from"./service.js";import{runCommand as l}from"./exec.js";import{AutoUpgradeScheduler as L}from"./auto-upgrade.js";import{isAgentActivityResponse as R}from"@messenger-agent/shared/agent-activity";const w=x(import.meta.url);function _(){return[{name:"codex",entry:w.resolve("@messenger-agent/codex-agent")},{name:"claude",entry:w.resolve("@messenger-agent/claude-agent")},{name:"workspace",entry:w.resolve("@messenger-agent/messenger-agent")}]}function B(s,t){let e=s;for(const r of t){if(!e||typeof e!="object"||Array.isArray(e))return;e=e[r]}return e}async function j(s){const t=S(await M(s,"utf8")),e=B(t,["workspaces"]);if(Array.isArray(e)){const r=e.find(i=>!!i&&typeof i=="object"&&!Array.isArray(i)&&typeof i.path=="string");if(typeof r?.path=="string"&&r.path.trim())return r.path}return d(s)}class q{options;stopping=!1;running;restartBaseMs;restartMaxMs;constructor(t){this.options=t,this.running=(t.agents??_()).map(e=>({definition:e,restartAttempts:0})),this.restartBaseMs=t.restartBaseMs??1e3,this.restartMaxMs=t.restartMaxMs??3e4}start(){for(const t of this.running)this.startAgent(t)}async stop(){this.stopping=!0;for(const t of this.running)t.restartTimer&&clearTimeout(t.restartTimer),t.process?.kill("SIGTERM");await Promise.all(this.running.map(t=>t.process).filter(t=>!!t&&t.exitCode===null&&!t.killed).map(t=>new Promise(e=>{const r=setTimeout(()=>{t.kill("SIGKILL"),e()},8e3);t.once("exit",()=>{clearTimeout(r),e()})})))}restartAgent(t){const e=this.running.find(({definition:r})=>r.name===t);return e?(e.restartPromise||(e.restartPromise=this.restartAgentProcess(e).finally(()=>{e.restartPromise=void 0})),e.restartPromise):Promise.reject(new Error(`Agent is not managed by this client: ${t}`))}async activityStatus(t=1e3){const[e,r]=await Promise.all([this.agentActivityStatus("codex",t),this.agentActivityStatus("claude",t)]),i=[e,r].filter(n=>n.available);return{active:i.reduce((n,a)=>n+a.active,0),waiting:i.reduce((n,a)=>n+a.waiting,0),agents:{codex:e,claude:r}}}agentActivityStatus(t,e){const r=this.running.find(({definition:i})=>i.name===t)?.process;return!r||!r.connected||!r.send?Promise.resolve({available:!1,error:`${t} agent is not connected`}):new Promise(i=>{const n=T(),a={type:"client.activity.request",requestId:n};let u=!1;const c=o=>{u||(u=!0,clearTimeout(A),r.off("message",m),i(o))},m=o=>{!R(o)||o.requestId!==n||o.agent!==t||c({available:!0,...o.snapshot})},A=setTimeout(()=>c({available:!1,error:`${t} agent did not respond`}),e);r.on("message",m),r.send(a,o=>{o&&c({available:!1,error:o.message})})})}async restartAgentProcess(t){t.restartTimer&&(clearTimeout(t.restartTimer),t.restartTimer=void 0);const e=t.process;if(e&&e.exitCode===null&&!e.killed&&(e.kill("SIGTERM"),await H(e)),this.stopping)throw new Error("Client service is stopping");t.restartAttempts=0,this.startAgent(t)}startAgent(t){const e={...process.env,AGENT_CONFIG_PATH:this.options.configPath};t.definition.name==="workspace"&&(delete e.OPENAI_API_KEY,delete e.CODEX_API_KEY,delete e.ANTHROPIC_API_KEY);const r=(this.options.spawnProcess??P)(process.execPath,[t.definition.entry],{cwd:this.options.workspacePath,env:e,stdio:["inherit","inherit","inherit","ipc"]});t.process=r,console.log(`[client] started ${t.definition.name}-agent pid=${r.pid}`),r.once("exit",(i,n)=>{if(t.process=void 0,this.stopping||t.restartPromise)return;const a=Math.min(this.restartBaseMs*2**t.restartAttempts,this.restartMaxMs);t.restartAttempts+=1,console.error(`[client] ${t.definition.name}-agent exited with code=${i??"null"} signal=${n??"null"}; restarting in ${a}ms`),t.restartTimer=setTimeout(()=>{t.restartTimer=void 0,this.startAgent(t)},a)})}}async function nt(s){await O(b(),k());const t=await j(s),e=new q({configPath:s,workspacePath:t}),r=await E(s),i=new C({statePath:p(d(r),"maintenance.json"),getActivity:()=>e.activityStatus(),execute:(c,m)=>U(c,s,e,m)});await i.start();const n=new L({statePath:p(d(r),"auto-upgrade.json"),maintenance:i,getChannel:()=>$(s)});await n.start();const a=await I(r,{restartAgent:c=>e.restartAgent(c),getActivity:()=>e.activityStatus(),maintenance:i});e.start();const u=async()=>{n.stop(),i.stop(),await a.close(),await e.stop(),process.exit(0)};process.once("SIGINT",()=>{u()}),process.once("SIGTERM",()=>{u()})}async function U(s,t,e,r){if(s.type==="upgrade"){await N({version:s.version,configPath:t}),await r("restarting"),await h(g().restart);return}if(s.type==="restart"&&s.agent){await e.restartAgent(s.agent);return}if(s.type==="restart"){await r("restarting"),await h(g().restart);return}if(s.type==="stop"){await r("stopping"),await h(g().stop);return}await r("stopping"),await K()}function g(){return process.platform==="darwin"?F():G()}async function h(s){const t=await l("/bin/sh",["-lc",s],{allowFailure:!0});if(t.status!==0)throw new Error(t.stderr||t.stdout||`Service command failed: ${s}`)}async function K(){const s=process.env.HOME??"";if(process.platform==="linux"){await l("systemctl",["--user","disable",`${f}.service`],{allowFailure:!0}),await y(p(s,".config","systemd","user",`${f}.service`)).catch(t=>{if(t.code!=="ENOENT")throw t}),await l("systemctl",["--user","daemon-reload"],{allowFailure:!0}),await l("systemctl",["--user","stop",`${f}.service`],{allowFailure:!0});return}if(process.platform==="darwin"){const t=process.getuid?.();if(t===void 0)throw new Error("Unable to determine current uid for launchctl");const e=p(s,"Library","LaunchAgents",`${v}.plist`);await y(e).catch(r=>{if(r.code!=="ENOENT")throw r}),await l("launchctl",["bootout",`gui/${t}/${v}`],{allowFailure:!0});return}throw new Error("Only Linux and macOS are supported")}function H(s){return new Promise(t=>{const e=setTimeout(()=>{s.kill("SIGKILL")},8e3);s.once("exit",()=>{clearTimeout(e),t()})})}export{q as AgentSupervisor,j as readWorkspacePathFromConfig,_ as resolveAgentEntries,nt as runSupervisor};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@messenger-agent/client",
-  "version": "0.24.0-alpha.2",
+  "version": "0.24.0-alpha.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
   "dependencies": {
     "cac": "^7.0.0",
     "yaml": "^2.9.0",
-    "@messenger-agent/claude-agent": "0.24.0-alpha.2",
-    "@messenger-agent/messenger-agent": "0.24.0-alpha.2",
-    "@messenger-agent/codex-agent": "0.24.0-alpha.2",
-    "@messenger-agent/shared": "0.24.0-alpha.2"
+    "@messenger-agent/claude-agent": "0.24.0-alpha.4",
+    "@messenger-agent/messenger-agent": "0.24.0-alpha.4",
+    "@messenger-agent/codex-agent": "0.24.0-alpha.4",
+    "@messenger-agent/shared": "0.24.0-alpha.4"
   },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json && node ../../scripts/copy-client-assets.mjs && chmod +x dist/index.js",