@alfe.ai/gateway 0.9.4 → 0.9.6

package/dist/health.js

@@ -1,21 +1,21 @@
 import { n as logger$1 } from "./logger.js";
 import { a as captureFatal, c as captureRuntimeCrash, d as initAgentSentry, f as setAgentContext, l as captureRuntimeErrorOutput, o as captureIntegrationFailure, s as captureMcpFailure, u as flushSentry } from "./sentry.js";
 import { createRequire } from "node:module";
-import { mkdir, readFile, rename, stat, unlink, writeFile } from "node:fs/promises";
-import { execFile, execSync, spawn } from "node:child_process";
-import { promisify } from "node:util";
+import { chmod, mkdir, readFile, rename, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import pino from "pino";
 import { chmodSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { getEndpointFromToken, readConfig } from "@alfe.ai/config";
 import crypto from "crypto";
+import { AgentApiClient } from "@alfe.ai/agent-api-client";
 import { parse } from "smol-toml";
 import WebSocket from "ws";
-import { createConnection, createServer } from "node:net";
+import { execFile, execSync, spawn } from "node:child_process";
+import { promisify } from "node:util";
 import { ClaudeCodeApplier, ClaudeCodeMcpSync, HermesApplier, HermesMcpSync, IntegrationManager, IntegrationManagerAdapter, McpApplier, NoopOpenClawCliLock, OpenClawApplier, SerialOpenClawCliLock } from "@alfe.ai/integrations";
-import { AgentApiClient } from "@alfe.ai/agent-api-client";
-import { Manager, McpBundler, defaultConnect } from "@alfe.ai/mcp-bundler";
+import { Manager, McpBundler, defaultConnect, serverLaunchFingerprint } from "@alfe.ai/mcp-bundler";
+import { createConnection, createServer } from "node:net";
 import stream, { Readable } from "stream";
 import util, { format } from "util";
 import http from "http";
@@ -94,7 +94,7 @@ const PINNED_OPENCLAW_VERSION = "2026.6.11";
 * `PINNED_OPENCLAW_VERSION` — there is no `services/compute/Dockerfile` mirror to
 * keep in sync.
 */
-const PINNED_CLAUDE_CODE_HOST_VERSION = "0.1.3";
+const PINNED_CLAUDE_CODE_HOST_VERSION = "0.1.6";
 //#endregion
 //#region ../../packages-internal/ids/dist/prefixes.js
 const ID_PREFIXES = {
@@ -110,6 +110,7 @@ const ID_PREFIXES = {
 	promoCode: "prc",
 	promoRedemption: "prr",
 	pendingPromo: "pdp",
+	remoteSession: "rms",
 	webhook: "whk",
 	webhookDelivery: "wdl",
 	onboardingSession: "obs",
@@ -298,7 +299,7 @@ var AlfeApiClient = class {
 	getToken;
 	onAuthFailure;
 	constructor(options) {
-		this.apiBaseUrl = options.apiBaseUrl;
+		this.apiBaseUrl = options.apiBaseUrl.replace(/\/+$/, "");
 		this.getToken = options.getToken;
 		this.onAuthFailure = options.onAuthFailure;
 	}
@@ -315,7 +316,7 @@ var AlfeApiClient = class {
 		try {
 			const url = `${this.apiBaseUrl}${path}`;
 			const headers = new Headers(options?.headers);
-			headers.set("Content-Type", "application/json");
+			if (typeof options?.body === "string" && !headers.has("Content-Type")) headers.set("Content-Type", "application/json");
 			headers.set("x-correlation-id", correlationId());
 			if (!skipAuth) {
 				const token = await this.getToken();
@@ -347,15 +348,24 @@ var AlfeApiClient = class {
 					}
 				};
 			}
-			const body = await res.json();
-			if (!res.ok) return {
-				ok: false,
-				result: {
+			const text = res.status === 204 ? "" : await res.text();
+			let body;
+			if (text) try {
+				body = JSON.parse(text);
+			} catch {
+				body = text;
+			}
+			if (!res.ok) {
+				const errBody = body;
+				return {
 					ok: false,
-					error: body.message || `API error: ${String(res.status)}`,
-					status: res.status
-				}
-			};
+					result: {
+						ok: false,
+						error: (typeof errBody === "object" ? errBody.message : void 0) ?? (typeof body === "string" ? body : `API error: ${String(res.status)}`),
+						status: res.status
+					}
+				};
+			}
 			return {
 				ok: true,
 				res,
@@ -378,6 +388,10 @@ var AlfeApiClient = class {
 	async request(path, options) {
 		const result = await this._fetch(path, options);
 		if (!result.ok) return result.result;
+		if (result.body === void 0) return {
+			ok: true,
+			data: void 0
+		};
 		return {
 			ok: true,
 			data: result.body.data
@@ -392,6 +406,10 @@ var AlfeApiClient = class {
 	async publicRequest(path, options) {
 		const result = await this._fetch(path, options, true);
 		if (!result.ok) return result.result;
+		if (result.body === void 0) return {
+			ok: true,
+			data: void 0
+		};
 		return {
 			ok: true,
 			data: result.body.data
@@ -422,7 +440,9 @@ var AlfeApiClient = class {
 * (both need `readonly [string, ...string[]]`).
 */
 function enumValues(obj) {
-	return Object.values(obj);
+	const values = Object.values(obj);
+	if (values.length === 0) throw new TypeError("enumValues requires at least one value");
+	return values;
 }
 Object.freeze({ status: "aborted" });
 function $constructor(name, initializer, params) {
@@ -4105,6 +4125,12 @@ function refine(fn, _params = {}) {
 function superRefine(fn) {
 	return /* @__PURE__ */ _superRefine(fn);
 }
+//#endregion
+//#region ../../packages-internal/types/dist/lib/usd.js
+function isWholeUsdCentAmount(amountUsd) {
+	const roundedCents = Math.round(amountUsd * 100);
+	return Math.abs(amountUsd - roundedCents / 100) < 1e-9;
+}
 enumValues({
 	Active: "active",
 	PastDue: "past_due",
@@ -4133,6 +4159,7 @@ enumValues({
 	Month: "month",
 	Year: "year"
 });
+number().min(0).max(1e6).refine(isWholeUsdCentAmount, "Stripe price amounts cannot contain fractional cents");
 object({
 	gracePeriodDays: number().int().positive().optional(),
 	launchDiscountEnabled: boolean().optional()
@@ -4268,6 +4295,7 @@ enumValues({
 	Completed: "completed",
 	Failed: "failed"
 });
+number().min(.01).max(1e6).refine(isWholeUsdCentAmount, "discountAmountUsd cannot contain fractional cents");
 enumValues({
 	BalanceCredit: "balance_credit",
 	SubscriptionDiscount: "subscription_discount",
@@ -4448,7 +4476,7 @@ _enum(XAI_MODELS);
 _enum(ZHIPU_MODELS);
 _enum(MOONSHOT_MODELS);
 _enum(QWEN_MODELS);
-string().min(1);
+string().trim().min(1);
 AnthropicModel.Opus5, AnthropicModel.Opus48, AnthropicModel.Opus47, AnthropicModel.Opus46, AnthropicModel.Sonnet5, AnthropicModel.Sonnet46, AnthropicModel.Haiku45, OpenAIModel.GPT4o, OpenAIModel.GPT4oMini, OpenAIModel.O3, OpenAIModel.GPT41, OpenAIModel.GPT41Mini, OpenAIModel.GPT41Nano, OpenAIModel.GPT54, OpenAIModel.GPT54Mini, OpenAIModel.GPT54Nano, OpenAIModel.GPT54Pro, OpenAIModel.GPT55, OpenAIModel.GPT55Pro, OpenAIModel.GPT56Sol, OpenAIModel.GPT56Terra, OpenAIModel.GPT56Luna, OpenAIModel.O3Mini, OpenAIModel.O4Mini, OpenAIModel.TextEmbedding3Small, OpenAIModel.TextEmbedding3Large, DeepSeekModel.Chat, DeepSeekModel.Reasoner, DeepSeekModel.V4Flash, DeepSeekModel.V4Pro, GoogleModel.Gemini35Flash, GoogleModel.Gemini31Pro, GoogleModel.Gemini31FlashLite, GoogleModel.Gemini25Pro, GoogleModel.Gemini25Flash, GoogleModel.Gemini25FlashLite, GoogleModel.Gemini20Flash, MiniMaxModel.M3, MiniMaxModel.M27, MiniMaxModel.M27HighSpeed, MiniMaxModel.M25, MiniMaxModel.M21, MiniMaxModel.M2, MistralModel.Large, MistralModel.Medium, MistralModel.Small, MistralModel.Codestral, MistralModel.Ministral8b, MistralModel.Ministral3b, MistralModel.MagistralMedium, MistralModel.MagistralSmall, MistralModel.DevstralMedium, XAIModel.Grok45, XAIModel.Grok43, XAIModel.Grok4, XAIModel.Grok41Fast, ZhipuModel.GLM52, ZhipuModel.GLM51, ZhipuModel.GLM46, ZhipuModel.GLM45, ZhipuModel.GLM45Air, MoonshotModel.K3, MoonshotModel.K26, MoonshotModel.K27Code, MoonshotModel.K27CodeHighSpeed, QwenModel.Qwen37Max, QwenModel.Qwen37Plus, QwenModel.Qwen36Flash, QwenModel.Qwen35Flash;
 AnthropicModel.Opus5, AnthropicModel.Opus48, AnthropicModel.Opus47, AnthropicModel.Opus46, AnthropicModel.Sonnet5, AnthropicModel.Sonnet46, AnthropicModel.Haiku45, OpenAIModel.GPT4o, OpenAIModel.GPT4oMini, OpenAIModel.O3, OpenAIModel.GPT41, OpenAIModel.GPT41Mini, OpenAIModel.GPT41Nano, OpenAIModel.GPT54, OpenAIModel.GPT54Mini, OpenAIModel.GPT54Nano, OpenAIModel.GPT54Pro, OpenAIModel.GPT55, OpenAIModel.GPT55Pro, OpenAIModel.GPT56Sol, OpenAIModel.GPT56Terra, OpenAIModel.GPT56Luna, OpenAIModel.O3Mini, OpenAIModel.O4Mini, OpenAIModel.TextEmbedding3Small, OpenAIModel.TextEmbedding3Large, DeepSeekModel.Chat, DeepSeekModel.Reasoner, DeepSeekModel.V4Flash, DeepSeekModel.V4Pro, GoogleModel.Gemini35Flash, GoogleModel.Gemini31Pro, GoogleModel.Gemini31FlashLite, GoogleModel.Gemini25Pro, GoogleModel.Gemini25Flash, GoogleModel.Gemini25FlashLite, GoogleModel.Gemini20Flash, MiniMaxModel.M3, MiniMaxModel.M27, MiniMaxModel.M27HighSpeed, MiniMaxModel.M25, MiniMaxModel.M21, MiniMaxModel.M2, MistralModel.Large, MistralModel.Medium, MistralModel.Small, MistralModel.Codestral, MistralModel.Ministral8b, MistralModel.Ministral3b, MistralModel.MagistralMedium, MistralModel.MagistralSmall, MistralModel.DevstralMedium, XAIModel.Grok45, XAIModel.Grok43, XAIModel.Grok4, XAIModel.Grok41Fast, ZhipuModel.GLM52, ZhipuModel.GLM51, ZhipuModel.GLM46, ZhipuModel.GLM45, ZhipuModel.GLM45Air, MoonshotModel.K3, MoonshotModel.K26, MoonshotModel.K27Code, MoonshotModel.K27CodeHighSpeed, QwenModel.Qwen37Max, QwenModel.Qwen37Plus, QwenModel.Qwen36Flash, QwenModel.Qwen35Flash;
 enumValues({
@@ -4553,7 +4581,7 @@ const RecipientStrategy = {
 	TenantAdmins: "tenant_admins",
 	SpecificUser: "specific_user"
 };
-NotificationType.PaymentSucceeded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PaymentFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.TopUpCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AutoRechargeCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AutoRechargeFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.SubscriptionCreated, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.SubscriptionCancelled, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.StartupGrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.GrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.EnterpriseGrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.SubscriptionPastDue, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.BalanceThresholdWarning, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PlatformTierPriceIncrease, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AgentCreated, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentProvisionFailed, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentBillingSuspended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentDisconnectedExtended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.BrowserTakeoverRequested, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.InviteCreated, NotificationCategory.System, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationType.OrgClaimed, NotificationCategory.System, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.TeamMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.ProjectMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.IntegrationInstalled, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.IntegrationRemoved, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push;
+NotificationType.PaymentSucceeded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PaymentFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.TopUpCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AutoRechargeCompleted, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AutoRechargeFailed, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.SubscriptionCreated, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.SubscriptionCancelled, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.StartupGrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.GrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.EnterpriseGrantEnded, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.SubscriptionPastDue, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationChannel.Sms, NotificationType.BalanceThresholdWarning, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.PlatformTierPriceIncrease, NotificationCategory.Billing, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.AgentCreated, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentProvisionFailed, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentBillingSuspended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.AgentDisconnectedExtended, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.BrowserTakeoverRequested, NotificationCategory.Agents, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.InviteCreated, NotificationCategory.System, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationType.OrgClaimed, NotificationCategory.System, RecipientStrategy.TenantAdmins, NotificationChannel.Email, NotificationChannel.Push, NotificationType.TeamMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.ProjectMemberAdded, NotificationCategory.Team, RecipientStrategy.SpecificUser, NotificationChannel.Email, NotificationChannel.Push, NotificationType.IntegrationInstalled, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push, NotificationType.IntegrationRemoved, NotificationCategory.Integrations, RecipientStrategy.TenantAdmins, NotificationChannel.Push;
 //#endregion
 //#region ../../packages-internal/api-client/dist/services/auth.js
 var AuthService = class {
@@ -4578,7 +4606,7 @@ var AuthService = class {
 		});
 	}
 	deleteToken(tokenId) {
-		return this.client.request(`${this.prefix}/tokens/${tokenId}`, { method: "DELETE" });
+		return this.client.request(`${this.prefix}/tokens/${encodeURIComponent(tokenId)}`, { method: "DELETE" });
 	}
 	/**
 	* Start a device-code flow. Called by the CLI when the user runs
@@ -4798,6 +4826,12 @@ var IntegrationsService = class {
 	constructor(client) {
 		this.client = client;
 	}
+	agentIntegrationsPath(agentId) {
+		return `/integrations/agents/${encodeURIComponent(agentId)}`;
+	}
+	agentIntegrationPath(agentId, integrationId) {
+		return `${this.agentIntegrationsPath(agentId)}/${encodeURIComponent(integrationId)}`;
+	}
 	listScopedInstalls(scope, scopeId) {
 		const params = new URLSearchParams({
 			scope,
@@ -4846,31 +4880,31 @@ var IntegrationsService = class {
 	}
 	listIntegrations(agentId, options) {
 		const params = new URLSearchParams();
-		if (options?.includeInherited) params.set("includeInherited", "true");
-		if (options?.effective) params.set("effective", "true");
+		if (options?.includeInherited !== void 0) params.set("includeInherited", String(options.includeInherited));
+		if (options?.effective !== void 0) params.set("effective", String(options.effective));
 		const qs = params.toString();
-		return this.client.request(`/integrations/agents/${agentId}${qs ? `?${qs}` : ""}`);
+		return this.client.request(`${this.agentIntegrationsPath(agentId)}${qs ? `?${qs}` : ""}`);
 	}
 	installIntegration(agentId, data) {
-		return this.client.request(`/integrations/agents/${agentId}`, {
+		return this.client.request(this.agentIntegrationsPath(agentId), {
 			method: "POST",
 			body: JSON.stringify(data)
 		});
 	}
 	getIntegrationConfig(agentId, integrationId) {
-		return this.client.request(`/integrations/agents/${agentId}/${integrationId}/config`);
+		return this.client.request(`${this.agentIntegrationPath(agentId, integrationId)}/config`);
 	}
 	updateIntegration(agentId, integrationId, data) {
-		return this.client.request(`/integrations/agents/${agentId}/${integrationId}`, {
+		return this.client.request(this.agentIntegrationPath(agentId, integrationId), {
 			method: "PATCH",
 			body: JSON.stringify(data)
 		});
 	}
 	removeIntegration(agentId, integrationId) {
-		return this.client.request(`/integrations/agents/${agentId}/${integrationId}`, { method: "DELETE" });
+		return this.client.request(this.agentIntegrationPath(agentId, integrationId), { method: "DELETE" });
 	}
 	reinstallIntegration(agentId, integrationId) {
-		return this.client.request(`/integrations/agents/${agentId}/${integrationId}/reinstall`, { method: "POST" });
+		return this.client.request(`${this.agentIntegrationPath(agentId, integrationId)}/reinstall`, { method: "POST" });
 	}
 	/**
 	* Upgrade an integration to the registry's latest version via the fast,
@@ -4879,7 +4913,7 @@ var IntegrationsService = class {
 	* {@link reinstallIntegration}, which is the destructive repair path.
 	*/
 	upgradeIntegration(agentId, integrationId) {
-		return this.client.request(`/integrations/agents/${agentId}/${integrationId}/upgrade`, { method: "POST" });
+		return this.client.request(`${this.agentIntegrationPath(agentId, integrationId)}/upgrade`, { method: "POST" });
 	}
 	getRegistry() {
 		return this.client.request("/integrations/registry");
@@ -4890,17 +4924,16 @@ var IntegrationsService = class {
 			body: JSON.stringify({ agentId })
 		});
 	}
-	getDiscordGuildChannels(guildId) {
-		return this.client.request(`/discord/guilds/${encodeURIComponent(guildId)}/channels`);
-	}
-	listMobileNumbers() {
-		return this.client.request("/mobile/numbers");
+	getDiscordGuildChannels(agentId, guildId) {
+		const query = new URLSearchParams({ agentId });
+		return this.client.request(`/discord/guilds/${encodeURIComponent(guildId)}/channels?${query}`);
 	}
 	searchMobileNumbers(country, query) {
 		const params = new URLSearchParams();
-		if (country) params.set("country", country);
-		if (query) params.set("query", query);
-		return this.client.request(`/mobile/numbers/search?${params}`);
+		if (country !== void 0) params.set("country", country);
+		if (query !== void 0) params.set("query", query);
+		const qs = params.toString();
+		return this.client.request(`/mobile/numbers/search${qs ? `?${qs}` : ""}`);
 	}
 	assignMobileNumber(agentId, phoneNumber, countryCode) {
 		return this.client.request("/mobile/numbers/assign", {
@@ -4921,10 +4954,6 @@ var IntegrationsService = class {
 	getMobileNumber(agentId) {
 		return this.client.request(`/mobile/numbers?agentId=${encodeURIComponent(agentId)}`);
 	}
-	disconnectGoogle(agentId, email) {
-		const query = email ? `?email=${encodeURIComponent(email)}` : "";
-		return this.client.request(`/google/agents/${encodeURIComponent(agentId)}/account${query}`, { method: "DELETE" });
-	}
 	getAtlassianSites(agentId) {
 		return this.client.request(`/atlassian/agents/${encodeURIComponent(agentId)}/sites`);
 	}
@@ -4966,10 +4995,7 @@ const PID_PATH = join(ALFE_DIR, "gateway.pid");
 * Returns agentId (derived from tokenId) and orgId (tenantId).
 */
 async function resolveAgentIdentity(apiKey, apiEndpoint) {
-	logger$1.debug({
-		apiEndpoint,
-		keyPrefix: apiKey.slice(0, 8) + "..."
-	}, "Resolving agent identity...");
+	logger$1.debug({ apiEndpoint }, "Resolving agent identity...");
 	const auth = new AuthService(new AlfeApiClient({
 		apiBaseUrl: apiEndpoint,
 		getToken: () => Promise.resolve(apiKey)
@@ -5065,21 +5091,32 @@ function deriveAgentWorkspace(runtime, home) {
 	if (runtime === "claude-code") return join(home, "workspace");
 	return home;
 }
+const UNSAFE_RECORD_KEYS = new Set([
+	"__proto__",
+	"constructor",
+	"prototype"
+]);
+function isRecord$1(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseRuntimeConfigs(parsed) {
+	if (!isRecord$1(parsed) || !isRecord$1(parsed.runtimes)) return {};
+	const result = {};
+	for (const [name, candidate] of Object.entries(parsed.runtimes)) {
+		if (name.length === 0 || name.length > 128 || UNSAFE_RECORD_KEYS.has(name) || !isRecord$1(candidate) || typeof candidate.workspace !== "string" || candidate.workspace.length === 0 || candidate.workspace.length > 4096) continue;
+		const workspace = candidate.workspace.startsWith("~/") ? join(homedir(), candidate.workspace.slice(2)) : candidate.workspace;
+		result[name] = {
+			workspace,
+			agentWorkspace: deriveAgentWorkspace(name, workspace)
+		};
+	}
+	return result;
+}
 async function loadRuntimeConfigs() {
 	const configPath = join(ALFE_DIR, "config.toml");
 	if (!existsSync(configPath)) return {};
 	try {
-		const runtimes = parse(await readFile(configPath, "utf-8")).runtimes;
-		if (!runtimes) return {};
-		const result = {};
-		for (const [name, cfg] of Object.entries(runtimes)) if (typeof cfg.workspace === "string") {
-			const workspace = cfg.workspace.startsWith("~/") ? join(homedir(), cfg.workspace.slice(2)) : cfg.workspace;
-			result[name] = {
-				workspace,
-				agentWorkspace: deriveAgentWorkspace(name, workspace)
-			};
-		}
-		return result;
+		return parseRuntimeConfigs(parse(await readFile(configPath, "utf-8")));
 	} catch {
 		return {};
 	}
@@ -5204,66 +5241,59 @@ async function loadDaemonConfig() {
 * Returns null if the agent has no template assigned or the fetch fails.
 */
 async function fetchAgentConfig(apiKey, apiEndpoint) {
+	const client = new AgentApiClient({
+		apiKey,
+		apiUrl: apiEndpoint
+	});
+	logger$1.debug({ apiEndpoint }, "Fetching agent workspace config...");
+	let workspace;
 	try {
-		logger$1.debug({ apiEndpoint }, "Fetching agent workspace config...");
-		const wsResponse = await fetch(`${apiEndpoint}/agents/me/workspace`, {
-			method: "GET",
-			headers: { "Authorization": `Bearer ${apiKey}` }
-		});
-		if (!wsResponse.ok) {
-			logger$1.debug({ status: wsResponse.status }, "Workspace config fetch failed");
-			return null;
-		}
-		const wsResult = await wsResponse.json();
-		const templateKey = wsResult.data?.templateKey;
-		const defaultModel = wsResult.data?.defaultModel ?? void 0;
-		const installedFrom = wsResult.data?.installedFrom;
-		if (!templateKey) {
-			logger$1.debug("No templateKey in workspace response");
-			return defaultModel ? {
-				defaultModel,
-				files: {}
-			} : null;
-		}
-		const pinnedVersion = installedFrom?.templateKey === templateKey ? installedFrom.version : void 0;
-		const filesUrl = new URL(`${apiEndpoint}/templates/${encodeURIComponent(templateKey)}/files`);
-		if (pinnedVersion !== void 0) filesUrl.searchParams.set("version", String(pinnedVersion));
-		logger$1.debug({
-			templateKey,
-			version: pinnedVersion
-		}, "Fetching template files...");
-		const filesResponse = await fetch(filesUrl.toString(), {
-			method: "GET",
-			headers: { "Authorization": `Bearer ${apiKey}` }
-		});
-		if (!filesResponse.ok) {
-			logger$1.debug({ status: filesResponse.status }, "Template files fetch failed");
-			return {
-				templateKey,
-				defaultModel,
-				files: {}
-			};
-		}
-		const files = (await filesResponse.json()).data?.files ?? {};
-		const fileCount = Object.keys(files).length;
-		logger$1.debug({
-			templateKey,
-			version: pinnedVersion,
-			fileCount
-		}, "Template files fetched");
+		workspace = await client.getWorkspace();
+	} catch (err) {
+		logger$1.debug({ err: err instanceof Error ? err.message : String(err) }, "Workspace config fetch failed");
+		return null;
+	}
+	const { templateKey, installedFrom } = workspace;
+	const defaultModel = workspace.defaultModel ?? void 0;
+	if (!templateKey) {
+		logger$1.debug("No templateKey in workspace response");
+		return defaultModel ? {
+			defaultModel,
+			files: {}
+		} : null;
+	}
+	const pinnedVersion = installedFrom?.templateKey === templateKey ? installedFrom.version : void 0;
+	logger$1.debug({
+		templateKey,
+		version: pinnedVersion
+	}, "Fetching template files...");
+	let files;
+	try {
+		files = (await client.getTemplateFiles(templateKey, { version: pinnedVersion })).files;
+	} catch (err) {
+		logger$1.debug({ err: err instanceof Error ? err.message : String(err) }, "Template files fetch failed");
 		return {
 			templateKey,
 			defaultModel,
-			files,
-			personaFiles: Object.keys(files)
+			files: {}
 		};
-	} catch (err) {
-		logger$1.debug({ err: err instanceof Error ? err.message : String(err) }, "fetchAgentConfig failed");
-		return null;
 	}
+	logger$1.debug({
+		templateKey,
+		version: pinnedVersion,
+		fileCount: Object.keys(files).length
+	}, "Template files fetched");
+	return {
+		templateKey,
+		defaultModel,
+		files,
+		personaFiles: Object.keys(files)
+	};
 }
 //#endregion
 //#region src/protocol.ts
+/** Maximum size of one newline-delimited local IPC message. */
+const MAX_IPC_MESSAGE_BYTES = 1024 * 1024;
 /**
 * Map a cloud command name to an IPC method name.
 * Cloud commands use dot-notation matching IPC methods.
@@ -5362,23 +5392,56 @@ function parseMessage(raw) {
 		return null;
 	}
 }
+const MAX_DESIRED_INTEGRATIONS = 4096;
+const MAX_CONFIG_VALUES = 512;
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0;
+}
+function isDesiredCustomSource(value) {
+	if (!isRecord(value)) return false;
+	return isNonEmptyString(value.connectionId) && isNonEmptyString(value.manifestRepo) && isNonEmptyString(value.manifestPath) && isNonEmptyString(value.manifestRef) && isNonEmptyString(value.manifestSha) && isNonEmptyString(value.manifestCommit) && isRecord(value.manifest);
+}
+function isDesiredConfig(value) {
+	if (!isRecord(value)) return false;
+	if (!Number.isSafeInteger(value.version) || value.version < 0) return false;
+	if (!isRecord(value.values)) return false;
+	const entries = Object.entries(value.values);
+	return entries.length <= MAX_CONFIG_VALUES && entries.every(([key, configValue]) => key.trim().length > 0 && (typeof configValue === "string" || configValue === null));
+}
+function isDesiredIntegration(value) {
+	if (!isRecord(value)) return false;
+	return isNonEmptyString(value.integrationId) && typeof value.version === "string" && (value.desiredStatus === "active" || value.desiredStatus === "removed") && (value.reinstallRequestedAt === void 0 || typeof value.reinstallRequestedAt === "string") && (value.customSource === void 0 || isDesiredCustomSource(value.customSource));
+}
 /**
 * Type guard: is this a cloud COMMAND message?
 */
 function isCloudCommand(msg) {
-	return typeof msg === "object" && msg !== null && msg.type === "COMMAND" && typeof msg.commandId === "string";
+	if (!isRecord(msg)) return false;
+	return msg.type === "COMMAND" && isNonEmptyString(msg.commandId) && isNonEmptyString(msg.agentId) && isNonEmptyString(msg.command);
 }
 /**
 * Type guard: is this a cloud SERVICE_ACK message?
 */
 function isCloudServiceAck(msg) {
-	return typeof msg === "object" && msg !== null && msg.type === "SERVICE_ACK";
+	return isRecord(msg) && msg.type === "SERVICE_ACK" && (msg.status === "ok" || msg.status === "error");
 }
 /**
 * Type guard: is this a cloud DESIRED_STATE message?
 */
 function isCloudDesiredState(msg) {
-	return typeof msg === "object" && msg !== null && msg.type === "DESIRED_STATE" && Array.isArray(msg.integrations);
+	if (!isRecord(msg) || msg.type !== "DESIRED_STATE" || !Array.isArray(msg.integrations)) return false;
+	if (msg.integrations.length > MAX_DESIRED_INTEGRATIONS) return false;
+	if (msg.config !== void 0 && !isDesiredConfig(msg.config)) return false;
+	const integrationIds = /* @__PURE__ */ new Set();
+	for (const integration of msg.integrations) {
+		if (!isDesiredIntegration(integration)) return false;
+		if (integrationIds.has(integration.integrationId)) return false;
+		integrationIds.add(integration.integrationId);
+	}
+	return true;
 }
 /**
 * Create a RECONCILIATION_REPORT message.
@@ -5411,7 +5474,7 @@ function isCloudPing(msg) {
 * Type guard: is this an IPC request?
 */
 function isIPCRequest(msg) {
-	return typeof msg === "object" && msg !== null && msg.type === "req" && typeof msg.id === "string" && typeof msg.method === "string";
+	return isRecord(msg) && msg.type === "req" && isNonEmptyString(msg.id) && isNonEmptyString(msg.method) && isRecord(msg.params);
 }
 /**
 * Type guard: is this an IPC response?
@@ -5567,7 +5630,20 @@ var ReconciliationEngine = class {
 			localIntegrations = await this.manager.getInstalledIntegrations();
 		} catch (err) {
 			log$5.error({ err }, "Failed to get local integrations");
-			localIntegrations = [];
+			captureIntegrationFailure("_reconciliation", "read_local_state", err);
+			const errorMessage = "Failed to read local integration state; reconciliation skipped";
+			const affectedIds = desiredIntegrations.length > 0 ? desiredIntegrations.map((desired) => desired.integrationId) : ["*"];
+			report.errors.push(...affectedIds.map((integrationId) => ({
+				integrationId,
+				error: errorMessage
+			})));
+			report.results.push(...desiredIntegrations.map((desired) => ({
+				integrationId: desired.integrationId,
+				action: "error",
+				actualStatus: "unknown",
+				errorMessage
+			})));
+			return report;
 		}
 		const localMap = new Map(localIntegrations.map((i) => [i.id, i]));
 		const desiredMap = new Map(desiredIntegrations.map((d) => [d.integrationId, d]));
@@ -5922,6 +5998,7 @@ var CloudClient = class {
 	closed = false;
 	registered = false;
 	pingTimer = null;
+	reconnectTimer = null;
 	lastPong = 0;
 	config;
 	onCommand = null;
@@ -5994,6 +6071,7 @@ var CloudClient = class {
 			agentId: this.config.agentId
 		}, "Cloud client starting...");
 		this.closed = false;
+		if (this.ws || this.reconnectTimer) return;
 		this.doConnect();
 	}
 	/**
@@ -6003,12 +6081,14 @@ var CloudClient = class {
 		logger$1.debug("Cloud client stopping...");
 		this.closed = true;
 		this.stopPingTimer();
+		this.stopReconnectTimer();
 		if (this.ws) {
-			logger$1.debug({ readyState: this.ws.readyState }, "Cloud: closing WebSocket");
+			const ws = this.ws;
+			this.ws = null;
+			logger$1.debug({ readyState: ws.readyState }, "Cloud: closing WebSocket");
 			try {
-				this.ws.close(1e3, "Daemon shutting down");
+				ws.close(1e3, "Daemon shutting down");
 			} catch {}
-			this.ws = null;
 		}
 		this.registered = false;
 		this.reconciling = false;
@@ -6043,35 +6123,45 @@ var CloudClient = class {
 			logger$1.debug("Cloud: doConnect skipped — client is closed");
 			return;
 		}
+		if (this.ws) {
+			logger$1.debug("Cloud: doConnect skipped — connection already exists");
+			return;
+		}
 		logger$1.info({
 			url: this.config.wsUrl,
 			backoffMs: this.backoffMs
 		}, "Connecting to cloud gateway...");
-		logger$1.debug({
-			agentId: this.config.agentId,
-			keyPrefix: this.config.apiKey.slice(0, 12) + "..."
-		}, "Cloud: connection details");
-		this.ws = new WebSocket(this.config.wsUrl, {
+		logger$1.debug({ agentId: this.config.agentId }, "Cloud: connection details");
+		const ws = new WebSocket(this.config.wsUrl, {
 			headers: { authorization: `Bearer ${this.config.apiKey}` },
 			maxPayload: 10 * 1024 * 1024,
 			handshakeTimeout: 1e4
 		});
-		this.ws.on("open", () => {
+		this.ws = ws;
+		ws.on("open", () => {
+			if (this.ws !== ws) return;
 			logger$1.info("Cloud WebSocket connected");
-			logger$1.debug({ readyState: this.ws?.readyState }, "Cloud: WebSocket open, sending registration...");
+			logger$1.debug({ readyState: ws.readyState }, "Cloud: WebSocket open, sending registration...");
 			this.backoffMs = 1e3;
 			this.sendRegister();
 		});
-		this.ws.on("message", (data) => {
+		ws.on("message", (data) => {
+			if (this.ws !== ws) return;
 			const text = Buffer.isBuffer(data) ? data.toString("utf-8") : Buffer.from(data).toString("utf-8");
 			logger$1.debug({ size: text.length }, "Cloud: received message");
 			this.handleMessage(text);
 		});
-		this.ws.on("ping", () => {
+		ws.on("ping", () => {
+			if (this.ws !== ws) return;
 			logger$1.debug("Cloud: received ping, sending pong");
-			this.ws?.pong();
+			ws.pong();
 		});
-		this.ws.on("close", (code, reason) => {
+		ws.on("close", (code, reason) => {
+			if (this.ws !== ws) {
+				logger$1.debug("Cloud: ignoring close from superseded WebSocket");
+				return;
+			}
+			this.ws = null;
 			logger$1.warn({
 				code,
 				reason: reason.toString()
@@ -6081,7 +6171,8 @@ var CloudClient = class {
 			this.onConnectionChange?.(false);
 			this.scheduleReconnect();
 		});
-		this.ws.on("error", (err) => {
+		ws.on("error", (err) => {
+			if (this.ws !== ws) return;
 			logger$1.error({
 				err: err.message,
 				url: this.config.wsUrl
@@ -6128,10 +6219,16 @@ var CloudClient = class {
 		if (ack.status === "ok") {
 			logger$1.info("Cloud: registered successfully ✅");
 			this.registered = true;
+			this.lastPong = Date.now();
 			this.startPingTimer();
 			this.onConnectionChange?.(true);
+		} else if (ack.retryable === false) {
+			logger$1.error({ message: ack.message }, "Cloud: registration rejected — not retrying");
+			this.closed = true;
+			this.stopReconnectTimer();
+			this.ws?.close(1008, "Registration rejected");
 		} else {
-			logger$1.error({ message: ack.message }, "Cloud: registration failed");
+			logger$1.error({ message: ack.message }, "Cloud: registration failed — will retry");
 			this.ws?.close(1008, "Registration rejected");
 		}
 	}
@@ -6261,16 +6358,27 @@ var CloudClient = class {
 			logger$1.debug("Cloud: reconnect skipped — client is closed");
 			return;
 		}
+		if (this.reconnectTimer) {
+			logger$1.debug("Cloud: reconnect already scheduled");
+			return;
+		}
 		const delay = this.backoffMs;
 		this.backoffMs = Math.min(this.backoffMs * 2, 3e4);
 		logger$1.info({
 			delayMs: delay,
 			nextBackoffMs: this.backoffMs
 		}, "Cloud: scheduling reconnect...");
-		setTimeout(() => {
+		this.reconnectTimer = setTimeout(() => {
+			this.reconnectTimer = null;
 			this.doConnect();
 		}, delay);
 	}
+	stopReconnectTimer() {
+		if (this.reconnectTimer) {
+			clearTimeout(this.reconnectTimer);
+			this.reconnectTimer = null;
+		}
+	}
 };
 //#endregion
 //#region src/config-reconciler.ts
@@ -6360,406 +6468,70 @@ var ConfigReconciler = class {
 	}
 };
 //#endregion
-//#region src/ipc-server.ts
-/**
-* IPC Server — Unix socket server for local plugin connections.
-*
-* Plugins connect to ~/.alfe/gateway.sock and speak the IPC protocol:
-*   Request:  { type: 'req', id, method, params }
-*   Response: { id, ok, payload?, error? }
-*   Event:    { type: 'event', event, payload }
-*
-* Each connected plugin registers with its name/version and receives
-* commands from the daemon (forwarded from cloud).
-*/
-var IPCServer = class {
-	server = null;
-	connections = /* @__PURE__ */ new Map();
-	socketPath;
-	requestHandler = null;
-	constructor(socketPath) {
-		this.socketPath = socketPath;
+//#region src/command-queue.ts
+const DEFAULT_TTL_MS$1 = 300 * 1e3;
+const DEFAULT_MAX_PER_SERVICE = 100;
+const DEFAULT_MAX_TOTAL = 1e3;
+var CommandQueue = class {
+	queues = /* @__PURE__ */ new Map();
+	ttlMs;
+	gcTimer = null;
+	constructor(ttlMs = DEFAULT_TTL_MS$1, maxPerService = DEFAULT_MAX_PER_SERVICE, maxTotal = DEFAULT_MAX_TOTAL) {
+		this.maxPerService = maxPerService;
+		this.maxTotal = maxTotal;
+		this.ttlMs = ttlMs;
 	}
 	/**
-	* Set the handler for incoming IPC requests from plugins.
+	* Start periodic garbage collection of expired commands.
 	*/
-	setRequestHandler(handler) {
-		this.requestHandler = handler;
+	startGC(intervalMs = 3e4) {
+		this.stopGC();
+		this.gcTimer = setInterval(() => this.purgeExpired(), intervalMs);
 	}
 	/**
-	* Start listening on the Unix socket.
+	* Stop periodic garbage collection.
 	*/
-	async start() {
-		try {
-			unlinkSync(this.socketPath);
-		} catch {}
-		return new Promise((resolve, reject) => {
-			this.server = createServer((socket) => {
-				this.handleConnection(socket);
-			});
-			this.server.on("error", (err) => {
-				logger$1.error({ err: err.message }, "IPC server error");
-				reject(err);
-			});
-			this.server.listen(this.socketPath, () => {
-				try {
-					chmodSync(this.socketPath, 384);
-				} catch (err) {
-					logger$1.warn({ err }, "Failed to chmod socket");
-				}
-				logger$1.info({ path: this.socketPath }, "IPC server listening");
-				resolve();
-			});
-		});
+	stopGC() {
+		if (this.gcTimer) {
+			clearInterval(this.gcTimer);
+			this.gcTimer = null;
+		}
 	}
 	/**
-	* Stop the IPC server and disconnect all plugins.
+	* Enqueue a command for a specific service.
 	*/
-	async stop() {
-		for (const conn of this.connections.values()) try {
-			this.sendEvent(conn, "daemon.shutdown", { reason: "daemon stopping" });
-			conn.socket.end();
-		} catch {}
-		return new Promise((resolve) => {
-			if (!this.server) {
-				resolve();
-				return;
-			}
-			this.server.close(() => {
-				try {
-					unlinkSync(this.socketPath);
-				} catch {}
-				logger$1.info("IPC server stopped");
-				resolve();
-			});
-			for (const conn of this.connections.values()) conn.socket.destroy();
-			this.connections.clear();
+	enqueue(serviceId, request, commandId) {
+		this.purgeExpired();
+		let queue = this.queues.get(serviceId);
+		if (!queue) {
+			queue = [];
+			this.queues.set(serviceId, queue);
+		}
+		if (queue.length >= this.maxPerService || this.totalPending() >= this.maxTotal) {
+			if (queue.length === 0) this.queues.delete(serviceId);
+			return false;
+		}
+		queue.push({
+			request,
+			queuedAt: Date.now(),
+			commandId
 		});
+		return true;
 	}
 	/**
-	* Send an IPC request to a specific plugin and wait for response.
+	* Drain all pending (non-expired) commands for a service.
+	* Returns them in order and removes them from the queue.
 	*/
-	async sendRequest(pluginId, method, params, timeoutMs = 3e4) {
-		const conn = this.connections.get(pluginId);
-		if (!conn?.info) return {
-			id: "",
-			ok: false,
-			error: {
-				code: "PLUGIN_NOT_CONNECTED",
-				message: `Plugin ${pluginId} not connected`
-			}
-		};
-		const id = pluginConnectionId();
-		const request = {
-			type: "req",
-			id,
-			method,
-			params
-		};
-		return new Promise((resolve, reject) => {
-			const timer = setTimeout(() => {
-				conn.pending.delete(id);
-				resolve({
-					id,
-					ok: false,
-					error: {
-						code: "TIMEOUT",
-						message: `Request ${method} timed out after ${String(timeoutMs)}ms`
-					}
-				});
-			}, timeoutMs);
-			conn.pending.set(id, {
-				resolve,
-				reject,
-				timer
-			});
-			try {
-				conn.socket.write(JSON.stringify(request) + "\n");
-			} catch (err) {
-				clearTimeout(timer);
-				conn.pending.delete(id);
-				resolve({
-					id,
-					ok: false,
-					error: {
-						code: "SEND_FAILED",
-						message: `Failed to send to plugin: ${err instanceof Error ? err.message : String(err)}`
-					}
-				});
-			}
-		});
+	drain(serviceId) {
+		const queue = this.queues.get(serviceId);
+		if (!queue || queue.length === 0) return [];
+		const now = Date.now();
+		const valid = queue.filter((cmd) => now - cmd.queuedAt < this.ttlMs);
+		this.queues.delete(serviceId);
+		return valid;
 	}
 	/**
-	* Send an IPC request to ALL registered plugins.
-	* Returns responses keyed by plugin ID.
-	*/
-	async broadcastRequest(method, params, timeoutMs = 3e4) {
-		const results = /* @__PURE__ */ new Map();
-		const registered = this.getRegisteredPlugins();
-		await Promise.all(registered.map(async ([pluginId]) => {
-			const response = await this.sendRequest(pluginId, method, params, timeoutMs);
-			results.set(pluginId, response);
-		}));
-		return results;
-	}
-	/**
-	* Send an event to a specific plugin (fire-and-forget).
-	*/
-	sendEventToPlugin(pluginId, event, payload) {
-		const conn = this.connections.get(pluginId);
-		if (!conn) return false;
-		return this.sendEvent(conn, event, payload);
-	}
-	/**
-	* Broadcast an event to all connected plugins.
-	*/
-	broadcastEvent(event, payload) {
-		for (const conn of this.connections.values()) if (conn.info) this.sendEvent(conn, event, payload);
-	}
-	/**
-	* Get all registered plugins and their info.
-	*/
-	getRegisteredPlugins() {
-		const plugins = [];
-		for (const [id, conn] of this.connections) if (conn.info) plugins.push([id, conn.info]);
-		return plugins;
-	}
-	/**
-	* Get number of connected plugins (including unregistered).
-	*/
-	get connectionCount() {
-		return this.connections.size;
-	}
-	/**
-	* Get number of registered plugins.
-	*/
-	get registeredCount() {
-		let count = 0;
-		for (const conn of this.connections.values()) if (conn.info) count++;
-		return count;
-	}
-	handleConnection(socket) {
-		const connId = pluginConnectionId();
-		const conn = {
-			id: connId,
-			socket,
-			info: null,
-			buffer: "",
-			pending: /* @__PURE__ */ new Map()
-		};
-		this.connections.set(connId, conn);
-		logger$1.info({ connId }, "IPC: new connection");
-		socket.on("data", (data) => {
-			conn.buffer += data.toString();
-			this.processBuffer(conn);
-		});
-		socket.on("close", () => {
-			logger$1.info({
-				connId,
-				plugin: conn.info?.name
-			}, "IPC: connection closed");
-			for (const [, pending] of conn.pending) {
-				clearTimeout(pending.timer);
-				pending.resolve({
-					id: "",
-					ok: false,
-					error: {
-						code: "DISCONNECTED",
-						message: "Plugin disconnected"
-					}
-				});
-			}
-			this.connections.delete(connId);
-		});
-		socket.on("error", (err) => {
-			logger$1.error({
-				connId,
-				err: err.message
-			}, "IPC: socket error");
-		});
-	}
-	processBuffer(conn) {
-		let newlineIdx;
-		while ((newlineIdx = conn.buffer.indexOf("\n")) !== -1) {
-			const line = conn.buffer.slice(0, newlineIdx).trim();
-			conn.buffer = conn.buffer.slice(newlineIdx + 1);
-			if (!line) continue;
-			let parsed;
-			try {
-				parsed = JSON.parse(line);
-			} catch {
-				logger$1.warn({ connId: conn.id }, "IPC: invalid JSON from plugin");
-				continue;
-			}
-			if (isIPCResponse(parsed)) {
-				this.handlePluginResponse(conn, parsed);
-				continue;
-			}
-			if (isIPCRequest(parsed)) {
-				this.handlePluginRequest(conn, parsed);
-				continue;
-			}
-			logger$1.debug({
-				connId: conn.id,
-				msg: parsed
-			}, "IPC: unhandled message");
-		}
-	}
-	handlePluginResponse(conn, response) {
-		const pending = conn.pending.get(response.id);
-		if (!pending) return;
-		clearTimeout(pending.timer);
-		conn.pending.delete(response.id);
-		pending.resolve(response);
-	}
-	async handlePluginRequest(conn, request) {
-		if (conn.info) conn.info.lastSeen = Date.now();
-		if (request.method === "register") {
-			this.handleRegister(conn, request);
-			return;
-		}
-		if (this.requestHandler) try {
-			const result = await this.requestHandler(request.method, request.params, conn.id);
-			const response = result.ok ? createIPCResponse(request.id, result.payload) : createIPCError(request.id, result.error?.code ?? "UNKNOWN", result.error?.message ?? "Unknown error");
-			this.sendResponse(conn, response);
-		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			this.sendResponse(conn, createIPCError(request.id, "INTERNAL", message));
-		}
-		else this.sendResponse(conn, createIPCError(request.id, "NO_HANDLER", `No handler for method: ${request.method}`));
-	}
-	handleRegister(conn, request) {
-		const { name, version, protocolVersion, capabilities, pid } = request.params;
-		if (!name || !version) {
-			this.sendResponse(conn, createIPCError(request.id, "INVALID_REGISTER", "name and version are required"));
-			return;
-		}
-		if (protocolVersion !== void 0 && protocolVersion !== 1) {
-			this.sendResponse(conn, createIPCError(request.id, "PROTOCOL_MISMATCH", `Unsupported protocol version ${String(protocolVersion)}. Server supports v${String(1)}.`));
-			return;
-		}
-		const staleIds = [];
-		for (const [existingId, existing] of this.connections) if (existingId !== conn.id && existing.info?.name === name) if (pid != null && existing.info.pid === pid) {
-			logger$1.info({
-				staleConnId: existingId,
-				newConnId: conn.id,
-				plugin: name,
-				pid
-			}, "IPC: closing stale duplicate connection (same PID)");
-			existing.socket.destroy();
-			staleIds.push(existingId);
-		} else {
-			logger$1.info({
-				staleConnId: existingId,
-				newConnId: conn.id,
-				plugin: name,
-				oldPid: existing.info.pid,
-				newPid: pid
-			}, "IPC: replacing connection from different process");
-			this.sendEvent(existing, "plugin.replaced", {
-				reason: "Another process registered with the same plugin name",
-				replacedBy: conn.id
-			});
-			existing.socket.end();
-			staleIds.push(existingId);
-		}
-		for (const id of staleIds) this.connections.delete(id);
-		conn.info = {
-			name,
-			version,
-			protocolVersion: protocolVersion ?? 1,
-			capabilities: capabilities ?? [],
-			pid: pid ?? null,
-			connectedAt: Date.now(),
-			lastSeen: Date.now()
-		};
-		logger$1.info({
-			connId: conn.id,
-			plugin: name,
-			version,
-			capabilities
-		}, "IPC: plugin registered");
-		this.sendResponse(conn, createIPCResponse(request.id, {
-			status: "registered",
-			daemonVersion: "0.1.0",
-			protocolVersion: 1
-		}));
-	}
-	sendResponse(conn, response) {
-		try {
-			conn.socket.write(JSON.stringify(response) + "\n");
-		} catch (err) {
-			logger$1.error({
-				connId: conn.id,
-				err
-			}, "IPC: failed to send response");
-		}
-	}
-	sendEvent(conn, event, payload) {
-		try {
-			const msg = createIPCEvent(event, payload);
-			conn.socket.write(JSON.stringify(msg) + "\n");
-			return true;
-		} catch {
-			return false;
-		}
-	}
-};
-//#endregion
-//#region src/command-queue.ts
-const DEFAULT_TTL_MS$1 = 300 * 1e3;
-var CommandQueue = class {
-	queues = /* @__PURE__ */ new Map();
-	ttlMs;
-	gcTimer = null;
-	constructor(ttlMs = DEFAULT_TTL_MS$1) {
-		this.ttlMs = ttlMs;
-	}
-	/**
-	* Start periodic garbage collection of expired commands.
-	*/
-	startGC(intervalMs = 3e4) {
-		this.stopGC();
-		this.gcTimer = setInterval(() => this.purgeExpired(), intervalMs);
-	}
-	/**
-	* Stop periodic garbage collection.
-	*/
-	stopGC() {
-		if (this.gcTimer) {
-			clearInterval(this.gcTimer);
-			this.gcTimer = null;
-		}
-	}
-	/**
-	* Enqueue a command for a specific service.
-	*/
-	enqueue(serviceId, request, commandId) {
-		let queue = this.queues.get(serviceId);
-		if (!queue) {
-			queue = [];
-			this.queues.set(serviceId, queue);
-		}
-		queue.push({
-			request,
-			queuedAt: Date.now(),
-			commandId
-		});
-	}
-	/**
-	* Drain all pending (non-expired) commands for a service.
-	* Returns them in order and removes them from the queue.
-	*/
-	drain(serviceId) {
-		const queue = this.queues.get(serviceId);
-		if (!queue || queue.length === 0) return [];
-		const now = Date.now();
-		const valid = queue.filter((cmd) => now - cmd.queuedAt < this.ttlMs);
-		this.queues.delete(serviceId);
-		return valid;
-	}
-	/**
-	* Get the number of pending commands for a service.
+	* Get the number of pending commands for a service.
 	*/
 	pendingCount(serviceId) {
 		const queue = this.queues.get(serviceId);
@@ -6813,6 +6585,13 @@ var CommandQueue = class {
 */
 const LAUNCHD_LABEL = "ai.alfe.gateway";
 const SYSTEMD_SERVICE = "alfe-gateway";
+const MANAGED_ENV_VARS = [
+	"ALFE_MANAGED",
+	"ALFE_API_KEY",
+	"LOG_LEVEL",
+	"ALFE_CLI_VERSION"
+];
+const execFileAsync$3 = promisify(execFile);
 /**
 * On-disk path for the boot-time self-heal guard script (Linux only).
 * Written next to the systemd unit at setup time and invoked via
@@ -6827,6 +6606,21 @@ function isRootUser() {
 function getSystemdSystemServicePath() {
 	return `/etc/systemd/system/${SYSTEMD_SERVICE}.service`;
 }
+function getManagedEnvironmentPath() {
+	return isRootUser() ? "/etc/alfe/gateway.env" : join(homedir(), ".alfe", "gateway.env");
+}
+function escapeEnvironmentFileValue(value) {
+	if (/[\0\r\n]/.test(value)) throw new Error("Managed environment values cannot contain NUL or newlines");
+	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
+}
+/** @internal exported for unit tests; not re-exported from the barrel. */
+function generateManagedEnvironmentFile() {
+	const lines = MANAGED_ENV_VARS.flatMap((key) => {
+		const value = process.env[key];
+		return value === void 0 ? [] : [`${key}="${escapeEnvironmentFileValue(value)}"`];
+	});
+	return lines.length > 0 ? `${lines.join("\n")}\n` : "";
+}
 function getLaunchdPlistPath() {
 	return join(homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
 }
@@ -6921,7 +6715,7 @@ function generateLaunchdPlist() {
 */
 /** @internal exported for unit tests; not re-exported from the barrel. */
 function generateGuardScript() {
-	const version = process.env.ALFE_CLI_VERSION;
+	const exactVersion = process.env.ALFE_CLI_VERSION?.match(/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/)?.[0];
 	return `#!/bin/sh
 # Alfe CLI boot-time self-heal guard. Auto-generated by 'alfe setup' — do not edit.
 # Repairs an interrupted 'npm install -g @alfe.ai/cli' before the daemon starts,
@@ -6929,7 +6723,7 @@ function generateGuardScript() {
 # Must never wedge boot: every failure path logs and exits 0.
 set -u
 
-TARGET='${version && version.length > 0 ? `@alfe.ai/cli@${version}` : "@alfe.ai/cli@latest"}'
+TARGET='${exactVersion ? `@alfe.ai/cli@${exactVersion}` : "@alfe.ai/cli@latest"}'
 log() { echo "[alfe-cli-guard] $*" >&2; }
 
 # Resolve the alfe bin and its real target (dist/index.js). readlink -f follows
@@ -6993,12 +6787,7 @@ exit 0
 function generateSystemdUnit() {
 	const alfeBin = getAlfeBinPath();
 	const root = isRootUser();
-	const envLines = [
-		"ALFE_MANAGED",
-		"ALFE_API_KEY",
-		"LOG_LEVEL",
-		"ALFE_CLI_VERSION"
-	].filter((key) => process.env[key]).map((key) => `Environment=${key}=${process.env[key] ?? ""}`).join("\n");
+	const managedEnvironmentPath = getManagedEnvironmentPath();
 	return `[Unit]
 Description=Alfe Gateway Daemon
 After=network-online.target
@@ -7017,7 +6806,7 @@ RestartSec=10
 # SIGKILL when the stop timeout expires.
 KillMode=mixed
 Environment=NODE_ENV=production${root ? "\nEnvironment=HOME=/root\nWorkingDirectory=/root" : ""}
-${envLines}
+EnvironmentFile=-${managedEnvironmentPath}
 
 [Install]
 WantedBy=${root ? "multi-user.target" : "default.target"}`;
@@ -7035,6 +6824,19 @@ async function writeGuardScript() {
 	});
 	logger$1.info({ path: guardPath }, "Wrote CLI self-heal guard script");
 }
+async function writeManagedEnvironmentFile() {
+	const environmentPath = getManagedEnvironmentPath();
+	await mkdir(dirname(environmentPath), {
+		recursive: true,
+		mode: 448
+	});
+	await writeFile(environmentPath, generateManagedEnvironmentFile(), {
+		encoding: "utf-8",
+		mode: 384
+	});
+	await chmod(environmentPath, 384);
+	logger$1.info({ path: environmentPath }, "Wrote managed environment file");
+}
 /**
 * Install the service unit for the current platform.
 */
@@ -7098,6 +6900,7 @@ async function installSystemd() {
 	const ctl = root ? "systemctl" : "systemctl --user";
 	if (!root) await mkdir(dir, { recursive: true });
 	await writeGuardScript();
+	await writeManagedEnvironmentFile();
 	await writeFile(unitPath, generateSystemdUnit(), "utf-8");
 	logger$1.info({
 		path: unitPath,
@@ -7123,6 +6926,9 @@ async function uninstallSystemd() {
 	try {
 		await unlink(getGuardScriptPath());
 	} catch {}
+	try {
+		await unlink(getManagedEnvironmentPath());
+	} catch {}
 	try {
 		execSync(`${ctl} daemon-reload`, { stdio: "pipe" });
 	} catch {}
@@ -7217,6 +7023,26 @@ function isServiceInstalled() {
 async function writePidFile() {
 	await writeFile(PID_PATH, String(process.pid), "utf-8");
 }
+/** @internal exported for unit tests; not re-exported from the barrel. */
+function isGatewayDaemonCommand(command) {
+	const normalized = command.replaceAll("\0", " ").replace(/\s+/g, " ").trim();
+	const hasGatewayEntrypoint = /(?:^|[\s/])(?:alfe-gateway|gateway(?:\.js)?)(?:\s|$)/.test(normalized) || /(?:^|\s)alfe(?:\s|$)/.test(normalized) && /(?:^|\s)gateway(?:\s|$)/.test(normalized);
+	const hasDaemonVerb = /(?:^|\s)(?:daemon|start|restart)(?:\s|$)/.test(normalized);
+	return hasGatewayEntrypoint && hasDaemonVerb;
+}
+async function isGatewayDaemonProcess(pid) {
+	try {
+		const { stdout } = await execFileAsync$3("ps", [
+			"-p",
+			String(pid),
+			"-o",
+			"command="
+		], { timeout: 2e3 });
+		return isGatewayDaemonCommand(stdout);
+	} catch {
+		return false;
+	}
+}
 /**
 * Remove the PID file.
 */
@@ -7232,15 +7058,18 @@ async function removePidFile() {
 async function checkExistingDaemon() {
 	if (!existsSync(PID_PATH)) return null;
 	try {
-		const pidStr = await readFile(PID_PATH, "utf-8");
-		const pid = parseInt(pidStr.trim(), 10);
-		if (isNaN(pid)) {
+		const trimmedPid = (await readFile(PID_PATH, "utf-8")).trim();
+		const pid = /^\d+$/.test(trimmedPid) ? Number(trimmedPid) : NaN;
+		if (!Number.isSafeInteger(pid) || pid <= 1) {
 			await removePidFile();
 			return null;
 		}
 		try {
 			process.kill(pid, 0);
-			return pid;
+			if (await isGatewayDaemonProcess(pid)) return pid;
+			logger$1.warn({ pid }, "Ignoring stale daemon PID owned by another process");
+			await removePidFile();
+			return null;
 		} catch {
 			await removePidFile();
 			return null;
@@ -7266,7 +7095,8 @@ async function stopExistingDaemon() {
 				return true;
 			}
 		}
-		process.kill(pid, "SIGKILL");
+		if (await isGatewayDaemonProcess(pid)) process.kill(pid, "SIGKILL");
+		else logger$1.warn({ pid }, "Skipping SIGKILL because daemon PID ownership changed");
 		await removePidFile();
 		return true;
 	} catch {
@@ -7275,176 +7105,1104 @@ async function stopExistingDaemon() {
 	}
 }
 //#endregion
-//#region ../../node_modules/.pnpm/dotenv@17.2.2/node_modules/dotenv/package.json
-var require_package = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	module.exports = {
-		"name": "dotenv",
-		"version": "17.2.2",
-		"description": "Loads environment variables from .env file",
-		"main": "lib/main.js",
-		"types": "lib/main.d.ts",
-		"exports": {
-			".": {
-				"types": "./lib/main.d.ts",
-				"require": "./lib/main.js",
-				"default": "./lib/main.js"
-			},
-			"./config": "./config.js",
-			"./config.js": "./config.js",
-			"./lib/env-options": "./lib/env-options.js",
-			"./lib/env-options.js": "./lib/env-options.js",
-			"./lib/cli-options": "./lib/cli-options.js",
-			"./lib/cli-options.js": "./lib/cli-options.js",
-			"./package.json": "./package.json"
-		},
-		"scripts": {
-			"dts-check": "tsc --project tests/types/tsconfig.json",
-			"lint": "standard",
-			"pretest": "npm run lint && npm run dts-check",
-			"test": "tap run --allow-empty-coverage --disable-coverage --timeout=60000",
-			"test:coverage": "tap run --show-full-coverage --timeout=60000 --coverage-report=text --coverage-report=lcov",
-			"prerelease": "npm test",
-			"release": "standard-version"
-		},
-		"repository": {
-			"type": "git",
-			"url": "git://github.com/motdotla/dotenv.git"
-		},
-		"homepage": "https://github.com/motdotla/dotenv#readme",
-		"funding": "https://dotenvx.com",
-		"keywords": [
-			"dotenv",
-			"env",
-			".env",
-			"environment",
-			"variables",
-			"config",
-			"settings"
-		],
-		"readmeFilename": "README.md",
-		"license": "BSD-2-Clause",
-		"devDependencies": {
-			"@types/node": "^18.11.3",
-			"decache": "^4.6.2",
-			"sinon": "^14.0.1",
-			"standard": "^17.0.0",
-			"standard-version": "^9.5.0",
-			"tap": "^19.2.0",
-			"typescript": "^4.8.4"
-		},
-		"engines": { "node": ">=12" },
-		"browser": { "fs": false }
-	};
-}));
-(/* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$1 = __require("fs");
-	const path$1 = __require("path");
-	const os$1 = __require("os");
-	const crypto$2 = __require("crypto");
-	const version = require_package().version;
-	const TIPS = [
-		"🔐 encrypt with Dotenvx: https://dotenvx.com",
-		"🔐 prevent committing .env to code: https://dotenvx.com/precommit",
-		"🔐 prevent building .env in docker: https://dotenvx.com/prebuild",
-		"📡 observe env with Radar: https://dotenvx.com/radar",
-		"📡 auto-backup env with Radar: https://dotenvx.com/radar",
-		"📡 version env with Radar: https://dotenvx.com/radar",
-		"🛠️  run anywhere with `dotenvx run -- yourcommand`",
-		"⚙️  specify custom .env file path with { path: '/custom/path/.env' }",
-		"⚙️  enable debug logging with { debug: true }",
-		"⚙️  override existing env vars with { override: true }",
-		"⚙️  suppress all logs with { quiet: true }",
-		"⚙️  write to custom object with { processEnv: myObject }",
-		"⚙️  load multiple .env files with { path: ['.env.local', '.env'] }"
-	];
-	function _getRandomTip() {
-		return TIPS[Math.floor(Math.random() * TIPS.length)];
-	}
-	function parseBoolean(value) {
-		if (typeof value === "string") return ![
-			"false",
-			"0",
-			"no",
-			"off",
-			""
-		].includes(value.toLowerCase());
-		return Boolean(value);
+//#region src/ipc-server.ts
+/**
+* IPC Server — Unix socket server for local plugin connections.
+*
+* Plugins connect to ~/.alfe/gateway.sock and speak the IPC protocol:
+*   Request:  { type: 'req', id, method, params }
+*   Response: { id, ok, payload?, error? }
+*   Event:    { type: 'event', event, payload }
+*
+* Each connected plugin registers with its name/version and receives
+* commands from the daemon (forwarded from cloud).
+*/
+var IPCServer = class {
+	server = null;
+	connections = /* @__PURE__ */ new Map();
+	socketPath;
+	requestHandler = null;
+	constructor(socketPath, daemonVersion = "unknown") {
+		this.daemonVersion = daemonVersion;
+		this.socketPath = socketPath;
 	}
-	function supportsAnsi() {
-		return process.stdout.isTTY;
+	/**
+	* Set the handler for incoming IPC requests from plugins.
+	*/
+	setRequestHandler(handler) {
+		this.requestHandler = handler;
 	}
-	function dim(text) {
-		return supportsAnsi() ? `\x1b[2m${text}\x1b[0m` : text;
+	/**
+	* Start listening on the Unix socket.
+	*/
+	async start() {
+		try {
+			unlinkSync(this.socketPath);
+		} catch {}
+		return new Promise((resolve, reject) => {
+			this.server = createServer((socket) => {
+				this.handleConnection(socket);
+			});
+			this.server.on("error", (err) => {
+				logger$1.error({ err: err.message }, "IPC server error");
+				reject(err);
+			});
+			this.server.listen(this.socketPath, () => {
+				try {
+					chmodSync(this.socketPath, 384);
+				} catch (err) {
+					logger$1.warn({ err }, "Failed to chmod socket");
+				}
+				logger$1.info({ path: this.socketPath }, "IPC server listening");
+				resolve();
+			});
+		});
 	}
-	const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
-	function parse(src) {
-		const obj = {};
-		let lines = src.toString();
-		lines = lines.replace(/\r\n?/gm, "\n");
-		let match;
-		while ((match = LINE.exec(lines)) != null) {
-			const key = match[1];
-			let value = match[2] || "";
-			value = value.trim();
-			const maybeQuote = value[0];
-			value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2");
-			if (maybeQuote === "\"") {
-				value = value.replace(/\\n/g, "\n");
-				value = value.replace(/\\r/g, "\r");
+	/**
+	* Stop the IPC server and disconnect all plugins.
+	*/
+	async stop() {
+		for (const conn of this.connections.values()) try {
+			this.sendEvent(conn, "daemon.shutdown", { reason: "daemon stopping" });
+			conn.socket.end();
+		} catch {}
+		return new Promise((resolve) => {
+			if (!this.server) {
+				resolve();
+				return;
 			}
-			obj[key] = value;
-		}
-		return obj;
-	}
-	function _parseVault(options) {
-		options = options || {};
-		const vaultPath = _vaultPath(options);
-		options.path = vaultPath;
-		const result = DotenvModule.configDotenv(options);
-		if (!result.parsed) {
-			const err = /* @__PURE__ */ new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
-			err.code = "MISSING_DATA";
-			throw err;
-		}
-		const keys = _dotenvKey(options).split(",");
-		const length = keys.length;
-		let decrypted;
-		for (let i = 0; i < length; i++) try {
-			const attrs = _instructions(result, keys[i].trim());
-			decrypted = DotenvModule.decrypt(attrs.ciphertext, attrs.key);
-			break;
-		} catch (error) {
-			if (i + 1 >= length) throw error;
-		}
-		return DotenvModule.parse(decrypted);
-	}
-	function _warn(message) {
-		console.error(`[dotenv@${version}][WARN] ${message}`);
-	}
-	function _debug(message) {
-		console.log(`[dotenv@${version}][DEBUG] ${message}`);
-	}
-	function _log(message) {
-		console.log(`[dotenv@${version}] ${message}`);
-	}
-	function _dotenvKey(options) {
-		if (options && options.DOTENV_KEY && options.DOTENV_KEY.length > 0) return options.DOTENV_KEY;
-		if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) return process.env.DOTENV_KEY;
-		return "";
+			this.server.close(() => {
+				try {
+					unlinkSync(this.socketPath);
+				} catch {}
+				logger$1.info("IPC server stopped");
+				resolve();
+			});
+			for (const conn of this.connections.values()) conn.socket.destroy();
+			this.connections.clear();
+		});
 	}
-	function _instructions(result, dotenvKey) {
-		let uri;
-		try {
-			uri = new URL(dotenvKey);
-		} catch (error) {
-			if (error.code === "ERR_INVALID_URL") {
-				const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=development");
-				err.code = "INVALID_DOTENV_KEY";
-				throw err;
-			}
-			throw error;
-		}
-		const key = uri.password;
+	/**
+	* Send an IPC request to a specific plugin and wait for response.
+	*/
+	async sendRequest(pluginId, method, params, timeoutMs = 3e4) {
+		const conn = this.connections.get(pluginId);
+		if (!conn?.info) return {
+			id: "",
+			ok: false,
+			error: {
+				code: "PLUGIN_NOT_CONNECTED",
+				message: `Plugin ${pluginId} not connected`
+			}
+		};
+		const id = pluginConnectionId();
+		const request = {
+			type: "req",
+			id,
+			method,
+			params
+		};
+		return new Promise((resolve, reject) => {
+			const timer = setTimeout(() => {
+				conn.pending.delete(id);
+				resolve({
+					id,
+					ok: false,
+					error: {
+						code: "TIMEOUT",
+						message: `Request ${method} timed out after ${String(timeoutMs)}ms`
+					}
+				});
+			}, timeoutMs);
+			conn.pending.set(id, {
+				resolve,
+				reject,
+				timer
+			});
+			try {
+				conn.socket.write(JSON.stringify(request) + "\n");
+			} catch (err) {
+				clearTimeout(timer);
+				conn.pending.delete(id);
+				resolve({
+					id,
+					ok: false,
+					error: {
+						code: "SEND_FAILED",
+						message: `Failed to send to plugin: ${err instanceof Error ? err.message : String(err)}`
+					}
+				});
+			}
+		});
+	}
+	/**
+	* Send an IPC request to ALL registered plugins.
+	* Returns responses keyed by plugin ID.
+	*/
+	async broadcastRequest(method, params, timeoutMs = 3e4) {
+		const results = /* @__PURE__ */ new Map();
+		const registered = this.getRegisteredPlugins();
+		await Promise.all(registered.map(async ([pluginId]) => {
+			const response = await this.sendRequest(pluginId, method, params, timeoutMs);
+			results.set(pluginId, response);
+		}));
+		return results;
+	}
+	/**
+	* Send an event to a specific plugin (fire-and-forget).
+	*/
+	sendEventToPlugin(pluginId, event, payload) {
+		const conn = this.connections.get(pluginId);
+		if (!conn) return false;
+		return this.sendEvent(conn, event, payload);
+	}
+	/**
+	* Broadcast an event to all connected plugins.
+	*/
+	broadcastEvent(event, payload) {
+		for (const conn of this.connections.values()) if (conn.info) this.sendEvent(conn, event, payload);
+	}
+	/**
+	* Get all registered plugins and their info.
+	*/
+	getRegisteredPlugins() {
+		const plugins = [];
+		for (const [id, conn] of this.connections) if (conn.info) plugins.push([id, conn.info]);
+		return plugins;
+	}
+	/**
+	* Get number of connected plugins (including unregistered).
+	*/
+	get connectionCount() {
+		return this.connections.size;
+	}
+	/**
+	* Get number of registered plugins.
+	*/
+	get registeredCount() {
+		let count = 0;
+		for (const conn of this.connections.values()) if (conn.info) count++;
+		return count;
+	}
+	handleConnection(socket) {
+		const connId = pluginConnectionId();
+		const conn = {
+			id: connId,
+			socket,
+			info: null,
+			buffer: "",
+			pending: /* @__PURE__ */ new Map()
+		};
+		this.connections.set(connId, conn);
+		logger$1.info({ connId }, "IPC: new connection");
+		socket.on("data", (data) => {
+			conn.buffer += data.toString();
+			this.processBuffer(conn);
+			if (Buffer.byteLength(conn.buffer, "utf8") > 1048576) this.closeOversizedConnection(conn);
+		});
+		socket.on("close", () => {
+			logger$1.info({
+				connId,
+				plugin: conn.info?.name
+			}, "IPC: connection closed");
+			for (const [, pending] of conn.pending) {
+				clearTimeout(pending.timer);
+				pending.resolve({
+					id: "",
+					ok: false,
+					error: {
+						code: "DISCONNECTED",
+						message: "Plugin disconnected"
+					}
+				});
+			}
+			this.connections.delete(connId);
+		});
+		socket.on("error", (err) => {
+			logger$1.error({
+				connId,
+				err: err.message
+			}, "IPC: socket error");
+		});
+	}
+	processBuffer(conn) {
+		let newlineIdx;
+		while ((newlineIdx = conn.buffer.indexOf("\n")) !== -1) {
+			const rawLine = conn.buffer.slice(0, newlineIdx);
+			conn.buffer = conn.buffer.slice(newlineIdx + 1);
+			if (Buffer.byteLength(rawLine, "utf8") > 1048576) {
+				this.closeOversizedConnection(conn);
+				return;
+			}
+			const line = rawLine.trim();
+			if (!line) continue;
+			let parsed;
+			try {
+				parsed = JSON.parse(line);
+			} catch {
+				logger$1.warn({ connId: conn.id }, "IPC: invalid JSON from plugin");
+				continue;
+			}
+			if (isIPCResponse(parsed)) {
+				this.handlePluginResponse(conn, parsed);
+				continue;
+			}
+			if (isIPCRequest(parsed)) {
+				this.handlePluginRequest(conn, parsed);
+				continue;
+			}
+			logger$1.debug({
+				connId: conn.id,
+				msg: parsed
+			}, "IPC: unhandled message");
+		}
+	}
+	closeOversizedConnection(conn) {
+		logger$1.warn({
+			connId: conn.id,
+			maxBytes: MAX_IPC_MESSAGE_BYTES
+		}, "IPC: message exceeded size limit — closing connection");
+		conn.buffer = "";
+		conn.socket.destroy();
+	}
+	handlePluginResponse(conn, response) {
+		const pending = conn.pending.get(response.id);
+		if (!pending) return;
+		clearTimeout(pending.timer);
+		conn.pending.delete(response.id);
+		pending.resolve(response);
+	}
+	async handlePluginRequest(conn, request) {
+		if (conn.info) conn.info.lastSeen = Date.now();
+		if (request.method === "register") {
+			this.handleRegister(conn, request);
+			return;
+		}
+		if (this.requestHandler) try {
+			const result = await this.requestHandler(request.method, request.params, conn.id);
+			const response = result.ok ? createIPCResponse(request.id, result.payload) : createIPCError(request.id, result.error?.code ?? "UNKNOWN", result.error?.message ?? "Unknown error");
+			this.sendResponse(conn, response);
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			this.sendResponse(conn, createIPCError(request.id, "INTERNAL", message));
+		}
+		else this.sendResponse(conn, createIPCError(request.id, "NO_HANDLER", `No handler for method: ${request.method}`));
+	}
+	handleRegister(conn, request) {
+		const { name, version, protocolVersion, capabilities, pid } = request.params;
+		const validCapabilities = capabilities === void 0 || Array.isArray(capabilities) && capabilities.length <= 256 && capabilities.every((capability) => typeof capability === "string" && capability.trim().length > 0 && capability.length <= 256);
+		const validPid = pid === void 0 || Number.isSafeInteger(pid) && pid > 0;
+		const validProtocolVersion = protocolVersion === void 0 || Number.isSafeInteger(protocolVersion);
+		if (typeof name !== "string" || name.trim().length === 0 || name.length > 256 || typeof version !== "string" || version.trim().length === 0 || version.length > 256 || !validCapabilities || !validPid || !validProtocolVersion) {
+			this.sendResponse(conn, createIPCError(request.id, "INVALID_REGISTER", "Invalid plugin registration fields"));
+			return;
+		}
+		if (protocolVersion !== void 0 && protocolVersion !== 1) {
+			this.sendResponse(conn, createIPCError(request.id, "PROTOCOL_MISMATCH", `Unsupported protocol version ${String(protocolVersion)}. Server supports v${String(1)}.`));
+			return;
+		}
+		const staleIds = [];
+		for (const [existingId, existing] of this.connections) if (existingId !== conn.id && existing.info?.name === name) if (pid != null && existing.info.pid === pid) {
+			logger$1.info({
+				staleConnId: existingId,
+				newConnId: conn.id,
+				plugin: name,
+				pid
+			}, "IPC: closing stale duplicate connection (same PID)");
+			existing.socket.destroy();
+			staleIds.push(existingId);
+		} else {
+			logger$1.info({
+				staleConnId: existingId,
+				newConnId: conn.id,
+				plugin: name,
+				oldPid: existing.info.pid,
+				newPid: pid
+			}, "IPC: replacing connection from different process");
+			this.sendEvent(existing, "plugin.replaced", {
+				reason: "Another process registered with the same plugin name",
+				replacedBy: conn.id
+			});
+			existing.socket.end();
+			staleIds.push(existingId);
+		}
+		for (const id of staleIds) this.connections.delete(id);
+		conn.info = {
+			name,
+			version,
+			protocolVersion: protocolVersion ?? 1,
+			capabilities: capabilities ? [...capabilities] : [],
+			pid: pid ?? null,
+			connectedAt: Date.now(),
+			lastSeen: Date.now()
+		};
+		logger$1.info({
+			connId: conn.id,
+			plugin: name,
+			version,
+			capabilities
+		}, "IPC: plugin registered");
+		this.sendResponse(conn, createIPCResponse(request.id, {
+			status: "registered",
+			daemonVersion: this.daemonVersion,
+			protocolVersion: 1
+		}));
+	}
+	sendResponse(conn, response) {
+		try {
+			conn.socket.write(JSON.stringify(response) + "\n");
+		} catch (err) {
+			logger$1.error({
+				connId: conn.id,
+				err
+			}, "IPC: failed to send response");
+		}
+	}
+	sendEvent(conn, event, payload) {
+		try {
+			const msg = createIPCEvent(event, payload);
+			conn.socket.write(JSON.stringify(msg) + "\n");
+			return true;
+		} catch {
+			return false;
+		}
+	}
+};
+//#endregion
+//#region src/daemon-bootstrap.ts
+/**
+* Daemon bootstrap helpers — startup ordering, config/version resolution,
+* AI-proxy + IPC server wiring.
+*
+* Extracted from daemon.ts (which remains the orchestrator). These are the
+* standalone pieces of `startDaemon()`: version detection, the one-shot
+* persona-file migration, the AI proxy listener, and the IPC server start.
+*/
+const execFileAsync$2 = promisify(execFile);
+/**
+* Resolve the installed @alfe.ai/cli version.
+*
+* Strategy (in order):
+*   1. ALFE_CLI_VERSION env var (set by CLI entry point when run directly)
+*   2. Walk up from this file to find @alfe.ai/cli/package.json
+*      (works when systemd runs the gateway binary directly, since
+*      the path is .../cli/node_modules/@alfe.ai/gateway/dist/...)
+*/
+async function getCliVersion() {
+	if (process.env.ALFE_CLI_VERSION) return process.env.ALFE_CLI_VERSION;
+	try {
+		const { fileURLToPath } = await import("node:url");
+		const { dirname } = await import("node:path");
+		let dir = dirname(fileURLToPath(import.meta.url));
+		for (let i = 0; i < 10; i++) {
+			const candidate = join(dir, "package.json");
+			try {
+				const raw = await readFile(candidate, "utf-8");
+				const pkg = JSON.parse(raw);
+				if (pkg.name === "@alfe.ai/cli") return pkg.version;
+			} catch {}
+			const parent = dirname(dir);
+			if (parent === dir) break;
+			dir = parent;
+		}
+	} catch {}
+	logger$1.debug("Could not resolve @alfe.ai/cli version");
+}
+/**
+* Per-runtime "print installed version" commands. Local to the gateway — we do
+* NOT import the CLI's `detectRuntime` (`@alfe.ai/gateway` must not depend on
+* `@alfe.ai/cli`). Unknown runtimes resolve to `undefined` (never throw) so the
+* connection-status report degrades gracefully instead of crashing.
+*/
+const RUNTIME_VERSION_COMMANDS = {
+	openclaw: {
+		command: "openclaw",
+		args: ["--version"]
+	},
+	hermes: {
+		command: "hermes",
+		args: ["version"]
+	},
+	"claude-code": {
+		command: "alfe-claude-host",
+		args: ["--version"]
+	}
+};
+/**
+* Pure resolver (exported for tests) — the per-runtime version command, or
+* `undefined` for an unknown runtime.
+*/
+function resolveRuntimeVersionCommand(runtime) {
+	return RUNTIME_VERSION_COMMANDS[runtime];
+}
+/**
+* Resolve the installed runtime version by running the per-runtime version
+* command and returning the trimmed stdout. An unknown runtime (no command in
+* the map) returns `undefined` without spawning — it must never throw.
+*/
+async function getRuntimeVersion(runtime) {
+	const cmd = resolveRuntimeVersionCommand(runtime);
+	if (!cmd) {
+		logger$1.debug({ runtime }, "No version command for runtime — skipping version detection");
+		return;
+	}
+	try {
+		const { stdout } = await execFileAsync$2(cmd.command, cmd.args);
+		return stdout.trim() || void 0;
+	} catch {
+		logger$1.debug({ runtime }, "Could not resolve runtime version");
+		return;
+	}
+}
+/**
+* Flush pino's async transport and exit.
+* process.exit() can drop buffered log lines — this ensures they're written first.
+*/
+async function flushAndExit(code) {
+	await flushSentry();
+	await new Promise((resolve) => {
+		logger$1.flush();
+		setTimeout(resolve, 500);
+	});
+	process.exit(code);
+}
+/**
+* One-shot migration for VMs provisioned before the persona-files-go-in-agent-workspace
+* fix landed. Old behavior wrote SOUL.md/IDENTITY.md/BOOTSTRAP.md/AGENTS.md at the
+* OpenClaw home (e.g. `~/.openclaw/`); the agent reads from the agent workspace
+* (e.g. `~/.openclaw/workspace/`). Move stale copies into place; skip if the
+* workspace already has the file. Idempotent and safe to run on every daemon start.
+*/
+const PERSONA_FILES = [
+	"SOUL.md",
+	"IDENTITY.md",
+	"BOOTSTRAP.md",
+	"AGENTS.md"
+];
+async function migrateLegacyPersonaFiles(home, agentWorkspace) {
+	if (home === agentWorkspace) return;
+	let moved = 0;
+	let skipped = 0;
+	for (const filename of PERSONA_FILES) {
+		const src = join(home, filename);
+		const dst = join(agentWorkspace, filename);
+		try {
+			await stat(src);
+		} catch {
+			continue;
+		}
+		try {
+			await stat(dst);
+			skipped++;
+			continue;
+		} catch {}
+		try {
+			await mkdir(agentWorkspace, { recursive: true });
+			await rename(src, dst);
+			moved++;
+		} catch (err) {
+			logger$1.warn({
+				src,
+				dst,
+				err: err instanceof Error ? err.message : String(err)
+			}, "Persona file migration: rename failed");
+		}
+	}
+	if (moved > 0 || skipped > 0) logger$1.info({
+		home,
+		agentWorkspace,
+		moved,
+		skipped
+	}, "Persona file backfill migration complete");
+}
+/**
+* Start the local AI proxy (before the runtime so LLM requests work
+* immediately). Failure is non-fatal — the daemon starts anyway and LLM
+* requests fail until the proxy is fixed.
+*/
+async function startAiProxy(apiKey) {
+	logger$1.debug("Starting AI proxy...");
+	const handle = {
+		server: null,
+		url: null,
+		running: false
+	};
+	try {
+		const { createProxyServer, DEFAULT_AI_PROXY_PORT } = await import("@alfe.ai/ai-proxy-local");
+		const { getAiServiceUrlFromToken } = await import("@alfe.ai/config");
+		const proxyUrl = getAiServiceUrlFromToken(apiKey);
+		const port = DEFAULT_AI_PROXY_PORT ?? 18193;
+		handle.server = createProxyServer({
+			port,
+			apiKey,
+			proxyUrl
+		});
+		const server = handle.server;
+		await new Promise((resolve, reject) => {
+			server.listen(port, "127.0.0.1", () => {
+				handle.running = true;
+				handle.url = `http://127.0.0.1:${String(port)}`;
+				logger$1.info({
+					port,
+					upstream: proxyUrl
+				}, "AI proxy started");
+				resolve();
+			});
+			server.on("error", reject);
+		});
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		const stack = err instanceof Error ? err.stack : void 0;
+		logger$1.error({
+			err: message,
+			stack
+		}, "Failed to start AI proxy — LLM requests will fail");
+	}
+	return handle;
+}
+/**
+* Start the IPC server (runtime plugins connect via this socket). A failure
+* here is fatal — plugins have no other path to the daemon — so this flushes
+* logs and exits instead of returning.
+*/
+async function startIpcServer(socketPath, requestHandler, daemonVersion) {
+	logger$1.debug({ socketPath }, "Starting IPC server...");
+	const ipcServer = new IPCServer(socketPath, daemonVersion);
+	ipcServer.setRequestHandler(requestHandler);
+	try {
+		await ipcServer.start();
+		logger$1.debug("IPC server started");
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		const stack = err instanceof Error ? err.stack : void 0;
+		logger$1.error({
+			err: message,
+			stack
+		}, "Failed to start IPC server");
+		await flushAndExit(1);
+	}
+	return ipcServer;
+}
+//#endregion
+//#region src/mcp-handlers.ts
+/**
+* Return the daemon-hosted MCP bundler's current namespaced tool catalog.
+* Called by the openclaw-mcp-bundler plugin on every tool-factory invocation;
+* cheap (in-memory snapshot, no I/O).
+*/
+function handleMcpListTools(bundler) {
+	if (!bundler) return {
+		ok: false,
+		error: {
+			code: "MCP_BUNDLER_UNAVAILABLE",
+			message: "MCP bundler not initialized"
+		}
+	};
+	return {
+		ok: true,
+		payload: { tools: bundler.listTools() }
+	};
+}
+/**
+* Observability backstop for the INTEGRATION warm path. `applyForIntegration`
+* registers MCP servers into the store and the daemon warms them silently via
+* the store-change `onChange` hook — so a server that fails its connect (e.g.
+* an MCP server whose backing account/credential wasn't resolvable at warm
+* time, like ctrader-mcp `exit(1)`-ing on empty accounts) leaves NO trace,
+* making the black hole undiagnosable. After a warm, read `bundler.statuses()`
+* and warn once per still-failed server so the failure is visible. These
+* self-heal on the bundler's background retry sweep once the dependency
+* appears. Returns the servers it warned about (for tests / callers).
+*/
+function warnFailedMcpServers(bundler, log, reason) {
+	if (!bundler) return [];
+	const failed = bundler.statuses().filter((s) => !s.connected && s.lastError !== void 0);
+	for (const status of failed) log.warn({
+		server: status.name,
+		reason,
+		consecutiveFailures: status.consecutiveFailures,
+		lastError: status.lastError
+	}, `MCP server "${status.name}" failed to connect: ${status.lastError ?? ""}`);
+	return failed;
+}
+/**
+* Route a tool call to the appropriate MCP child via the daemon-hosted
+* bundler. `name` is the prefixed (`mcp__<server>__<tool>`) name; args is
+* the raw JSON object the LLM produced.
+*/
+/**
+* List every server entry in the alfe bundler store. Lets agents inspect
+* what they've already registered before adding a new one.
+*/
+function handleMcpListServers(manager) {
+	if (!manager) return {
+		ok: false,
+		error: {
+			code: "MCP_MANAGER_UNAVAILABLE",
+			message: "MCP manager not initialized"
+		}
+	};
+	const statuses = manager.serverStatuses ? manager.serverStatuses() : [];
+	const byName = new Map(statuses.map((s) => [s.name, s]));
+	return {
+		ok: true,
+		payload: { servers: manager.listServers().map(({ id, entry }) => ({
+			id,
+			entry: toPublicServerEntry(entry),
+			fingerprint: serverLaunchFingerprint(entry),
+			status: byName.get(id) ?? {
+				name: id,
+				connected: false,
+				toolCount: 0,
+				consecutiveFailures: 0
+			}
+		})) }
+	};
+}
+function toPublicServerEntry(entry) {
+	return {
+		owner: entry.owner,
+		addedAt: entry.addedAt,
+		transport: entry.transport,
+		...entry.version !== void 0 ? { version: entry.version } : {}
+	};
+}
+/**
+* How long the add-confirm probe waits for the freshly-added server to
+* connect before replying. This is effectively the whole budget for
+* `bundler.warmServer`: `Manager.addServer` now reconciles the bundler
+* BEFORE resolving, so the Connection object already exists and
+* `warmServer`'s pre-reconcile is a no-diff cheap pass. Kept well under the
+* plugin caller's 30s IPC timeout. A slower server still connects in the
+* background and surfaces on the next `alfe_mcp_list_tools` — the probe just
+* reports what it saw within the window; a missed connect is re-attempted by
+* the bundler's `retryNeverConnected` sweep.
+*/
+const MCP_ADD_WARM_TIMEOUT_MS = 12e3;
+/**
+* Register a new MCP server in the alfe bundler store on behalf of the agent,
+* then CONFIRM the connect before replying so the agent learns whether the
+* server actually works. Owned as `'manual'` so the agent can later remove it
+* without an expectedOwner conflict — matches what `alfe mcp add` does from the
+* CLI. Registration is durable regardless of the probe outcome: a probe
+* failure (or a runtime with no daemon bundler, e.g. hermes) still returns
+* `ok` with `connected: false`; the store watcher / runtime picks the entry up.
+*/
+async function handleMcpAddServer(params, manager) {
+	if (!manager) return {
+		ok: false,
+		error: {
+			code: "MCP_MANAGER_UNAVAILABLE",
+			message: "MCP manager not initialized"
+		}
+	};
+	const p = params;
+	if (typeof p.id !== "string" || p.id.length === 0) return {
+		ok: false,
+		error: {
+			code: "INVALID_PARAMS",
+			message: "id is required (string)"
+		}
+	};
+	const config = buildServerConfig(p);
+	if (!config) return {
+		ok: false,
+		error: {
+			code: "INVALID_PARAMS",
+			message: "expected either { command, args?, env?, cwd? } for stdio or { url, transport, headers? } for remote"
+		}
+	};
+	try {
+		await manager.addServer(config, {
+			id: p.id,
+			owner: "manual"
+		});
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		logger$1.warn({
+			id: p.id,
+			err: message
+		}, "mcp.add_server failed");
+		return {
+			ok: false,
+			error: {
+				code: "MCP_ADD_FAILED",
+				message
+			}
+		};
+	}
+	let status = null;
+	if (manager.warmServer) try {
+		status = await manager.warmServer(p.id, MCP_ADD_WARM_TIMEOUT_MS);
+	} catch (err) {
+		logger$1.warn({
+			id: p.id,
+			err: err instanceof Error ? err.message : String(err)
+		}, "mcp.add_server warm probe threw");
+	}
+	return {
+		ok: true,
+		payload: {
+			id: p.id,
+			connected: status?.connected ?? false,
+			toolCount: status?.toolCount ?? 0,
+			...status?.lastError !== void 0 ? { error: status.lastError } : {}
+		}
+	};
+}
+function buildServerConfig(p) {
+	if (typeof p.command === "string" && p.command.length > 0) {
+		const cfg = { command: p.command };
+		if (Array.isArray(p.args) && p.args.every((a) => typeof a === "string")) cfg.args = p.args;
+		if (p.env && typeof p.env === "object" && !Array.isArray(p.env)) {
+			const env = {};
+			for (const [k, v] of Object.entries(p.env)) if (typeof v === "string") env[k] = v;
+			cfg.env = env;
+		}
+		if (typeof p.cwd === "string") cfg.cwd = p.cwd;
+		return cfg;
+	}
+	if (typeof p.url === "string" && p.url.length > 0) {
+		const transport = p.transport === "streamable-http" ? "streamable-http" : "sse";
+		const cfg = {
+			url: p.url,
+			transport
+		};
+		if (p.headers && typeof p.headers === "object" && !Array.isArray(p.headers)) {
+			const headers = {};
+			for (const [k, v] of Object.entries(p.headers)) if (typeof v === "string") headers[k] = v;
+			cfg.headers = headers;
+		}
+		return cfg;
+	}
+	return null;
+}
+/**
+* Drop a server entry the agent previously registered. Restricted to
+* `manual`-owned entries so the agent can't accidentally clobber
+* integration-installed or CLI-installed servers (the daemon owns
+* those; the agent can ask the user to uninstall an integration via
+* the dashboard).
+*/
+async function handleMcpRemoveServer(params, manager) {
+	if (!manager) return {
+		ok: false,
+		error: {
+			code: "MCP_MANAGER_UNAVAILABLE",
+			message: "MCP manager not initialized"
+		}
+	};
+	const { id } = params;
+	if (typeof id !== "string" || id.length === 0) return {
+		ok: false,
+		error: {
+			code: "INVALID_PARAMS",
+			message: "id is required (string)"
+		}
+	};
+	try {
+		return {
+			ok: true,
+			payload: { removed: await manager.removeServer(id, { expectedOwner: "manual" }) }
+		};
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		if (message.includes("owned by")) return {
+			ok: false,
+			error: {
+				code: "MCP_OWNER_MISMATCH",
+				message
+			}
+		};
+		logger$1.warn({
+			id,
+			err: message
+		}, "mcp.remove_server failed");
+		return {
+			ok: false,
+			error: {
+				code: "MCP_REMOVE_FAILED",
+				message
+			}
+		};
+	}
+}
+async function handleMcpCallTool(bundler, params) {
+	if (!bundler) return {
+		ok: false,
+		error: {
+			code: "MCP_BUNDLER_UNAVAILABLE",
+			message: "MCP bundler not initialized"
+		}
+	};
+	const { name, args } = params;
+	if (typeof name !== "string" || name.length === 0) return {
+		ok: false,
+		error: {
+			code: "INVALID_PARAMS",
+			message: "name is required (string)"
+		}
+	};
+	try {
+		return {
+			ok: true,
+			payload: await bundler.callTool(name, args)
+		};
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		logger$1.warn({
+			tool: name,
+			err: message
+		}, "mcp.call_tool failed");
+		return {
+			ok: false,
+			error: {
+				code: "MCP_CALL_FAILED",
+				message
+			}
+		};
+	}
+}
+//#endregion
+//#region src/integration-bootstrap.ts
+/**
+* Adapter from `AgentApiClient`'s per-provider methods to the
+* `CredentialsResolver` shape the MCP applier expects. Returns
+* `undefined` for unknown providers and on 404/network error so the
+* applier can skip registration silently (its documented contract).
+*/
+async function fetchProviderCredentials(agentApi, provider, connectionId) {
+	if (connectionId) try {
+		const raw = await agentApi.getConnectionCredentials(connectionId);
+		const fields = { ...raw.providerMetadata ?? {} };
+		if (typeof raw.accessToken === "string" && raw.accessToken.length > 0) try {
+			const bundle = JSON.parse(raw.accessToken);
+			if (bundle && typeof bundle === "object" && !Array.isArray(bundle)) Object.assign(fields, bundle);
+		} catch (err) {
+			logger$1.warn({
+				connectionId,
+				err: err instanceof Error ? err.message : String(err)
+			}, "Custom connection accessToken is not a JSON bundle — exposing as accessToken field");
+			fields.accessToken = raw.accessToken;
+		}
+		return fields;
+	} catch (err) {
+		logger$1.warn({
+			connectionId,
+			err: err instanceof Error ? err.message : String(err)
+		}, "Failed to resolve connection-scoped credentials — MCP server will be skipped");
+		return;
+	}
+	const key = provider.toLowerCase();
+	try {
+		switch (key) {
+			case "atlassian": return await agentApi.getAtlassianCredentials();
+			case "github": return await agentApi.getGithubCredentials();
+			case "xero": return await agentApi.getXeroCredentials();
+			case "notion": return await agentApi.getNotionCredentials();
+			case "myob": return await agentApi.getMYOBCredentials();
+			case "google": return await agentApi.getGoogleCredentials();
+			default:
+				logger$1.warn({ provider }, "Unknown OAuth provider for requires_credentials — MCP server will be skipped");
+				return;
+		}
+	} catch {
+		return;
+	}
+}
+/**
+* Post-reconcile trigger: rebuild the command registry from the manager's
+* active integrations and report the available commands to the cloud
+* gateway. Wired by daemon.ts as the cloud client's
+* `onReconciliationComplete` callback.
+*/
+function reportAvailableCommands(deps) {
+	const { integrationManager, commandRegistry, cloudClient } = deps;
+	try {
+		const activeCommands = integrationManager.getActiveCommands();
+		commandRegistry.clear();
+		for (const { integrationId, commands } of activeCommands) for (const cmd of commands) commandRegistry.register(integrationId, cmd.name, cmd.resolvedPath, cmd.method, cmd.timeoutMs);
+		const commandsMsg = {
+			type: "COMMANDS_AVAILABLE",
+			commands: commandRegistry.listCommands()
+		};
+		cloudClient.sendMessage(commandsMsg);
+		logger$1.info({ commandCount: commandsMsg.commands.length }, "Reported available commands to cloud");
+	} catch (err) {
+		logger$1.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to rebuild command registry");
+	}
+}
+//#endregion
+//#region ../../node_modules/.pnpm/dotenv@17.2.2/node_modules/dotenv/package.json
+var require_package = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	module.exports = {
+		"name": "dotenv",
+		"version": "17.2.2",
+		"description": "Loads environment variables from .env file",
+		"main": "lib/main.js",
+		"types": "lib/main.d.ts",
+		"exports": {
+			".": {
+				"types": "./lib/main.d.ts",
+				"require": "./lib/main.js",
+				"default": "./lib/main.js"
+			},
+			"./config": "./config.js",
+			"./config.js": "./config.js",
+			"./lib/env-options": "./lib/env-options.js",
+			"./lib/env-options.js": "./lib/env-options.js",
+			"./lib/cli-options": "./lib/cli-options.js",
+			"./lib/cli-options.js": "./lib/cli-options.js",
+			"./package.json": "./package.json"
+		},
+		"scripts": {
+			"dts-check": "tsc --project tests/types/tsconfig.json",
+			"lint": "standard",
+			"pretest": "npm run lint && npm run dts-check",
+			"test": "tap run --allow-empty-coverage --disable-coverage --timeout=60000",
+			"test:coverage": "tap run --show-full-coverage --timeout=60000 --coverage-report=text --coverage-report=lcov",
+			"prerelease": "npm test",
+			"release": "standard-version"
+		},
+		"repository": {
+			"type": "git",
+			"url": "git://github.com/motdotla/dotenv.git"
+		},
+		"homepage": "https://github.com/motdotla/dotenv#readme",
+		"funding": "https://dotenvx.com",
+		"keywords": [
+			"dotenv",
+			"env",
+			".env",
+			"environment",
+			"variables",
+			"config",
+			"settings"
+		],
+		"readmeFilename": "README.md",
+		"license": "BSD-2-Clause",
+		"devDependencies": {
+			"@types/node": "^18.11.3",
+			"decache": "^4.6.2",
+			"sinon": "^14.0.1",
+			"standard": "^17.0.0",
+			"standard-version": "^9.5.0",
+			"tap": "^19.2.0",
+			"typescript": "^4.8.4"
+		},
+		"engines": { "node": ">=12" },
+		"browser": { "fs": false }
+	};
+}));
+(/* @__PURE__ */ __commonJSMin(((exports, module) => {
+	const fs$1 = __require("fs");
+	const path$1 = __require("path");
+	const os$1 = __require("os");
+	const crypto$2 = __require("crypto");
+	const version = require_package().version;
+	const TIPS = [
+		"🔐 encrypt with Dotenvx: https://dotenvx.com",
+		"🔐 prevent committing .env to code: https://dotenvx.com/precommit",
+		"🔐 prevent building .env in docker: https://dotenvx.com/prebuild",
+		"📡 observe env with Radar: https://dotenvx.com/radar",
+		"📡 auto-backup env with Radar: https://dotenvx.com/radar",
+		"📡 version env with Radar: https://dotenvx.com/radar",
+		"🛠️  run anywhere with `dotenvx run -- yourcommand`",
+		"⚙️  specify custom .env file path with { path: '/custom/path/.env' }",
+		"⚙️  enable debug logging with { debug: true }",
+		"⚙️  override existing env vars with { override: true }",
+		"⚙️  suppress all logs with { quiet: true }",
+		"⚙️  write to custom object with { processEnv: myObject }",
+		"⚙️  load multiple .env files with { path: ['.env.local', '.env'] }"
+	];
+	function _getRandomTip() {
+		return TIPS[Math.floor(Math.random() * TIPS.length)];
+	}
+	function parseBoolean(value) {
+		if (typeof value === "string") return ![
+			"false",
+			"0",
+			"no",
+			"off",
+			""
+		].includes(value.toLowerCase());
+		return Boolean(value);
+	}
+	function supportsAnsi() {
+		return process.stdout.isTTY;
+	}
+	function dim(text) {
+		return supportsAnsi() ? `\x1b[2m${text}\x1b[0m` : text;
+	}
+	const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
+	function parse(src) {
+		const obj = {};
+		let lines = src.toString();
+		lines = lines.replace(/\r\n?/gm, "\n");
+		let match;
+		while ((match = LINE.exec(lines)) != null) {
+			const key = match[1];
+			let value = match[2] || "";
+			value = value.trim();
+			const maybeQuote = value[0];
+			value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2");
+			if (maybeQuote === "\"") {
+				value = value.replace(/\\n/g, "\n");
+				value = value.replace(/\\r/g, "\r");
+			}
+			obj[key] = value;
+		}
+		return obj;
+	}
+	function _parseVault(options) {
+		options = options || {};
+		const vaultPath = _vaultPath(options);
+		options.path = vaultPath;
+		const result = DotenvModule.configDotenv(options);
+		if (!result.parsed) {
+			const err = /* @__PURE__ */ new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
+			err.code = "MISSING_DATA";
+			throw err;
+		}
+		const keys = _dotenvKey(options).split(",");
+		const length = keys.length;
+		let decrypted;
+		for (let i = 0; i < length; i++) try {
+			const attrs = _instructions(result, keys[i].trim());
+			decrypted = DotenvModule.decrypt(attrs.ciphertext, attrs.key);
+			break;
+		} catch (error) {
+			if (i + 1 >= length) throw error;
+		}
+		return DotenvModule.parse(decrypted);
+	}
+	function _warn(message) {
+		console.error(`[dotenv@${version}][WARN] ${message}`);
+	}
+	function _debug(message) {
+		console.log(`[dotenv@${version}][DEBUG] ${message}`);
+	}
+	function _log(message) {
+		console.log(`[dotenv@${version}] ${message}`);
+	}
+	function _dotenvKey(options) {
+		if (options && options.DOTENV_KEY && options.DOTENV_KEY.length > 0) return options.DOTENV_KEY;
+		if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) return process.env.DOTENV_KEY;
+		return "";
+	}
+	function _instructions(result, dotenvKey) {
+		let uri;
+		try {
+			uri = new URL(dotenvKey);
+		} catch (error) {
+			if (error.code === "ERR_INVALID_URL") {
+				const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=development");
+				err.code = "INVALID_DOTENV_KEY";
+				throw err;
+			}
+			throw error;
+		}
+		const key = uri.password;
 		if (!key) {
 			const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: Missing key part");
 			err.code = "INVALID_DOTENV_KEY";
@@ -22568,7 +23326,7 @@ var RuntimeProcess = class {
 	* Start the runtime process.
 	*/
 	start() {
-		if (this.stopped) return;
+		if (this.stopped || this.child !== null) return;
 		const { command, args } = this.resolveCommand();
 		this.lastStartTime = Date.now();
 		log$3.info({
@@ -22577,7 +23335,7 @@ var RuntimeProcess = class {
 			args,
 			workspace: this.options.workspace
 		}, "Starting runtime process");
-		this.child = spawn(command, args, {
+		const child = spawn(command, args, {
 			cwd: this.options.workspace,
 			env: {
 				...process.env,
@@ -22589,7 +23347,9 @@ var RuntimeProcess = class {
 				"pipe"
 			]
 		});
-		this.child.stdout?.on("data", (data) => {
+		this.child = child;
+		let terminalHandled = false;
+		child.stdout.on("data", (data) => {
 			const lines = data.toString().trim().split("\n");
 			for (const line of lines) {
 				log$3.info({
@@ -22599,7 +23359,7 @@ var RuntimeProcess = class {
 				this.observeLine("stdout", line);
 			}
 		});
-		this.child.stderr?.on("data", (data) => {
+		child.stderr.on("data", (data) => {
 			const lines = data.toString().trim().split("\n");
 			for (const line of lines) {
 				log$3.warn({
@@ -22609,8 +23369,14 @@ var RuntimeProcess = class {
 				this.observeLine("stderr", line);
 			}
 		});
-		this.child.on("exit", (code, signal) => {
-			this.child = null;
+		const handleTermination = (code, signal, spawnError) => {
+			if (terminalHandled) return;
+			terminalHandled = true;
+			if (this.child === child) this.child = null;
+			if (spawnError) log$3.error({
+				runtime: this.options.runtime,
+				err: spawnError.message
+			}, "Runtime process error");
 			if (this.stopped) {
 				log$3.info({
 					runtime: this.options.runtime,
@@ -22619,7 +23385,7 @@ var RuntimeProcess = class {
 				}, "Runtime stopped (expected)");
 				return;
 			}
-			if (code === 0 && signal == null) {
+			if (!spawnError && code === 0 && signal == null) {
 				log$3.info({
 					runtime: this.options.runtime,
 					code
@@ -22634,6 +23400,7 @@ var RuntimeProcess = class {
 				runtime: this.options.runtime,
 				code,
 				signal,
+				spawnError: spawnError?.message,
 				backoffMs: this.backoffMs
 			}, "Runtime crashed — scheduling restart with backoff");
 			const uptime = Date.now() - this.lastStartTime;
@@ -22649,7 +23416,8 @@ var RuntimeProcess = class {
 				signal,
 				uptimeMs: uptime,
 				recentOutput: this.ringBuffer.snapshot(),
-				crashesSuppressed: crash.suppressedCount
+				crashesSuppressed: crash.suppressedCount,
+				...spawnError ? { spawnError } : {}
 			});
 			else log$3.debug({
 				runtime: this.options.runtime,
@@ -22661,23 +23429,12 @@ var RuntimeProcess = class {
 				this.start();
 			}, this.backoffMs);
 			this.backoffMs = Math.min(this.backoffMs * 2, BACKOFF_MAX_MS);
+		};
+		child.on("exit", (code, signal) => {
+			handleTermination(code, signal);
 		});
-		this.child.on("error", (err) => {
-			log$3.error({
-				runtime: this.options.runtime,
-				err: err.message
-			}, "Runtime process error");
-			if (this.stopped) return;
-			const crash = this.throttle.allowCrashCapture(Date.now() - this.lastStartTime);
-			if (crash.allow) captureRuntimeCrash({
-				runtime: this.options.runtime,
-				code: null,
-				signal: null,
-				uptimeMs: Date.now() - this.lastStartTime,
-				recentOutput: this.ringBuffer.snapshot(),
-				crashesSuppressed: crash.suppressedCount,
-				spawnError: err
-			});
+		child.on("error", (err) => {
+			handleTermination(null, null, err);
 		});
 	}
 	/**
@@ -22746,14 +23503,19 @@ var RuntimeProcess = class {
 		const child = this.child;
 		if (!child) return;
 		return new Promise((resolve) => {
+			let settled = false;
+			const finish = () => {
+				if (settled) return;
+				settled = true;
+				clearTimeout(killTimer);
+				resolve();
+			};
 			const killTimer = setTimeout(() => {
 				log$3.warn({ runtime: this.options.runtime }, "Runtime did not exit in time — sending SIGKILL");
 				child.kill("SIGKILL");
 			}, 5e3);
-			child.on("exit", () => {
-				clearTimeout(killTimer);
-				resolve();
-			});
+			child.once("exit", finish);
+			child.once("error", finish);
 			child.kill("SIGTERM");
 		});
 	}
@@ -22925,6 +23687,8 @@ var IpcTurnActivityProbe = class {
 * via ESM dynamic import on first use and cached until the registry is cleared.
 */
 const log$1 = createLogger("CommandRegistry");
+const DEFAULT_COMMAND_TIMEOUT_MS = 3e4;
+const MAX_COMMAND_TIMEOUT_MS = 1800 * 1e3;
 var CommandRegistry = class {
 	commands = /* @__PURE__ */ new Map();
 	version = 0;
@@ -22932,7 +23696,7 @@ var CommandRegistry = class {
 	* Register a command from an integration.
 	* Rejects duplicate command names — first registration wins.
 	*/
-	register(integrationId, name, handlerPath, method = "handle", timeoutMs = 3e4) {
+	register(integrationId, name, handlerPath, method = "handle", timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS) {
 		const existing = this.commands.get(name);
 		if (existing) {
 			log$1.warn({
@@ -22950,12 +23714,13 @@ var CommandRegistry = class {
 			}, "Handler file does not exist — skipping registration");
 			return;
 		}
+		const boundedTimeoutMs = Number.isSafeInteger(timeoutMs) && timeoutMs > 0 ? Math.min(timeoutMs, MAX_COMMAND_TIMEOUT_MS) : DEFAULT_COMMAND_TIMEOUT_MS;
 		this.commands.set(name, {
 			commandName: name,
 			integrationId,
 			handlerPath,
 			handlerMethod: method,
-			timeoutMs,
+			timeoutMs: boundedTimeoutMs,
 			handler: null
 		});
 		log$1.info({
@@ -22963,7 +23728,7 @@ var CommandRegistry = class {
 			integrationId,
 			handlerPath,
 			method,
-			timeoutMs
+			timeoutMs: boundedTimeoutMs
 		}, "Registered command");
 	}
 	/**
@@ -23023,9 +23788,10 @@ var CommandRegistry = class {
 				}
 			};
 		}
+		let timeout;
 		try {
 			return await Promise.race([entry.handler(payload, context), new Promise((_, reject) => {
-				setTimeout(() => {
+				timeout = setTimeout(() => {
 					reject(/* @__PURE__ */ new Error(`Command "${name}" timed out after ${String(entry.timeoutMs)}ms`));
 				}, entry.timeoutMs);
 			})]);
@@ -23042,6 +23808,8 @@ var CommandRegistry = class {
 					message
 				}
 			};
+		} finally {
+			if (timeout) clearTimeout(timeout);
 		}
 	}
 	/**
@@ -23091,13 +23859,18 @@ var CommandDedupe = class {
 			duplicate: true
 		};
 		const promise = exec();
-		this.entries.set(commandId, {
+		const entry = {
 			insertedAt: this.now(),
-			promise
-		});
+			promise,
+			settled: false
+		};
+		this.entries.set(commandId, entry);
 		this.evictOverCap();
-		promise.catch(() => {
-			this.entries.delete(commandId);
+		promise.then(() => {
+			entry.settled = true;
+			this.evictOverCap();
+		}, () => {
+			if (this.entries.get(commandId) === entry) this.entries.delete(commandId);
 		});
 		return {
 			ack: await promise,
@@ -23112,7 +23885,7 @@ var CommandDedupe = class {
 	has(commandId) {
 		const e = this.entries.get(commandId);
 		if (!e) return false;
-		if (this.now() - e.insertedAt > this.ttlMs) {
+		if (e.settled && this.now() - e.insertedAt > this.ttlMs) {
 			this.entries.delete(commandId);
 			return false;
 		}
@@ -23120,13 +23893,13 @@ var CommandDedupe = class {
 	}
 	evictExpired() {
 		const cutoff = this.now() - this.ttlMs;
-		for (const [id, entry] of this.entries) if (entry.insertedAt <= cutoff) this.entries.delete(id);
+		for (const [id, entry] of this.entries) if (entry.settled && entry.insertedAt <= cutoff) this.entries.delete(id);
 	}
 	evictOverCap() {
 		while (this.entries.size > this.maxEntries) {
-			const oldest = this.entries.keys().next().value;
-			if (oldest === void 0) break;
-			this.entries.delete(oldest);
+			const oldestSettled = Array.from(this.entries).find(([, entry]) => entry.settled);
+			if (!oldestSettled) break;
+			this.entries.delete(oldestSettled[0]);
 		}
 	}
 };
@@ -23151,7 +23924,7 @@ var CommandDedupe = class {
 *      the gateway when needed and uses `callerScopes: ["operator.admin"]`.
 *   3. Skip iteration if `pending.json` mtime hasn't changed (cheap fast path)
 */
-const execFileAsync$2 = promisify(execFile);
+const execFileAsync$1 = promisify(execFile);
 const APPROVE_TIMEOUT_MS = 1e4;
 function resolveStateDir(override) {
 	if (override) return override;
@@ -23250,7 +24023,7 @@ function startPairingApprovalPoller(opts) {
 	const intervalMs = opts.intervalMs ?? 3e4;
 	const cliLock = opts.cliLock ?? new NoopOpenClawCliLock();
 	const rawExec = opts.exec ?? (async (file, args, { timeout }) => {
-		const { stdout, stderr } = await execFileAsync$2(file, args, { timeout });
+		const { stdout, stderr } = await execFileAsync$1(file, args, { timeout });
 		return {
 			stdout,
 			stderr
@@ -23324,12 +24097,12 @@ function startPairingApprovalPoller(opts) {
 * Sentinel-gated at `~/.alfe/.openclaw-mirror-migrated` — runs exactly
 * once per agent.
 */
-const execFileAsync$1 = promisify(execFile);
+const execFileAsync = promisify(execFile);
 const DEFAULT_SENTINEL_PATH = join(homedir(), ".alfe", ".openclaw-mirror-migrated");
 const defaultOpenclaw = {
 	async listServers() {
 		try {
-			const { stdout } = await execFileAsync$1("openclaw", [
+			const { stdout } = await execFileAsync("openclaw", [
 				"config",
 				"get",
 				"mcp.servers"
@@ -23346,7 +24119,7 @@ const defaultOpenclaw = {
 		}
 	},
 	async unsetServer(key) {
-		await execFileAsync$1("openclaw", [
+		await execFileAsync("openclaw", [
 			"config",
 			"unset",
 			`mcp.servers.${key}`
@@ -23528,8 +24301,12 @@ function createMcpErrorHooks() {
 *   7. Start agent runtime (managed mode only — e.g. OpenClaw)
 *   8. Write PID file (non-managed only)
 *   9. Handle graceful shutdown
+*
+* Split along seams (this file stays the orchestrator):
+*   - daemon-bootstrap.ts     — version resolution, persona migration, AI-proxy + IPC start
+*   - mcp-handlers.ts         — `mcp.*` IPC request handlers
+*   - integration-bootstrap.ts — provider-credential fetch + post-reconcile command reporting
 */
-const execFileAsync = promisify(execFile);
 let config;
 let cloudClient;
 let ipcServer = null;
@@ -23538,225 +24315,46 @@ let startedAt;
 let integrationManager;
 let mcpBundler = null;
 let mcpManagerRef = null;
-/**
-* Hermes-only MCP store consumer (Approach B). Mirrors the runtime-agnostic MCP
-* store into ~/.hermes/config.yaml. Null for openclaw agents (never constructed)
-* and for managed/self-hosted runtimes other than hermes.
-*/
-let hermesMcpSync = null;
-/**
-* claude-code-only MCP store consumer. Mirrors the runtime-agnostic MCP store
-* into the host's `--mcp-config` JSON (~/.claude-code/mcp-config.json), injecting
-* ALFE_API_KEY into every stdio server's env. Null for every other runtime
-* (never constructed) — same shape/role as {@link hermesMcpSync}.
-*/
-let claudeCodeMcpSync = null;
-let aiProxyServer = null;
-let runtimeProcess = null;
-let turnActivityProbe = null;
-let aiProxyUrl = null;
-let aiProxyRunning = false;
-let cloudConnected = false;
-/**
-* Dedupe for at-least-once durable command delivery (Phase B). The cloud may
-* push a command over the live WS AND re-drain the same commandId on the next
-* SERVICE_REGISTER; both hit handleCloudCommand. This remembers recent outcomes
-* so a duplicate is ACKed with the prior result without re-executing.
-*/
-const commandDedupe = new CommandDedupe();
-let shuttingDown = false;
-let commandRegistry;
-let resolvedCliVersion;
-let resolvedRuntimeVersion;
-let upgradingRuntime = false;
-let stopPairingApprovalPoller = null;
-/**
-* Module-level handle on the runtime appliers built during start(), so the
-* module-scoped command handler can route `alfe.config_set` to the active
-* runtime's applier (mirrors `mcpManagerRef`). Null until start() builds it.
-*/
-let runtimeAppliersRef = null;
-/**
-* Resolve the installed @alfe.ai/cli version.
-*
-* Strategy (in order):
-*   1. ALFE_CLI_VERSION env var (set by CLI entry point when run directly)
-*   2. Walk up from this file to find @alfe.ai/cli/package.json
-*      (works when systemd runs the gateway binary directly, since
-*      the path is .../cli/node_modules/@alfe.ai/gateway/dist/...)
-*/
-/**
-* Adapter from `AgentApiClient`'s per-provider methods to the
-* `CredentialsResolver` shape the MCP applier expects. Returns
-* `undefined` for unknown providers and on 404/network error so the
-* applier can skip registration silently (its documented contract).
-*/
-async function fetchProviderCredentials(agentApi, provider, connectionId) {
-	if (connectionId) try {
-		const raw = await agentApi.getConnectionCredentials(connectionId);
-		const fields = { ...raw.providerMetadata ?? {} };
-		if (typeof raw.accessToken === "string" && raw.accessToken.length > 0) try {
-			const bundle = JSON.parse(raw.accessToken);
-			if (bundle && typeof bundle === "object" && !Array.isArray(bundle)) Object.assign(fields, bundle);
-		} catch (err) {
-			logger$1.warn({
-				connectionId,
-				err: err instanceof Error ? err.message : String(err)
-			}, "Custom connection accessToken is not a JSON bundle — exposing as accessToken field");
-			fields.accessToken = raw.accessToken;
-		}
-		return fields;
-	} catch (err) {
-		logger$1.warn({
-			connectionId,
-			err: err instanceof Error ? err.message : String(err)
-		}, "Failed to resolve connection-scoped credentials — MCP server will be skipped");
-		return;
-	}
-	const key = provider.toLowerCase();
-	try {
-		switch (key) {
-			case "atlassian": return await agentApi.getAtlassianCredentials();
-			case "github": return await agentApi.getGithubCredentials();
-			case "xero": return await agentApi.getXeroCredentials();
-			case "notion": return await agentApi.getNotionCredentials();
-			case "myob": return await agentApi.getMYOBCredentials();
-			case "google": return await agentApi.getGoogleCredentials();
-			default:
-				logger$1.warn({ provider }, "Unknown OAuth provider for requires_credentials — MCP server will be skipped");
-				return;
-		}
-	} catch {
-		return;
-	}
-}
-async function getCliVersion() {
-	if (process.env.ALFE_CLI_VERSION) return process.env.ALFE_CLI_VERSION;
-	try {
-		const { fileURLToPath } = await import("node:url");
-		const { dirname } = await import("node:path");
-		let dir = dirname(fileURLToPath(import.meta.url));
-		for (let i = 0; i < 10; i++) {
-			const candidate = join(dir, "package.json");
-			try {
-				const raw = await readFile(candidate, "utf-8");
-				const pkg = JSON.parse(raw);
-				if (pkg.name === "@alfe.ai/cli") return pkg.version;
-			} catch {}
-			const parent = dirname(dir);
-			if (parent === dir) break;
-			dir = parent;
-		}
-	} catch {}
-	logger$1.debug("Could not resolve @alfe.ai/cli version");
-}
-/**
-* Per-runtime "print installed version" commands. Local to the gateway — we do
-* NOT import the CLI's `detectRuntime` (`@alfe.ai/gateway` must not depend on
-* `@alfe.ai/cli`). Unknown runtimes resolve to `undefined` (never throw) so the
-* connection-status report degrades gracefully instead of crashing.
-*/
-const RUNTIME_VERSION_COMMANDS = {
-	openclaw: {
-		command: "openclaw",
-		args: ["--version"]
-	},
-	hermes: {
-		command: "hermes",
-		args: ["version"]
-	},
-	"claude-code": {
-		command: "alfe-claude-host",
-		args: ["--version"]
-	}
-};
-/**
-* Pure resolver (exported for tests) — the per-runtime version command, or
-* `undefined` for an unknown runtime.
+/**
+* Hermes-only MCP store consumer (Approach B). Mirrors the runtime-agnostic MCP
+* store into ~/.hermes/config.yaml. Null for openclaw agents (never constructed)
+* and for managed/self-hosted runtimes other than hermes.
 */
-function resolveRuntimeVersionCommand(runtime) {
-	return RUNTIME_VERSION_COMMANDS[runtime];
-}
+let hermesMcpSync = null;
 /**
-* Resolve the installed runtime version by running the per-runtime version
-* command and returning the trimmed stdout. An unknown runtime (no command in
-* the map) returns `undefined` without spawning — it must never throw.
+* claude-code-only MCP store consumer. Mirrors the runtime-agnostic MCP store
+* into the host's `--mcp-config` JSON (~/.claude-code/mcp-config.json), injecting
+* ALFE_API_KEY into every stdio server's env. Null for every other runtime
+* (never constructed) — same shape/role as {@link hermesMcpSync}.
 */
-async function getRuntimeVersion(runtime) {
-	const cmd = resolveRuntimeVersionCommand(runtime);
-	if (!cmd) {
-		logger$1.debug({ runtime }, "No version command for runtime — skipping version detection");
-		return;
-	}
-	try {
-		const { stdout } = await execFileAsync(cmd.command, cmd.args);
-		return stdout.trim() || void 0;
-	} catch {
-		logger$1.debug({ runtime }, "Could not resolve runtime version");
-		return;
-	}
-}
+let claudeCodeMcpSync = null;
+let aiProxyServer = null;
+let runtimeProcess = null;
+let turnActivityProbe = null;
+let aiProxyUrl = null;
+let aiProxyRunning = false;
+let cloudConnected = false;
 /**
-* Flush pino's async transport and exit.
-* process.exit() can drop buffered log lines — this ensures they're written first.
+* Dedupe for at-least-once durable command delivery (Phase B). The cloud may
+* push a command over the live WS AND re-drain the same commandId on the next
+* SERVICE_REGISTER; both hit handleCloudCommand. This remembers recent outcomes
+* so a duplicate is ACKed with the prior result without re-executing.
 */
-async function flushAndExit(code) {
-	await flushSentry();
-	await new Promise((resolve) => {
-		logger$1.flush();
-		setTimeout(resolve, 500);
-	});
-	process.exit(code);
-}
+const commandDedupe = new CommandDedupe();
+let shuttingDown = false;
+let commandRegistry;
+let resolvedCliVersion;
+let resolvedRuntimeVersion;
+let upgradingRuntime = false;
+let stopPairingApprovalPoller = null;
 /**
-* One-shot migration for VMs provisioned before the persona-files-go-in-agent-workspace
-* fix landed. Old behavior wrote SOUL.md/IDENTITY.md/BOOTSTRAP.md/AGENTS.md at the
-* OpenClaw home (e.g. `~/.openclaw/`); the agent reads from the agent workspace
-* (e.g. `~/.openclaw/workspace/`). Move stale copies into place; skip if the
-* workspace already has the file. Idempotent and safe to run on every daemon start.
+* Module-level handle on the runtime appliers built during start(), so the
+* module-scoped command handler can route `alfe.config_set` to the active
+* runtime's applier (mirrors `mcpManagerRef`). Null until start() builds it.
 */
-const PERSONA_FILES = [
-	"SOUL.md",
-	"IDENTITY.md",
-	"BOOTSTRAP.md",
-	"AGENTS.md"
-];
-async function migrateLegacyPersonaFiles(home, agentWorkspace) {
-	if (home === agentWorkspace) return;
-	let moved = 0;
-	let skipped = 0;
-	for (const filename of PERSONA_FILES) {
-		const src = join(home, filename);
-		const dst = join(agentWorkspace, filename);
-		try {
-			await stat(src);
-		} catch {
-			continue;
-		}
-		try {
-			await stat(dst);
-			skipped++;
-			continue;
-		} catch {}
-		try {
-			await mkdir(agentWorkspace, { recursive: true });
-			await rename(src, dst);
-			moved++;
-		} catch (err) {
-			logger$1.warn({
-				src,
-				dst,
-				err: err instanceof Error ? err.message : String(err)
-			}, "Persona file migration: rename failed");
-		}
-	}
-	if (moved > 0 || skipped > 0) logger$1.info({
-		home,
-		agentWorkspace,
-		moved,
-		skipped
-	}, "Persona file backfill migration complete");
-}
+let runtimeAppliersRef = null;
+const LEGACY_CONFIG_SET_KEYS = new Set(["agents.defaults.model"]);
+const MAX_LEGACY_CONFIG_VALUE_LENGTH = 16 * 1024;
 async function startDaemon() {
 	startedAt = Date.now();
 	const managed = isManagedMode();
@@ -23764,9 +24362,10 @@ async function startDaemon() {
 		managed,
 		pid: process.pid
 	}, "Starting Alfe Gateway Daemon...");
+	resolvedCliVersion = await getCliVersion();
 	await initAgentSentry({
 		surface: "daemon",
-		release: await getCliVersion()
+		release: resolvedCliVersion
 	});
 	let fatalExiting = false;
 	process.on("uncaughtException", (err) => {
@@ -23816,55 +24415,12 @@ async function startDaemon() {
 	commandQueue = new CommandQueue();
 	commandQueue.startGC();
 	commandRegistry = new CommandRegistry();
-	logger$1.debug("Starting AI proxy...");
-	try {
-		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,
-			apiKey: config.apiKey,
-			proxyUrl
-		});
-		const server = aiProxyServer;
-		await new Promise((resolve, reject) => {
-			server.listen(port, "127.0.0.1", () => {
-				aiProxyRunning = true;
-				aiProxyUrl = `http://127.0.0.1:${String(port)}`;
-				logger$1.info({
-					port,
-					upstream: proxyUrl
-				}, "AI proxy started");
-				resolve();
-			});
-			server.on("error", reject);
-		});
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		const stack = err instanceof Error ? err.stack : void 0;
-		logger$1.error({
-			err: message,
-			stack
-		}, "Failed to start AI proxy — LLM requests will fail");
-	}
-	logger$1.debug({ socketPath: config.socketPath }, "Starting IPC server...");
-	ipcServer = new IPCServer(config.socketPath);
-	ipcServer.setRequestHandler(handlePluginRequest);
+	const aiProxy = await startAiProxy(config.apiKey);
+	aiProxyServer = aiProxy.server;
+	aiProxyUrl = aiProxy.url;
+	aiProxyRunning = aiProxy.running;
+	ipcServer = await startIpcServer(config.socketPath, handlePluginRequest, resolvedCliVersion);
 	turnActivityProbe = new IpcTurnActivityProbe(() => ipcServer);
-	try {
-		await ipcServer.start();
-		logger$1.debug("IPC server started");
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		const stack = err instanceof Error ? err.stack : void 0;
-		logger$1.error({
-			err: message,
-			stack
-		}, "Failed to start IPC server");
-		await flushAndExit(1);
-	}
-	resolvedCliVersion = await getCliVersion();
 	resolvedRuntimeVersion = await getRuntimeVersion(config.runtime);
 	logger$1.info({
 		cliVersion: resolvedCliVersion,
@@ -24007,19 +24563,11 @@ async function startDaemon() {
 		}
 	}
 	cloudClient.setOnReconciliationComplete(() => {
-		try {
-			const activeCommands = integrationManager.getActiveCommands();
-			commandRegistry.clear();
-			for (const { integrationId, commands } of activeCommands) for (const cmd of commands) commandRegistry.register(integrationId, cmd.name, cmd.resolvedPath, cmd.method, cmd.timeoutMs);
-			const commandsMsg = {
-				type: "COMMANDS_AVAILABLE",
-				commands: commandRegistry.listCommands()
-			};
-			cloudClient.sendMessage(commandsMsg);
-			logger$1.info({ commandCount: commandsMsg.commands.length }, "Reported available commands to cloud");
-		} catch (err) {
-			logger$1.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to rebuild command registry");
-		}
+		reportAvailableCommands({
+			integrationManager,
+			commandRegistry,
+			cloudClient
+		});
 	});
 	cloudClient.start();
 	logger$1.debug("Cloud client started");
@@ -24228,7 +24776,7 @@ async function executeCloudCommand(command) {
 		};
 		const payload = command.payload;
 		const runtime = config.runtime;
-		const version = payload?.version ?? (runtime === "openclaw" ? "2026.6.11" : runtime === "claude-code" ? "0.1.3" : void 0);
+		const version = payload?.version ?? (runtime === "openclaw" ? "2026.6.11" : runtime === "claude-code" ? "0.1.6" : void 0);
 		upgradingRuntime = true;
 		setTimeout(() => {
 			(async () => {
@@ -24334,504 +24882,258 @@ async function executeCloudCommand(command) {
 		const payload = command.payload;
 		const key = payload?.key;
 		const value = payload?.value;
-		if (!key || value === void 0) return {
-			type: "COMMAND_ACK",
-			commandId: command.commandId,
-			status: "error",
-			result: {
-				code: "INVALID_PAYLOAD",
-				message: "alfe.config_set requires key and value"
-			}
-		};
-		const runtime = config.runtime;
-		const applier = runtimeAppliersRef?.get(runtime);
-		if (!applier || typeof applier.setConfigRaw !== "function") {
-			const message = `No runtime applier supports config_set for runtime "${runtime}"`;
-			logger$1.warn({
-				runtime,
-				key
-			}, message);
-			return {
-				type: "COMMAND_ACK",
-				commandId: command.commandId,
-				status: "error",
-				result: {
-					code: "CONFIG_SET_UNSUPPORTED",
-					message
-				}
-			};
-		}
-		try {
-			await applier.setConfigRaw(key, value);
-			logger$1.info({
-				runtime,
-				key
-			}, "Applied config via runtime applier setConfigRaw");
-			return {
-				type: "COMMAND_ACK",
-				commandId: command.commandId,
-				status: "ok",
-				result: {
-					key,
-					value
-				}
-			};
-		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			logger$1.error({
-				err: message,
-				runtime,
-				key
-			}, "Failed to apply config via runtime applier");
-			return {
-				type: "COMMAND_ACK",
-				commandId: command.commandId,
-				status: "error",
-				result: {
-					code: "CONFIG_SET_FAILED",
-					message
-				}
-			};
-		}
-	}
-	if (commandRegistry.has(command.command)) try {
-		const ctx = buildCommandContext();
-		const result = await commandRegistry.execute(command.command, typeof command.payload === "object" && command.payload !== null ? command.payload : {}, ctx);
-		return {
-			type: "COMMAND_ACK",
-			commandId: command.commandId,
-			status: result.status,
-			result: result.result
-		};
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		logger$1.error({
-			err: message,
-			command: command.command
-		}, "Command registry execution failed");
-		return {
-			type: "COMMAND_ACK",
-			commandId: command.commandId,
-			status: "error",
-			result: {
-				code: "REGISTRY_ERROR",
-				message
-			}
-		};
-	}
-	const ipcRequest = cloudCommandToIPCRequest(command);
-	if (!ipcRequest) {
-		logger$1.warn({ command: command.command }, "Unrecognized cloud command");
-		return {
-			type: "COMMAND_ACK",
-			commandId: command.commandId,
-			status: "error",
-			result: {
-				code: "UNKNOWN_COMMAND",
-				message: `Unrecognized command: ${command.command}`
-			}
-		};
-	}
-	const plugins = ipcServer?.getRegisteredPlugins() ?? [];
-	if (plugins.length === 0) {
-		logger$1.info({
-			commandId: command.commandId,
-			command: command.command
-		}, "No plugins connected — queuing command");
-		commandQueue.enqueue("_default", ipcRequest, command.commandId);
-		return {
+		if (!key || value === void 0) return {
 			type: "COMMAND_ACK",
 			commandId: command.commandId,
-			status: "ok",
+			status: "error",
 			result: {
-				queued: true,
-				message: "Command queued — no plugins connected"
+				code: "INVALID_PAYLOAD",
+				message: "alfe.config_set requires key and value"
 			}
 		};
-	}
-	const [pluginId] = plugins[0];
-	if (!ipcServer) return {
-		type: "COMMAND_ACK",
-		commandId: command.commandId,
-		status: "error",
-		result: {
-			code: "NO_IPC",
-			message: "IPC server not available"
-		}
-	};
-	try {
-		const response = await ipcServer.sendRequest(pluginId, ipcRequest.method, ipcRequest.params, 3e4);
-		return ipcResponseToCloudAck(command.commandId, response);
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		return {
+		if (!LEGACY_CONFIG_SET_KEYS.has(key) || value.length > MAX_LEGACY_CONFIG_VALUE_LENGTH) return {
 			type: "COMMAND_ACK",
 			commandId: command.commandId,
 			status: "error",
 			result: {
-				code: "PLUGIN_ERROR",
-				message
+				code: "CONFIG_KEY_UNSUPPORTED",
+				message: "Config key is not supported by the legacy command path"
 			}
 		};
-	}
-}
-function buildCommandContext() {
-	const workspacePath = Object.values(config.runtimes)[0]?.workspace ?? "~/.openclaw";
-	return {
-		workspacePath,
-		aiProxyUrl: aiProxyUrl ?? void 0,
-		aiProxyRunning,
-		apiKey: config.apiKey,
-		async exec(cmd, opts) {
-			const { exec: execCb } = await import("child_process");
-			const { promisify } = await import("util");
-			const { stdout, stderr } = await promisify(execCb)(cmd, {
-				cwd: workspacePath,
-				timeout: opts?.timeoutMs ?? 25e3,
-				maxBuffer: opts?.maxBuffer ?? 512 * 1024
-			});
+		const runtime = config.runtime;
+		const applier = runtimeAppliersRef?.get(runtime);
+		if (!applier || typeof applier.setConfigRaw !== "function") {
+			const message = `No runtime applier supports config_set for runtime "${runtime}"`;
+			logger$1.warn({
+				runtime,
+				key
+			}, message);
 			return {
-				stdout: stdout.trim(),
-				stderr: stderr.trim()
+				type: "COMMAND_ACK",
+				commandId: command.commandId,
+				status: "error",
+				result: {
+					code: "CONFIG_SET_UNSUPPORTED",
+					message
+				}
 			};
 		}
-	};
-}
-function handlePluginRequest(method, params, pluginId) {
-	switch (method) {
-		case "status": return Promise.resolve(handleStatus());
-		case "integration.list": return Promise.resolve(handleIntegrationList());
-		case "integration.report": return Promise.resolve(handleIntegrationReport(params, pluginId));
-		case "mcp.list_tools": return Promise.resolve(handleMcpListTools(mcpBundler));
-		case "mcp.call_tool": return handleMcpCallTool(mcpBundler, params);
-		case "mcp.list_servers": return Promise.resolve(handleMcpListServers());
-		case "mcp.add_server": return handleMcpAddServer(params);
-		case "mcp.remove_server": return handleMcpRemoveServer(params);
-		default: return Promise.resolve({
-			ok: false,
-			error: {
-				code: "UNKNOWN_METHOD",
-				message: `Unknown method: ${method}`
-			}
-		});
-	}
-}
-function handleStatus() {
-	return {
-		ok: true,
-		payload: {
-			daemon: {
-				status: "running",
-				pid: process.pid,
-				uptime: (Date.now() - startedAt) / 1e3,
-				version: "0.1.0",
-				runtimeVersion: resolvedRuntimeVersion
-			},
-			cloud: {
-				status: cloudConnected ? "connected" : "disconnected",
-				latencyMs: cloudClient.getLatencyMs()
-			},
-			aiProxy: { status: aiProxyRunning ? "running" : "stopped" },
-			plugins: (ipcServer?.getRegisteredPlugins() ?? []).map(([, info]) => ({
-				name: info.name,
-				version: info.version,
-				capabilities: info.capabilities,
-				connectedAt: info.connectedAt,
-				lastSeen: info.lastSeen
-			})),
-			commandQueue: { totalPending: commandQueue.totalPending() }
-		}
-	};
-}
-function handleIntegrationList() {
-	return {
-		ok: true,
-		payload: { integrations: integrationManager.list() }
-	};
-}
-/**
-* Return the daemon-hosted MCP bundler's current namespaced tool catalog.
-* Called by the openclaw-mcp-bundler plugin on every tool-factory invocation;
-* cheap (in-memory snapshot, no I/O).
-*/
-function handleMcpListTools(bundler) {
-	if (!bundler) return {
-		ok: false,
-		error: {
-			code: "MCP_BUNDLER_UNAVAILABLE",
-			message: "MCP bundler not initialized"
-		}
-	};
-	return {
-		ok: true,
-		payload: { tools: bundler.listTools() }
-	};
-}
-/**
-* Observability backstop for the INTEGRATION warm path. `applyForIntegration`
-* registers MCP servers into the store and the daemon warms them silently via
-* the store-change `onChange` hook — so a server that fails its connect (e.g.
-* an MCP server whose backing account/credential wasn't resolvable at warm
-* time, like ctrader-mcp `exit(1)`-ing on empty accounts) leaves NO trace,
-* making the black hole undiagnosable. After a warm, read `bundler.statuses()`
-* and warn once per still-failed server so the failure is visible. These
-* self-heal on the bundler's background retry sweep once the dependency
-* appears. Returns the servers it warned about (for tests / callers).
-*/
-function warnFailedMcpServers(bundler, log, reason) {
-	if (!bundler) return [];
-	const failed = bundler.statuses().filter((s) => !s.connected && s.lastError !== void 0);
-	for (const status of failed) log.warn({
-		server: status.name,
-		reason,
-		consecutiveFailures: status.consecutiveFailures,
-		lastError: status.lastError
-	}, `MCP server "${status.name}" failed to connect: ${status.lastError ?? ""}`);
-	return failed;
-}
-/**
-* Route a tool call to the appropriate MCP child via the daemon-hosted
-* bundler. `name` is the prefixed (`mcp__<server>__<tool>`) name; args is
-* the raw JSON object the LLM produced.
-*/
-/**
-* List every server entry in the alfe bundler store. Lets agents inspect
-* what they've already registered before adding a new one.
-*/
-function handleMcpListServers(manager = mcpManagerRef) {
-	if (!manager) return {
-		ok: false,
-		error: {
-			code: "MCP_MANAGER_UNAVAILABLE",
-			message: "MCP manager not initialized"
-		}
-	};
-	const statuses = manager.serverStatuses ? manager.serverStatuses() : [];
-	const byName = new Map(statuses.map((s) => [s.name, s]));
-	return {
-		ok: true,
-		payload: { servers: manager.listServers().map(({ id, entry }) => ({
-			id,
-			entry,
-			status: byName.get(id) ?? {
-				name: id,
-				connected: false,
-				toolCount: 0,
-				consecutiveFailures: 0
-			}
-		})) }
-	};
-}
-/**
-* How long the add-confirm probe waits for the freshly-added server to
-* connect before replying. This is effectively the whole budget for
-* `bundler.warmServer`: `Manager.addServer` now reconciles the bundler
-* BEFORE resolving, so the Connection object already exists and
-* `warmServer`'s pre-reconcile is a no-diff cheap pass. Kept well under the
-* plugin caller's 30s IPC timeout. A slower server still connects in the
-* background and surfaces on the next `alfe_mcp_list_tools` — the probe just
-* reports what it saw within the window; a missed connect is re-attempted by
-* the bundler's `retryNeverConnected` sweep.
-*/
-const MCP_ADD_WARM_TIMEOUT_MS = 12e3;
-/**
-* Register a new MCP server in the alfe bundler store on behalf of the agent,
-* then CONFIRM the connect before replying so the agent learns whether the
-* server actually works. Owned as `'manual'` so the agent can later remove it
-* without an expectedOwner conflict — matches what `alfe mcp add` does from the
-* CLI. Registration is durable regardless of the probe outcome: a probe
-* failure (or a runtime with no daemon bundler, e.g. hermes) still returns
-* `ok` with `connected: false`; the store watcher / runtime picks the entry up.
-*/
-async function handleMcpAddServer(params, manager = mcpManagerRef) {
-	if (!manager) return {
-		ok: false,
-		error: {
-			code: "MCP_MANAGER_UNAVAILABLE",
-			message: "MCP manager not initialized"
-		}
-	};
-	const p = params;
-	if (typeof p.id !== "string" || p.id.length === 0) return {
-		ok: false,
-		error: {
-			code: "INVALID_PARAMS",
-			message: "id is required (string)"
-		}
-	};
-	const config = buildServerConfig(p);
-	if (!config) return {
-		ok: false,
-		error: {
-			code: "INVALID_PARAMS",
-			message: "expected either { command, args?, env?, cwd? } for stdio or { url, transport, headers? } for remote"
-		}
-	};
-	try {
-		await manager.addServer(config, {
-			id: p.id,
-			owner: "manual"
-		});
+		try {
+			await applier.setConfigRaw(key, value);
+			logger$1.info({
+				runtime,
+				key
+			}, "Applied config via runtime applier setConfigRaw");
+			return {
+				type: "COMMAND_ACK",
+				commandId: command.commandId,
+				status: "ok",
+				result: {
+					key,
+					applied: true
+				}
+			};
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			logger$1.error({
+				err: message,
+				runtime,
+				key
+			}, "Failed to apply config via runtime applier");
+			return {
+				type: "COMMAND_ACK",
+				commandId: command.commandId,
+				status: "error",
+				result: {
+					code: "CONFIG_SET_FAILED",
+					message
+				}
+			};
+		}
+	}
+	if (commandRegistry.has(command.command)) try {
+		const ctx = buildCommandContext();
+		const result = await commandRegistry.execute(command.command, typeof command.payload === "object" && command.payload !== null ? command.payload : {}, ctx);
+		return {
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: result.status,
+			result: result.result
+		};
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		logger$1.warn({
-			id: p.id,
-			err: message
-		}, "mcp.add_server failed");
+		logger$1.error({
+			err: message,
+			command: command.command
+		}, "Command registry execution failed");
 		return {
-			ok: false,
-			error: {
-				code: "MCP_ADD_FAILED",
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: "error",
+			result: {
+				code: "REGISTRY_ERROR",
 				message
 			}
 		};
 	}
-	let status = null;
-	if (manager.warmServer) try {
-		status = await manager.warmServer(p.id, MCP_ADD_WARM_TIMEOUT_MS);
-	} catch (err) {
-		logger$1.warn({
-			id: p.id,
-			err: err instanceof Error ? err.message : String(err)
-		}, "mcp.add_server warm probe threw");
+	const ipcRequest = cloudCommandToIPCRequest(command);
+	if (!ipcRequest) {
+		logger$1.warn({ command: command.command }, "Unrecognized cloud command");
+		return {
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: "error",
+			result: {
+				code: "UNKNOWN_COMMAND",
+				message: `Unrecognized command: ${command.command}`
+			}
+		};
 	}
-	return {
-		ok: true,
-		payload: {
-			id: p.id,
-			connected: status?.connected ?? false,
-			toolCount: status?.toolCount ?? 0,
-			...status?.lastError !== void 0 ? { error: status.lastError } : {}
-		}
-	};
-}
-function buildServerConfig(p) {
-	if (typeof p.command === "string" && p.command.length > 0) {
-		const cfg = { command: p.command };
-		if (Array.isArray(p.args) && p.args.every((a) => typeof a === "string")) cfg.args = p.args;
-		if (p.env && typeof p.env === "object" && !Array.isArray(p.env)) {
-			const env = {};
-			for (const [k, v] of Object.entries(p.env)) if (typeof v === "string") env[k] = v;
-			cfg.env = env;
+	const plugins = ipcServer?.getRegisteredPlugins() ?? [];
+	if (plugins.length === 0) {
+		logger$1.info({
+			commandId: command.commandId,
+			command: command.command
+		}, "No plugins connected — queuing command");
+		if (!commandQueue.enqueue("_default", ipcRequest, command.commandId)) {
+			logger$1.warn({
+				commandId: command.commandId,
+				command: command.command
+			}, "Plugin command queue is full");
+			return {
+				type: "COMMAND_ACK",
+				commandId: command.commandId,
+				status: "error",
+				result: {
+					code: "QUEUE_FULL",
+					message: "Plugin command queue is at capacity"
+				}
+			};
 		}
-		if (typeof p.cwd === "string") cfg.cwd = p.cwd;
-		return cfg;
-	}
-	if (typeof p.url === "string" && p.url.length > 0) {
-		const transport = p.transport === "streamable-http" ? "streamable-http" : "sse";
-		const cfg = {
-			url: p.url,
-			transport
+		return {
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: "ok",
+			result: {
+				queued: true,
+				message: "Command queued — no plugins connected"
+			}
 		};
-		if (p.headers && typeof p.headers === "object" && !Array.isArray(p.headers)) {
-			const headers = {};
-			for (const [k, v] of Object.entries(p.headers)) if (typeof v === "string") headers[k] = v;
-			cfg.headers = headers;
-		}
-		return cfg;
 	}
-	return null;
-}
-/**
-* Drop a server entry the agent previously registered. Restricted to
-* `manual`-owned entries so the agent can't accidentally clobber
-* integration-installed or CLI-installed servers (the daemon owns
-* those; the agent can ask the user to uninstall an integration via
-* the dashboard).
-*/
-async function handleMcpRemoveServer(params, manager = mcpManagerRef) {
-	if (!manager) return {
-		ok: false,
-		error: {
-			code: "MCP_MANAGER_UNAVAILABLE",
-			message: "MCP manager not initialized"
-		}
-	};
-	const { id } = params;
-	if (typeof id !== "string" || id.length === 0) return {
-		ok: false,
-		error: {
-			code: "INVALID_PARAMS",
-			message: "id is required (string)"
+	const [pluginId] = plugins[0];
+	if (!ipcServer) return {
+		type: "COMMAND_ACK",
+		commandId: command.commandId,
+		status: "error",
+		result: {
+			code: "NO_IPC",
+			message: "IPC server not available"
 		}
 	};
 	try {
-		return {
-			ok: true,
-			payload: { removed: await manager.removeServer(id, { expectedOwner: "manual" }) }
-		};
+		const response = await ipcServer.sendRequest(pluginId, ipcRequest.method, ipcRequest.params, 3e4);
+		return ipcResponseToCloudAck(command.commandId, response);
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		if (message.includes("owned by")) return {
-			ok: false,
-			error: {
-				code: "MCP_OWNER_MISMATCH",
-				message
-			}
-		};
-		logger$1.warn({
-			id,
-			err: message
-		}, "mcp.remove_server failed");
 		return {
-			ok: false,
-			error: {
-				code: "MCP_REMOVE_FAILED",
+			type: "COMMAND_ACK",
+			commandId: command.commandId,
+			status: "error",
+			result: {
+				code: "PLUGIN_ERROR",
 				message
 			}
 		};
 	}
 }
-async function handleMcpCallTool(bundler, params) {
-	if (!bundler) return {
-		ok: false,
-		error: {
-			code: "MCP_BUNDLER_UNAVAILABLE",
-			message: "MCP bundler not initialized"
-		}
-	};
-	const { name, args } = params;
-	if (typeof name !== "string" || name.length === 0) return {
-		ok: false,
-		error: {
-			code: "INVALID_PARAMS",
-			message: "name is required (string)"
+function buildCommandContext() {
+	const workspacePath = Object.values(config.runtimes)[0]?.workspace ?? "~/.openclaw";
+	return {
+		workspacePath,
+		aiProxyUrl: aiProxyUrl ?? void 0,
+		aiProxyRunning,
+		apiKey: config.apiKey,
+		async exec(cmd, opts) {
+			const { exec: execCb } = await import("child_process");
+			const { promisify } = await import("util");
+			const { stdout, stderr } = await promisify(execCb)(cmd, {
+				cwd: workspacePath,
+				timeout: opts?.timeoutMs ?? 25e3,
+				maxBuffer: opts?.maxBuffer ?? 512 * 1024
+			});
+			return {
+				stdout: stdout.trim(),
+				stderr: stderr.trim()
+			};
 		}
 	};
-	try {
-		return {
-			ok: true,
-			payload: await bundler.callTool(name, args)
-		};
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		logger$1.warn({
-			tool: name,
-			err: message
-		}, "mcp.call_tool failed");
-		return {
+}
+function handlePluginRequest(method, params, pluginId) {
+	switch (method) {
+		case "status": return Promise.resolve(handleStatus());
+		case "integration.list": return Promise.resolve(handleIntegrationList());
+		case "integration.report": return Promise.resolve(handleIntegrationReport(params, pluginId));
+		case "mcp.list_tools": return Promise.resolve(handleMcpListTools(mcpBundler));
+		case "mcp.call_tool": return handleMcpCallTool(mcpBundler, params);
+		case "mcp.list_servers": return Promise.resolve(handleMcpListServers(mcpManagerRef));
+		case "mcp.add_server": return handleMcpAddServer(params, mcpManagerRef);
+		case "mcp.remove_server": return handleMcpRemoveServer(params, mcpManagerRef);
+		default: return Promise.resolve({
 			ok: false,
 			error: {
-				code: "MCP_CALL_FAILED",
-				message
+				code: "UNKNOWN_METHOD",
+				message: `Unknown method: ${method}`
 			}
-		};
+		});
 	}
 }
+function handleStatus() {
+	return {
+		ok: true,
+		payload: {
+			daemon: {
+				status: "running",
+				pid: process.pid,
+				uptime: (Date.now() - startedAt) / 1e3,
+				version: resolvedCliVersion,
+				runtimeVersion: resolvedRuntimeVersion
+			},
+			cloud: {
+				status: cloudConnected ? "connected" : "disconnected",
+				latencyMs: cloudClient.getLatencyMs()
+			},
+			aiProxy: { status: aiProxyRunning ? "running" : "stopped" },
+			plugins: (ipcServer?.getRegisteredPlugins() ?? []).map(([, info]) => ({
+				name: info.name,
+				version: info.version,
+				capabilities: info.capabilities,
+				connectedAt: info.connectedAt,
+				lastSeen: info.lastSeen
+			})),
+			commandQueue: { totalPending: commandQueue.totalPending() }
+		}
+	};
+}
+function handleIntegrationList() {
+	return {
+		ok: true,
+		payload: { integrations: integrationManager.list() }
+	};
+}
 function handleIntegrationReport(params, pluginId) {
 	const { name, status, detail } = params;
-	if (!name || !status) return {
+	if (typeof name !== "string" || name.length === 0 || name.length > 256 || typeof status !== "string" || status.length === 0 || status.length > 64) return {
 		ok: false,
 		error: {
 			code: "INVALID_PARAMS",
-			message: "name and status are required"
+			message: "name and status must be non-empty bounded strings"
 		}
 	};
 	logger$1.info({
 		pluginId,
 		integration: name,
 		status,
-		detail
+		hasDetail: detail !== void 0
 	}, "Integration status report");
 	return {
 		ok: true,
@@ -24869,6 +25171,12 @@ async function queryDaemonHealth(socketPath, timeoutMs = 5e3) {
 		}, timeoutMs);
 		socket.on("data", (data) => {
 			buffer += data.toString();
+			if (Buffer.byteLength(buffer, "utf8") > 1048576) {
+				clearTimeout(timer);
+				socket.destroy();
+				reject(/* @__PURE__ */ new Error("Health response exceeded IPC size limit"));
+				return;
+			}
 			const newlineIdx = buffer.indexOf("\n");
 			if (newlineIdx === -1) return;
 			const line = buffer.slice(0, newlineIdx).trim();
@@ -24877,7 +25185,8 @@ async function queryDaemonHealth(socketPath, timeoutMs = 5e3) {
 			socket.end();
 			try {
 				const response = JSON.parse(line);
-				if (response.ok && response.payload) resolve(response.payload);
+				if (!isIPCResponse(response)) reject(/* @__PURE__ */ new Error("Invalid health response"));
+				else if (response.ok && response.payload) resolve(response.payload);
 				else reject(new Error(response.error?.message ?? "Health check failed"));
 			} catch {
 				reject(/* @__PURE__ */ new Error("Invalid health response"));