@alfe.ai/gateway 0.1.0 → 0.1.2

package/dist/health.js

@@ -6,7 +6,7 @@ import { promisify } from "node:util";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import pino from "pino";
-import { chmodSync, existsSync, readFileSync, unlinkSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { getEndpointFromToken, readConfig } from "@alfe.ai/config";
 import crypto from "crypto";
 import { parse } from "smol-toml";
@@ -14,7 +14,7 @@ import WebSocket from "ws";
 import { createConnection, createServer } from "node:net";
 import { IntegrationManager, IntegrationManagerAdapter, McpApplier, OpenClawApplier } from "@alfe.ai/integrations";
 import { AgentApiClient } from "@alfe.ai/agent-api-client";
-import { Manager } from "@alfe.ai/mcp-bundler";
+import { Manager, McpBundler, defaultConnect } from "@alfe.ai/mcp-bundler";
 import stream, { Readable } from "stream";
 import util, { format } from "util";
 import http from "http";
@@ -93,7 +93,9 @@ const ID_PREFIXES = {
 	role: "role",
 	directGrant: "dgr",
 	oauthConnection: "con",
+	channel: "chn",
 	oauthConnectionRequest: "crq",
+	deviceCode: "dvc",
 	attachment: "att",
 	run: "run",
 	request: "req",
@@ -259,31 +261,41 @@ var AlfeApiClient = class {
 		this.getToken = options.getToken;
 		this.onAuthFailure = options.onAuthFailure;
 	}
-	/** Shared fetch logic — handles auth, 401, and network errors. */
-	async _fetch(path, options) {
+	/**
+	* Shared fetch logic — handles auth, 401, and network errors.
+	*
+	* `skipAuth` callers (public endpoints like OAuth device-code) opt out of
+	* the auth-header injection AND the synthetic 401 short-circuit. Without
+	* this opt-out, a CLI calling /auth/device-code (no token yet by design)
+	* would never reach the network — the `getToken: () => null` path would
+	* synthesize a 401 and fire onAuthFailure, breaking the entire flow.
+	*/
+	async _fetch(path, options, skipAuth = false) {
 		try {
-			const token = await this.getToken();
-			if (!token) {
-				this.onAuthFailure?.();
-				return {
-					ok: false,
-					result: {
-						ok: false,
-						error: "No auth token available",
-						status: 401
-					}
-				};
-			}
 			const url = `${this.apiBaseUrl}${path}`;
 			const headers = new Headers(options?.headers);
-			headers.set("Authorization", `Bearer ${token}`);
 			headers.set("Content-Type", "application/json");
 			headers.set("x-correlation-id", correlationId());
+			if (!skipAuth) {
+				const token = await this.getToken();
+				if (!token) {
+					this.onAuthFailure?.();
+					return {
+						ok: false,
+						result: {
+							ok: false,
+							error: "No auth token available",
+							status: 401
+						}
+					};
+				}
+				headers.set("Authorization", `Bearer ${token}`);
+			}
 			const res = await fetch(url, {
 				...options,
 				headers
 			});
-			if (res.status === 401) {
+			if (res.status === 401 && !skipAuth) {
 				this.onAuthFailure?.();
 				return {
 					ok: false,
@@ -331,6 +343,20 @@ var AlfeApiClient = class {
 		};
 	}
 	/**
+	* Make a request to a PUBLIC endpoint that does not require authentication.
+	* Skips both the Authorization header injection AND the onAuthFailure
+	* callback. Use for endpoints like /auth/device-code that the CLI hits
+	* before it has a token.
+	*/
+	async publicRequest(path, options) {
+		const result = await this._fetch(path, options, true);
+		if (!result.ok) return result.result;
+		return {
+			ok: true,
+			data: result.body.data
+		};
+	}
+	/**
 	* Make an authenticated request that returns the body directly (no envelope unwrap).
 	* Use for APIs that don't use the @auriclabs/api-core response format (e.g. gateway).
 	*/
@@ -372,6 +398,55 @@ var AuthService = class {
 	deleteToken(tokenId) {
 		return this.client.request(`${this.prefix}/tokens/${tokenId}`, { method: "DELETE" });
 	}
+	/**
+	* Start a device-code flow. Called by the CLI when the user runs
+	* `alfe login` and picks the browser path. The returned `device_code`
+	* is the CLI's bearer secret for polling /auth/device-token; the
+	* `user_code` is what the user types/sees on the dashboard.
+	*
+	* Uses `publicRequest` because the CLI has no token yet — the standard
+	* `request` path would short-circuit with a synthetic 401.
+	*/
+	startDeviceCode(input) {
+		return this.client.publicRequest(`${this.prefix}/device-code`, {
+			method: "POST",
+			body: JSON.stringify(input)
+		});
+	}
+	/**
+	* Poll for the minted API key. Public endpoint. Returns:
+	*   200 → { api_key, tenantId, tokenExpiresAt } (success — write to config)
+	*   428 → still pending (caller should sleep `interval` and retry)
+	*   429 → polling too fast; caller should back off
+	*   410 → device-code expired; user must run `alfe login` again
+	*   400 → already redeemed (security: do not retry)
+	*
+	* Surface the HTTP-status code via the standard ApiResult error shape
+	* so callers can branch.
+	*/
+	pollDeviceToken(deviceCode) {
+		return this.client.publicRequest(`${this.prefix}/device-token`, {
+			method: "POST",
+			body: JSON.stringify({ device_code: deviceCode })
+		});
+	}
+	/** Dashboard-side. Fetch the device fingerprint for an approval card. */
+	lookupDeviceCode(userCode) {
+		return this.client.request(`${this.prefix}/device-code/lookup`, {
+			method: "POST",
+			body: JSON.stringify({ user_code: userCode })
+		});
+	}
+	/** Dashboard-side. Approve the pending device-code; CLI's next poll gets the key. */
+	approveDeviceCode(input) {
+		return this.client.request(`${this.prefix}/device-code/approve`, {
+			method: "POST",
+			body: JSON.stringify({
+				user_code: input.userCode,
+				expiresIn: input.expiresIn
+			})
+		});
+	}
 	getOnboardingStatus() {
 		return this.client.request(`${this.prefix}/onboarding/status`);
 	}
@@ -510,8 +585,9 @@ var IntegrationsService = class {
 		});
 		return this.client.request(`/integrations/scoped/${encodeURIComponent(integrationId)}?${params}`, { method: "DELETE" });
 	}
-	listIntegrations(agentId) {
-		return this.client.request(`/integrations/agents/${agentId}`);
+	listIntegrations(agentId, options) {
+		const qs = options?.includeInherited ? "?includeInherited=true" : "";
+		return this.client.request(`/integrations/agents/${agentId}${qs}`);
 	}
 	installIntegration(agentId, data) {
 		return this.client.request(`/integrations/agents/${agentId}`, {
@@ -4276,7 +4352,10 @@ enumValues({
 	Zhipu: "zhipu",
 	OpenRouter: "openrouter",
 	ElevenLabs: "elevenlabs",
-	Twilio: "twilio"
+	Twilio: "twilio",
+	ClaudeMax: "claude-max",
+	OpenAICodexMax: "openai-codex-max",
+	GeminiMax: "gemini-max"
 });
 enumValues({
 	Month: "month",
@@ -4334,6 +4413,7 @@ enumValues({
 	Project: "project",
 	Agent: "agent"
 });
+["alfe"].filter((id) => id !== "alfe");
 enumValues({
 	Public: "public",
 	Hidden: "hidden"
@@ -21700,7 +21780,7 @@ var CommandRegistry = 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$1 = promisify(execFile);
+const execFileAsync$2 = promisify(execFile);
 const APPROVE_TIMEOUT_MS = 1e4;
 function resolveStateDir(override) {
 	if (override) return override;
@@ -21798,7 +21878,7 @@ function startPairingApprovalPoller(opts) {
 	const stateDir = resolveStateDir(opts.stateDir);
 	const intervalMs = opts.intervalMs ?? 3e4;
 	const exec = opts.exec ?? (async (file, args, { timeout }) => {
-		const { stdout, stderr } = await execFileAsync$1(file, args, { timeout });
+		const { stdout, stderr } = await execFileAsync$2(file, args, { timeout });
 		return {
 			stdout,
 			stderr
@@ -21840,6 +21920,128 @@ function startPairingApprovalPoller(opts) {
 	};
 }
 //#endregion
+//#region src/openclaw-mcp-cleanup.ts
+/**
+* One-shot startup migration that drops stale `mcp.servers.*` entries
+* from openclaw.json on agents set up before the single-source-of-truth
+* refactor. Pre-cutover agents had two writers:
+*
+*   - The old `post_activate.mjs` hook wrote `mcp.servers.<integrationId>`
+*     directly (legacy style — e.g. QA Tester's `mcp.servers.atlassian`).
+*   - The bundler manager mirror-wrote `mcp.servers.<integrationId>-<serverId>`
+*     for entries it owned (newer style).
+*
+* Post-cutover the alfe store owns everything and the openclaw.json
+* mirror is gone. If the legacy entries linger they cause:
+*   1. claude-cli / codex-cli to native-spawn from openclaw.json AND the
+*      daemon's bundler to spawn from the store → two mcp-atlassian
+*      children, the second one likely missing credentials.
+*   2. The openclaw-mcp-bundler plugin's `hasNativeOpenclawMcpServers`
+*      check returns true (mcp.servers non-empty) → plugin no-ops on
+*      every backend → MiniMax-backed agents lose tools entirely.
+*
+* Strategy: on first daemon start after the upgrade, drop every key in
+* openclaw.json#mcp.servers that the alfe store ALSO holds (direct id
+* match) OR that maps to an alfe-store entry by integration owner
+* (catches the legacy `mcp.servers.<integrationId>` shape where the
+* new store uses `<integrationId>-<serverId>`). User-added private MCPs
+* (e.g. `mcp.servers.my-private-thing` with no matching alfe entry) are
+* preserved.
+*
+* Sentinel-gated at `~/.alfe/.openclaw-mirror-migrated` — runs exactly
+* once per agent.
+*/
+const execFileAsync$1 = promisify(execFile);
+const DEFAULT_SENTINEL_PATH = join(homedir(), ".alfe", ".openclaw-mirror-migrated");
+const defaultOpenclaw = {
+	async listServers() {
+		try {
+			const { stdout } = await execFileAsync$1("openclaw", [
+				"config",
+				"get",
+				"mcp.servers"
+			], { timeout: 1e4 });
+			const trimmed = stdout.trim();
+			if (!trimmed) return [];
+			const parsed = JSON.parse(trimmed);
+			if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return [];
+			return Object.keys(parsed);
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			if (/not\s+set|not\s+found|undefined|no such key/i.test(message)) return [];
+			throw err;
+		}
+	},
+	async unsetServer(key) {
+		await execFileAsync$1("openclaw", [
+			"config",
+			"unset",
+			`mcp.servers.${key}`
+		], { timeout: 1e4 });
+	}
+};
+/**
+* Run the cleanup. Idempotent — second call after the sentinel lands
+* returns immediately. Errors are caught and logged; the daemon must
+* not abort startup over a best-effort migration.
+*/
+async function runOpenclawMcpCleanup(opts) {
+	const sentinelPath = opts.sentinelPath ?? DEFAULT_SENTINEL_PATH;
+	const openclaw = opts.openclaw ?? defaultOpenclaw;
+	if (existsSync(sentinelPath)) {
+		opts.logger.debug({ sentinel: sentinelPath }, "openclaw.json mcp.servers cleanup already ran — skipping");
+		return;
+	}
+	let cleanupErr;
+	try {
+		const existing = await openclaw.listServers();
+		if (existing.length === 0) {
+			opts.logger.debug({}, "openclaw.json#mcp.servers is empty — nothing to clean up");
+			writeSentinel(sentinelPath);
+			return;
+		}
+		const stored = opts.manager.listServers();
+		const storeIds = new Set(stored.map((s) => s.id));
+		const integrationOwners = /* @__PURE__ */ new Set();
+		for (const s of stored) if (s.entry.owner.startsWith("integration:")) integrationOwners.add(s.entry.owner.slice(12));
+		const toUnset = [];
+		for (const key of existing) {
+			if (storeIds.has(key)) {
+				toUnset.push(key);
+				continue;
+			}
+			if (integrationOwners.has(key)) toUnset.push(key);
+		}
+		if (toUnset.length === 0) {
+			opts.logger.info({ existingKeys: existing }, "openclaw.json#mcp.servers has entries but none match alfe-managed integrations — preserving as user customizations");
+			writeSentinel(sentinelPath);
+			return;
+		}
+		for (const key of toUnset) try {
+			await openclaw.unsetServer(key);
+			opts.logger.info({ key }, "Cleaned up stale openclaw.json#mcp.servers entry");
+		} catch (err) {
+			opts.logger.warn({
+				key,
+				err: err instanceof Error ? err.message : String(err)
+			}, "Failed to unset stale mcp.servers entry — continuing");
+		}
+	} catch (err) {
+		cleanupErr = err;
+		opts.logger.warn({ err: err instanceof Error ? err.message : String(err) }, "openclaw.json#mcp.servers cleanup hit an error — leaving sentinel un-touched so next start retries");
+	}
+	if (cleanupErr === void 0) writeSentinel(sentinelPath);
+}
+function writeSentinel(path) {
+	try {
+		mkdirSync(dirname(path), { recursive: true });
+		writeFileSync(path, `${(/* @__PURE__ */ new Date()).toISOString()}\n`, {
+			encoding: "utf8",
+			mode: 384
+		});
+	} catch {}
+}
+//#endregion
 //#region src/daemon.ts
 /**
 * Alfe Gateway Daemon — main entry point.
@@ -21862,6 +22064,8 @@ let ipcServer = null;
 let commandQueue;
 let startedAt;
 let integrationManager;
+let mcpBundler = null;
+let mcpManagerRef = null;
 let aiProxyServer = null;
 let runtimeProcess = null;
 let aiProxyUrl = null;
@@ -22126,6 +22330,32 @@ async function startDaemon() {
 		apiUrl: config.apiEndpoint
 	});
 	const mcpManager = new Manager({ logger: logger$1 });
+	mcpManagerRef = mcpManager;
+	mcpBundler = new McpBundler({
+		logger: logger$1,
+		idleTtlMs: 0
+	}, { connect: defaultConnect });
+	await mcpManager.loadIntoBundler(mcpBundler);
+	const warmBundler = (reason) => {
+		if (!mcpBundler) return;
+		mcpBundler.warmup().catch((err) => {
+			logger$1.warn({
+				err: err instanceof Error ? err.message : String(err),
+				reason
+			}, "MCP bundler warmup failed");
+		});
+	};
+	warmBundler("startup");
+	mcpManager.onChange(() => {
+		warmBundler("store change");
+	});
+	logger$1.info("MCP bundler attached to manager — warming children");
+	await runOpenclawMcpCleanup({
+		manager: mcpManager,
+		logger: logger$1
+	}).catch((err) => {
+		logger$1.warn({ err: err instanceof Error ? err.message : String(err) }, "openclaw.json mcp.servers cleanup threw — startup continues");
+	});
 	integrationManager = new IntegrationManager({
 		runtimeAppliers,
 		mcpApplier: new McpApplier({
@@ -22203,8 +22433,15 @@ async function startDaemon() {
 			await runtimeProcess.stop();
 			logger$1.debug("Runtime process stopped");
 		}
+		if (mcpBundler) {
+			logger$1.debug("Stopping MCP bundler...");
+			await mcpBundler.dispose();
+			mcpBundler = null;
+			logger$1.debug("MCP bundler stopped");
+		}
 		logger$1.debug("Stopping MCP bundler manager...");
 		await mcpManager.dispose();
+		mcpManagerRef = null;
 		logger$1.debug("MCP bundler manager stopped");
 		if (ipcServer) {
 			logger$1.debug("Stopping IPC server...");
@@ -22523,6 +22760,11 @@ function handlePluginRequest(method, params, pluginId) {
 		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: {
@@ -22565,6 +22807,214 @@ function handleIntegrationList() {
 		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() }
+	};
+}
+/**
+* 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"
+		}
+	};
+	return {
+		ok: true,
+		payload: { servers: manager.listServers() }
+	};
+}
+/**
+* Register a new MCP server in the alfe bundler store on behalf of the
+* agent. Owned as `'manual'` so the agent can later remove it without
+* an expectedOwner conflict — matches what `alfe mcp add` does from the
+* CLI. The daemon's bundler will pick the change up via the manager's
+* store watcher and spawn the child on the next tool-factory call.
+*/
+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"
+		});
+		return {
+			ok: true,
+			payload: { id: p.id }
+		};
+	} 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
+			}
+		};
+	}
+}
+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 = 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)"
+		}
+	};
+	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
+			}
+		};
+	}
+}
 function handleIntegrationReport(params, pluginId) {
 	const { name, status, detail } = params;
 	if (!name || !status) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/gateway",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Alfe local gateway daemon — persistent control plane for agent integrations",
   "type": "module",
   "bin": {
@@ -22,12 +22,12 @@
     "pino-roll": "^1.2.0",
     "smol-toml": ">=1.6.1",
     "ws": "^8.18.0",
-    "@alfe.ai/agent-api-client": "^0.1.4",
-    "@alfe.ai/ai-proxy-local": "^0.0.9",
-    "@alfe.ai/config": "^0.0.8",
-    "@alfe.ai/integration-manifest": "^0.1.0",
-    "@alfe.ai/integrations": "^0.1.0",
-    "@alfe.ai/mcp-bundler": "^0.1.0"
+    "@alfe.ai/agent-api-client": "^0.2.0",
+    "@alfe.ai/ai-proxy-local": "^0.0.10",
+    "@alfe.ai/config": "^0.0.9",
+    "@alfe.ai/integration-manifest": "^0.2.0",
+    "@alfe.ai/integrations": "^0.1.2",
+    "@alfe.ai/mcp-bundler": "^0.2.0"
   },
   "license": "UNLICENSED",
   "scripts": {