@alfe.ai/gateway 0.0.12 → 0.0.14

package/dist/health.js

@@ -3152,7 +3152,16 @@ enumValues({
 object({ gracePeriodDays: number().int().positive().optional() });
 enumValues({
 	Active: "active",
-	Inactive: "inactive",
+	Pending: "pending",
+	Provisioning: "provisioning",
+	Starting: "starting",
+	Running: "running",
+	Stopping: "stopping",
+	Stopped: "stopped",
+	Rebooting: "rebooting",
+	Failing: "failing",
+	Failed: "failed",
+	BillingSuspended: "billing_suspended",
 	Deleted: "deleted"
 });
 enumValues({
@@ -3163,16 +3172,6 @@ enumValues({
 	OpenClaw: "openclaw",
 	NanoClaw: "nanoclaw"
 });
-enumValues({
-	None: "none",
-	Pending: "pending",
-	Provisioning: "provisioning",
-	Running: "running",
-	Stopped: "stopped",
-	Failing: "failing",
-	Failed: "failed",
-	BillingSuspended: "billing_suspended"
-});
 enumValues({
 	Active: "active",
 	Removed: "removed"
@@ -3873,6 +3872,7 @@ var CloudClient = class {
 	onCommand = null;
 	onConnectionChange = null;
 	onServiceRelay = null;
+	onPluginsChanged = null;
 	reconciliationEngine = null;
 	constructor(config) {
 		this.config = config;
@@ -3910,6 +3910,12 @@ var CloudClient = class {
 	* Set the integration manager for reconciliation.
 	* When set, the cloud client will handle DESIRED_STATE messages automatically.
 	*/
+	/**
+	* Set a callback for when plugins change (install/uninstall) — used to restart the runtime.
+	*/
+	setPluginsChangedHandler(handler) {
+		this.onPluginsChanged = handler;
+	}
 	setIntegrationManager(manager) {
 		this.reconciliationEngine = new ReconciliationEngine(manager);
 	}
@@ -4106,6 +4112,7 @@ var CloudClient = class {
 			}, "Cloud: reconciliation complete");
 			const reportMsg = createReconciliationReport(report.results);
 			this.send(reportMsg);
+			if ((report.installed.length > 0 || report.uninstalled.length > 0) && this.onPluginsChanged) this.onPluginsChanged();
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			logger$1.error({ err: message }, "Cloud: reconciliation failed");
@@ -4594,22 +4601,13 @@ function getSystemdServicePath() {
 	return join(homedir(), ".config", "systemd", "user", `${SYSTEMD_SERVICE}.service`);
 }
 /**
-* Resolve the path to the gateway binary.
+* Resolve the alfe CLI path. Globally installed via npm, always in PATH.
 */
-function getGatewayBinPath() {
-	const globalBin = process.env.ALFE_GATEWAY_BIN;
-	if (globalBin) return globalBin;
-	for (const rel of ["../bin/gateway.js", "bin/gateway.js"]) {
-		const candidate = join(import.meta.dirname, rel);
-		if (existsSync(candidate)) return candidate;
-	}
-	return "alfe-gateway";
-}
-function getNodePath() {
+function getAlfeBinPath() {
 	try {
-		return execSync("which node", { encoding: "utf-8" }).trim();
+		return execSync("which alfe", { encoding: "utf-8" }).trim();
 	} catch {
-		return "/usr/local/bin/node";
+		return "alfe";
 	}
 }
 /**
@@ -4624,8 +4622,8 @@ function generateLaunchdPlist() {
   <string>${LAUNCHD_LABEL}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>${getNodePath()}</string>
-    <string>${getGatewayBinPath()}</string>
+    <string>${getAlfeBinPath()}</string>
+    <string>gateway</string>
     <string>daemon</string>
   </array>
   <key>RunAtLoad</key>
@@ -4653,8 +4651,7 @@ function generateLaunchdPlist() {
 * Root users get a system-level unit; non-root get a user-level unit.
 */
 function generateSystemdUnit() {
-	const nodePath = getNodePath();
-	const gatewayBin = getGatewayBinPath();
+	const alfeBin = getAlfeBinPath();
 	const root = isRootUser();
 	const envLines = [
 		"ALFE_MANAGED",
@@ -4668,7 +4665,7 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=${nodePath} ${gatewayBin} daemon
+ExecStart=${alfeBin} gateway daemon
 Restart=always
 RestartSec=10
 Environment=NODE_ENV=production${root ? "\nEnvironment=HOME=/root\nWorkingDirectory=/root" : ""}
@@ -19902,6 +19899,16 @@ var RuntimeProcess = class {
 		});
 	}
 	/**
+	* Restart the runtime process (stop then start with fresh backoff).
+	*/
+	async restart() {
+		log$1.info({ runtime: this.options.runtime }, "Restarting runtime...");
+		await this.stop();
+		this.stopped = false;
+		this.backoffMs = BACKOFF_INITIAL_MS;
+		this.start();
+	}
+	/**
 	* Whether the runtime process is currently running.
 	*/
 	get isRunning() {
@@ -20187,18 +20194,19 @@ async function startDaemon() {
 		const { createProxyServer, DEFAULT_AI_PROXY_PORT } = await import("@alfe.ai/ai-proxy-local");
 		const { getAiServiceUrlFromToken } = await import("@alfe.ai/config");
 		const proxyUrl = getAiServiceUrlFromToken(config.apiKey);
+		const port = DEFAULT_AI_PROXY_PORT ?? 18193;
 		aiProxyServer = createProxyServer({
-			port: DEFAULT_AI_PROXY_PORT,
+			port,
 			apiKey: config.apiKey,
 			proxyUrl
 		});
 		const server = aiProxyServer;
 		await new Promise((resolve, reject) => {
-			server.listen(DEFAULT_AI_PROXY_PORT, "127.0.0.1", () => {
+			server.listen(port, "127.0.0.1", () => {
 				aiProxyRunning = true;
-				aiProxyUrl = `http://127.0.0.1:${String(DEFAULT_AI_PROXY_PORT)}`;
+				aiProxyUrl = `http://127.0.0.1:${String(port)}`;
 				logger$1.info({
-					port: DEFAULT_AI_PROXY_PORT,
+					port,
 					upstream: proxyUrl
 				}, "AI proxy started");
 				resolve();
@@ -20268,6 +20276,14 @@ async function startDaemon() {
 	});
 	const integrationAdapter = new IntegrationManagerAdapter(integrationManager);
 	cloudClient.setIntegrationManager(integrationAdapter);
+	cloudClient.setPluginsChangedHandler(() => {
+		if (runtimeProcess) {
+			logger$1.info("Plugins changed — restarting runtime to load new plugins");
+			runtimeProcess.restart().catch((err) => {
+				logger$1.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to restart runtime");
+			});
+		}
+	});
 	cloudClient.start();
 	logger$1.debug("Cloud client started");
 	if (config.autoStartRuntime && config.runtime) {
@@ -20415,44 +20431,78 @@ async function handleCloudCommand(command) {
 			};
 		}
 	}
-	if (command.command === "daemon.update") {
-		const version = command.payload?.version ?? "latest";
-		if (!isManagedMode()) return {
+	if (command.command === "support.bash") {
+		const payload = command.payload;
+		if (!payload.cmd) return {
 			type: "COMMAND_ACK",
 			commandId: command.commandId,
 			status: "error",
 			result: {
-				code: "NOT_MANAGED",
-				message: "daemon.update is only supported in managed mode"
+				code: "MISSING_CMD",
+				message: "No command provided"
 			}
 		};
+		const workspacePath = Object.values(config.runtimes)[0]?.workspace ?? "~/.openclaw";
 		try {
-			const { spawnUpgradeScript } = await import("./upgrade.js");
-			await spawnUpgradeScript(version);
-			logger$1.info({ version }, "Upgrade script spawned — daemon will restart shortly");
+			const { exec } = await import("child_process");
+			const { promisify } = await import("util");
+			const { stdout, stderr } = await promisify(exec)(payload.cmd, {
+				cwd: workspacePath,
+				timeout: 25e3,
+				maxBuffer: 512 * 1024
+			});
 			return {
 				type: "COMMAND_ACK",
 				commandId: command.commandId,
 				status: "ok",
 				result: {
-					upgrading: true,
-					version
+					stdout: stdout.trim(),
+					stderr: stderr.trim()
 				}
 			};
 		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			logger$1.error({ err: message }, "Failed to spawn upgrade script");
+			const execErr = err;
 			return {
 				type: "COMMAND_ACK",
 				commandId: command.commandId,
 				status: "error",
 				result: {
-					code: "UPGRADE_FAILED",
-					message
+					code: "EXEC_FAILED",
+					stdout: execErr.stdout?.trim() ?? "",
+					stderr: execErr.stderr?.trim() ?? "",
+					message: execErr.message ?? String(err),
+					exitCode: execErr.code
 				}
 			};
 		}
 	}
+	if (command.command === "daemon.update") {
+		const version = command.payload?.version ?? "latest";
+		if (!isManagedMode()) return {
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: "error",
+			result: {
+				code: "NOT_MANAGED",
+				message: "daemon.update is only supported in managed mode"
+			}
+		};
+		setTimeout(() => {
+			import("./upgrade.js").then(({ upgradeAndExit }) => upgradeAndExit(version)).catch((err) => {
+				logger$1.error({ err: err instanceof Error ? err.message : String(err) }, "Upgrade failed");
+				process.exit(1);
+			});
+		}, 500);
+		return {
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: "ok",
+			result: {
+				upgrading: true,
+				version
+			}
+		};
+	}
 	if (command.command === "integration.status") {
 		const payload = command.payload;
 		try {

package/dist/upgrade.js

@@ -1,62 +1,44 @@
 import { n as logger } from "./logger.js";
-import { chmod, writeFile } from "node:fs/promises";
-import { spawn } from "node:child_process";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 //#region src/upgrade.ts
 /**
-* CLI upgrade — spawns a detached shell script to upgrade @alfe.ai/cli.
+* CLI upgrade — runs npm install inline then exits.
 *
-* The daemon process IS the service being upgraded, so it cannot manage the
-* upgrade itself. Instead we:
-*   1. Write a bash script to /tmp
-*   2. Spawn it detached (survives parent death)
-*   3. The script stops the service, upgrades, re-runs setup, and restarts
+* Systemd has Restart=always, so after the daemon exits the service
+* restarts automatically with the new CLI version. No detached scripts,
+* no race conditions.
 *
-* The daemon ACKs the COMMAND before the script runs, so the cloud gets
-* confirmation. After restart the daemon reconnects with the new version.
+* Flow:
+*   1. Daemon ACKs the COMMAND (caller handles this before calling upgrade)
+*   2. npm install -g @alfe.ai/cli@{version} runs as a child process
+*   3. Daemon exits with code 0
+*   4. Systemd restarts the service → new version boots
 */
+const execFileAsync = promisify(execFile);
 /**
-* Spawn a detached upgrade script that will:
-*   1. Wait briefly for the daemon to finish sending its ACK
-*   2. Stop the systemd service
-*   3. Install the target CLI version globally
-*   4. Re-run `alfe setup --managed` to regenerate the systemd unit
-*   5. Start the service again
-*   6. Clean up the script file
+* Upgrade the CLI to a target version and exit.
+* Systemd will restart the daemon with the new version.
 */
-async function spawnUpgradeScript(version) {
-	const scriptPath = `/tmp/alfe-upgrade-${String(Date.now())}.sh`;
-	await writeFile(scriptPath, `#!/bin/bash
-set -euo pipefail
-
-# Wait for daemon to finish sending COMMAND_ACK
-sleep 2
-
-# Stop the gateway service
-systemctl stop alfe-gateway
-
-# Upgrade CLI to target version
-npm install -g @alfe.ai/cli@${version}
-
-# Re-run setup to regenerate systemd unit with new binary path
-alfe setup --managed
-
-# Start the service — daemon will reconnect with new version
-systemctl start alfe-gateway
-
-# Clean up
-rm -f "$0"
-`, "utf-8");
-	await chmod(scriptPath, 493);
-	const child = spawn("bash", [scriptPath], {
-		detached: true,
-		stdio: "ignore"
-	});
-	child.unref();
-	logger.info({
-		scriptPath,
-		version,
-		pid: child.pid
-	}, "Spawned detached upgrade script");
+async function upgradeAndExit(version) {
+	logger.info({ version }, "Upgrading CLI...");
+	try {
+		const { stdout, stderr } = await execFileAsync("npm", [
+			"install",
+			"-g",
+			`@alfe.ai/cli@${version}`
+		], { timeout: 12e4 });
+		if (stdout) logger.debug({ stdout: stdout.trim() }, "npm install stdout");
+		if (stderr) logger.debug({ stderr: stderr.trim() }, "npm install stderr");
+		logger.info({ version }, "CLI upgraded — exiting for systemd restart");
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		logger.error({
+			err: message,
+			version
+		}, "CLI upgrade failed");
+	}
+	process.exit(0);
 }
 //#endregion
-export { spawnUpgradeScript };
+export { upgradeAndExit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/gateway",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Alfe local gateway daemon — persistent control plane for agent integrations",
   "type": "module",
   "bin": {
@@ -22,10 +22,10 @@
     "pino-roll": "^1.2.0",
     "smol-toml": ">=1.6.1",
     "ws": "^8.18.0",
-    "@alfe.ai/ai-proxy-local": "^0.0.2",
-    "@alfe.ai/config": "^0.0.2",
-    "@alfe.ai/doctor": "^0.0.2",
-    "@alfe.ai/integrations": "^0.0.5"
+    "@alfe.ai/ai-proxy-local": "^0.0.4",
+    "@alfe.ai/config": "^0.0.4",
+    "@alfe.ai/doctor": "^0.0.4",
+    "@alfe.ai/integrations": "^0.0.7"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13",