@alfe.ai/mcp-bundler 0.3.1 → 0.4.0

package/dist/index.d.ts

@@ -9,6 +9,8 @@ interface StdioServerConfig {
   args?: string[];
   env?: Record<string, string>;
   cwd?: string;
+  /** Per-server connect+discovery bound (ms) — overrides `BundlerOptions.connectTimeoutMs`. */
+  connectionTimeoutMs?: number;
 }
 interface RemoteServerConfig {
   url: string;
@@ -92,6 +94,33 @@ interface BundlerOptions {
   idleTtlMs?: number;
   /** Sweep interval for idle reaping (ms). Default: 60_000 (1 min). */
   idleSweepIntervalMs?: number;
+  /**
+   * Sweep interval for re-attempting servers that failed to connect
+   * (`connected: false && lastError`), so a server whose backing
+   * credential/account/network appears AFTER the first warm self-heals without
+   * an operator restart (ms). 0 disables. Default: 60_000 (1 min). The
+   * fine-grained backoff still lives on each Connection — this is the coarse
+   * outer bound that keeps re-checking.
+   */
+  retrySweepIntervalMs?: number;
+  /**
+   * Upper bound (ms) on one connect + tool-discovery attempt. A hung child —
+   * or a cold `npx` download that never completes the MCP handshake — throws
+   * past this bound, which records `lastError` and arms reconnect backoff so
+   * the retry sweep can re-attempt. Without a bound such a server has no
+   * error, no diagnostics, and no self-heal path. Per-server
+   * `connectionTimeoutMs` overrides. 0 disables. Default: 120_000 (generous
+   * enough for a cold `npx` package download).
+   */
+  connectTimeoutMs?: number;
+  /**
+   * Also have the retry sweep attempt servers that have NEVER had a connect
+   * attempt (e.g. added after the host's warmup pass already ran). Off by
+   * default to preserve pure-lazy embedding semantics; the daemon — which
+   * eagerly warms everything — enables it so a missed warm self-heals within
+   * one sweep instead of stranding the server's tools until a restart.
+   */
+  retryNeverConnected?: boolean;
   /**
    * Host hook fired when a tool call fails — thrown or `isError` result.
    * Invoked best-effort (exceptions swallowed); must not block.
@@ -182,6 +211,9 @@ declare class Connection {
   private static readonly RECONNECT_BACKOFF_MAX_MS;
   private readonly onUnexpectedClose;
   private readonly onStderrLine;
+  private readonly connectTimeoutMs;
+  /** Whether any connect has ever been attempted — drives the eager retry sweep. */
+  private connectAttempted;
   constructor(params: {
     name: string;
     config: McpServerConfig;
@@ -191,6 +223,8 @@ declare class Connection {
     onUnexpectedClose?: () => void;
     /** Threaded to the connect factory — pipes stdio child stderr when set. */
     onStderrLine?: (line: string) => void;
+    /** Bound (ms) on one connect + discovery attempt. 0/undefined disables. */
+    connectTimeoutMs?: number;
   });
   /** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */
   snapshotTools(): McpToolDescriptor[];
@@ -202,6 +236,13 @@ declare class Connection {
   failureCount(): number;
   /** Message from the most recent failed connect attempt, if any. */
   lastErrorMessage(): string | undefined;
+  /**
+   * Whether a connect was ever attempted (success or failure). A reconciled
+   * connection that was never warmed has neither a client nor a `lastError` —
+   * this flag lets an eager host's retry sweep find it without also
+   * resurrecting cleanly-closed (idle-reaped) connections.
+   */
+  hasConnectAttempted(): boolean;
   /** Idle timestamp for reaping. */
   idleSinceMs(): number;
   /**
@@ -210,6 +251,8 @@ declare class Connection {
    */
   ensureConnected(): Promise<void>;
   private connectAndDiscover;
+  /** Race the attempt against `connectTimeoutMs`; 0 disables the bound. */
+  private raceConnectTimeout;
   /**
    * Handle an unexpected transport close (crash / network drop). Clears the
    * dead client + tools so the next `ensureConnected` re-spawns. No-op if we
@@ -259,6 +302,11 @@ declare class McpBundler {
   private readonly idleTtlMs;
   private readonly idleSweepIntervalMs;
   private idleSweepTimer;
+  private readonly retrySweepIntervalMs;
+  private retrySweepTimer;
+  private retrySweepInFlight;
+  private readonly connectTimeoutMs;
+  private readonly retryNeverConnected;
   private readonly deps;
   private readonly onToolError;
   private readonly onServerCrash;
@@ -296,6 +344,30 @@ declare class McpBundler {
    * swallowed per-server (logged), so one bad server doesn't fail the batch.
    */
   warmup(): Promise<void>;
+  /**
+   * Re-attempt every server that is NOT connected but HAS a recorded connect
+   * failure (`connected: false && lastError`). This is the self-heal path: a
+   * server that failed its first warm — because its backing credential /
+   * account / network wasn't resolvable yet — gets reconnected once that
+   * dependency appears, WITHOUT needing an operator to restart the daemon.
+   *
+   * Convergence: this only calls `ensureConnected()`, which honours each
+   * Connection's own exponential reconnect backoff (`reconnectBlockedUntilMs`,
+   * 500ms → 30s cap). A server that keeps `exit(1)`-ing fast-fails while in
+   * backoff, so repeated sweeps are cheap and never become a tight crash-loop
+   * — the backoff widens with each failure. Servers that connect on their
+   * first warm are left alone, as are cleanly-closed (idle-reaped) ones.
+   *
+   * Lazily-added servers that were NEVER attempted (no client, no
+   * `lastError`) are also left alone by default — but with
+   * `retryNeverConnected` (the daemon's eager mode) the sweep picks them up,
+   * so a server added after the host's warmup pass self-heals within one
+   * sweep instead of stranding its tools until a restart.
+   *
+   * Returns the statuses of the servers it attempted (empty if none needed a
+   * retry). Never throws — per-server failures are reflected in the status.
+   */
+  retryFailed(): Promise<McpServerStatus[]>;
   /** Build the live status descriptor for one connection. */
   private statusOf;
   /** Live status for every known server. Synchronous snapshot, no I/O. */
@@ -331,6 +403,7 @@ declare class McpBundler {
    */
   dispose(): Promise<void>;
   private startIdleSweep;
+  private startRetrySweep;
   private sweepIdle;
 }
 //# sourceMappingURL=bundler.d.ts.map
@@ -512,8 +585,11 @@ declare class Manager {
   /**
    * Register or overwrite a server entry. Mutation lands in the store
    * synchronously; if a bundler has been attached via `loadIntoBundler`,
-   * it gets re-reconciled in the background (errors logged, never
-   * thrown — the store is the source of truth, the bundler is derived).
+   * it is re-reconciled BEFORE `onChange` listeners fire (errors logged,
+   * never thrown — the store is the source of truth, the bundler is
+   * derived). The ordering is load-bearing: the daemon's `onChange`
+   * handler warms the bundler's current connections, so the just-added
+   * server must already have its Connection object or it is never warmed.
    */
   addServer(config: McpServerConfig, opts: AddServerOptions): Promise<void>;
   /**
@@ -564,7 +640,13 @@ declare class Manager {
    * shared instance survives multi-manager environments (rare).
    */
   dispose(): Promise<void>;
-  private scheduleBundlerReconcile;
+  /**
+   * Awaited by every mutator so `onChange` listeners observe a bundler
+   * that already contains the mutation. Reconcile failures are logged,
+   * never thrown — a mutation must not fail because the derived bundler
+   * hiccuped.
+   */
+  private reconcileBundlerLogged;
   private reconcileBundler;
   private fireChange;
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/types.ts","../src/connection.ts","../src/bundler.ts","../src/tool-naming.ts","../src/store.ts","../src/manager.ts","../src/pattern-a-validator.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/types.ts","../src/connection.ts","../src/bundler.ts","../src/tool-naming.ts","../src/store.ts","../src/manager.ts","../src/pattern-a-validator.ts"],"mappings":"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"}

package/dist/index.js

@@ -89,6 +89,9 @@ var Connection = class Connection {
 	static RECONNECT_BACKOFF_MAX_MS = 3e4;
 	onUnexpectedClose;
 	onStderrLine;
+	connectTimeoutMs;
+	/** Whether any connect has ever been attempted — drives the eager retry sweep. */
+	connectAttempted = false;
 	constructor(params) {
 		this.name = params.name;
 		this.config = params.config;
@@ -96,6 +99,7 @@ var Connection = class Connection {
 		this.logger = params.logger;
 		this.onUnexpectedClose = params.onUnexpectedClose;
 		this.onStderrLine = params.onStderrLine;
+		this.connectTimeoutMs = params.connectTimeoutMs ?? 0;
 	}
 	/** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */
 	snapshotTools() {
@@ -117,6 +121,15 @@ var Connection = class Connection {
 	lastErrorMessage() {
 		return this.lastError;
 	}
+	/**
+	* Whether a connect was ever attempted (success or failure). A reconciled
+	* connection that was never warmed has neither a client nor a `lastError` —
+	* this flag lets an eager host's retry sweep find it without also
+	* resurrecting cleanly-closed (idle-reaped) connections.
+	*/
+	hasConnectAttempted() {
+		return this.connectAttempted;
+	}
 	/** Idle timestamp for reaping. */
 	idleSinceMs() {
 		return Date.now() - this.lastUsedAt;
@@ -135,23 +148,33 @@ var Connection = class Connection {
 		return this.connectInFlight;
 	}
 	async connectAndDiscover() {
+		this.connectAttempted = true;
 		const safeConfig = "command" in this.config ? {
 			...this.config,
 			env: sanitizeStdioEnv(this.config.env)
 		} : this.config;
 		this.logger?.debug(`[mcp-bundler] connecting server "${this.name}"`);
-		let client;
-		try {
-			client = await this.deps.connect(safeConfig, {
+		const attempt = (async () => {
+			const c = await this.deps.connect(safeConfig, {
 				serverName: this.name,
 				onStderrLine: this.onStderrLine
 			});
-			const advertised = await client.listTools();
-			const connected = client;
-			this.client = connected;
+			try {
+				return {
+					client: c,
+					advertised: await c.listTools()
+				};
+			} catch (err) {
+				await c.close().catch(() => void 0);
+				throw err;
+			}
+		})();
+		try {
+			const { client, advertised } = await this.raceConnectTimeout(attempt);
+			this.client = client;
 			this.closing = false;
-			connected.onClose?.(() => {
-				this.handleUnexpectedClose(connected);
+			client.onClose?.(() => {
+				this.handleUnexpectedClose(client);
 			});
 			this.tools = advertised.map((t) => ({
 				prefixed: buildNamespacedToolName(this.name, t.name),
@@ -167,7 +190,7 @@ var Connection = class Connection {
 			this.reconnectBlockedUntilMs = 0;
 			this.logger?.info(`[mcp-bundler] server "${this.name}" connected, ${this.tools.length.toString()} tool(s)`);
 		} catch (err) {
-			if (client) await client.close().catch(() => void 0);
+			attempt.then(({ client }) => client.close()).catch(() => void 0);
 			this.consecutiveFailures += 1;
 			this.lastError = err instanceof Error ? err.message : String(err);
 			const backoff = Math.min(Connection.RECONNECT_BACKOFF_BASE_MS * 2 ** (this.consecutiveFailures - 1), Connection.RECONNECT_BACKOFF_MAX_MS);
@@ -175,6 +198,23 @@ var Connection = class Connection {
 			throw err;
 		}
 	}
+	/** Race the attempt against `connectTimeoutMs`; 0 disables the bound. */
+	async raceConnectTimeout(attempt) {
+		const ms = this.connectTimeoutMs;
+		if (ms <= 0) return attempt;
+		let timer;
+		const timeout = new Promise((_, reject) => {
+			timer = setTimeout(() => {
+				reject(/* @__PURE__ */ new Error(`server "${this.name}" connect timed out after ${ms.toString()}ms — spawned but did not complete the MCP handshake/discovery`));
+			}, ms);
+			if (typeof timer === "object" && "unref" in timer) timer.unref();
+		});
+		try {
+			return await Promise.race([attempt, timeout]);
+		} finally {
+			clearTimeout(timer);
+		}
+	}
 	/**
 	* Handle an unexpected transport close (crash / network drop). Clears the
 	* dead client + tools so the next `ensureConnected` re-spawns. No-op if we
@@ -334,6 +374,8 @@ async function defaultConnect(server, ctx) {
 //#region src/bundler.ts
 const DEFAULT_IDLE_TTL_MS = 600 * 1e3;
 const DEFAULT_IDLE_SWEEP_INTERVAL_MS = 60 * 1e3;
+const DEFAULT_RETRY_SWEEP_INTERVAL_MS = 60 * 1e3;
+const DEFAULT_CONNECT_TIMEOUT_MS = 120 * 1e3;
 /** First text content of an error result, for host error reporting. */
 function extractErrorText(result) {
 	for (const item of result.content) if (item.type === "text" && typeof item.text === "string") return item.text.slice(0, 500);
@@ -354,6 +396,11 @@ var McpBundler = class {
 	idleTtlMs;
 	idleSweepIntervalMs;
 	idleSweepTimer;
+	retrySweepIntervalMs;
+	retrySweepTimer;
+	retrySweepInFlight = false;
+	connectTimeoutMs;
+	retryNeverConnected;
 	deps;
 	onToolError;
 	onServerCrash;
@@ -364,11 +411,15 @@ var McpBundler = class {
 		this.logger = opts.logger;
 		this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;
 		this.idleSweepIntervalMs = opts.idleSweepIntervalMs ?? DEFAULT_IDLE_SWEEP_INTERVAL_MS;
+		this.retrySweepIntervalMs = opts.retrySweepIntervalMs ?? DEFAULT_RETRY_SWEEP_INTERVAL_MS;
+		this.connectTimeoutMs = opts.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
+		this.retryNeverConnected = opts.retryNeverConnected ?? false;
 		this.deps = deps ?? { connect: defaultConnect };
 		this.onToolError = opts.onToolError;
 		this.onServerCrash = opts.onServerCrash;
 		this.onServerStderr = opts.onServerStderr;
 		if (this.idleTtlMs > 0) this.startIdleSweep();
+		if (this.retrySweepIntervalMs > 0) this.startRetrySweep();
 	}
 	/** Construct a Connection with the host hooks bound to its server name. */
 	buildConnection(name, config) {
@@ -379,6 +430,7 @@ var McpBundler = class {
 			config,
 			deps: this.deps,
 			logger: this.logger,
+			connectTimeoutMs: config.connectionTimeoutMs ?? this.connectTimeoutMs,
 			...crash ? { onUnexpectedClose: () => {
 				crash(name);
 			} } : {},
@@ -485,6 +537,40 @@ var McpBundler = class {
 			}
 		}));
 	}
+	/**
+	* Re-attempt every server that is NOT connected but HAS a recorded connect
+	* failure (`connected: false && lastError`). This is the self-heal path: a
+	* server that failed its first warm — because its backing credential /
+	* account / network wasn't resolvable yet — gets reconnected once that
+	* dependency appears, WITHOUT needing an operator to restart the daemon.
+	*
+	* Convergence: this only calls `ensureConnected()`, which honours each
+	* Connection's own exponential reconnect backoff (`reconnectBlockedUntilMs`,
+	* 500ms → 30s cap). A server that keeps `exit(1)`-ing fast-fails while in
+	* backoff, so repeated sweeps are cheap and never become a tight crash-loop
+	* — the backoff widens with each failure. Servers that connect on their
+	* first warm are left alone, as are cleanly-closed (idle-reaped) ones.
+	*
+	* Lazily-added servers that were NEVER attempted (no client, no
+	* `lastError`) are also left alone by default — but with
+	* `retryNeverConnected` (the daemon's eager mode) the sweep picks them up,
+	* so a server added after the host's warmup pass self-heals within one
+	* sweep instead of stranding its tools until a restart.
+	*
+	* Returns the statuses of the servers it attempted (empty if none needed a
+	* retry). Never throws — per-server failures are reflected in the status.
+	*/
+	async retryFailed() {
+		if (this.disposed) return [];
+		const targets = Array.from(this.connections.values()).filter((conn) => !conn.isConnected() && (conn.lastErrorMessage() !== void 0 || this.retryNeverConnected && !conn.hasConnectAttempted()));
+		if (targets.length === 0) return [];
+		return (await Promise.allSettled(targets.map(async (conn) => {
+			try {
+				await conn.ensureConnected();
+			} catch {}
+			return this.statusOf(conn);
+		}))).flatMap((r) => r.status === "fulfilled" ? [r.value] : []);
+	}
 	/** Build the live status descriptor for one connection. */
 	statusOf(conn) {
 		const status = {
@@ -614,6 +700,10 @@ var McpBundler = class {
 			clearInterval(this.idleSweepTimer);
 			this.idleSweepTimer = void 0;
 		}
+		if (this.retrySweepTimer) {
+			clearInterval(this.retrySweepTimer);
+			this.retrySweepTimer = void 0;
+		}
 		await Promise.allSettled(Array.from(this.connections.values()).map((c) => c.close()));
 		this.connections.clear();
 	}
@@ -625,6 +715,28 @@ var McpBundler = class {
 		}, this.idleSweepIntervalMs);
 		if (typeof this.idleSweepTimer === "object" && "unref" in this.idleSweepTimer) this.idleSweepTimer.unref();
 	}
+	startRetrySweep() {
+		this.retrySweepTimer = setInterval(() => {
+			if (this.retrySweepInFlight) return;
+			this.retrySweepInFlight = true;
+			this.retryFailed().then((attempted) => {
+				if (attempted.length === 0) return;
+				const healed = attempted.filter((s) => s.connected);
+				const stillDown = attempted.filter((s) => !s.connected);
+				this.logger?.debug("[mcp-bundler] retry sweep", {
+					attempted: attempted.length,
+					healed: healed.length,
+					stillDown: stillDown.length
+				});
+				for (const s of healed) this.logger?.info(`[mcp-bundler] server "${s.name}" self-healed on retry sweep`, { toolCount: s.toolCount });
+			}).catch((err) => {
+				this.logger?.warn("[mcp-bundler] retry sweep error", { err: err instanceof Error ? err.message : String(err) });
+			}).finally(() => {
+				this.retrySweepInFlight = false;
+			});
+		}, this.retrySweepIntervalMs);
+		if (typeof this.retrySweepTimer === "object" && "unref" in this.retrySweepTimer) this.retrySweepTimer.unref();
+	}
 	async sweepIdle() {
 		if (this.idleTtlMs <= 0) return;
 		const targets = [];
@@ -929,8 +1041,11 @@ var Manager = class {
 	/**
 	* Register or overwrite a server entry. Mutation lands in the store
 	* synchronously; if a bundler has been attached via `loadIntoBundler`,
-	* it gets re-reconciled in the background (errors logged, never
-	* thrown — the store is the source of truth, the bundler is derived).
+	* it is re-reconciled BEFORE `onChange` listeners fire (errors logged,
+	* never thrown — the store is the source of truth, the bundler is
+	* derived). The ordering is load-bearing: the daemon's `onChange`
+	* handler warms the bundler's current connections, so the just-added
+	* server must already have its Connection object or it is never warmed.
 	*/
 	async addServer(config, opts) {
 		if (!opts.id) throw new Error("Manager.addServer: id is required");
@@ -951,9 +1066,8 @@ var Manager = class {
 				}
 			};
 		});
-		this.scheduleBundlerReconcile();
+		await this.reconcileBundlerLogged();
 		this.fireChange();
-		return Promise.resolve();
 	}
 	/**
 	* Remove a single server entry. No-op if the id isn't in the store.
@@ -961,17 +1075,17 @@ var Manager = class {
 	* when supplied — the CLI uses this to guard `alfe mcp remove` from
 	* accidentally clobbering integration- or cli-owned entries.
 	*/
-	removeServer(id, opts = {}) {
+	async removeServer(id, opts = {}) {
 		const existing = lookupEntry(this.store.read().servers, id);
-		if (!existing) return Promise.resolve(false);
-		if (opts.expectedOwner && existing.owner !== opts.expectedOwner) return Promise.reject(/* @__PURE__ */ new Error(`Manager.removeServer: server "${id}" is owned by "${existing.owner}", not "${opts.expectedOwner}"`));
+		if (!existing) return false;
+		if (opts.expectedOwner && existing.owner !== opts.expectedOwner) throw new Error(`Manager.removeServer: server "${id}" is owned by "${existing.owner}", not "${opts.expectedOwner}"`);
 		this.store.update((cur) => ({
 			...cur,
 			servers: Object.fromEntries(Object.entries(cur.servers).filter(([k]) => k !== id))
 		}));
-		this.scheduleBundlerReconcile();
+		await this.reconcileBundlerLogged();
 		this.fireChange();
-		return Promise.resolve(true);
+		return true;
 	}
 	/** Drop every entry whose owner matches — used by integration uninstall. */
 	async removeServersByOwner(owner) {
@@ -987,10 +1101,10 @@ var Manager = class {
 			};
 		});
 		if (removed.length > 0) {
-			this.scheduleBundlerReconcile();
+			await this.reconcileBundlerLogged();
 			this.fireChange();
 		}
-		return Promise.resolve(removed);
+		return removed;
 	}
 	/** Read-only snapshot for `alfe mcp list` and similar UIs. */
 	listServers() {
@@ -1060,11 +1174,19 @@ var Manager = class {
 		this.bundler = void 0;
 		return Promise.resolve();
 	}
-	scheduleBundlerReconcile() {
+	/**
+	* Awaited by every mutator so `onChange` listeners observe a bundler
+	* that already contains the mutation. Reconcile failures are logged,
+	* never thrown — a mutation must not fail because the derived bundler
+	* hiccuped.
+	*/
+	async reconcileBundlerLogged() {
 		if (!this.bundler) return;
-		this.reconcileBundler().catch((err) => {
+		try {
+			await this.reconcileBundler();
+		} catch (err) {
 			this.logger?.warn("[mcp-bundler/manager] bundler reconcile failed", { err: errMsg(err) });
-		});
+		}
 	}
 	async reconcileBundler() {
 		if (!this.bundler) return;