@alfe.ai/gateway 0.4.0 → 0.6.0

package/dist/bin/gateway.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { S as SOCKET_PATH, a as installService, c as uninstallService, i as checkExistingDaemon, n as queryDaemonHealth, r as startDaemon, s as stopExistingDaemon, t as formatHealthReport } from "../health.js";
+import { a as installService, c as uninstallService, i as checkExistingDaemon, n as queryDaemonHealth, r as startDaemon, s as stopExistingDaemon, t as formatHealthReport, w as SOCKET_PATH } from "../health.js";
 import { t as LOG_FILE } from "../logger.js";
 import { spawn } from "node:child_process";
 //#region bin/gateway.ts

package/dist/health.js

@@ -5266,7 +5266,7 @@ function isIPCResponse(msg) {
 const PROTOCOL_VERSION = 1;
 //#endregion
 //#region src/runtime-gate.ts
-const log$3 = logger$1.child({ component: "RuntimeGate" });
+const log$4 = logger$1.child({ component: "RuntimeGate" });
 var RuntimeGate = class {
 	depth = 0;
 	wasRunning = false;
@@ -5284,7 +5284,7 @@ var RuntimeGate = class {
 		const rp = this.getRuntime();
 		this.wasRunning = rp?.isRunning ?? false;
 		if (rp && this.wasRunning) {
-			log$3.info("Suspending runtime for mutating reconcile (avoid concurrent SQLite writers)");
+			log$4.info("Suspending runtime for mutating reconcile (avoid concurrent SQLite writers)");
 			await rp.stop();
 		}
 	}
@@ -5299,7 +5299,7 @@ var RuntimeGate = class {
 		if (this.depth < 0) this.depth = 0;
 		const rp = this.getRuntime();
 		if (rp && this.wasRunning) {
-			log$3.info("Resuming runtime after mutating reconcile");
+			log$4.info("Resuming runtime after mutating reconcile");
 			rp.resume();
 		}
 		this.wasRunning = false;
@@ -5314,12 +5314,12 @@ var RuntimeGate = class {
 	*/
 	requestRestart() {
 		if (this.depth > 0) {
-			log$3.info("Runtime restart requested while suspended — deferring to pending resume");
+			log$4.info("Runtime restart requested while suspended — deferring to pending resume");
 			return;
 		}
 		const rp = this.getRuntime();
 		if (rp) rp.restart().catch((err) => {
-			log$3.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to restart runtime");
+			log$4.error({ err: err instanceof Error ? err.message : String(err) }, "Failed to restart runtime");
 		});
 	}
 };
@@ -5374,6 +5374,13 @@ const CLI_SENTRY_DSN = "https://82dde4631336561f2fcc89d7531623de@o45110082394521
 * Mirrors `SENTRY_DSNS.agentRuntime` in `config/config.ts`.
 */
 const AGENT_RUNTIME_SENTRY_DSN = "https://feb7fb2e3b8e723aec518e74715bfa6d@o4511008239452160.ingest.us.sentry.io/4511683667558400";
+/**
+* MCP tool/server failures on agent VMs — reported by the daemon-hosted MCP
+* bundler (tool errors, child crashes, stderr output). This is the SAME
+* project as the cloud MCP Fly service (`SENTRY_DSNS.mcp`); agent-side events
+* are distinguished by `source: agent-daemon` + `agentId` tags.
+*/
+const AGENT_MCP_SENTRY_DSN = "https://638309eac96146a945f46b578f10c806@o4511008239452160.ingest.us.sentry.io/4511146364174336";
 /** Surface → Sentry project: `cli` and `agent-daemon` respectively. */
 const SURFACE_DSNS = {
 	cli: CLI_SENTRY_DSN,
@@ -5382,13 +5389,16 @@ const SURFACE_DSNS = {
 /** Held after a successful init so the capture helpers can run synchronously. */
 let sentry = null;
 /**
-* Second client for the `agent-runtime` project (daemon surface only). The
-* default client keeps the daemon's own DSN; runtime child-process events are
-* routed here via an explicitly-bound Scope — the documented multi-client
-* pattern. `null` until `initAgentSentry({ surface: "daemon" })` succeeds.
+* Additional bound clients (daemon surface only). The default client keeps the
+* daemon's own DSN; runtime child-process events and MCP failures are routed
+* to their own projects via explicitly-bound Scopes — the documented
+* multi-client pattern. `null` until `initAgentSentry({ surface: "daemon" })`
+* succeeds.
 */
 let runtimeClient = null;
 let runtimeScope = null;
+let mcpClient = null;
+let mcpScope = null;
 /**
 * Map the configured API URL to a coarse environment tag. Best-effort — returns
 * `"unknown"` when no config is present yet (e.g. `alfe login` pre-setup).
@@ -5470,32 +5480,46 @@ async function initAgentSentry(options) {
 		const dsn = SURFACE_DSNS[options.surface].trim();
 		if (!dsn) return;
 		const mod = await import("@sentry/node");
-		if (options.surface === "daemon" && !runtimeScope) try {
-			const dsn = AGENT_RUNTIME_SENTRY_DSN.trim();
-			{
-				const client = new mod.NodeClient({
-					dsn,
-					environment: deriveEnvironment(),
-					...options.release ? { release: options.release } : {},
-					sampleRate: 1,
-					tracesSampleRate: 0,
-					sendDefaultPii: false,
-					transport: mod.makeNodeTransport,
-					stackParser: mod.defaultStackParser,
-					integrations: [],
-					beforeSend: (event) => scrubEvent(event)
-				});
-				client.init();
-				const scope = new mod.Scope();
-				scope.setClient(client);
-				const runtime = deriveRuntime();
-				if (runtime) scope.setTag("runtime", runtime);
-				runtimeClient = client;
-				runtimeScope = scope;
+		if (options.surface === "daemon") {
+			const buildBoundScope = (dsn, extraTags) => {
+				try {
+					if (!dsn.trim()) return null;
+					const client = new mod.NodeClient({
+						dsn: dsn.trim(),
+						environment: deriveEnvironment(),
+						...options.release ? { release: options.release } : {},
+						sampleRate: 1,
+						tracesSampleRate: 0,
+						sendDefaultPii: false,
+						transport: mod.makeNodeTransport,
+						stackParser: mod.defaultStackParser,
+						integrations: [],
+						beforeSend: (event) => scrubEvent(event)
+					});
+					client.init();
+					const scope = new mod.Scope();
+					scope.setClient(client);
+					const runtime = deriveRuntime();
+					if (runtime) scope.setTag("runtime", runtime);
+					for (const [k, v] of Object.entries(extraTags)) scope.setTag(k, v);
+					return {
+						client,
+						scope
+					};
+				} catch {
+					return null;
+				}
+			};
+			if (!runtimeScope) {
+				const bound = buildBoundScope(AGENT_RUNTIME_SENTRY_DSN, {});
+				runtimeClient = bound?.client ?? null;
+				runtimeScope = bound?.scope ?? null;
+			}
+			if (!mcpScope) {
+				const bound = buildBoundScope(AGENT_MCP_SENTRY_DSN, { source: "agent-daemon" });
+				mcpClient = bound?.client ?? null;
+				mcpScope = bound?.scope ?? null;
 			}
-		} catch {
-			runtimeClient = null;
-			runtimeScope = null;
 		}
 		if (mod.getClient()) {
 			sentry = mod;
@@ -5527,11 +5551,14 @@ async function initAgentSentry(options) {
 function setAgentContext(context) {
 	if (!sentry) return;
 	try {
-		if (context.agentId) sentry.setTag("agentId", context.agentId);
-		if (context.runtime) sentry.setTag("runtime", context.runtime);
-		if (runtimeScope) {
-			if (context.agentId) runtimeScope.setTag("agentId", context.agentId);
-			if (context.runtime) runtimeScope.setTag("runtime", context.runtime);
+		for (const scope of [
+			sentry,
+			runtimeScope,
+			mcpScope
+		]) {
+			if (!scope) continue;
+			if (context.agentId) scope.setTag("agentId", context.agentId);
+			if (context.runtime) scope.setTag("runtime", context.runtime);
 		}
 	} catch {}
 }
@@ -5641,10 +5668,40 @@ function captureRuntimeErrorOutput(opts) {
 		scope.captureMessage(opts.lines[0].slice(0, 300), "error");
 	} catch {}
 }
+/**
+* Capture an MCP failure (tool error, server crash, or error-looking stderr
+* output) into the `mcp` project via the daemon's bound MCP client. Throttling
+* is the caller's job (`mcp-error-capture.ts`). No-op when the MCP client is
+* not initialised. Never throws.
+*/
+function captureMcpFailure(opts) {
+	if (!mcpScope) return;
+	try {
+		const scope = mcpScope.clone();
+		for (const line of opts.lines ?? []) scope.addBreadcrumb({
+			category: `mcp.${opts.server}`,
+			level: "error",
+			message: line
+		});
+		scope.setFingerprint([
+			"agent-mcp",
+			opts.server,
+			opts.kind,
+			...opts.tool ? [opts.tool] : []
+		]);
+		scope.setTags({
+			server: opts.server,
+			kind: opts.kind,
+			...opts.tool ? { tool: opts.tool } : {},
+			suppressedCount: String(opts.suppressedCount ?? 0)
+		});
+		scope.captureMessage(`MCP ${opts.server}${opts.tool ? `.${opts.tool}` : ""} ${opts.kind}: ${opts.message.slice(0, 300)}`, "error");
+	} catch {}
+}
 /** Flush queued events (small timeout) so short-lived commands deliver them. */
 async function flushSentry(timeoutMs = 2e3) {
-	try {
-		if (runtimeClient) await runtimeClient.flush(timeoutMs);
+	for (const client of [runtimeClient, mcpClient]) try {
+		if (client) await client.flush(timeoutMs);
 	} catch {}
 	if (!sentry) return;
 	try {
@@ -5664,7 +5721,7 @@ function captureFatal(cause) {
 }
 //#endregion
 //#region src/reconciliation.ts
-const log$2 = logger$1.child({ component: "Reconciliation" });
+const log$3 = logger$1.child({ component: "Reconciliation" });
 /**
 * How many times reconcile will re-attempt activation of an intact integration
 * stuck in `error` (with no reinstall requested) before giving up and waiting
@@ -5734,7 +5791,7 @@ var ReconciliationEngine = class {
 		try {
 			localIntegrations = await this.manager.getInstalledIntegrations();
 		} catch (err) {
-			log$2.error({ err }, "Failed to get local integrations");
+			log$3.error({ err }, "Failed to get local integrations");
 			localIntegrations = [];
 		}
 		const localMap = new Map(localIntegrations.map((i) => [i.id, i]));
@@ -5753,10 +5810,10 @@ var ReconciliationEngine = class {
 		try {
 			if (!local) {
 				await this.ensureSuspended();
-				log$2.info(`Installing ${id}@${desired.version}`);
+				log$3.info(`Installing ${id}@${desired.version}`);
 				await this.manager.install(id, desired.version, desired.config, desired.customSource);
 				report.installed.push(id);
-				log$2.info(`Activating ${id}`);
+				log$3.info(`Activating ${id}`);
 				if ((await this.manager.activate(id)).configApplied) report.configApplied = true;
 				report.activated.push(id);
 				report.results.push({
@@ -5767,22 +5824,54 @@ var ReconciliationEngine = class {
 				return;
 			}
 			if (local.version !== desired.version && desired.version !== "" && local.version !== "unknown") {
-				await this.ensureSuspended();
-				log$2.info(`Upgrading ${id}: ${local.version} → ${desired.version}`);
-				if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
-				report.installed.push(id);
-				report.activated.push(id);
-				report.results.push({
-					integrationId: id,
-					action: "activated",
-					actualStatus: "active"
-				});
+				if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
+					await this.ensureSuspended();
+					log$3.info(`Reinstalling ${id} on version change (reinstall requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt}): ${local.version} → ${desired.version}`);
+					this.manager.resetReinstallAttempts(id);
+					this.activateAttempts.delete(id);
+					if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
+					report.installed.push(id);
+					report.activated.push(id);
+					report.results.push({
+						integrationId: id,
+						action: "installed",
+						actualStatus: "active"
+					});
+					return;
+				}
+				log$3.info(`Upgrading ${id} in place: ${local.version} → ${desired.version}`);
+				try {
+					if ((await this.manager.upgrade(id, desired.version, desired.config, desired.customSource, { onBeforeRuntimeMutation: () => this.ensureSuspended() })).configApplied) report.configApplied = true;
+					this.manager.resetReinstallAttempts(id);
+					this.activateAttempts.delete(id);
+					report.installed.push(id);
+					report.activated.push(id);
+					report.results.push({
+						integrationId: id,
+						action: "activated",
+						actualStatus: "active"
+					});
+				} catch (upgradeErr) {
+					const upgradeMsg = upgradeErr instanceof Error ? upgradeErr.message : String(upgradeErr);
+					log$3.error({ err: upgradeErr }, `Upgrade failed for ${id}`);
+					captureIntegrationFailure(id, "upgrade", upgradeErr);
+					report.errors.push({
+						integrationId: id,
+						error: upgradeMsg
+					});
+					report.results.push({
+						integrationId: id,
+						action: "error",
+						actualStatus: "error",
+						errorMessage: upgradeMsg
+					});
+				}
 				return;
 			}
 			if (local.status === "error") {
 				if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
 					await this.ensureSuspended();
-					log$2.info(`Reinstalling ${id} from error state (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
+					log$3.info(`Reinstalling ${id} from error state (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
 					this.manager.resetReinstallAttempts(id);
 					this.activateAttempts.delete(id);
 					if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -5798,7 +5887,7 @@ var ReconciliationEngine = class {
 				if (!await this.manager.isInstallIntact(id)) {
 					const attempts = this.manager.getReinstallAttempts(id);
 					if (attempts >= 3) {
-						log$2.error(`Auto-reinstall blocked for ${id} — ${String(attempts)} consecutive failures. Manual reinstall required.`);
+						log$3.error(`Auto-reinstall blocked for ${id} — ${String(attempts)} consecutive failures. Manual reinstall required.`);
 						captureIntegrationFailure(id, "reinstall", `Max auto-reinstall attempts (${String(attempts)}) reached — manual reinstall required`);
 						report.errors.push({
 							integrationId: id,
@@ -5813,7 +5902,7 @@ var ReconciliationEngine = class {
 						return;
 					}
 					await this.ensureSuspended();
-					log$2.info(`Auto-reinstalling ${id} — install directory is corrupted or missing (attempt ${String(attempts + 1)}/3)`);
+					log$3.info(`Auto-reinstalling ${id} — install directory is corrupted or missing (attempt ${String(attempts + 1)}/3)`);
 					this.manager.incrementReinstallAttempts(id);
 					try {
 						if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -5828,7 +5917,7 @@ var ReconciliationEngine = class {
 						});
 					} catch (reinstallErr) {
 						const reinstallMsg = reinstallErr instanceof Error ? reinstallErr.message : String(reinstallErr);
-						log$2.error({ err: reinstallErr }, `Auto-reinstall failed for ${id}`);
+						log$3.error({ err: reinstallErr }, `Auto-reinstall failed for ${id}`);
 						captureIntegrationFailure(id, "reinstall", reinstallErr);
 						report.errors.push({
 							integrationId: id,
@@ -5847,9 +5936,9 @@ var ReconciliationEngine = class {
 				if (activateAttempts < MAX_ERROR_ACTIVATE_ATTEMPTS) {
 					this.activateAttempts.set(id, activateAttempts + 1);
 					await this.ensureSuspended();
-					log$2.info(`Re-activating ${id} from error state (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)})`);
+					log$3.info(`Re-activating ${id} from error state (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)})`);
 					try {
-						if ((await this.manager.activate(id)).configApplied) report.configApplied = true;
+						if ((await this.manager.activate(id, { forcePlugins: true })).configApplied) report.configApplied = true;
 						this.activateAttempts.delete(id);
 						report.activated.push(id);
 						report.results.push({
@@ -5860,7 +5949,7 @@ var ReconciliationEngine = class {
 						return;
 					} catch (reactivateErr) {
 						const reactivateMsg = reactivateErr instanceof Error ? reactivateErr.message : String(reactivateErr);
-						log$2.warn(`Re-activation of ${id} from error state failed (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)}): ${reactivateMsg}`);
+						log$3.warn(`Re-activation of ${id} from error state failed (attempt ${String(activateAttempts + 1)}/${String(MAX_ERROR_ACTIVATE_ATTEMPTS)}): ${reactivateMsg}`);
 						captureIntegrationFailure(id, "reactivate", reactivateErr);
 						report.errors.push({
 							integrationId: id,
@@ -5875,7 +5964,7 @@ var ReconciliationEngine = class {
 						return;
 					}
 				}
-				log$2.warn(`Integration ${id} is in error state — re-activation exhausted, waiting for reinstall request`);
+				log$3.warn(`Integration ${id} is in error state — re-activation exhausted, waiting for reinstall request`);
 				captureIntegrationFailure(id, "reactivate", `Integration ${id} stuck in error state — re-activation attempts exhausted`);
 				report.errors.push({
 					integrationId: id,
@@ -5891,8 +5980,8 @@ var ReconciliationEngine = class {
 			}
 			if (local.status !== "active") {
 				await this.ensureSuspended();
-				log$2.info(`Activating ${id}`);
-				if ((await this.manager.activate(id)).configApplied) report.configApplied = true;
+				log$3.info(`Activating ${id}`);
+				if ((await this.manager.activate(id, { forcePlugins: true })).configApplied) report.configApplied = true;
 				report.activated.push(id);
 				report.results.push({
 					integrationId: id,
@@ -5903,7 +5992,7 @@ var ReconciliationEngine = class {
 			}
 			if (desired.reinstallRequestedAt && local.installedAt && desired.reinstallRequestedAt > local.installedAt) {
 				await this.ensureSuspended();
-				log$2.info(`Reinstall requested for ${id} (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
+				log$3.info(`Reinstall requested for ${id} (requested: ${desired.reinstallRequestedAt}, installed: ${local.installedAt})`);
 				this.manager.resetReinstallAttempts(id);
 				this.activateAttempts.delete(id);
 				if ((await this.manager.reinstall(id, desired.version, desired.config, desired.customSource)).configApplied) report.configApplied = true;
@@ -5924,7 +6013,7 @@ var ReconciliationEngine = class {
 			});
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			log$2.error({ err }, `Error reconciling ${id}`);
+			log$3.error({ err }, `Error reconciling ${id}`);
 			captureIntegrationFailure(id, "reconcile_active", err);
 			report.errors.push({
 				integrationId: id,
@@ -5949,7 +6038,7 @@ var ReconciliationEngine = class {
 		}
 		try {
 			await this.ensureSuspended();
-			log$2.info(`Removing ${id}`);
+			log$3.info(`Removing ${id}`);
 			if (local.status === "active") {
 				await this.manager.deactivate(id);
 				report.deactivated.push(id);
@@ -5963,7 +6052,7 @@ var ReconciliationEngine = class {
 			});
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			log$2.error({ err }, `Error removing ${id}`);
+			log$3.error({ err }, `Error removing ${id}`);
 			captureIntegrationFailure(id, "reconcile_removed", err);
 			report.errors.push({
 				integrationId: id,
@@ -22275,7 +22364,7 @@ var CaptureThrottle = class {
 * Spawns the runtime binary, pipes stdout/stderr to the daemon logger,
 * and restarts on crash with exponential backoff.
 */
-const log$1 = createLogger("RuntimeProcess");
+const log$2 = createLogger("RuntimeProcess");
 /** Quiet-period flush for a pending multi-line error block (e.g. a traceback
 * followed by silence — no closing line ever arrives to complete it). */
 const DETECTOR_FLUSH_DEBOUNCE_MS = 1500;
@@ -22322,7 +22411,7 @@ var RuntimeProcess = class {
 		if (this.stopped) return;
 		const { command, args } = this.resolveCommand();
 		this.lastStartTime = Date.now();
-		log$1.info({
+		log$2.info({
 			runtime: this.options.runtime,
 			command,
 			args,
@@ -22343,7 +22432,7 @@ var RuntimeProcess = class {
 		this.child.stdout?.on("data", (data) => {
 			const lines = data.toString().trim().split("\n");
 			for (const line of lines) {
-				log$1.info({
+				log$2.info({
 					runtime: this.options.runtime,
 					stream: "stdout"
 				}, line);
@@ -22353,7 +22442,7 @@ var RuntimeProcess = class {
 		this.child.stderr?.on("data", (data) => {
 			const lines = data.toString().trim().split("\n");
 			for (const line of lines) {
-				log$1.warn({
+				log$2.warn({
 					runtime: this.options.runtime,
 					stream: "stderr"
 				}, line);
@@ -22363,7 +22452,7 @@ var RuntimeProcess = class {
 		this.child.on("exit", (code, signal) => {
 			this.child = null;
 			if (this.stopped) {
-				log$1.info({
+				log$2.info({
 					runtime: this.options.runtime,
 					code,
 					signal
@@ -22371,7 +22460,7 @@ var RuntimeProcess = class {
 				return;
 			}
 			if (code === 0 && signal == null) {
-				log$1.info({
+				log$2.info({
 					runtime: this.options.runtime,
 					code
 				}, "Runtime exited gracefully — restarting");
@@ -22381,7 +22470,7 @@ var RuntimeProcess = class {
 				}, 500);
 				return;
 			}
-			log$1.warn({
+			log$2.warn({
 				runtime: this.options.runtime,
 				code,
 				signal,
@@ -22402,7 +22491,7 @@ var RuntimeProcess = class {
 				recentOutput: this.ringBuffer.snapshot(),
 				crashesSuppressed: crash.suppressedCount
 			});
-			else log$1.debug({
+			else log$2.debug({
 				runtime: this.options.runtime,
 				suppressed: crash.suppressedCount
 			}, "Crash capture suppressed by throttle");
@@ -22414,7 +22503,7 @@ var RuntimeProcess = class {
 			this.backoffMs = Math.min(this.backoffMs * 2, BACKOFF_MAX_MS);
 		});
 		this.child.on("error", (err) => {
-			log$1.error({
+			log$2.error({
 				runtime: this.options.runtime,
 				err: err.message
 			}, "Runtime process error");
@@ -22453,7 +22542,7 @@ var RuntimeProcess = class {
 				this.emitErrorBlock(this.detector.flush());
 			}, DETECTOR_FLUSH_DEBOUNCE_MS);
 		} catch (err) {
-			log$1.debug({
+			log$2.debug({
 				runtime: this.options.runtime,
 				err: err instanceof Error ? err.message : String(err)
 			}, "Runtime output observation failed");
@@ -22464,7 +22553,7 @@ var RuntimeProcess = class {
 		if (!block) return;
 		const { allow, suppressedCount } = this.throttle.allowErrorCapture(block.fingerprintKey);
 		if (!allow) {
-			log$1.debug({
+			log$2.debug({
 				runtime: this.options.runtime,
 				kind: block.kind,
 				suppressed: suppressedCount
@@ -22498,7 +22587,7 @@ var RuntimeProcess = class {
 		if (!child) return;
 		return new Promise((resolve) => {
 			const killTimer = setTimeout(() => {
-				log$1.warn({ runtime: this.options.runtime }, "Runtime did not exit in time — sending SIGKILL");
+				log$2.warn({ runtime: this.options.runtime }, "Runtime did not exit in time — sending SIGKILL");
 				child.kill("SIGKILL");
 			}, 5e3);
 			child.on("exit", () => {
@@ -22523,7 +22612,7 @@ var RuntimeProcess = class {
 	* Restart the runtime process (stop then start with fresh backoff).
 	*/
 	async restart() {
-		log$1.info({ runtime: this.options.runtime }, "Restarting runtime...");
+		log$2.info({ runtime: this.options.runtime }, "Restarting runtime...");
 		await this.stop();
 		this.stopped = false;
 		this.backoffMs = BACKOFF_INITIAL_MS;
@@ -22545,7 +22634,7 @@ var RuntimeProcess = class {
 * this registry from active integration manifests. Handler files are loaded
 * via ESM dynamic import on first use and cached until the registry is cleared.
 */
-const log = createLogger("CommandRegistry");
+const log$1 = createLogger("CommandRegistry");
 var CommandRegistry = class {
 	commands = /* @__PURE__ */ new Map();
 	version = 0;
@@ -22556,7 +22645,7 @@ var CommandRegistry = class {
 	register(integrationId, name, handlerPath, method = "handle", timeoutMs = 3e4) {
 		const existing = this.commands.get(name);
 		if (existing) {
-			log.warn({
+			log$1.warn({
 				command: name,
 				existing: existing.integrationId,
 				attempted: integrationId
@@ -22564,7 +22653,7 @@ var CommandRegistry = class {
 			return;
 		}
 		if (!existsSync(handlerPath)) {
-			log.warn({
+			log$1.warn({
 				command: name,
 				handlerPath,
 				integrationId
@@ -22579,7 +22668,7 @@ var CommandRegistry = class {
 			timeoutMs,
 			handler: null
 		});
-		log.info({
+		log$1.info({
 			command: name,
 			integrationId,
 			handlerPath,
@@ -22593,7 +22682,7 @@ var CommandRegistry = class {
 	unregisterAll(integrationId) {
 		for (const [name, entry] of this.commands) if (entry.integrationId === integrationId) {
 			this.commands.delete(name);
-			log.info({
+			log$1.info({
 				command: name,
 				integrationId
 			}, "Unregistered command");
@@ -22631,7 +22720,7 @@ var CommandRegistry = class {
 			entry.handler = fn;
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			log.error({
+			log$1.error({
 				err: message,
 				command: name,
 				handlerPath: entry.handlerPath
@@ -22652,7 +22741,7 @@ var CommandRegistry = class {
 			})]);
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			log.error({
+			log$1.error({
 				err: message,
 				command: name
 			}, "Command execution failed");
@@ -22681,7 +22770,7 @@ var CommandRegistry = class {
 	clear() {
 		this.commands.clear();
 		this.version++;
-		log.info({ version: this.version }, "Command registry cleared");
+		log$1.info({ version: this.version }, "Command registry cleared");
 	}
 };
 //#endregion
@@ -22970,6 +23059,93 @@ function writeSentinel(path) {
 	} catch {}
 }
 //#endregion
+//#region src/mcp-error-capture.ts
+const log = createLogger("McpErrorCapture");
+/** Quiet-period flush for a pending multi-line stderr block. */
+const MCP_STDERR_FLUSH_DEBOUNCE_MS = 1500;
+function createMcpErrorHooks() {
+	const resultErrorThrottle = new CaptureThrottle(6e4);
+	const errorThrottle = new CaptureThrottle(6e4);
+	const crashThrottle = new CaptureThrottle(6e4);
+	const throttleFor = (kind) => kind === "tool-result-error" ? resultErrorThrottle : kind === "server-crash" ? crashThrottle : errorThrottle;
+	const detectors = /* @__PURE__ */ new Map();
+	const flushTimers = /* @__PURE__ */ new Map();
+	const capture = (opts) => {
+		const { allow, suppressedCount } = throttleFor(opts.kind).allowErrorCapture(opts.fingerprintKey);
+		if (!allow) {
+			log.debug({
+				server: opts.server,
+				kind: opts.kind,
+				suppressed: suppressedCount
+			}, "MCP failure capture suppressed by throttle");
+			return;
+		}
+		captureMcpFailure({
+			...opts,
+			suppressedCount
+		});
+	};
+	const emitBlock = (server, block) => {
+		if (!block) return;
+		capture({
+			server,
+			kind: "stderr-output",
+			message: block.lines[0],
+			lines: block.lines,
+			fingerprintKey: `stderr:${server}:${block.fingerprintKey}`
+		});
+	};
+	return {
+		onToolError: (info) => {
+			capture({
+				server: info.server,
+				tool: info.tool,
+				kind: info.kind === "thrown" ? "tool-thrown" : "tool-result-error",
+				message: info.message,
+				fingerprintKey: `tool:${info.server}:${info.tool}:${toFingerprintKey(info.message)}`
+			});
+		},
+		onServerCrash: (server) => {
+			const timer = flushTimers.get(server);
+			if (timer) {
+				clearTimeout(timer);
+				flushTimers.delete(server);
+			}
+			emitBlock(server, detectors.get(server)?.flush() ?? null);
+			capture({
+				server,
+				kind: "server-crash",
+				message: "MCP server connection closed unexpectedly",
+				fingerprintKey: `crash:${server}`
+			});
+		},
+		onServerStderr: (server, line) => {
+			let detector = detectors.get(server);
+			if (!detector) {
+				detector = new ErrorLineDetector();
+				detectors.set(server, detector);
+			}
+			for (const block of detector.feed("stderr", line)) emitBlock(server, block);
+			const existing = flushTimers.get(server);
+			if (existing) {
+				clearTimeout(existing);
+				flushTimers.delete(server);
+			}
+			if (detector.isCollecting) {
+				const target = detector;
+				flushTimers.set(server, setTimeout(() => {
+					flushTimers.delete(server);
+					emitBlock(server, target.flush());
+				}, MCP_STDERR_FLUSH_DEBOUNCE_MS));
+			}
+		},
+		dispose: () => {
+			for (const timer of flushTimers.values()) clearTimeout(timer);
+			flushTimers.clear();
+		}
+	};
+}
+//#endregion
 //#region src/daemon.ts
 /**
 * Alfe Gateway Daemon — main entry point.
@@ -23354,9 +23530,11 @@ async function startDaemon() {
 	});
 	const mcpManager = new Manager({ logger: logger$1 });
 	mcpManagerRef = mcpManager;
+	const mcpErrorHooks = createMcpErrorHooks();
 	mcpBundler = new McpBundler({
 		logger: logger$1,
-		idleTtlMs: 0
+		idleTtlMs: 0,
+		...mcpErrorHooks
 	}, { connect: defaultConnect });
 	if (config.runtime === "hermes") logger$1.info("Hermes runtime — daemon MCP bundler left idle (store mirrored to config.yaml by HermesMcpSync)");
 	else {
@@ -23483,6 +23661,7 @@ async function startDaemon() {
 			mcpBundler = null;
 			logger$1.debug("MCP bundler stopped");
 		}
+		mcpErrorHooks.dispose();
 		logger$1.debug("Stopping MCP bundler manager...");
 		await mcpManager.dispose();
 		mcpManagerRef = null;
@@ -24207,4 +24386,4 @@ function formatDuration(ms) {
 	return `${String(Math.round(seconds / 3600))}h`;
 }
 //#endregion
-export { fetchAgentConfig as C, PINNED_OPENCLAW_VERSION as E, SOCKET_PATH as S, resolveAgentIdentity as T, initAgentSentry as _, installService as a, ALFE_DIR as b, uninstallService as c, captureCliFailure as d, captureFatal as f, flushSentry as g, captureRuntimeErrorOutput as h, checkExistingDaemon as i, AGENT_DAEMON_SENTRY_DSN as l, captureRuntimeCrash as m, queryDaemonHealth as n, startService as o, captureIntegrationFailure as p, startDaemon as r, stopExistingDaemon as s, formatHealthReport as t, AGENT_RUNTIME_SENTRY_DSN as u, setAgentContext as v, loadDaemonConfig as w, PID_PATH as x, PROTOCOL_VERSION as y };
+export { PID_PATH as C, resolveAgentIdentity as D, loadDaemonConfig as E, PINNED_OPENCLAW_VERSION as O, ALFE_DIR as S, fetchAgentConfig as T, captureRuntimeErrorOutput as _, installService as a, setAgentContext as b, uninstallService as c, AGENT_RUNTIME_SENTRY_DSN as d, captureCliFailure as f, captureRuntimeCrash as g, captureMcpFailure as h, checkExistingDaemon as i, AGENT_DAEMON_SENTRY_DSN as l, captureIntegrationFailure as m, queryDaemonHealth as n, startService as o, captureFatal as p, startDaemon as r, stopExistingDaemon as s, formatHealthReport as t, AGENT_MCP_SENTRY_DSN as u, flushSentry as v, SOCKET_PATH as w, PROTOCOL_VERSION as x, initAgentSentry as y };

package/dist/src/index.d.ts

@@ -81,6 +81,13 @@ declare const AGENT_DAEMON_SENTRY_DSN = "https://a47f010d8d39fb4350f913492189f28
  * Mirrors `SENTRY_DSNS.agentRuntime` in `config/config.ts`.
  */
 declare const AGENT_RUNTIME_SENTRY_DSN = "https://feb7fb2e3b8e723aec518e74715bfa6d@o4511008239452160.ingest.us.sentry.io/4511683667558400";
+/**
+ * MCP tool/server failures on agent VMs — reported by the daemon-hosted MCP
+ * bundler (tool errors, child crashes, stderr output). This is the SAME
+ * project as the cloud MCP Fly service (`SENTRY_DSNS.mcp`); agent-side events
+ * are distinguished by `source: agent-daemon` + `agentId` tags.
+ */
+declare const AGENT_MCP_SENTRY_DSN = "https://638309eac96146a945f46b578f10c806@o4511008239452160.ingest.us.sentry.io/4511146364174336";
 /** Which surface initialised Sentry — tagged on every event. */
 type SentrySurface = "cli" | "daemon";
 interface InitAgentSentryOptions {
@@ -157,6 +164,21 @@ declare function captureRuntimeErrorOutput(opts: {
   fingerprintKey: string;
   suppressedCount?: number;
 }): void;
+/**
+ * Capture an MCP failure (tool error, server crash, or error-looking stderr
+ * output) into the `mcp` project via the daemon's bound MCP client. Throttling
+ * is the caller's job (`mcp-error-capture.ts`). No-op when the MCP client is
+ * not initialised. Never throws.
+ */
+declare function captureMcpFailure(opts: {
+  server: string;
+  tool?: string;
+  kind: "tool-thrown" | "tool-result-error" | "server-crash" | "stderr-output";
+  message: string;
+  /** Optional context lines (stderr block) — attached as breadcrumbs. */
+  lines?: readonly string[];
+  suppressedCount?: number;
+}): void;
 /** Flush queued events (small timeout) so short-lived commands deliver them. */
 declare function flushSentry(timeoutMs?: number): Promise<void>;
 /**
@@ -338,4 +360,4 @@ declare function checkExistingDaemon(): Promise<number | null>;
  */
 declare function stopExistingDaemon(): Promise<boolean>;
 //#endregion
-export { AGENT_DAEMON_SENTRY_DSN, AGENT_RUNTIME_SENTRY_DSN, ALFE_DIR, type AgentIdentity, type AgentWorkspaceConfig, type DaemonConfig, type DaemonHealth, type IPCEvent, type IPCRequest, type IPCResponse, type InitAgentSentryOptions, PID_PATH, PINNED_OPENCLAW_VERSION, PROTOCOL_VERSION, type RuntimeOutputLine, SOCKET_PATH, type SentrySurface, captureCliFailure, captureFatal, captureIntegrationFailure, captureRuntimeCrash, captureRuntimeErrorOutput, checkExistingDaemon, fetchAgentConfig, flushSentry, formatHealthReport, initAgentSentry, installService, loadDaemonConfig, logger, queryDaemonHealth, resolveAgentIdentity, setAgentContext, startDaemon, startService, stopExistingDaemon, uninstallService };
+export { AGENT_DAEMON_SENTRY_DSN, AGENT_MCP_SENTRY_DSN, AGENT_RUNTIME_SENTRY_DSN, ALFE_DIR, type AgentIdentity, type AgentWorkspaceConfig, type DaemonConfig, type DaemonHealth, type IPCEvent, type IPCRequest, type IPCResponse, type InitAgentSentryOptions, PID_PATH, PINNED_OPENCLAW_VERSION, PROTOCOL_VERSION, type RuntimeOutputLine, SOCKET_PATH, type SentrySurface, captureCliFailure, captureFatal, captureIntegrationFailure, captureMcpFailure, captureRuntimeCrash, captureRuntimeErrorOutput, checkExistingDaemon, fetchAgentConfig, flushSentry, formatHealthReport, initAgentSentry, installService, loadDaemonConfig, logger, queryDaemonHealth, resolveAgentIdentity, setAgentContext, startDaemon, startService, stopExistingDaemon, uninstallService };

package/dist/src/index.js

@@ -1,3 +1,3 @@
-import { C as fetchAgentConfig, E as PINNED_OPENCLAW_VERSION, S as SOCKET_PATH, T as resolveAgentIdentity, _ as initAgentSentry, a as installService, b as ALFE_DIR, c as uninstallService, d as captureCliFailure, f as captureFatal, g as flushSentry, h as captureRuntimeErrorOutput, i as checkExistingDaemon, l as AGENT_DAEMON_SENTRY_DSN, m as captureRuntimeCrash, n as queryDaemonHealth, o as startService, p as captureIntegrationFailure, r as startDaemon, s as stopExistingDaemon, t as formatHealthReport, u as AGENT_RUNTIME_SENTRY_DSN, v as setAgentContext, w as loadDaemonConfig, x as PID_PATH, y as PROTOCOL_VERSION } from "../health.js";
+import { C as PID_PATH, D as resolveAgentIdentity, E as loadDaemonConfig, O as PINNED_OPENCLAW_VERSION, S as ALFE_DIR, T as fetchAgentConfig, _ as captureRuntimeErrorOutput, a as installService, b as setAgentContext, c as uninstallService, d as AGENT_RUNTIME_SENTRY_DSN, f as captureCliFailure, g as captureRuntimeCrash, h as captureMcpFailure, i as checkExistingDaemon, l as AGENT_DAEMON_SENTRY_DSN, m as captureIntegrationFailure, n as queryDaemonHealth, o as startService, p as captureFatal, r as startDaemon, s as stopExistingDaemon, t as formatHealthReport, u as AGENT_MCP_SENTRY_DSN, v as flushSentry, w as SOCKET_PATH, x as PROTOCOL_VERSION, y as initAgentSentry } from "../health.js";
 import { n as logger } from "../logger.js";
-export { AGENT_DAEMON_SENTRY_DSN, AGENT_RUNTIME_SENTRY_DSN, ALFE_DIR, PID_PATH, PINNED_OPENCLAW_VERSION, PROTOCOL_VERSION, SOCKET_PATH, captureCliFailure, captureFatal, captureIntegrationFailure, captureRuntimeCrash, captureRuntimeErrorOutput, checkExistingDaemon, fetchAgentConfig, flushSentry, formatHealthReport, initAgentSentry, installService, loadDaemonConfig, logger, queryDaemonHealth, resolveAgentIdentity, setAgentContext, startDaemon, startService, stopExistingDaemon, uninstallService };
+export { AGENT_DAEMON_SENTRY_DSN, AGENT_MCP_SENTRY_DSN, AGENT_RUNTIME_SENTRY_DSN, ALFE_DIR, PID_PATH, PINNED_OPENCLAW_VERSION, PROTOCOL_VERSION, SOCKET_PATH, captureCliFailure, captureFatal, captureIntegrationFailure, captureMcpFailure, captureRuntimeCrash, captureRuntimeErrorOutput, checkExistingDaemon, fetchAgentConfig, flushSentry, formatHealthReport, initAgentSentry, installService, loadDaemonConfig, logger, queryDaemonHealth, resolveAgentIdentity, setAgentContext, startDaemon, startService, stopExistingDaemon, uninstallService };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/gateway",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Alfe local gateway daemon — persistent control plane for agent integrations",
   "type": "module",
   "bin": {
@@ -23,12 +23,12 @@
     "pino-roll": "^1.2.0",
     "smol-toml": ">=1.6.1",
     "ws": "^8.18.0",
-    "@alfe.ai/agent-api-client": "^0.7.0",
+    "@alfe.ai/agent-api-client": "^0.8.0",
     "@alfe.ai/ai-proxy-local": "^0.0.13",
     "@alfe.ai/config": "^0.3.0",
     "@alfe.ai/integration-manifest": "^0.3.1",
-    "@alfe.ai/integrations": "^0.2.8",
-    "@alfe.ai/mcp-bundler": "^0.2.2"
+    "@alfe.ai/integrations": "^0.3.0",
+    "@alfe.ai/mcp-bundler": "^0.3.0"
   },
   "license": "UNLICENSED",
   "homepage": "https://alfe.ai",