@alfe.ai/mcp-bundler 0.2.2 → 0.3.1

package/dist/index.d.ts

@@ -40,6 +40,24 @@ interface ReconcileDiff {
   changed: string[];
   unchanged: string[];
 }
+/**
+ * Live connection status for one MCP server in the bundler. Surfaced so a
+ * host can report whether a server actually connected and how many tools it
+ * advertises — e.g. the daemon confirming an `alfe mcp add` before replying
+ * to the agent, rather than optimistically claiming tools will appear.
+ */
+interface McpServerStatus {
+  /** Server name (store key). */
+  name: string;
+  /** Whether a child process / remote connection is currently established. */
+  connected: boolean;
+  /** Tools currently advertised (0 until the server connects + discovers). */
+  toolCount: number;
+  /** Consecutive failed connect attempts; 0 when healthy. */
+  consecutiveFailures: number;
+  /** Message from the most recent failed connect attempt, if any. */
+  lastError?: string;
+}
 interface Logger {
   debug: (msg: string, meta?: Record<string, unknown>) => void;
   info: (msg: string, meta?: Record<string, unknown>) => void;
@@ -50,12 +68,43 @@ interface McpToolCallResult {
   content: Record<string, unknown>[];
   isError?: boolean;
 }
+/** A failed MCP tool call, surfaced to the host via `BundlerOptions.onToolError`. */
+interface McpToolErrorInfo {
+  /** Server name (key in the store). */
+  server: string;
+  /** Original tool name as the server advertises it. */
+  tool: string;
+  /** Namespaced name the model invoked. */
+  prefixed: string;
+  /**
+   * `thrown` — the call rejected (transport/connect failure, timeout).
+   * `result-error` — the server returned `isError: true` (the MCP SDK also
+   * converts handler throws inside the child into this shape, so this is
+   * where most real tool failures surface).
+   */
+  kind: 'thrown' | 'result-error';
+  /** Error message / first text content of the error result. */
+  message: string;
+}
 interface BundlerOptions {
   logger?: Logger;
   /** Idle TTL for spawned children (ms). 0 disables. Default: 600_000 (10 min). */
   idleTtlMs?: number;
   /** Sweep interval for idle reaping (ms). Default: 60_000 (1 min). */
   idleSweepIntervalMs?: number;
+  /**
+   * Host hook fired when a tool call fails — thrown or `isError` result.
+   * Invoked best-effort (exceptions swallowed); must not block.
+   */
+  onToolError?: (info: McpToolErrorInfo) => void;
+  /** Host hook fired when a server's transport closes unexpectedly (child crash / network drop). */
+  onServerCrash?: (server: string) => void;
+  /**
+   * Host hook fired per stderr line from stdio children. Setting this switches
+   * the child's stderr from `inherit` to `pipe` (the hook consumes the stream,
+   * so the pipe can't back up).
+   */
+  onServerStderr?: (server: string, line: string) => void;
 }
 //# sourceMappingURL=types.d.ts.map
 //#endregion
@@ -63,13 +112,24 @@ interface BundlerOptions {
 /** Env keys OpenClaw rejects from stdio MCP env blocks. Filter them out before spawning. */
 declare const STDIO_ENV_DENYLIST: Set<string>;
 declare function sanitizeStdioEnv(env: Record<string, string> | undefined): Record<string, string>;
+/** Per-connect context the Connection threads into the connect factory. */
+interface ConnectContext {
+  /** Server name (store key) — for logging/attribution. */
+  serverName: string;
+  /**
+   * When set, stdio children are spawned with `stderr: 'pipe'` and each stderr
+   * line is delivered here. When absent, stderr stays `inherit` (host fd).
+   */
+  onStderrLine?: (line: string) => void;
+}
 interface ConnectionDeps {
   /**
    * Factory for an MCP Client connected to the given config. Injected so tests
    * can mock without spawning real processes. In production this wraps
-   * `@modelcontextprotocol/sdk/client`.
+   * `@modelcontextprotocol/sdk/client`. The context arg is optional so
+   * existing test mocks keep working.
    */
-  connect: (server: McpServerConfig) => Promise<McpClientHandle>;
+  connect: (server: McpServerConfig, ctx?: ConnectContext) => Promise<McpClientHandle>;
 }
 /**
  * Minimal interface our connection layer needs from an MCP client. Mirrors
@@ -114,20 +174,34 @@ declare class Connection {
   private closing;
   /** Consecutive failed connect attempts — drives reconnect backoff. */
   private consecutiveFailures;
+  /** Message from the most recent failed connect attempt; cleared on success. */
+  private lastError;
   /** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */
   private reconnectBlockedUntilMs;
   private static readonly RECONNECT_BACKOFF_BASE_MS;
   private static readonly RECONNECT_BACKOFF_MAX_MS;
+  private readonly onUnexpectedClose;
+  private readonly onStderrLine;
   constructor(params: {
     name: string;
     config: McpServerConfig;
     deps: ConnectionDeps;
     logger?: Logger;
+    /** Fired when the transport closes unexpectedly (crash), after internal cleanup. */
+    onUnexpectedClose?: () => void;
+    /** Threaded to the connect factory — pipes stdio child stderr when set. */
+    onStderrLine?: (line: string) => void;
   });
   /** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */
   snapshotTools(): McpToolDescriptor[];
   /** Whether an MCP child process / remote connection has been established. */
   isConnected(): boolean;
+  /** Tools currently advertised; 0 until the server connects + discovers. */
+  toolCount(): number;
+  /** Consecutive failed connect attempts; 0 when healthy. */
+  failureCount(): number;
+  /** Message from the most recent failed connect attempt, if any. */
+  lastErrorMessage(): string | undefined;
   /** Idle timestamp for reaping. */
   idleSinceMs(): number;
   /**
@@ -166,7 +240,7 @@ declare class Connection {
  * Kept in a separate function so tests can substitute a mock without
  * pulling the SDK into the test bundle.
  */
-declare function defaultConnect(server: McpServerConfig): Promise<McpClientHandle>;
+declare function defaultConnect(server: McpServerConfig, ctx?: ConnectContext): Promise<McpClientHandle>;
 //# sourceMappingURL=connection.d.ts.map
 //#endregion
 //#region src/bundler.d.ts
@@ -186,9 +260,16 @@ declare class McpBundler {
   private readonly idleSweepIntervalMs;
   private idleSweepTimer;
   private readonly deps;
+  private readonly onToolError;
+  private readonly onServerCrash;
+  private readonly onServerStderr;
   private disposed;
   private reconcileLatch;
   constructor(opts?: BundlerOptions, deps?: ConnectionDeps);
+  /** Construct a Connection with the host hooks bound to its server name. */
+  private buildConnection;
+  /** Fire the host's tool-error hook; exceptions must never affect the call path. */
+  private reportToolError;
   /**
    * Diff `desired` against current connections, spawn newcomers, dispose
    * removals, hot-restart on config change. Pull-based — call whenever the
@@ -215,6 +296,24 @@ declare class McpBundler {
    * swallowed per-server (logged), so one bad server doesn't fail the batch.
    */
   warmup(): Promise<void>;
+  /** Build the live status descriptor for one connection. */
+  private statusOf;
+  /** Live status for every known server. Synchronous snapshot, no I/O. */
+  statuses(): McpServerStatus[];
+  /**
+   * Eagerly connect ONE server and return its resulting status. Unlike
+   * `warmup()` — which fans out over all servers and swallows failures with
+   * no return value — this surfaces the outcome so a caller (e.g. the daemon
+   * confirming an `alfe mcp add`) can report "connected, N tools" or the exact
+   * connect error back to the agent.
+   *
+   * Never throws: a connect failure (or a warm timeout) is reflected in the
+   * returned status (`connected: false`, `lastError` set). Returns `undefined`
+   * only when the named server isn't present in the bundler.
+   */
+  warmServer(name: string, timeoutMs?: number): Promise<McpServerStatus | undefined>;
+  /** Race a promise against a timeout, clearing the timer either way. */
+  private raceTimeout;
   /**
    * Invoke a tool by its namespaced name. Routes to the originating server.
    * Errors are returned as `{ isError: true, content: [...] }` so a failing
@@ -433,6 +532,24 @@ declare class Manager {
     id: string;
     entry: StoredServerEntry;
   }[];
+  /**
+   * Live connection status per server from the attached bundler. Empty when
+   * no bundler is attached (e.g. a CLI-only manager). Lets callers show
+   * whether each registered server actually connected and how many tools it
+   * advertises, instead of only the stored config.
+   */
+  serverStatuses(): McpServerStatus[];
+  /**
+   * Reconcile the bundler against the current store (so a just-added entry
+   * has a connection object) then eagerly connect ONE server and return its
+   * status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected
+   * before replying to the agent — turning the fire-and-forget warm into a
+   * result the caller can report ("connected, N tools" or the real error).
+   *
+   * Returns `null` when no bundler is attached or the id isn't present; never
+   * throws (a connect failure is carried in the returned status).
+   */
+  warmServer(id: string, timeoutMs?: number): Promise<McpServerStatus | null>;
   /**
    * Push the current store contents into a bundler instance (which owns
    * connections / tools). Wires up a store watcher so external mutations
@@ -512,5 +629,5 @@ declare function fromMcpDescriptor(descriptor: McpToolDescriptor): ValidatableTo
 //# sourceMappingURL=pattern-a-validator.d.ts.map
 
 //#endregion
-export { type AddServerOptions, type BundlerOptions, Connection, type ConnectionDeps, type Logger, Manager, type ManagerOptions, McpBundler, type McpClientHandle, type McpServerConfig, type McpToolCallResult, type McpToolDescriptor, type McpTransportKind, type PatternAOptions, type PatternAViolation, type ReconcileDiff, type RemoteServerConfig, STDIO_ENV_DENYLIST, type ServerOwner, type StdioServerConfig, Store, type StoreOptions, type StoreSchema, type StoredServerEntry, type ValidatableTool, assertPatternA, buildNamespacedToolName, checkPatternA, defaultConnect, defaultStorePath, disambiguateAgainst, fromMcpDescriptor, sanitizeNameSegment, sanitizeStdioEnv, toServerConfig, toStoredEntry };
+export { type AddServerOptions, type BundlerOptions, type ConnectContext, Connection, type ConnectionDeps, type Logger, Manager, type ManagerOptions, McpBundler, type McpClientHandle, type McpServerConfig, type McpServerStatus, type McpToolCallResult, type McpToolDescriptor, type McpToolErrorInfo, type McpTransportKind, type PatternAOptions, type PatternAViolation, type ReconcileDiff, type RemoteServerConfig, STDIO_ENV_DENYLIST, type ServerOwner, type StdioServerConfig, Store, type StoreOptions, type StoreSchema, type StoredServerEntry, type ValidatableTool, assertPatternA, buildNamespacedToolName, checkPatternA, defaultConnect, defaultStorePath, disambiguateAgainst, fromMcpDescriptor, sanitizeNameSegment, sanitizeStdioEnv, toServerConfig, toStoredEntry };
 //# sourceMappingURL=index.d.ts.map

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":";;AAIA;;;AAAkD,KAAtC,eAAA,GAAkB,iBAAoB,GAAA,kBAAA;AAAkB,UAEnD,iBAAA,CAFmD;EAEnD,OAAA,EAAA,MAAA;EAOA,IAAA,CAAA,EAAA,MAAA,EAAA;EAOL,GAAA,CAAA,EAXJ,MAWI,CAAA,MAAgB,EAAA,MAAA,CAAA;EAKX,GAAA,CAAA,EAAA,MAAA;AAejB;AAOiB,UAlCA,kBAAA,CAkCM;EAAA,GAAA,EAAA,MAAA;WACO,CAAA,EAAA,KAAA,GAAA,iBAAA;SACD,CAAA,EAjCjB,MAiCiB,CAAA,MAAA,EAAA,MAAA,CAAA;qBACA,CAAA,EAAA,MAAA;;AACO,KA/BxB,gBAAA,GA+BwB,OAAA,GAAA,KAAA,GAAA,iBAAA;AAGpC;AAKA;;UAlCiB,iBAAA;;ECrBJ,QAAA,EAAA,MAAA;EAUG;EAAgB,MAAA,EAAA,MAAA;;UAA2C,EAAA,MAAA;EAAM;EAUhE,KAAA,EAAA,MAAA;EAAc;aAMX,EAAA,MAAA;;YAAoB,EDO1B,MCP0B,CAAA,MAAA,EAAA,OAAA,CAAA;;AAQvB,UDEA,aAAA,CCFe;EAAA,KAAA,EAAA,MAAA,EAAA;SAC0C,EAAA,MAAA,EAAA;SAA3D,EAAA,MAAA,EAAA;WAC2C,EAAA,MAAA,EAAA;;AAAgB,UDOzD,MAAA,CCPyD;OAC/D,EAAA,CAAA,GAAA,EAAA,MAAA,EAAA,IAAA,CAAA,EDOmB,MCPnB,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA,GAAA,IAAA;EAAO,IAAA,EAAA,CAAA,GAAA,EAAA,MAAA,EAAA,IAAA,CAAA,EDQW,MCRX,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA,GAAA,IAAA;EAeL,IAAA,EAAA,CAAA,GAAA,EAAA,MAAU,EAAA,IAAA,CAAA,EDNM,MCMN,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA,GAAA,IAAA;EAAA,KAAA,EAAA,CAAA,GAAA,EAAA,MAAA,EAAA,IAAA,CAAA,EDLO,MCKP,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA,GAAA,IAAA;;AAuBuB,UDzB7B,iBAAA,CCyB6B;SAAuB,EDxB1D,MCwB0D,CAAA,MAAA,EAAA,OAAA,CAAA,EAAA;SAAyB,CAAA,EAAA,OAAA;;AA0BnE,UD9CV,cAAA,CC8CU;QAwER,CAAA,EDrHR,MCqHQ;;WA8BkE,CAAA,EAAA,MAAA;;qBAYpE,CAAA,EAAA,MAAA;;AA6BjB;;;ADpPA;AAA2B,cCAd,kBDAc,ECAI,GDAJ,CAAA,MAAA,CAAA;AAAG,iBCUd,gBAAA,CDVc,GAAA,ECUQ,MDVR,CAAA,MAAA,EAAA,MAAA,CAAA,GAAA,SAAA,CAAA,ECU6C,MDV7C,CAAA,MAAA,EAAA,MAAA,CAAA;AAAoB,UCoBjC,cAAA,CDpBiC;EAAkB;AAEpE;AAOA;AAOA;AAKA;EAeiB,OAAA,EAAA,CAAA,MAAa,ECVV,eDUU,EAAA,GCVU,ODUV,CCVkB,eDUlB,CAAA;AAO9B;;;;;;AAIoC,UCbnB,eAAA,CDamB;EAGnB,SAAA,EAAA,ECfF,ODemB,CAAA;IAKjB,IAAA,EAAA,MAAA;;iBCpByD;;EAnC7D,QAAA,CAAA,IAAA,EAAA,MAQX,EAAA,IAAA,EAAA,OAR6B,EAAA,IAUC,CAVD,EAAA;IAUf,MAAA,CAAA,EA0B0C,WA1B1B;EAAA,CAAA,CAAA,EA0B0C,OA1B1C,CA0BkD,iBA1BlD,CAAA;OAAM,EAAA,EA2B3B,OA3B2B,CAAA,IAAA,CAAA;;;AAUtC;;;;SAMwC,EAAA,OAAA,EAAA,GAAA,GAAA,IAAA,CAAA,EAAA,IAAA;;AAQxC;;;;;AAEkF,cAgBrE,UAAA,CAhBqE;WAAR,IAAA,EAAA,MAAA;WAC/D,MAAA,EAiBQ,eAjBR;EAAO,iBAAA,IAAA;EAeL,iBAAU,MAAA;EAAA,QAAA,MAAA;UAEJ,KAAA;UAqB2B,eAAA;UAAuB,eAAA;UAAyB,aAAA;UAQ3E,UAAA;;UA0FA,OAAA;;UA8BkE,mBAAA;;UAYpE,uBAAA;EAAO,wBAAA,yBAAA;EA6BF,wBAAc,wBAAA;EAAA,WAAA,CAAA,MAAA,EAAA;IAAS,IAAA,EAAA,MAAA;IAA0B,MAAA,EAzKzB,eAyKyB;IAAR,IAAA,EAzKM,cAyKN;IAAO,MAAA,CAAA,EAzKwB,MAyKxB;;;mBAjKnD;EChEN;EAAU,WAAA,CAAA,CAAA,EAAA,OAAA;;aAayB,CAAA,CAAA,EAAA,MAAA;;;;;iBAqFjC,CAAA,CAAA,EDhBY,OCgBZ,CAAA,IAAA,CAAA;UAkBG,kBAAA;;;;;;;;;AC5HlB;AAIA;AAcA;aFgJmB;yDA8B4C,cAAc,QAAQ;;AGzLrF;AAAqE;AAWrE;;OACK,CAAA,CAAA,EHyLY,OGzLZ,CAAA,IAAA,CAAA;;;;;EAGY,iBAAW,CAAA,CAAA,EAAA,MAAA;;;;;AAsB5B;AAgBA;AAAkB,iBH6KI,cAAA,CG7KJ,MAAA,EH6K2B,eG7K3B,CAAA,EH6K6C,OG7K7C,CH6KqD,eG7KrD,CAAA;;;;;;;;AJrElB;AAOA;AAOA;AAKA;AAeA;AAOiB,cExBJ,UAAA,CFwBU;EAAA,iBAAA,MAAA;mBACO,WAAA;mBACD,SAAA;mBACA,mBAAA;UACC,cAAA;EAAM,iBAAA,IAAA;EAGnB,QAAA,QAAA;EAKA,QAAA,cAAc;qBEvBX,uBAA4B;;;ADhChD;AAUA;;;;;AAUA;EAA+B,SAAA,CAAA,OAAA,EC6BJ,MD7BI,CAAA,MAAA,EC6BW,eD7BX,CAAA,CAAA,EC6B8B,OD7B9B,CC6BsC,aD7BtC,CAAA;UAMX,WAAA;;;;AAQpB;;;;;WAEkF,CAAA,CAAA,ECiFnE,iBDjFmE,EAAA;;;;AAgBlF;;QAEmB,CAAA,CAAA,ECiFD,ODjFC,CAAA,IAAA,CAAA;;;;;;UAuHA,CAAA,QAAA,EAAA,MAAA,EAAA,IAAA,EAAA,OAAA,EAAA,MAAA,CAAA,EClBwC,WDkBxC,CAAA,EClBsD,ODkBtD,CClB8D,iBDkB9D,CAAA;;;;;EA0CK,QAAA,aAAA;EA6BF;;;;SAAyC,CAAA,CAAA,ECjD5C,ODiD4C,CAAA,IAAA,CAAA;EAAO,QAAA,cAAA;;;;;;;ADpPtE;;;;;AAEA;AAOA;AAOA;AAKA;AAeiB,iBGzBD,mBAAA,CHyBc,KAAA,EAAA,MAAA,CAAA,EAAA,MAAA;AAOb,iBG5BD,uBAAA,CH4BO,MAAA,EAAA,MAAA,EAAA,IAAA,EAAA,MAAA,CAAA,EAAA,MAAA;;;;;;AAIa,iBGlBpB,mBAAA,CHkBoB,SAAA,EAAA,MAAA,EAAA,KAAA,EGlB0B,WHkB1B,CAAA,MAAA,CAAA,CAAA,EAAA,MAAA;AAGpC;;;AAlDA;;;;;AAEiB,KIgBL,WAAA,GJhBsB,KAAA,GAAA,eAGpB,MAAA,EAAA,GAAA,QAAA;AAId,UIWU,kBAAA,CJXyB;EAOvB;EAKK,KAAA,EICR,WJDQ;EAeA;EAOA,OAAA,EAAM,MAAA;EAAA;SACO,CAAA,EAAA,MAAA;;AAED,KIjBjB,iBAAA,GJiBiB,CIhBxB,kBJgBwB,GAAA;WACC,EAAA,OAAA;CAAM,GIjBe,iBJiBf,CAAA,GAAA,CIhB/B,kBJgB+B,GAAA;EAGnB,SAAA,EAAA,KAAA,GAAA,iBACN;AAIX,CAAA,GIxBqE,kBJwBtC,CAAA;UItBd,WAAA;WACN,eAAe;;IHlCb,gBAAA,CAQX,EAAA,MAAA;EAEc,CAAA;EAAgB;;;;AAUhC;;oBAMoB,EAAA,MAAA,EAAA;;AAAoB,UG6BvB,YAAA,CH7BuB;EAAO;EAQ9B,IAAA,CAAA,EAAA,MAAA;EAAe,MAAA,CAAA,EGwBrB,MHxBqB;;;;;;;;AAkBhC;;;;AAuBqE,cGJxD,KAAA,CHIwD;mBAAyB,SAAA;mBAQ3E,MAAA;UAkBQ,OAAA;UAwER,gBAAA;UA8B4C,YAAA;aAAsB,CAAA,IAAA,CAAA,EG7HjE,YH6HiE;MAAR,IAAA,CAAA,CAAA,EAAA,MAAA;MAY5D,CAAA,CAAA,EGhIP,WHgIO;EAAO;AA6BxB;;;;;;;;;ACjOA;;;;;;;;QAkGe,CAAA,EAAA,EAAA,CAAA,GAAA,EEGI,WFHJ,EAAA,GEGoB,WFHpB,CAAA,EEGkC,WFHlC;;;;;;;;;;AC1Gf;AAIA;AAcA;;;;ACXA;AAAqE;AAWrE;;;;OAEK,CAAA,EAAA,EAAA,GAAA,GAAA,IAAA,CAAA,EAAA,GAAA,GAAA,IAAA;SAAgE,CAAA,CAAA,EAAA,IAAA;EAAkB,QAAA,aAAA;EAEtE,QAAA,cAAW;;AACF,iBAgQV,gBAAA,CAAA,CAhQU,EAAA,MAAA;;AAAT,iBAqQD,cAAA,CArQC,KAAA,EAqQqB,iBArQrB,CAAA,EAqQyC,eArQzC;AAqBjB;AAgBa,iBAiPG,aAAA,CAjPE,MAAA,EAkPR,eAlPQ,EAAA,IAAA,EAAA;EAAA,KAAA,EAmPD,WAnPC;WAOE,CAAA,EA4OsB,gBA5OtB;SASV,CAAA,EAAA,MAAA;SAiCS,CAAA,EAAA,MAAA;IAmMhB,iBAnMgC;;;AJxHL,UKAb,cAAA,CLAa;;EAAsC,KAAA,CAAA,EKE1D,KLF0D;EAEnD,MAAA,CAAA,EKCN,MLDM;AAOjB;AAOY,UKVK,gBAAA,CLUW;EAKX;EAeA,EAAA,EAAA,MAAA;EAOA;EAAM,KAAA,CAAA,EKjCb,WLiCa;;SAEM,CAAA,EAAA,MAAA;;WAEC,CAAA,EKjChB,gBLiCgB;;AAG9B;AAKA;;;;ACvDA;AAUA;;;;;AAUA;;;;AAMwC,cIM3B,OAAA,CJN2B;EAAO,iBAAA,KAAA;EAQ9B,iBAAA,MAAe;EAAA,QAAA,OAAA;UAC0C,eAAA;UAA3D,gBAAA;aAC2C,CAAA,IAAA,CAAA,EIGtC,cJHsC;;UAAgB,CAAA,CAAA,EIS5D,KJT4D;;;AAgB1E;;;;WAuBqE,CAAA,MAAA,EIpB3C,eJoB2C,EAAA,IAAA,EIpBpB,gBJoBoB,CAAA,EIpBD,OJoBC,CAAA,IAAA,CAAA;;;;;;;cAgIQ,CAAA,EAAA,EAAA,MAAA,EAAA,IAYrD,CAZqD,EAAA;IAY5D,aAAA,CAAA,EIrIkC,WJqIlC;EAAO,CAAA,CAAA,EIrIgD,OJqIhD,CAAA,OAAA,CAAA;EA6BF;EAAc,oBAAA,CAAA,KAAA,EI7IA,WJ6IA,CAAA,EI7Ic,OJ6Id,CAAA,MAAA,EAAA,CAAA;;aAAmC,CAAA,CAAA,EAAA;IAAR,EAAA,EAAA,MAAA;IAAO,KAAA,EIvHhC,iBJuHgC;;;;ACjOtE;;;iBAagD,CAAA,OAAA,EGuGf,UHvGe,CAAA,EGuGF,OHvGE,CAAA,IAAA,CAAA;;UAiBrB,CAAA,EAAA,EAAA,GAAA,GAAA,IAAA,CAAA,EAAA,GAAA,GAAA,IAAA;;;;;;SA0GsD,CAAA,CAAA,EGG9D,OHH8D,CAAA,IAAA,CAAA;UAAR,wBAAA;UAwCtD,gBAAA;EAAO,QAAA,UAAA;;;;;;;;;;;ADtBP,UKzHF,eAAA,CLyHE;;MA8BkE,EAAA,MAAA;;YAYpE,EK/JH,ML+JG,CAAA,MAAA,EAAA,OAAA,CAAA;;AA6BK,UKzLL,eAAA,CLyLmB;EAAA;;;;;;;;ACjOpC;;;;QA8B0C,CAAA,EAAA,SAAA,MAAA,EAAA;;AAA2B,UI0BpD,iBAAA,CJ1BoD;MAAR,EAAA,MAAA;QAoE9C,EAAA,2BAAA,GAAA,uBAAA,GAAA,8BAAA;QAkBG,EAAA,MAAA;;;;;;;;;AC5HlB;AAIA;AAcA;iBGmEgB,aAAA,iBACE,4BACP,kBACR;;;AFjFH;AAAqE;AAWzD,iBE0HI,cAAA,CF1Ha,KAAA,EAAA,SE2HX,eF3HW,EAAA,EAAA,OAAA,EE4HlB,eF5HkB,CAAA,EAAA,IAAA;;;;;;;AAIZ,iBEwID,iBAAA,CFxIY,UAAA,EEwIkB,iBFxIlB,CAAA,EEwIsC,eFxItC"}
+{"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

@@ -81,15 +81,21 @@ var Connection = class Connection {
 	closing = false;
 	/** Consecutive failed connect attempts — drives reconnect backoff. */
 	consecutiveFailures = 0;
+	/** Message from the most recent failed connect attempt; cleared on success. */
+	lastError;
 	/** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */
 	reconnectBlockedUntilMs = 0;
 	static RECONNECT_BACKOFF_BASE_MS = 500;
 	static RECONNECT_BACKOFF_MAX_MS = 3e4;
+	onUnexpectedClose;
+	onStderrLine;
 	constructor(params) {
 		this.name = params.name;
 		this.config = params.config;
 		this.deps = params.deps;
 		this.logger = params.logger;
+		this.onUnexpectedClose = params.onUnexpectedClose;
+		this.onStderrLine = params.onStderrLine;
 	}
 	/** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */
 	snapshotTools() {
@@ -99,6 +105,18 @@ var Connection = class Connection {
 	isConnected() {
 		return this.client !== void 0;
 	}
+	/** Tools currently advertised; 0 until the server connects + discovers. */
+	toolCount() {
+		return this.tools.length;
+	}
+	/** Consecutive failed connect attempts; 0 when healthy. */
+	failureCount() {
+		return this.consecutiveFailures;
+	}
+	/** Message from the most recent failed connect attempt, if any. */
+	lastErrorMessage() {
+		return this.lastError;
+	}
 	/** Idle timestamp for reaping. */
 	idleSinceMs() {
 		return Date.now() - this.lastUsedAt;
@@ -122,13 +140,18 @@ var Connection = class Connection {
 			env: sanitizeStdioEnv(this.config.env)
 		} : this.config;
 		this.logger?.debug(`[mcp-bundler] connecting server "${this.name}"`);
-		const client = await this.deps.connect(safeConfig);
+		let client;
 		try {
+			client = await this.deps.connect(safeConfig, {
+				serverName: this.name,
+				onStderrLine: this.onStderrLine
+			});
 			const advertised = await client.listTools();
-			this.client = client;
+			const connected = client;
+			this.client = connected;
 			this.closing = false;
-			client.onClose?.(() => {
-				this.handleUnexpectedClose(client);
+			connected.onClose?.(() => {
+				this.handleUnexpectedClose(connected);
 			});
 			this.tools = advertised.map((t) => ({
 				prefixed: buildNamespacedToolName(this.name, t.name),
@@ -140,11 +163,13 @@ var Connection = class Connection {
 			}));
 			this.lastUsedAt = Date.now();
 			this.consecutiveFailures = 0;
+			this.lastError = void 0;
 			this.reconnectBlockedUntilMs = 0;
 			this.logger?.info(`[mcp-bundler] server "${this.name}" connected, ${this.tools.length.toString()} tool(s)`);
 		} catch (err) {
-			await client.close().catch(() => void 0);
+			if (client) await 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);
 			this.reconnectBlockedUntilMs = Date.now() + backoff;
 			throw err;
@@ -160,6 +185,9 @@ var Connection = class Connection {
 		this.logger?.warn(`[mcp-bundler] server "${this.name}" connection closed unexpectedly; will re-spawn on next use`);
 		this.client = void 0;
 		this.tools = [];
+		try {
+			this.onUnexpectedClose?.();
+		} catch {}
 	}
 	/**
 	* Re-discover tools. Used on reconnect or `tools/list_changed` notification.
@@ -227,7 +255,7 @@ var Connection = class Connection {
 * Kept in a separate function so tests can substitute a mock without
 * pulling the SDK into the test bundle.
 */
-async function defaultConnect(server) {
+async function defaultConnect(server, ctx) {
 	const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
 	const client = new Client({
 		name: "alfe-mcp-bundler",
@@ -236,12 +264,27 @@ async function defaultConnect(server) {
 	if ("command" in server) {
 		const stdio = server;
 		const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
+		const onStderrLine = ctx?.onStderrLine;
 		const transport = new StdioClientTransport({
 			command: stdio.command,
 			args: stdio.args ?? [],
 			env: { ...sanitizeStdioEnv(stdio.env) },
-			cwd: stdio.cwd
+			cwd: stdio.cwd,
+			...onStderrLine ? { stderr: "pipe" } : {}
 		});
+		if (onStderrLine) {
+			let carry = "";
+			transport.stderr?.on("data", (chunk) => {
+				const parts = (carry + chunk.toString()).split("\n");
+				carry = parts.pop() ?? "";
+				for (const line of parts) {
+					if (line.trim() === "") continue;
+					try {
+						onStderrLine(line);
+					} catch {}
+				}
+			});
+		}
 		await client.connect(transport);
 	} else {
 		const remote = server;
@@ -291,6 +334,11 @@ async function defaultConnect(server) {
 //#region src/bundler.ts
 const DEFAULT_IDLE_TTL_MS = 600 * 1e3;
 const DEFAULT_IDLE_SWEEP_INTERVAL_MS = 60 * 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);
+	return "(no error text)";
+}
 /**
 * Provider-agnostic MCP server bundler. Holds N MCP server connections,
 * exposes a unified namespaced tool catalog, and routes calls to the right
@@ -307,6 +355,9 @@ var McpBundler = class {
 	idleSweepIntervalMs;
 	idleSweepTimer;
 	deps;
+	onToolError;
+	onServerCrash;
+	onServerStderr;
 	disposed = false;
 	reconcileLatch = Promise.resolve();
 	constructor(opts = {}, deps) {
@@ -314,8 +365,34 @@ var McpBundler = class {
 		this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;
 		this.idleSweepIntervalMs = opts.idleSweepIntervalMs ?? DEFAULT_IDLE_SWEEP_INTERVAL_MS;
 		this.deps = deps ?? { connect: defaultConnect };
+		this.onToolError = opts.onToolError;
+		this.onServerCrash = opts.onServerCrash;
+		this.onServerStderr = opts.onServerStderr;
 		if (this.idleTtlMs > 0) this.startIdleSweep();
 	}
+	/** Construct a Connection with the host hooks bound to its server name. */
+	buildConnection(name, config) {
+		const crash = this.onServerCrash;
+		const stderr = this.onServerStderr;
+		return new Connection({
+			name,
+			config,
+			deps: this.deps,
+			logger: this.logger,
+			...crash ? { onUnexpectedClose: () => {
+				crash(name);
+			} } : {},
+			...stderr ? { onStderrLine: (line) => {
+				stderr(name, line);
+			} } : {}
+		});
+	}
+	/** Fire the host's tool-error hook; exceptions must never affect the call path. */
+	reportToolError(info) {
+		try {
+			this.onToolError?.(info);
+		} catch {}
+	}
 	/**
 	* Diff `desired` against current connections, spawn newcomers, dispose
 	* removals, hot-restart on config change. Pull-based — call whenever the
@@ -348,24 +425,14 @@ var McpBundler = class {
 		for (const [name, config] of Object.entries(desired)) {
 			const existing = this.connections.get(name);
 			if (!existing) {
-				this.connections.set(name, new Connection({
-					name,
-					config,
-					deps: this.deps,
-					logger: this.logger
-				}));
+				this.connections.set(name, this.buildConnection(name, config));
 				added.push(name);
 				continue;
 			}
 			const nextFingerprint = JSON.stringify(config);
 			if (existing.configFingerprint() !== nextFingerprint) {
 				await existing.close();
-				this.connections.set(name, new Connection({
-					name,
-					config,
-					deps: this.deps,
-					logger: this.logger
-				}));
+				this.connections.set(name, this.buildConnection(name, config));
 				changed.push(name);
 			} else unchanged.push(name);
 		}
@@ -418,6 +485,64 @@ var McpBundler = class {
 			}
 		}));
 	}
+	/** Build the live status descriptor for one connection. */
+	statusOf(conn) {
+		const status = {
+			name: conn.name,
+			connected: conn.isConnected(),
+			toolCount: conn.toolCount(),
+			consecutiveFailures: conn.failureCount()
+		};
+		const err = conn.lastErrorMessage();
+		if (err !== void 0) status.lastError = err;
+		return status;
+	}
+	/** Live status for every known server. Synchronous snapshot, no I/O. */
+	statuses() {
+		return Array.from(this.connections.values()).map((conn) => this.statusOf(conn));
+	}
+	/**
+	* Eagerly connect ONE server and return its resulting status. Unlike
+	* `warmup()` — which fans out over all servers and swallows failures with
+	* no return value — this surfaces the outcome so a caller (e.g. the daemon
+	* confirming an `alfe mcp add`) can report "connected, N tools" or the exact
+	* connect error back to the agent.
+	*
+	* Never throws: a connect failure (or a warm timeout) is reflected in the
+	* returned status (`connected: false`, `lastError` set). Returns `undefined`
+	* only when the named server isn't present in the bundler.
+	*/
+	async warmServer(name, timeoutMs) {
+		if (this.disposed) return void 0;
+		const conn = this.connections.get(name);
+		if (!conn) return void 0;
+		const connect = conn.ensureConnected();
+		connect.catch(() => void 0);
+		try {
+			if (timeoutMs !== void 0 && timeoutMs > 0) await this.raceTimeout(connect, timeoutMs, name);
+			else await connect;
+		} catch (err) {
+			const status = this.statusOf(conn);
+			status.lastError ??= err instanceof Error ? err.message : String(err);
+			return status;
+		}
+		return this.statusOf(conn);
+	}
+	/** Race a promise against a timeout, clearing the timer either way. */
+	async raceTimeout(p, timeoutMs, name) {
+		let timer;
+		const timeout = new Promise((_, reject) => {
+			timer = setTimeout(() => {
+				reject(/* @__PURE__ */ new Error(`server "${name}" warm timed out after ${timeoutMs.toString()}ms`));
+			}, timeoutMs);
+			if (typeof timer === "object" && "unref" in timer) timer.unref();
+		});
+		try {
+			await Promise.race([p, timeout]);
+		} finally {
+			clearTimeout(timer);
+		}
+	}
 	/**
 	* Invoke a tool by its namespaced name. Routes to the originating server.
 	* Errors are returned as `{ isError: true, content: [...] }` so a failing
@@ -440,10 +565,25 @@ var McpBundler = class {
 			}]
 		};
 		try {
-			return await route.connection.callTool(route.original, args, signal);
+			const result = await route.connection.callTool(route.original, args, signal);
+			if (result.isError) this.reportToolError({
+				server: route.connection.name,
+				tool: route.original,
+				prefixed,
+				kind: "result-error",
+				message: extractErrorText(result)
+			});
+			return result;
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
 			this.logger?.error(`[mcp-bundler] tool call failed for "${prefixed}"`, { err: msg });
+			this.reportToolError({
+				server: route.connection.name,
+				tool: route.original,
+				prefixed,
+				kind: "thrown",
+				message: msg
+			});
 			return {
 				isError: true,
 				content: [{
@@ -861,6 +1001,30 @@ var Manager = class {
 		}));
 	}
 	/**
+	* Live connection status per server from the attached bundler. Empty when
+	* no bundler is attached (e.g. a CLI-only manager). Lets callers show
+	* whether each registered server actually connected and how many tools it
+	* advertises, instead of only the stored config.
+	*/
+	serverStatuses() {
+		return this.bundler ? this.bundler.statuses() : [];
+	}
+	/**
+	* Reconcile the bundler against the current store (so a just-added entry
+	* has a connection object) then eagerly connect ONE server and return its
+	* status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected
+	* before replying to the agent — turning the fire-and-forget warm into a
+	* result the caller can report ("connected, N tools" or the real error).
+	*
+	* Returns `null` when no bundler is attached or the id isn't present; never
+	* throws (a connect failure is carried in the returned status).
+	*/
+	async warmServer(id, timeoutMs) {
+		if (!this.bundler) return null;
+		await this.reconcileBundler();
+		return await this.bundler.warmServer(id, timeoutMs) ?? null;
+	}
+	/**
 	* Push the current store contents into a bundler instance (which owns
 	* connections / tools). Wires up a store watcher so external mutations
 	* (e.g. another shell running `alfe mcp add`) re-reconcile.