@alfe.ai/mcp-bundler 0.3.0 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +108 -8
- package/dist/index.d.cts +63 -1
- package/dist/index.d.cts.map +1 -1
- package/dist/index.d.ts +63 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +108 -8
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -82,6 +82,8 @@ var Connection = class Connection {
|
|
|
82
82
|
closing = false;
|
|
83
83
|
/** Consecutive failed connect attempts — drives reconnect backoff. */
|
|
84
84
|
consecutiveFailures = 0;
|
|
85
|
+
/** Message from the most recent failed connect attempt; cleared on success. */
|
|
86
|
+
lastError;
|
|
85
87
|
/** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */
|
|
86
88
|
reconnectBlockedUntilMs = 0;
|
|
87
89
|
static RECONNECT_BACKOFF_BASE_MS = 500;
|
|
@@ -104,6 +106,18 @@ var Connection = class Connection {
|
|
|
104
106
|
isConnected() {
|
|
105
107
|
return this.client !== void 0;
|
|
106
108
|
}
|
|
109
|
+
/** Tools currently advertised; 0 until the server connects + discovers. */
|
|
110
|
+
toolCount() {
|
|
111
|
+
return this.tools.length;
|
|
112
|
+
}
|
|
113
|
+
/** Consecutive failed connect attempts; 0 when healthy. */
|
|
114
|
+
failureCount() {
|
|
115
|
+
return this.consecutiveFailures;
|
|
116
|
+
}
|
|
117
|
+
/** Message from the most recent failed connect attempt, if any. */
|
|
118
|
+
lastErrorMessage() {
|
|
119
|
+
return this.lastError;
|
|
120
|
+
}
|
|
107
121
|
/** Idle timestamp for reaping. */
|
|
108
122
|
idleSinceMs() {
|
|
109
123
|
return Date.now() - this.lastUsedAt;
|
|
@@ -127,16 +141,18 @@ var Connection = class Connection {
|
|
|
127
141
|
env: sanitizeStdioEnv(this.config.env)
|
|
128
142
|
} : this.config;
|
|
129
143
|
this.logger?.debug(`[mcp-bundler] connecting server "${this.name}"`);
|
|
130
|
-
|
|
131
|
-
serverName: this.name,
|
|
132
|
-
onStderrLine: this.onStderrLine
|
|
133
|
-
});
|
|
144
|
+
let client;
|
|
134
145
|
try {
|
|
146
|
+
client = await this.deps.connect(safeConfig, {
|
|
147
|
+
serverName: this.name,
|
|
148
|
+
onStderrLine: this.onStderrLine
|
|
149
|
+
});
|
|
135
150
|
const advertised = await client.listTools();
|
|
136
|
-
|
|
151
|
+
const connected = client;
|
|
152
|
+
this.client = connected;
|
|
137
153
|
this.closing = false;
|
|
138
|
-
|
|
139
|
-
this.handleUnexpectedClose(
|
|
154
|
+
connected.onClose?.(() => {
|
|
155
|
+
this.handleUnexpectedClose(connected);
|
|
140
156
|
});
|
|
141
157
|
this.tools = advertised.map((t) => ({
|
|
142
158
|
prefixed: buildNamespacedToolName(this.name, t.name),
|
|
@@ -148,11 +164,13 @@ var Connection = class Connection {
|
|
|
148
164
|
}));
|
|
149
165
|
this.lastUsedAt = Date.now();
|
|
150
166
|
this.consecutiveFailures = 0;
|
|
167
|
+
this.lastError = void 0;
|
|
151
168
|
this.reconnectBlockedUntilMs = 0;
|
|
152
169
|
this.logger?.info(`[mcp-bundler] server "${this.name}" connected, ${this.tools.length.toString()} tool(s)`);
|
|
153
170
|
} catch (err) {
|
|
154
|
-
await client.close().catch(() => void 0);
|
|
171
|
+
if (client) await client.close().catch(() => void 0);
|
|
155
172
|
this.consecutiveFailures += 1;
|
|
173
|
+
this.lastError = err instanceof Error ? err.message : String(err);
|
|
156
174
|
const backoff = Math.min(Connection.RECONNECT_BACKOFF_BASE_MS * 2 ** (this.consecutiveFailures - 1), Connection.RECONNECT_BACKOFF_MAX_MS);
|
|
157
175
|
this.reconnectBlockedUntilMs = Date.now() + backoff;
|
|
158
176
|
throw err;
|
|
@@ -468,6 +486,64 @@ var McpBundler = class {
|
|
|
468
486
|
}
|
|
469
487
|
}));
|
|
470
488
|
}
|
|
489
|
+
/** Build the live status descriptor for one connection. */
|
|
490
|
+
statusOf(conn) {
|
|
491
|
+
const status = {
|
|
492
|
+
name: conn.name,
|
|
493
|
+
connected: conn.isConnected(),
|
|
494
|
+
toolCount: conn.toolCount(),
|
|
495
|
+
consecutiveFailures: conn.failureCount()
|
|
496
|
+
};
|
|
497
|
+
const err = conn.lastErrorMessage();
|
|
498
|
+
if (err !== void 0) status.lastError = err;
|
|
499
|
+
return status;
|
|
500
|
+
}
|
|
501
|
+
/** Live status for every known server. Synchronous snapshot, no I/O. */
|
|
502
|
+
statuses() {
|
|
503
|
+
return Array.from(this.connections.values()).map((conn) => this.statusOf(conn));
|
|
504
|
+
}
|
|
505
|
+
/**
|
|
506
|
+
* Eagerly connect ONE server and return its resulting status. Unlike
|
|
507
|
+
* `warmup()` — which fans out over all servers and swallows failures with
|
|
508
|
+
* no return value — this surfaces the outcome so a caller (e.g. the daemon
|
|
509
|
+
* confirming an `alfe mcp add`) can report "connected, N tools" or the exact
|
|
510
|
+
* connect error back to the agent.
|
|
511
|
+
*
|
|
512
|
+
* Never throws: a connect failure (or a warm timeout) is reflected in the
|
|
513
|
+
* returned status (`connected: false`, `lastError` set). Returns `undefined`
|
|
514
|
+
* only when the named server isn't present in the bundler.
|
|
515
|
+
*/
|
|
516
|
+
async warmServer(name, timeoutMs) {
|
|
517
|
+
if (this.disposed) return void 0;
|
|
518
|
+
const conn = this.connections.get(name);
|
|
519
|
+
if (!conn) return void 0;
|
|
520
|
+
const connect = conn.ensureConnected();
|
|
521
|
+
connect.catch(() => void 0);
|
|
522
|
+
try {
|
|
523
|
+
if (timeoutMs !== void 0 && timeoutMs > 0) await this.raceTimeout(connect, timeoutMs, name);
|
|
524
|
+
else await connect;
|
|
525
|
+
} catch (err) {
|
|
526
|
+
const status = this.statusOf(conn);
|
|
527
|
+
status.lastError ??= err instanceof Error ? err.message : String(err);
|
|
528
|
+
return status;
|
|
529
|
+
}
|
|
530
|
+
return this.statusOf(conn);
|
|
531
|
+
}
|
|
532
|
+
/** Race a promise against a timeout, clearing the timer either way. */
|
|
533
|
+
async raceTimeout(p, timeoutMs, name) {
|
|
534
|
+
let timer;
|
|
535
|
+
const timeout = new Promise((_, reject) => {
|
|
536
|
+
timer = setTimeout(() => {
|
|
537
|
+
reject(/* @__PURE__ */ new Error(`server "${name}" warm timed out after ${timeoutMs.toString()}ms`));
|
|
538
|
+
}, timeoutMs);
|
|
539
|
+
if (typeof timer === "object" && "unref" in timer) timer.unref();
|
|
540
|
+
});
|
|
541
|
+
try {
|
|
542
|
+
await Promise.race([p, timeout]);
|
|
543
|
+
} finally {
|
|
544
|
+
clearTimeout(timer);
|
|
545
|
+
}
|
|
546
|
+
}
|
|
471
547
|
/**
|
|
472
548
|
* Invoke a tool by its namespaced name. Routes to the originating server.
|
|
473
549
|
* Errors are returned as `{ isError: true, content: [...] }` so a failing
|
|
@@ -926,6 +1002,30 @@ var Manager = class {
|
|
|
926
1002
|
}));
|
|
927
1003
|
}
|
|
928
1004
|
/**
|
|
1005
|
+
* Live connection status per server from the attached bundler. Empty when
|
|
1006
|
+
* no bundler is attached (e.g. a CLI-only manager). Lets callers show
|
|
1007
|
+
* whether each registered server actually connected and how many tools it
|
|
1008
|
+
* advertises, instead of only the stored config.
|
|
1009
|
+
*/
|
|
1010
|
+
serverStatuses() {
|
|
1011
|
+
return this.bundler ? this.bundler.statuses() : [];
|
|
1012
|
+
}
|
|
1013
|
+
/**
|
|
1014
|
+
* Reconcile the bundler against the current store (so a just-added entry
|
|
1015
|
+
* has a connection object) then eagerly connect ONE server and return its
|
|
1016
|
+
* status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected
|
|
1017
|
+
* before replying to the agent — turning the fire-and-forget warm into a
|
|
1018
|
+
* result the caller can report ("connected, N tools" or the real error).
|
|
1019
|
+
*
|
|
1020
|
+
* Returns `null` when no bundler is attached or the id isn't present; never
|
|
1021
|
+
* throws (a connect failure is carried in the returned status).
|
|
1022
|
+
*/
|
|
1023
|
+
async warmServer(id, timeoutMs) {
|
|
1024
|
+
if (!this.bundler) return null;
|
|
1025
|
+
await this.reconcileBundler();
|
|
1026
|
+
return await this.bundler.warmServer(id, timeoutMs) ?? null;
|
|
1027
|
+
}
|
|
1028
|
+
/**
|
|
929
1029
|
* Push the current store contents into a bundler instance (which owns
|
|
930
1030
|
* connections / tools). Wires up a store watcher so external mutations
|
|
931
1031
|
* (e.g. another shell running `alfe mcp add`) re-reconcile.
|
package/dist/index.d.cts
CHANGED
|
@@ -40,6 +40,24 @@ interface ReconcileDiff {
|
|
|
40
40
|
changed: string[];
|
|
41
41
|
unchanged: string[];
|
|
42
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* Live connection status for one MCP server in the bundler. Surfaced so a
|
|
45
|
+
* host can report whether a server actually connected and how many tools it
|
|
46
|
+
* advertises — e.g. the daemon confirming an `alfe mcp add` before replying
|
|
47
|
+
* to the agent, rather than optimistically claiming tools will appear.
|
|
48
|
+
*/
|
|
49
|
+
interface McpServerStatus {
|
|
50
|
+
/** Server name (store key). */
|
|
51
|
+
name: string;
|
|
52
|
+
/** Whether a child process / remote connection is currently established. */
|
|
53
|
+
connected: boolean;
|
|
54
|
+
/** Tools currently advertised (0 until the server connects + discovers). */
|
|
55
|
+
toolCount: number;
|
|
56
|
+
/** Consecutive failed connect attempts; 0 when healthy. */
|
|
57
|
+
consecutiveFailures: number;
|
|
58
|
+
/** Message from the most recent failed connect attempt, if any. */
|
|
59
|
+
lastError?: string;
|
|
60
|
+
}
|
|
43
61
|
interface Logger {
|
|
44
62
|
debug: (msg: string, meta?: Record<string, unknown>) => void;
|
|
45
63
|
info: (msg: string, meta?: Record<string, unknown>) => void;
|
|
@@ -156,6 +174,8 @@ declare class Connection {
|
|
|
156
174
|
private closing;
|
|
157
175
|
/** Consecutive failed connect attempts — drives reconnect backoff. */
|
|
158
176
|
private consecutiveFailures;
|
|
177
|
+
/** Message from the most recent failed connect attempt; cleared on success. */
|
|
178
|
+
private lastError;
|
|
159
179
|
/** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */
|
|
160
180
|
private reconnectBlockedUntilMs;
|
|
161
181
|
private static readonly RECONNECT_BACKOFF_BASE_MS;
|
|
@@ -176,6 +196,12 @@ declare class Connection {
|
|
|
176
196
|
snapshotTools(): McpToolDescriptor[];
|
|
177
197
|
/** Whether an MCP child process / remote connection has been established. */
|
|
178
198
|
isConnected(): boolean;
|
|
199
|
+
/** Tools currently advertised; 0 until the server connects + discovers. */
|
|
200
|
+
toolCount(): number;
|
|
201
|
+
/** Consecutive failed connect attempts; 0 when healthy. */
|
|
202
|
+
failureCount(): number;
|
|
203
|
+
/** Message from the most recent failed connect attempt, if any. */
|
|
204
|
+
lastErrorMessage(): string | undefined;
|
|
179
205
|
/** Idle timestamp for reaping. */
|
|
180
206
|
idleSinceMs(): number;
|
|
181
207
|
/**
|
|
@@ -270,6 +296,24 @@ declare class McpBundler {
|
|
|
270
296
|
* swallowed per-server (logged), so one bad server doesn't fail the batch.
|
|
271
297
|
*/
|
|
272
298
|
warmup(): Promise<void>;
|
|
299
|
+
/** Build the live status descriptor for one connection. */
|
|
300
|
+
private statusOf;
|
|
301
|
+
/** Live status for every known server. Synchronous snapshot, no I/O. */
|
|
302
|
+
statuses(): McpServerStatus[];
|
|
303
|
+
/**
|
|
304
|
+
* Eagerly connect ONE server and return its resulting status. Unlike
|
|
305
|
+
* `warmup()` — which fans out over all servers and swallows failures with
|
|
306
|
+
* no return value — this surfaces the outcome so a caller (e.g. the daemon
|
|
307
|
+
* confirming an `alfe mcp add`) can report "connected, N tools" or the exact
|
|
308
|
+
* connect error back to the agent.
|
|
309
|
+
*
|
|
310
|
+
* Never throws: a connect failure (or a warm timeout) is reflected in the
|
|
311
|
+
* returned status (`connected: false`, `lastError` set). Returns `undefined`
|
|
312
|
+
* only when the named server isn't present in the bundler.
|
|
313
|
+
*/
|
|
314
|
+
warmServer(name: string, timeoutMs?: number): Promise<McpServerStatus | undefined>;
|
|
315
|
+
/** Race a promise against a timeout, clearing the timer either way. */
|
|
316
|
+
private raceTimeout;
|
|
273
317
|
/**
|
|
274
318
|
* Invoke a tool by its namespaced name. Routes to the originating server.
|
|
275
319
|
* Errors are returned as `{ isError: true, content: [...] }` so a failing
|
|
@@ -488,6 +532,24 @@ declare class Manager {
|
|
|
488
532
|
id: string;
|
|
489
533
|
entry: StoredServerEntry;
|
|
490
534
|
}[];
|
|
535
|
+
/**
|
|
536
|
+
* Live connection status per server from the attached bundler. Empty when
|
|
537
|
+
* no bundler is attached (e.g. a CLI-only manager). Lets callers show
|
|
538
|
+
* whether each registered server actually connected and how many tools it
|
|
539
|
+
* advertises, instead of only the stored config.
|
|
540
|
+
*/
|
|
541
|
+
serverStatuses(): McpServerStatus[];
|
|
542
|
+
/**
|
|
543
|
+
* Reconcile the bundler against the current store (so a just-added entry
|
|
544
|
+
* has a connection object) then eagerly connect ONE server and return its
|
|
545
|
+
* status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected
|
|
546
|
+
* before replying to the agent — turning the fire-and-forget warm into a
|
|
547
|
+
* result the caller can report ("connected, N tools" or the real error).
|
|
548
|
+
*
|
|
549
|
+
* Returns `null` when no bundler is attached or the id isn't present; never
|
|
550
|
+
* throws (a connect failure is carried in the returned status).
|
|
551
|
+
*/
|
|
552
|
+
warmServer(id: string, timeoutMs?: number): Promise<McpServerStatus | null>;
|
|
491
553
|
/**
|
|
492
554
|
* Push the current store contents into a bundler instance (which owns
|
|
493
555
|
* connections / tools). Wires up a store watcher so external mutations
|
|
@@ -567,5 +629,5 @@ declare function fromMcpDescriptor(descriptor: McpToolDescriptor): ValidatableTo
|
|
|
567
629
|
//# sourceMappingURL=pattern-a-validator.d.ts.map
|
|
568
630
|
|
|
569
631
|
//#endregion
|
|
570
|
-
export { type AddServerOptions, type BundlerOptions, type ConnectContext, Connection, type ConnectionDeps, type Logger, Manager, type ManagerOptions, McpBundler, type McpClientHandle, type McpServerConfig, 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 };
|
|
632
|
+
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 };
|
|
571
633
|
//# sourceMappingURL=index.d.cts.map
|
package/dist/index.d.cts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.cts","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;
|
|
1
|
+
{"version":3,"file":"index.d.cts","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.d.ts
CHANGED
|
@@ -40,6 +40,24 @@ interface ReconcileDiff {
|
|
|
40
40
|
changed: string[];
|
|
41
41
|
unchanged: string[];
|
|
42
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* Live connection status for one MCP server in the bundler. Surfaced so a
|
|
45
|
+
* host can report whether a server actually connected and how many tools it
|
|
46
|
+
* advertises — e.g. the daemon confirming an `alfe mcp add` before replying
|
|
47
|
+
* to the agent, rather than optimistically claiming tools will appear.
|
|
48
|
+
*/
|
|
49
|
+
interface McpServerStatus {
|
|
50
|
+
/** Server name (store key). */
|
|
51
|
+
name: string;
|
|
52
|
+
/** Whether a child process / remote connection is currently established. */
|
|
53
|
+
connected: boolean;
|
|
54
|
+
/** Tools currently advertised (0 until the server connects + discovers). */
|
|
55
|
+
toolCount: number;
|
|
56
|
+
/** Consecutive failed connect attempts; 0 when healthy. */
|
|
57
|
+
consecutiveFailures: number;
|
|
58
|
+
/** Message from the most recent failed connect attempt, if any. */
|
|
59
|
+
lastError?: string;
|
|
60
|
+
}
|
|
43
61
|
interface Logger {
|
|
44
62
|
debug: (msg: string, meta?: Record<string, unknown>) => void;
|
|
45
63
|
info: (msg: string, meta?: Record<string, unknown>) => void;
|
|
@@ -156,6 +174,8 @@ declare class Connection {
|
|
|
156
174
|
private closing;
|
|
157
175
|
/** Consecutive failed connect attempts — drives reconnect backoff. */
|
|
158
176
|
private consecutiveFailures;
|
|
177
|
+
/** Message from the most recent failed connect attempt; cleared on success. */
|
|
178
|
+
private lastError;
|
|
159
179
|
/** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */
|
|
160
180
|
private reconnectBlockedUntilMs;
|
|
161
181
|
private static readonly RECONNECT_BACKOFF_BASE_MS;
|
|
@@ -176,6 +196,12 @@ declare class Connection {
|
|
|
176
196
|
snapshotTools(): McpToolDescriptor[];
|
|
177
197
|
/** Whether an MCP child process / remote connection has been established. */
|
|
178
198
|
isConnected(): boolean;
|
|
199
|
+
/** Tools currently advertised; 0 until the server connects + discovers. */
|
|
200
|
+
toolCount(): number;
|
|
201
|
+
/** Consecutive failed connect attempts; 0 when healthy. */
|
|
202
|
+
failureCount(): number;
|
|
203
|
+
/** Message from the most recent failed connect attempt, if any. */
|
|
204
|
+
lastErrorMessage(): string | undefined;
|
|
179
205
|
/** Idle timestamp for reaping. */
|
|
180
206
|
idleSinceMs(): number;
|
|
181
207
|
/**
|
|
@@ -270,6 +296,24 @@ declare class McpBundler {
|
|
|
270
296
|
* swallowed per-server (logged), so one bad server doesn't fail the batch.
|
|
271
297
|
*/
|
|
272
298
|
warmup(): Promise<void>;
|
|
299
|
+
/** Build the live status descriptor for one connection. */
|
|
300
|
+
private statusOf;
|
|
301
|
+
/** Live status for every known server. Synchronous snapshot, no I/O. */
|
|
302
|
+
statuses(): McpServerStatus[];
|
|
303
|
+
/**
|
|
304
|
+
* Eagerly connect ONE server and return its resulting status. Unlike
|
|
305
|
+
* `warmup()` — which fans out over all servers and swallows failures with
|
|
306
|
+
* no return value — this surfaces the outcome so a caller (e.g. the daemon
|
|
307
|
+
* confirming an `alfe mcp add`) can report "connected, N tools" or the exact
|
|
308
|
+
* connect error back to the agent.
|
|
309
|
+
*
|
|
310
|
+
* Never throws: a connect failure (or a warm timeout) is reflected in the
|
|
311
|
+
* returned status (`connected: false`, `lastError` set). Returns `undefined`
|
|
312
|
+
* only when the named server isn't present in the bundler.
|
|
313
|
+
*/
|
|
314
|
+
warmServer(name: string, timeoutMs?: number): Promise<McpServerStatus | undefined>;
|
|
315
|
+
/** Race a promise against a timeout, clearing the timer either way. */
|
|
316
|
+
private raceTimeout;
|
|
273
317
|
/**
|
|
274
318
|
* Invoke a tool by its namespaced name. Routes to the originating server.
|
|
275
319
|
* Errors are returned as `{ isError: true, content: [...] }` so a failing
|
|
@@ -488,6 +532,24 @@ declare class Manager {
|
|
|
488
532
|
id: string;
|
|
489
533
|
entry: StoredServerEntry;
|
|
490
534
|
}[];
|
|
535
|
+
/**
|
|
536
|
+
* Live connection status per server from the attached bundler. Empty when
|
|
537
|
+
* no bundler is attached (e.g. a CLI-only manager). Lets callers show
|
|
538
|
+
* whether each registered server actually connected and how many tools it
|
|
539
|
+
* advertises, instead of only the stored config.
|
|
540
|
+
*/
|
|
541
|
+
serverStatuses(): McpServerStatus[];
|
|
542
|
+
/**
|
|
543
|
+
* Reconcile the bundler against the current store (so a just-added entry
|
|
544
|
+
* has a connection object) then eagerly connect ONE server and return its
|
|
545
|
+
* status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected
|
|
546
|
+
* before replying to the agent — turning the fire-and-forget warm into a
|
|
547
|
+
* result the caller can report ("connected, N tools" or the real error).
|
|
548
|
+
*
|
|
549
|
+
* Returns `null` when no bundler is attached or the id isn't present; never
|
|
550
|
+
* throws (a connect failure is carried in the returned status).
|
|
551
|
+
*/
|
|
552
|
+
warmServer(id: string, timeoutMs?: number): Promise<McpServerStatus | null>;
|
|
491
553
|
/**
|
|
492
554
|
* Push the current store contents into a bundler instance (which owns
|
|
493
555
|
* connections / tools). Wires up a store watcher so external mutations
|
|
@@ -567,5 +629,5 @@ declare function fromMcpDescriptor(descriptor: McpToolDescriptor): ValidatableTo
|
|
|
567
629
|
//# sourceMappingURL=pattern-a-validator.d.ts.map
|
|
568
630
|
|
|
569
631
|
//#endregion
|
|
570
|
-
export { type AddServerOptions, type BundlerOptions, type ConnectContext, Connection, type ConnectionDeps, type Logger, Manager, type ManagerOptions, McpBundler, type McpClientHandle, type McpServerConfig, 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 };
|
|
632
|
+
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 };
|
|
571
633
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +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;
|
|
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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"}
|
package/dist/index.js
CHANGED
|
@@ -81,6 +81,8 @@ var Connection = class Connection {
|
|
|
81
81
|
closing = false;
|
|
82
82
|
/** Consecutive failed connect attempts — drives reconnect backoff. */
|
|
83
83
|
consecutiveFailures = 0;
|
|
84
|
+
/** Message from the most recent failed connect attempt; cleared on success. */
|
|
85
|
+
lastError;
|
|
84
86
|
/** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */
|
|
85
87
|
reconnectBlockedUntilMs = 0;
|
|
86
88
|
static RECONNECT_BACKOFF_BASE_MS = 500;
|
|
@@ -103,6 +105,18 @@ var Connection = class Connection {
|
|
|
103
105
|
isConnected() {
|
|
104
106
|
return this.client !== void 0;
|
|
105
107
|
}
|
|
108
|
+
/** Tools currently advertised; 0 until the server connects + discovers. */
|
|
109
|
+
toolCount() {
|
|
110
|
+
return this.tools.length;
|
|
111
|
+
}
|
|
112
|
+
/** Consecutive failed connect attempts; 0 when healthy. */
|
|
113
|
+
failureCount() {
|
|
114
|
+
return this.consecutiveFailures;
|
|
115
|
+
}
|
|
116
|
+
/** Message from the most recent failed connect attempt, if any. */
|
|
117
|
+
lastErrorMessage() {
|
|
118
|
+
return this.lastError;
|
|
119
|
+
}
|
|
106
120
|
/** Idle timestamp for reaping. */
|
|
107
121
|
idleSinceMs() {
|
|
108
122
|
return Date.now() - this.lastUsedAt;
|
|
@@ -126,16 +140,18 @@ var Connection = class Connection {
|
|
|
126
140
|
env: sanitizeStdioEnv(this.config.env)
|
|
127
141
|
} : this.config;
|
|
128
142
|
this.logger?.debug(`[mcp-bundler] connecting server "${this.name}"`);
|
|
129
|
-
|
|
130
|
-
serverName: this.name,
|
|
131
|
-
onStderrLine: this.onStderrLine
|
|
132
|
-
});
|
|
143
|
+
let client;
|
|
133
144
|
try {
|
|
145
|
+
client = await this.deps.connect(safeConfig, {
|
|
146
|
+
serverName: this.name,
|
|
147
|
+
onStderrLine: this.onStderrLine
|
|
148
|
+
});
|
|
134
149
|
const advertised = await client.listTools();
|
|
135
|
-
|
|
150
|
+
const connected = client;
|
|
151
|
+
this.client = connected;
|
|
136
152
|
this.closing = false;
|
|
137
|
-
|
|
138
|
-
this.handleUnexpectedClose(
|
|
153
|
+
connected.onClose?.(() => {
|
|
154
|
+
this.handleUnexpectedClose(connected);
|
|
139
155
|
});
|
|
140
156
|
this.tools = advertised.map((t) => ({
|
|
141
157
|
prefixed: buildNamespacedToolName(this.name, t.name),
|
|
@@ -147,11 +163,13 @@ var Connection = class Connection {
|
|
|
147
163
|
}));
|
|
148
164
|
this.lastUsedAt = Date.now();
|
|
149
165
|
this.consecutiveFailures = 0;
|
|
166
|
+
this.lastError = void 0;
|
|
150
167
|
this.reconnectBlockedUntilMs = 0;
|
|
151
168
|
this.logger?.info(`[mcp-bundler] server "${this.name}" connected, ${this.tools.length.toString()} tool(s)`);
|
|
152
169
|
} catch (err) {
|
|
153
|
-
await client.close().catch(() => void 0);
|
|
170
|
+
if (client) await client.close().catch(() => void 0);
|
|
154
171
|
this.consecutiveFailures += 1;
|
|
172
|
+
this.lastError = err instanceof Error ? err.message : String(err);
|
|
155
173
|
const backoff = Math.min(Connection.RECONNECT_BACKOFF_BASE_MS * 2 ** (this.consecutiveFailures - 1), Connection.RECONNECT_BACKOFF_MAX_MS);
|
|
156
174
|
this.reconnectBlockedUntilMs = Date.now() + backoff;
|
|
157
175
|
throw err;
|
|
@@ -467,6 +485,64 @@ var McpBundler = class {
|
|
|
467
485
|
}
|
|
468
486
|
}));
|
|
469
487
|
}
|
|
488
|
+
/** Build the live status descriptor for one connection. */
|
|
489
|
+
statusOf(conn) {
|
|
490
|
+
const status = {
|
|
491
|
+
name: conn.name,
|
|
492
|
+
connected: conn.isConnected(),
|
|
493
|
+
toolCount: conn.toolCount(),
|
|
494
|
+
consecutiveFailures: conn.failureCount()
|
|
495
|
+
};
|
|
496
|
+
const err = conn.lastErrorMessage();
|
|
497
|
+
if (err !== void 0) status.lastError = err;
|
|
498
|
+
return status;
|
|
499
|
+
}
|
|
500
|
+
/** Live status for every known server. Synchronous snapshot, no I/O. */
|
|
501
|
+
statuses() {
|
|
502
|
+
return Array.from(this.connections.values()).map((conn) => this.statusOf(conn));
|
|
503
|
+
}
|
|
504
|
+
/**
|
|
505
|
+
* Eagerly connect ONE server and return its resulting status. Unlike
|
|
506
|
+
* `warmup()` — which fans out over all servers and swallows failures with
|
|
507
|
+
* no return value — this surfaces the outcome so a caller (e.g. the daemon
|
|
508
|
+
* confirming an `alfe mcp add`) can report "connected, N tools" or the exact
|
|
509
|
+
* connect error back to the agent.
|
|
510
|
+
*
|
|
511
|
+
* Never throws: a connect failure (or a warm timeout) is reflected in the
|
|
512
|
+
* returned status (`connected: false`, `lastError` set). Returns `undefined`
|
|
513
|
+
* only when the named server isn't present in the bundler.
|
|
514
|
+
*/
|
|
515
|
+
async warmServer(name, timeoutMs) {
|
|
516
|
+
if (this.disposed) return void 0;
|
|
517
|
+
const conn = this.connections.get(name);
|
|
518
|
+
if (!conn) return void 0;
|
|
519
|
+
const connect = conn.ensureConnected();
|
|
520
|
+
connect.catch(() => void 0);
|
|
521
|
+
try {
|
|
522
|
+
if (timeoutMs !== void 0 && timeoutMs > 0) await this.raceTimeout(connect, timeoutMs, name);
|
|
523
|
+
else await connect;
|
|
524
|
+
} catch (err) {
|
|
525
|
+
const status = this.statusOf(conn);
|
|
526
|
+
status.lastError ??= err instanceof Error ? err.message : String(err);
|
|
527
|
+
return status;
|
|
528
|
+
}
|
|
529
|
+
return this.statusOf(conn);
|
|
530
|
+
}
|
|
531
|
+
/** Race a promise against a timeout, clearing the timer either way. */
|
|
532
|
+
async raceTimeout(p, timeoutMs, name) {
|
|
533
|
+
let timer;
|
|
534
|
+
const timeout = new Promise((_, reject) => {
|
|
535
|
+
timer = setTimeout(() => {
|
|
536
|
+
reject(/* @__PURE__ */ new Error(`server "${name}" warm timed out after ${timeoutMs.toString()}ms`));
|
|
537
|
+
}, timeoutMs);
|
|
538
|
+
if (typeof timer === "object" && "unref" in timer) timer.unref();
|
|
539
|
+
});
|
|
540
|
+
try {
|
|
541
|
+
await Promise.race([p, timeout]);
|
|
542
|
+
} finally {
|
|
543
|
+
clearTimeout(timer);
|
|
544
|
+
}
|
|
545
|
+
}
|
|
470
546
|
/**
|
|
471
547
|
* Invoke a tool by its namespaced name. Routes to the originating server.
|
|
472
548
|
* Errors are returned as `{ isError: true, content: [...] }` so a failing
|
|
@@ -925,6 +1001,30 @@ var Manager = class {
|
|
|
925
1001
|
}));
|
|
926
1002
|
}
|
|
927
1003
|
/**
|
|
1004
|
+
* Live connection status per server from the attached bundler. Empty when
|
|
1005
|
+
* no bundler is attached (e.g. a CLI-only manager). Lets callers show
|
|
1006
|
+
* whether each registered server actually connected and how many tools it
|
|
1007
|
+
* advertises, instead of only the stored config.
|
|
1008
|
+
*/
|
|
1009
|
+
serverStatuses() {
|
|
1010
|
+
return this.bundler ? this.bundler.statuses() : [];
|
|
1011
|
+
}
|
|
1012
|
+
/**
|
|
1013
|
+
* Reconcile the bundler against the current store (so a just-added entry
|
|
1014
|
+
* has a connection object) then eagerly connect ONE server and return its
|
|
1015
|
+
* status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected
|
|
1016
|
+
* before replying to the agent — turning the fire-and-forget warm into a
|
|
1017
|
+
* result the caller can report ("connected, N tools" or the real error).
|
|
1018
|
+
*
|
|
1019
|
+
* Returns `null` when no bundler is attached or the id isn't present; never
|
|
1020
|
+
* throws (a connect failure is carried in the returned status).
|
|
1021
|
+
*/
|
|
1022
|
+
async warmServer(id, timeoutMs) {
|
|
1023
|
+
if (!this.bundler) return null;
|
|
1024
|
+
await this.reconcileBundler();
|
|
1025
|
+
return await this.bundler.warmServer(id, timeoutMs) ?? null;
|
|
1026
|
+
}
|
|
1027
|
+
/**
|
|
928
1028
|
* Push the current store contents into a bundler instance (which owns
|
|
929
1029
|
* connections / tools). Wires up a store watcher so external mutations
|
|
930
1030
|
* (e.g. another shell running `alfe mcp add`) re-reconcile.
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["errMsg"],"sources":["../src/tool-naming.ts","../src/connection.ts","../src/bundler.ts","../src/store.ts","../src/manager.ts","../src/pattern-a-validator.ts"],"sourcesContent":["/**\n * Tool name sanitization and collision handling.\n *\n * OpenClaw constraint: tool names must match `[A-Za-z0-9_-]` and be ≤64 chars.\n * Pattern mirrored from `openclaw/src/agents/pi-bundle-mcp-names.ts`.\n *\n * Strategy: prefix every tool with its server name (`{server}__{tool}`),\n * sanitize disallowed chars to `_`, truncate, then suffix-disambiguate\n * (`-2`, `-3`, ...) on collision.\n */\n\nconst DISALLOWED = /[^A-Za-z0-9_-]/g;\nconst MAX_LEN = 64;\nconst SEPARATOR = '__';\n\nexport function sanitizeNameSegment(value: string): string {\n return value.replace(DISALLOWED, '_');\n}\n\nexport function buildNamespacedToolName(server: string, tool: string): string {\n const base = `${sanitizeNameSegment(server)}${SEPARATOR}${sanitizeNameSegment(tool)}`;\n if (base.length <= MAX_LEN) return base;\n // Truncate from the tool side first to keep the server prefix intact.\n const reservedForServer = sanitizeNameSegment(server).length + SEPARATOR.length;\n const toolBudget = Math.max(1, MAX_LEN - reservedForServer);\n return `${sanitizeNameSegment(server)}${SEPARATOR}${sanitizeNameSegment(tool).slice(0, toolBudget)}`;\n}\n\n/**\n * Disambiguate a candidate name against an existing set by appending `-2`, `-3`, etc.\n * Mutates nothing; returns the chosen name. Caller is responsible for inserting it\n * into the set.\n */\nexport function disambiguateAgainst(candidate: string, taken: ReadonlySet<string>): string {\n if (!taken.has(candidate)) return candidate;\n for (let i = 2; i < 1000; i += 1) {\n const suffix = `-${i.toString()}`;\n const room = MAX_LEN - suffix.length;\n const trimmed = candidate.length > room ? candidate.slice(0, room) : candidate;\n const next = `${trimmed}${suffix}`;\n if (!taken.has(next)) return next;\n }\n // Pathological: 998 collisions. Fall back to a deterministic-ish hash.\n return `${candidate.slice(0, MAX_LEN - 6)}-x${(taken.size % 1000).toString().padStart(3, '0')}`;\n}\n","import type { Logger, McpServerConfig, McpToolDescriptor, McpToolCallResult, StdioServerConfig } from './types.js';\nimport { buildNamespacedToolName } from './tool-naming.js';\n\n/** Env keys OpenClaw rejects from stdio MCP env blocks. Filter them out before spawning. */\nexport const STDIO_ENV_DENYLIST = new Set([\n 'NODE_OPTIONS',\n 'PYTHONSTARTUP',\n 'PYTHONPATH',\n 'PERL5OPT',\n 'RUBYOPT',\n 'SHELLOPTS',\n 'PS4',\n]);\n\nexport function sanitizeStdioEnv(env: Record<string, string> | undefined): Record<string, string> {\n if (!env) return {};\n const safe: Record<string, string> = {};\n for (const [k, v] of Object.entries(env)) {\n if (STDIO_ENV_DENYLIST.has(k)) continue;\n safe[k] = v;\n }\n return safe;\n}\n\n/** Per-connect context the Connection threads into the connect factory. */\nexport interface ConnectContext {\n /** Server name (store key) — for logging/attribution. */\n serverName: string;\n /**\n * When set, stdio children are spawned with `stderr: 'pipe'` and each stderr\n * line is delivered here. When absent, stderr stays `inherit` (host fd).\n */\n onStderrLine?: (line: string) => void;\n}\n\nexport interface ConnectionDeps {\n /**\n * Factory for an MCP Client connected to the given config. Injected so tests\n * can mock without spawning real processes. In production this wraps\n * `@modelcontextprotocol/sdk/client`. The context arg is optional so\n * existing test mocks keep working.\n */\n connect: (server: McpServerConfig, ctx?: ConnectContext) => Promise<McpClientHandle>;\n}\n\n/**\n * Minimal interface our connection layer needs from an MCP client. Mirrors\n * the @modelcontextprotocol/sdk Client surface but kept narrow so we can\n * mock cleanly in tests.\n */\nexport interface McpClientHandle {\n listTools(): Promise<{ name: string; description?: string; inputSchema: Record<string, unknown> }[]>;\n callTool(name: string, args: unknown, opts?: { signal?: AbortSignal }): Promise<McpToolCallResult>;\n close(): Promise<void>;\n /**\n * Register a callback fired when the underlying transport closes or errors\n * unexpectedly (e.g. the child process crashed). Lets the Connection drop\n * its dead client so the next call re-spawns. Optional so test mocks can\n * omit it.\n */\n onClose?(handler: () => void): void;\n}\n\n/**\n * One Connection per MCP server. Owns lifecycle (lazy-spawn, close, refresh-lock).\n * Refresh-lock pattern adapted from AIWerk `index.ts:219-250` — prevents\n * reconnect + `notifications/tools/list_changed` race.\n */\nexport class Connection {\n readonly name: string;\n readonly config: McpServerConfig;\n private readonly deps: ConnectionDeps;\n private readonly logger: Logger | undefined;\n\n private client: McpClientHandle | undefined;\n private tools: McpToolDescriptor[] = [];\n private connectInFlight: Promise<void> | undefined;\n private refreshInFlight = false;\n private refreshQueued = false;\n private lastUsedAt = Date.now();\n\n /** Set while `close()` runs so the transport's onclose isn't treated as a crash. */\n private closing = false;\n /** Consecutive failed connect attempts — drives reconnect backoff. */\n private consecutiveFailures = 0;\n /** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */\n private reconnectBlockedUntilMs = 0;\n\n private static readonly RECONNECT_BACKOFF_BASE_MS = 500;\n private static readonly RECONNECT_BACKOFF_MAX_MS = 30_000;\n\n private readonly onUnexpectedClose: (() => void) | undefined;\n private readonly onStderrLine: ((line: string) => void) | undefined;\n\n constructor(params: {\n name: string;\n config: McpServerConfig;\n deps: ConnectionDeps;\n logger?: Logger;\n /** Fired when the transport closes unexpectedly (crash), after internal cleanup. */\n onUnexpectedClose?: () => void;\n /** Threaded to the connect factory — pipes stdio child stderr when set. */\n onStderrLine?: (line: string) => void;\n }) {\n this.name = params.name;\n this.config = params.config;\n this.deps = params.deps;\n this.logger = params.logger;\n this.onUnexpectedClose = params.onUnexpectedClose;\n this.onStderrLine = params.onStderrLine;\n }\n\n /** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */\n snapshotTools(): McpToolDescriptor[] {\n return this.tools;\n }\n\n /** Whether an MCP child process / remote connection has been established. */\n isConnected(): boolean {\n return this.client !== undefined;\n }\n\n /** Idle timestamp for reaping. */\n idleSinceMs(): number {\n return Date.now() - this.lastUsedAt;\n }\n\n /**\n * Lazy connect + tool discovery. Safe to call concurrently; in-flight\n * connects coalesce.\n */\n async ensureConnected(): Promise<void> {\n if (this.client) return;\n if (this.connectInFlight) return this.connectInFlight;\n if (Date.now() < this.reconnectBlockedUntilMs) {\n throw new Error(\n `server \"${this.name}\" is in reconnect backoff after ${this.consecutiveFailures.toString()} failed attempt(s)`,\n );\n }\n this.connectInFlight = this.connectAndDiscover().finally(() => {\n this.connectInFlight = undefined;\n });\n return this.connectInFlight;\n }\n\n private async connectAndDiscover(): Promise<void> {\n const safeConfig = 'command' in this.config\n ? ({ ...this.config, env: sanitizeStdioEnv(this.config.env) } satisfies StdioServerConfig)\n : this.config;\n this.logger?.debug(`[mcp-bundler] connecting server \"${this.name}\"`);\n const client = await this.deps.connect(safeConfig, {\n serverName: this.name,\n onStderrLine: this.onStderrLine,\n });\n try {\n const advertised = await client.listTools();\n this.client = client;\n this.closing = false;\n // Drop the dead client on an unexpected transport close so the next\n // call re-spawns instead of calling into a corpse. Bind the callback to\n // THIS handle so a late close from an already-replaced client can't wipe\n // out a freshly respawned one.\n client.onClose?.(() => { this.handleUnexpectedClose(client); });\n this.tools = advertised.map((t) => ({\n prefixed: buildNamespacedToolName(this.name, t.name),\n server: this.name,\n original: t.name,\n label: (t.description ?? t.name).slice(0, 80),\n description: t.description ?? '',\n parameters: t.inputSchema,\n }));\n this.lastUsedAt = Date.now();\n this.consecutiveFailures = 0;\n this.reconnectBlockedUntilMs = 0;\n this.logger?.info(`[mcp-bundler] server \"${this.name}\" connected, ${this.tools.length.toString()} tool(s)`);\n } catch (err) {\n await client.close().catch(() => undefined);\n this.consecutiveFailures += 1;\n const backoff = Math.min(\n Connection.RECONNECT_BACKOFF_BASE_MS * 2 ** (this.consecutiveFailures - 1),\n Connection.RECONNECT_BACKOFF_MAX_MS,\n );\n this.reconnectBlockedUntilMs = Date.now() + backoff;\n throw err;\n }\n }\n\n /**\n * Handle an unexpected transport close (crash / network drop). Clears the\n * dead client + tools so the next `ensureConnected` re-spawns. No-op if we\n * initiated the close ourselves (idle reap / reconcile removal).\n */\n private handleUnexpectedClose(handle: McpClientHandle): void {\n // Ignore if we initiated the close, or if this callback belongs to a\n // client we've already replaced (stale late-fire after a respawn).\n if (this.closing || this.client !== handle) return;\n this.logger?.warn(`[mcp-bundler] server \"${this.name}\" connection closed unexpectedly; will re-spawn on next use`);\n this.client = undefined;\n this.tools = [];\n try {\n this.onUnexpectedClose?.();\n } catch {\n /* host hook must never break the connection lifecycle */\n }\n }\n\n /**\n * Re-discover tools. Used on reconnect or `tools/list_changed` notification.\n * Refresh-lock collapses concurrent refreshes; if one is in flight, the next\n * is queued (max 1 queued, since N>1 queued provides no extra freshness).\n */\n async refresh(): Promise<void> {\n if (!this.client) return this.ensureConnected();\n if (this.refreshInFlight) {\n this.refreshQueued = true;\n return;\n }\n this.refreshInFlight = true;\n try {\n const advertised = await this.client.listTools();\n this.tools = advertised.map((t) => ({\n prefixed: buildNamespacedToolName(this.name, t.name),\n server: this.name,\n original: t.name,\n label: (t.description ?? t.name).slice(0, 80),\n description: t.description ?? '',\n parameters: t.inputSchema,\n }));\n this.logger?.debug(`[mcp-bundler] server \"${this.name}\" refreshed, ${this.tools.length.toString()} tool(s)`);\n } finally {\n this.refreshInFlight = false;\n if (this.refreshQueued) {\n this.refreshQueued = false;\n // Trigger one more refresh; do not await so caller isn't blocked on cascading refreshes.\n void this.refresh().catch((err: unknown) => {\n this.logger?.warn(`[mcp-bundler] queued refresh for \"${this.name}\" failed`, { err: err instanceof Error ? err.message : String(err) });\n });\n }\n }\n }\n\n async callTool(originalName: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult> {\n await this.ensureConnected();\n if (!this.client) throw new Error(`server \"${this.name}\" failed to connect`);\n this.lastUsedAt = Date.now();\n return this.client.callTool(originalName, args, signal ? { signal } : undefined);\n }\n\n /**\n * Close the underlying transport. Idempotent. If a connect is in flight\n * (warmup racing with reconcile-removal), wait for it to settle and then\n * close the client it produced — otherwise the child process is orphaned.\n */\n async close(): Promise<void> {\n if (this.connectInFlight) {\n await this.connectInFlight.catch(() => undefined);\n }\n // Mark this close as intentional so the transport's onclose callback\n // doesn't trip the unexpected-close re-spawn path.\n this.closing = true;\n const c = this.client;\n this.client = undefined;\n this.tools = [];\n if (c) await c.close().catch((err: unknown) => {\n this.logger?.warn(`[mcp-bundler] close error for \"${this.name}\"`, { err: err instanceof Error ? err.message : String(err) });\n });\n }\n\n /**\n * Stable hash of the config for diff detection in `reconcile`.\n * Two configs with the same hash are equivalent (no restart needed).\n */\n configFingerprint(): string {\n return JSON.stringify(this.config);\n }\n}\n\n/**\n * Build the production `connect` factory using the official MCP SDK.\n * Kept in a separate function so tests can substitute a mock without\n * pulling the SDK into the test bundle.\n */\nexport async function defaultConnect(server: McpServerConfig, ctx?: ConnectContext): Promise<McpClientHandle> {\n const { Client } = await import('@modelcontextprotocol/sdk/client/index.js');\n const client = new Client({ name: 'alfe-mcp-bundler', version: '0.0.0' }, {});\n\n if ('command' in server) {\n const stdio = server;\n const { StdioClientTransport } = await import('@modelcontextprotocol/sdk/client/stdio.js');\n const onStderrLine = ctx?.onStderrLine;\n const transport = new StdioClientTransport({\n command: stdio.command,\n args: stdio.args ?? [],\n env: { ...sanitizeStdioEnv(stdio.env) } as Record<string, string>,\n cwd: stdio.cwd,\n // Default is 'inherit' (child stderr lands on the HOST's fd 2, invisible\n // to any output monitoring). Pipe only when the host consumes it — an\n // unread pipe would back-pressure the child's stderr writes.\n ...(onStderrLine ? { stderr: 'pipe' as const } : {}),\n });\n if (onStderrLine) {\n // The SDK exposes the PassThrough immediately when stderr:'pipe', so\n // attaching before connect() captures early startup output too.\n let carry = '';\n transport.stderr?.on('data', (chunk: Buffer) => {\n const parts = (carry + chunk.toString()).split('\\n');\n carry = parts.pop() ?? '';\n for (const line of parts) {\n if (line.trim() === '') continue;\n try {\n onStderrLine(line);\n } catch {\n /* host hook must never break the transport */\n }\n }\n });\n }\n await client.connect(transport);\n } else {\n const remote = server;\n if (remote.transport === 'streamable-http') {\n const { StreamableHTTPClientTransport } = await import('@modelcontextprotocol/sdk/client/streamableHttp.js');\n const transport = new StreamableHTTPClientTransport(new URL(remote.url), {\n requestInit: { headers: remote.headers ?? {} },\n });\n await client.connect(transport);\n } else {\n // SSE is deprecated in newer MCP SDK in favor of streamable-http, but\n // some servers still only support SSE — keep transport for back-compat.\n /* eslint-disable @typescript-eslint/no-deprecated */\n const { SSEClientTransport } = await import('@modelcontextprotocol/sdk/client/sse.js');\n const transport = new SSEClientTransport(new URL(remote.url), {\n requestInit: { headers: remote.headers ?? {} },\n });\n /* eslint-enable @typescript-eslint/no-deprecated */\n await client.connect(transport);\n }\n }\n\n let closeHandler: (() => void) | undefined;\n let closed = false;\n const fireClose = () => {\n if (closed) return;\n closed = true;\n closeHandler?.();\n };\n // The high-level SDK Client proxies its transport's lifecycle callbacks.\n client.onclose = fireClose;\n client.onerror = fireClose;\n\n return {\n async listTools() {\n const result = await client.listTools();\n return result.tools.map((t) => ({\n name: t.name,\n description: t.description,\n inputSchema: t.inputSchema as Record<string, unknown>,\n }));\n },\n async callTool(name, args, opts) {\n return (await client.callTool({ name, arguments: args as Record<string, unknown> | undefined }, undefined, opts)) as McpToolCallResult;\n },\n async close() {\n closed = true; // suppress the onClose callback for an intentional close\n await client.close();\n },\n onClose(handler: () => void) {\n closeHandler = handler;\n },\n };\n}\n","import { Connection, defaultConnect, type ConnectionDeps } from './connection.js';\nimport { disambiguateAgainst } from './tool-naming.js';\nimport type {\n BundlerOptions,\n Logger,\n McpServerConfig,\n McpToolCallResult,\n McpToolDescriptor,\n McpToolErrorInfo,\n ReconcileDiff,\n} from './types.js';\n\nconst DEFAULT_IDLE_TTL_MS = 10 * 60 * 1000;\nconst DEFAULT_IDLE_SWEEP_INTERVAL_MS = 60 * 1000;\n\n/** First text content of an error result, for host error reporting. */\nfunction extractErrorText(result: McpToolCallResult): string {\n for (const item of result.content) {\n if (item.type === 'text' && typeof item.text === 'string') return item.text.slice(0, 500);\n }\n return '(no error text)';\n}\n\n/**\n * Provider-agnostic MCP server bundler. Holds N MCP server connections,\n * exposes a unified namespaced tool catalog, and routes calls to the right\n * server.\n *\n * Designed to be embedded in any host (OpenClaw plugin, AI proxy, Lambda).\n * Public surface is intentionally synchronous where the host needs sync\n * (snapshot, listTools), async only where I/O is unavoidable.\n */\nexport class McpBundler {\n private readonly logger: Logger | undefined;\n private readonly connections = new Map<string, Connection>();\n private readonly idleTtlMs: number;\n private readonly idleSweepIntervalMs: number;\n private idleSweepTimer: ReturnType<typeof setInterval> | undefined;\n private readonly deps: ConnectionDeps;\n private readonly onToolError: ((info: McpToolErrorInfo) => void) | undefined;\n private readonly onServerCrash: ((server: string) => void) | undefined;\n private readonly onServerStderr: ((server: string, line: string) => void) | undefined;\n private disposed = false;\n // Serialize reconcile() so concurrent callers (multiple plugin tool factory\n // ticks within the same ms) don't interleave and orphan Connections, leaking\n // child processes. Acquired via a chain-of-promises latch.\n private reconcileLatch: Promise<unknown> = Promise.resolve();\n\n constructor(opts: BundlerOptions = {}, deps?: ConnectionDeps) {\n this.logger = opts.logger;\n this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;\n this.idleSweepIntervalMs = opts.idleSweepIntervalMs ?? DEFAULT_IDLE_SWEEP_INTERVAL_MS;\n this.deps = deps ?? { connect: defaultConnect };\n this.onToolError = opts.onToolError;\n this.onServerCrash = opts.onServerCrash;\n this.onServerStderr = opts.onServerStderr;\n if (this.idleTtlMs > 0) this.startIdleSweep();\n }\n\n /** Construct a Connection with the host hooks bound to its server name. */\n private buildConnection(name: string, config: McpServerConfig): Connection {\n const crash = this.onServerCrash;\n const stderr = this.onServerStderr;\n return new Connection({\n name,\n config,\n deps: this.deps,\n logger: this.logger,\n ...(crash ? { onUnexpectedClose: () => { crash(name); } } : {}),\n ...(stderr ? { onStderrLine: (line: string) => { stderr(name, line); } } : {}),\n });\n }\n\n /** Fire the host's tool-error hook; exceptions must never affect the call path. */\n private reportToolError(info: McpToolErrorInfo): void {\n try {\n this.onToolError?.(info);\n } catch {\n /* host hook must never break tool routing */\n }\n }\n\n /**\n * Diff `desired` against current connections, spawn newcomers, dispose\n * removals, hot-restart on config change. Pull-based — call whenever the\n * host's config snapshot may have changed. Cheap if no diff.\n *\n * Lazy: newly-added servers are NOT eagerly connected; they connect on the\n * first `callTool()` (or first `listTools()` after `forceDiscover()`).\n * This avoids paying spawn cost for servers the agent never uses.\n */\n async reconcile(desired: Record<string, McpServerConfig>): Promise<ReconcileDiff> {\n if (this.disposed) throw new Error('McpBundler: disposed');\n // Serialize reconciles. Caller awaits its slot; in-flight reconciles run\n // in declaration order. Errors don't poison the latch — `.catch` swallows\n // for chaining, the actual error rejects the awaited slot.\n const slot = this.reconcileLatch.then(async () => this.doReconcile(desired));\n this.reconcileLatch = slot.catch(() => undefined);\n return slot;\n }\n\n private async doReconcile(desired: Record<string, McpServerConfig>): Promise<ReconcileDiff> {\n if (this.disposed) throw new Error('McpBundler: disposed');\n const desiredNames = new Set(Object.keys(desired));\n const currentNames = new Set(this.connections.keys());\n\n const added: string[] = [];\n const removed: string[] = [];\n const changed: string[] = [];\n const unchanged: string[] = [];\n\n // Removals: dispose connections no longer in desired set.\n for (const name of currentNames) {\n if (!desiredNames.has(name)) {\n const conn = this.connections.get(name);\n this.connections.delete(name);\n if (conn) await conn.close();\n removed.push(name);\n }\n }\n\n // Additions and changes.\n for (const [name, config] of Object.entries(desired)) {\n const existing = this.connections.get(name);\n if (!existing) {\n this.connections.set(name, this.buildConnection(name, config));\n added.push(name);\n continue;\n }\n const nextFingerprint = JSON.stringify(config);\n if (existing.configFingerprint() !== nextFingerprint) {\n // Config changed — close old, replace with fresh (lazy reconnect).\n await existing.close();\n this.connections.set(name, this.buildConnection(name, config));\n changed.push(name);\n } else {\n unchanged.push(name);\n }\n }\n\n if (added.length || removed.length || changed.length) {\n this.logger?.info('[mcp-bundler] reconciled', {\n added: added.length,\n removed: removed.length,\n changed: changed.length,\n unchanged: unchanged.length,\n });\n }\n return { added, removed, changed, unchanged };\n }\n\n /**\n * Synchronous snapshot of all currently-known tools across connected servers.\n * Servers that have not connected yet contribute nothing. Intended for use\n * inside OpenClaw's plugin tool factory which must be sync.\n *\n * Tool names are namespaced and disambiguated (suffix `-2`, `-3` on collision)\n * so cross-server name clashes never produce duplicate registrations.\n */\n listTools(): McpToolDescriptor[] {\n const seen = new Set<string>();\n const out: McpToolDescriptor[] = [];\n for (const conn of this.connections.values()) {\n for (const tool of conn.snapshotTools()) {\n const finalName = disambiguateAgainst(tool.prefixed, seen);\n seen.add(finalName);\n out.push(finalName === tool.prefixed ? tool : { ...tool, prefixed: finalName });\n }\n }\n return out;\n }\n\n /**\n * Eagerly connect to every configured server and discover tools. Used by\n * hosts that want a hot list rather than the lazy default. Errors are\n * swallowed per-server (logged), so one bad server doesn't fail the batch.\n */\n async warmup(): Promise<void> {\n if (this.disposed) return;\n await Promise.allSettled(\n Array.from(this.connections.values()).map(async (conn) => {\n try {\n await conn.ensureConnected();\n } catch (err) {\n this.logger?.warn(`[mcp-bundler] warmup failed for \"${conn.name}\"`, {\n err: err instanceof Error ? err.message : String(err),\n });\n }\n }),\n );\n }\n\n /**\n * Invoke a tool by its namespaced name. Routes to the originating server.\n * Errors are returned as `{ isError: true, content: [...] }` so a failing\n * tool doesn't crash the host.\n */\n async callTool(prefixed: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult> {\n if (this.disposed) {\n return { isError: true, content: [{ type: 'text', text: 'mcp-bundler disposed' }] };\n }\n const route = this.routeToolName(prefixed);\n if (!route) {\n return {\n isError: true,\n content: [{ type: 'text', text: `unknown tool: ${prefixed}` }],\n };\n }\n try {\n const result = await route.connection.callTool(route.original, args, signal);\n if (result.isError) {\n this.reportToolError({\n server: route.connection.name,\n tool: route.original,\n prefixed,\n kind: 'result-error',\n message: extractErrorText(result),\n });\n }\n return result;\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n this.logger?.error(`[mcp-bundler] tool call failed for \"${prefixed}\"`, { err: msg });\n this.reportToolError({\n server: route.connection.name,\n tool: route.original,\n prefixed,\n kind: 'thrown',\n message: msg,\n });\n return {\n isError: true,\n content: [{ type: 'text', text: `tool ${prefixed} failed: ${msg}` }],\n };\n }\n }\n\n /**\n * Resolve a namespaced tool name back to its server connection and original\n * tool name. Returns undefined if the tool is not currently advertised.\n */\n private routeToolName(prefixed: string): { connection: Connection; original: string } | undefined {\n for (const conn of this.connections.values()) {\n for (const tool of conn.snapshotTools()) {\n if (tool.prefixed === prefixed) return { connection: conn, original: tool.original };\n }\n }\n return undefined;\n }\n\n /**\n * Tear down all connections and stop background tasks. Idempotent.\n * Call from `registerRuntimeLifecycle({ cleanup })` in the host plugin.\n */\n async dispose(): Promise<void> {\n if (this.disposed) return;\n this.disposed = true;\n if (this.idleSweepTimer) {\n clearInterval(this.idleSweepTimer);\n this.idleSweepTimer = undefined;\n }\n await Promise.allSettled(Array.from(this.connections.values()).map((c) => c.close()));\n this.connections.clear();\n }\n\n private startIdleSweep(): void {\n this.idleSweepTimer = setInterval(() => {\n void this.sweepIdle().catch((err: unknown) => {\n this.logger?.warn('[mcp-bundler] idle sweep error', {\n err: err instanceof Error ? err.message : String(err),\n });\n });\n }, this.idleSweepIntervalMs);\n // Don't keep the host process alive just for the sweep.\n if (typeof this.idleSweepTimer === 'object' && 'unref' in this.idleSweepTimer) {\n (this.idleSweepTimer as { unref: () => void }).unref();\n }\n }\n\n private async sweepIdle(): Promise<void> {\n if (this.idleTtlMs <= 0) return;\n const targets: Connection[] = [];\n for (const conn of this.connections.values()) {\n if (conn.isConnected() && conn.idleSinceMs() > this.idleTtlMs) {\n targets.push(conn);\n }\n }\n if (targets.length === 0) return;\n this.logger?.debug(`[mcp-bundler] reaping ${targets.length.toString()} idle server(s)`);\n await Promise.allSettled(targets.map((c) => c.close()));\n }\n}\n","import {\n closeSync,\n existsSync,\n mkdirSync,\n openSync,\n readFileSync,\n renameSync,\n statSync,\n unlinkSync,\n watch,\n writeFileSync,\n type FSWatcher,\n} from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { homedir } from 'node:os';\nimport type { Logger, McpServerConfig, StdioServerConfig, RemoteServerConfig, McpTransportKind } from './types.js';\n\n/**\n * Where a server entry came from. Used by `removeServersByOwner` so an\n * integration uninstall can drop only its own entries without touching\n * `cli`-owned (e.g. `alfe-platform`) or `manual`-owned (user-added) ones.\n */\nexport type ServerOwner = 'cli' | `integration:${string}` | 'manual';\n\ninterface StoredServerCommon {\n /** Where the entry came from — controls bulk-removal semantics. */\n owner: ServerOwner;\n /** ISO timestamp of first registration; preserved across updates. */\n addedAt: string;\n /** Optional semver of the providing package (e.g. `@alfe.ai/mcp-server` for `alfe-platform`). Used for drift detection on CLI upgrade. */\n version?: string;\n}\n\nexport type StoredServerEntry =\n | (StoredServerCommon & { transport: 'stdio' } & StdioServerConfig)\n | (StoredServerCommon & { transport: 'sse' | 'streamable-http' } & RemoteServerConfig);\n\nexport interface StoreSchema {\n servers: Record<string, StoredServerEntry>;\n config: {\n sessionIdleTtlMs?: number;\n };\n /**\n * Server names this manager has written into `openclaw.json#mcp.servers.*`.\n * Used to compute the mirror-write diff without re-reading openclaw.json\n * (which would be a second source of truth). Foreign keys not listed here\n * are preserved across mirror writes.\n */\n _ownedOpenclawKeys: string[];\n}\n\nconst DEFAULT_STORE_DIR = join(homedir(), '.alfe', 'mcp');\nconst DEFAULT_STORE_PATH = join(DEFAULT_STORE_DIR, 'servers.json');\n\n/** Inter-process lock tunings — exported as constants so tests can override. */\nconst LOCK_WAIT_MS = 5_000;\nconst LOCK_RETRY_INTERVAL_MS = 25;\nconst LOCK_STALE_MS = 10_000;\n\nexport interface StoreOptions {\n /** Absolute path to the store file. Defaults to `~/.alfe/mcp/servers.json`. */\n path?: string;\n logger?: Logger;\n}\n\n/**\n * On-disk source of truth for the bundler's configured servers.\n *\n * Mutations go through `update()` (read-modify-write with atomic\n * temp+rename) so a concurrent writer (e.g. two `alfe mcp add` invocations\n * racing) can't lose data — the second writer reads the first's state.\n *\n * Schema is owner-tagged so `removeServersByOwner` can implement\n * integration uninstall without touching CLI-owned or manual entries.\n */\nexport class Store {\n private readonly storePath: string;\n private readonly logger?: Logger;\n private watcher?: FSWatcher;\n private watcherListeners = new Set<() => void>();\n private rewatchTimer?: NodeJS.Timeout;\n\n constructor(opts: StoreOptions = {}) {\n this.storePath = opts.path ?? DEFAULT_STORE_PATH;\n this.logger = opts.logger;\n }\n\n get path(): string {\n return this.storePath;\n }\n\n read(): StoreSchema {\n if (!existsSync(this.storePath)) return cloneEmpty();\n try {\n const raw = readFileSync(this.storePath, 'utf8');\n const parsed: unknown = JSON.parse(raw);\n return normalize(parsed);\n } catch (err) {\n this.logger?.warn('[mcp-bundler/store] failed to read store; returning empty', {\n err: errMsg(err),\n path: this.storePath,\n });\n return cloneEmpty();\n }\n }\n\n /**\n * Read-modify-write with atomic temp+rename, guarded by an\n * inter-process lock file. Caller passes a pure function that\n * produces the next state; this serialises the mutation to disk in\n * one rename, which is atomic on POSIX and on Windows when the\n * target path is on the same volume.\n *\n * The lock guards the read-then-rename window so two processes\n * (e.g. two `alfe mcp add` shells, or the CLI racing the daemon)\n * can't drop each other's writes. The lock file is at\n * `<storePath>.lock`; stale locks (older than `LOCK_STALE_MS`) are\n * stolen so a crashed writer doesn't wedge the store.\n *\n * Pure-function shape (instead of a `read()` then `write(next)`\n * pair) intentionally — it keeps the read-modify-write contract\n * local to each caller so two updates back-to-back never see each\n * other's partial state.\n */\n update(fn: (cur: StoreSchema) => StoreSchema): StoreSchema {\n mkdirSync(dirname(this.storePath), { recursive: true });\n const release = this.acquireLock();\n try {\n const cur = this.read();\n const next = fn(cur);\n const tempPath = `${this.storePath}.${String(process.pid)}.${String(Date.now())}.tmp`;\n writeFileSync(tempPath, JSON.stringify(next, null, 2), { encoding: 'utf8', mode: 0o600 });\n try {\n renameSync(tempPath, this.storePath);\n } catch (err) {\n try {\n unlinkSync(tempPath);\n } catch {\n // Best-effort cleanup; the temp file's name has the pid + timestamp\n // so an orphan won't collide with future writers.\n }\n throw err;\n }\n return next;\n } finally {\n release();\n }\n }\n\n /**\n * Acquire an inter-process file lock by atomically creating a\n * sentinel via `openSync(lockPath, 'wx')`. Spins with bounded\n * backoff up to `LOCK_WAIT_MS`. If the lock file is older than\n * `LOCK_STALE_MS` it's assumed orphaned (writer crashed mid-update)\n * and stolen — the write window is sub-second in practice, so\n * holding the lock for >5s means something went wrong.\n *\n * Returns the release function. Single-process callers are\n * unaffected — re-entering the same process spins briefly while\n * the prior call's `finally` runs.\n */\n private acquireLock(): () => void {\n const lockPath = `${this.storePath}.lock`;\n const deadline = Date.now() + LOCK_WAIT_MS;\n let fd = -1;\n for (;;) {\n try {\n fd = openSync(lockPath, 'wx', 0o600);\n break;\n } catch (err) {\n const code = (err as NodeJS.ErrnoException).code;\n if (code !== 'EEXIST') throw err;\n if (this.lockIsStale(lockPath)) {\n try {\n unlinkSync(lockPath);\n } catch {\n // Another process may have just released it — fall through and retry.\n }\n continue;\n }\n if (Date.now() >= deadline) {\n throw new Error(\n `Store.update: timed out waiting for ${lockPath} (held by another writer or stale lock)`,\n );\n }\n // Synchronous spin — the lock window is sub-second under\n // normal load; busy-waiting briefly is simpler than wiring\n // async/await through every `update()` caller.\n const sleepUntil = Date.now() + LOCK_RETRY_INTERVAL_MS;\n while (Date.now() < sleepUntil) { /* spin */ }\n }\n }\n const held = fd;\n return () => {\n try {\n closeSync(held);\n } catch {\n // ignore — the unlink is what releases the lock for the next writer.\n }\n try {\n unlinkSync(lockPath);\n } catch {\n // ignore — already unlinked or stolen by a stale-lock breaker.\n }\n };\n }\n\n private lockIsStale(lockPath: string): boolean {\n try {\n const st = statSync(lockPath);\n return Date.now() - st.mtimeMs > LOCK_STALE_MS;\n } catch {\n return false;\n }\n }\n\n /**\n * Watch the store file for external changes (e.g. another `alfe mcp add`\n * shelling out from a separate process). Returns an unsubscribe fn.\n *\n * Coalesces bursts via a 50 ms debounce — editors and atomic-rename\n * writers commonly fire multiple events per logical save.\n */\n watch(cb: () => void): () => void {\n this.watcherListeners.add(cb);\n this.ensureWatcher();\n return () => {\n this.watcherListeners.delete(cb);\n if (this.watcherListeners.size === 0) this.disposeWatcher();\n };\n }\n\n dispose(): void {\n this.watcherListeners.clear();\n this.disposeWatcher();\n }\n\n private ensureWatcher(): void {\n if (this.watcher) return;\n mkdirSync(dirname(this.storePath), { recursive: true });\n // Some platforms / atomic renames make a per-file watch flaky after\n // a rename; watching the parent directory and filtering by basename\n // is more robust.\n const dir = dirname(this.storePath);\n const basename = this.storePath.slice(dir.length + 1);\n let pending: NodeJS.Timeout | undefined;\n const fire = (): void => {\n pending = undefined;\n for (const cb of this.watcherListeners) {\n try {\n cb();\n } catch (err) {\n this.logger?.warn('[mcp-bundler/store] watcher listener threw', { err: errMsg(err) });\n }\n }\n };\n try {\n this.watcher = watch(dir, (_event, fn) => {\n if (fn !== basename) return;\n if (pending) clearTimeout(pending);\n pending = setTimeout(fire, 50);\n });\n this.watcher.on('error', (err) => {\n this.logger?.warn('[mcp-bundler/store] watcher error; retrying in 1s', { err: errMsg(err) });\n this.disposeWatcher();\n if (!this.rewatchTimer && this.watcherListeners.size > 0) {\n this.rewatchTimer = setTimeout(() => {\n this.rewatchTimer = undefined;\n this.ensureWatcher();\n }, 1000);\n this.rewatchTimer.unref();\n }\n });\n } catch (err) {\n this.logger?.warn('[mcp-bundler/store] failed to start watcher', { err: errMsg(err) });\n }\n }\n\n private disposeWatcher(): void {\n if (this.watcher) {\n try {\n this.watcher.close();\n } catch {\n // close throws on already-disposed watchers; ignore.\n }\n this.watcher = undefined;\n }\n if (this.rewatchTimer) {\n clearTimeout(this.rewatchTimer);\n this.rewatchTimer = undefined;\n }\n }\n}\n\nexport function defaultStorePath(): string {\n return DEFAULT_STORE_PATH;\n}\n\n/** Pull the runtime config (transport + transport-specific fields) out of a stored entry. */\nexport function toServerConfig(entry: StoredServerEntry): McpServerConfig {\n if (entry.transport === 'stdio') {\n const { command, args, env, cwd } = entry;\n const cfg: StdioServerConfig = { command };\n if (args) cfg.args = args;\n if (env) cfg.env = env;\n if (cwd) cfg.cwd = cwd;\n return cfg;\n }\n const { url, transport, headers, connectionTimeoutMs } = entry;\n const cfg: RemoteServerConfig = { url, transport };\n if (headers) cfg.headers = headers;\n if (connectionTimeoutMs !== undefined) cfg.connectionTimeoutMs = connectionTimeoutMs;\n return cfg;\n}\n\n/** Build a stored entry from a runtime config + ownership metadata. */\nexport function toStoredEntry(\n config: McpServerConfig,\n meta: { owner: ServerOwner; transport?: McpTransportKind; version?: string; addedAt?: string },\n): StoredServerEntry {\n const addedAt = meta.addedAt ?? new Date().toISOString();\n if ('command' in config) {\n return {\n transport: 'stdio',\n owner: meta.owner,\n addedAt,\n ...(meta.version !== undefined ? { version: meta.version } : {}),\n ...config,\n };\n }\n const transport = meta.transport ?? config.transport ?? 'sse';\n if (transport === 'stdio') {\n throw new Error('toStoredEntry: transport=stdio specified but config is remote-shaped');\n }\n return {\n transport,\n owner: meta.owner,\n addedAt,\n ...(meta.version !== undefined ? { version: meta.version } : {}),\n ...config,\n };\n}\n\nfunction cloneEmpty(): StoreSchema {\n return { servers: {}, config: {}, _ownedOpenclawKeys: [] };\n}\n\nfunction normalize(raw: unknown): StoreSchema {\n if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return cloneEmpty();\n const r = raw as Partial<StoreSchema>;\n return {\n servers: r.servers && typeof r.servers === 'object' ? r.servers : {},\n config: r.config && typeof r.config === 'object' ? r.config : {},\n _ownedOpenclawKeys: Array.isArray(r._ownedOpenclawKeys) ? r._ownedOpenclawKeys.slice() : [],\n };\n}\n\nfunction errMsg(err: unknown): string {\n return err instanceof Error ? err.message : String(err);\n}\n","import type { McpBundler } from './bundler.js';\nimport { Store, toServerConfig, toStoredEntry, type ServerOwner, type StoredServerEntry } from './store.js';\nimport type { Logger, McpServerConfig, McpTransportKind } from './types.js';\n\nexport interface ManagerOptions {\n /** Pre-constructed store. If omitted, one is built with default options. */\n store?: Store;\n logger?: Logger;\n}\n\nexport interface AddServerOptions {\n /** Required — flat-namespace key under the bundler store. */\n id: string;\n /** Marks ownership for bulk removal. Defaults to `manual`. */\n owner?: ServerOwner;\n /** Semver of the providing package; used for CLI version-drift detection. */\n version?: string;\n /** Explicit transport hint for remote configs. Defaults to inferring from `config`. */\n transport?: McpTransportKind;\n}\n\n/**\n * Bundler manager — owns the `~/.alfe/mcp/servers.json` store and surfaces a\n * small CRUD API the CLI and integration applier both call into.\n *\n * Single source of truth: every consumer (daemon-hosted bundler, CLI `alfe mcp\n * list`, integration uninstall) reads from this store. Openclaw.json is no\n * longer kept in sync — the daemon hosts the bundler children and the\n * openclaw plugin reaches them via IPC, so the openclaw.json mirror became\n * dead weight and an active source of duplicate spawning on claude-cli /\n * codex-cli backends.\n *\n * Call `loadIntoBundler(bundler)` once at daemon startup to wire the store\n * into a live `McpBundler` — subsequent store mutations (including those\n * landed by other processes via the file watcher) re-reconcile automatically.\n */\nexport class Manager {\n private readonly store: Store;\n private readonly logger?: Logger;\n private bundler?: McpBundler;\n private changeListeners = new Set<() => void>();\n private storeUnsubscribe?: () => void;\n\n constructor(opts: ManagerOptions = {}) {\n this.store = opts.store ?? new Store({ logger: opts.logger });\n this.logger = opts.logger;\n }\n\n /** Direct accessor — handy for tests and the CLI's `alfe mcp list`. */\n getStore(): Store {\n return this.store;\n }\n\n /**\n * Register or overwrite a server entry. Mutation lands in the store\n * synchronously; if a bundler has been attached via `loadIntoBundler`,\n * it gets re-reconciled in the background (errors logged, never\n * thrown — the store is the source of truth, the bundler is derived).\n */\n async addServer(config: McpServerConfig, opts: AddServerOptions): Promise<void> {\n if (!opts.id) throw new Error('Manager.addServer: id is required');\n const owner = opts.owner ?? 'manual';\n this.store.update((cur) => {\n const previousAddedAt = lookupAddedAt(cur.servers, opts.id);\n const entry = toStoredEntry(config, {\n owner,\n transport: opts.transport,\n version: opts.version,\n addedAt: previousAddedAt,\n });\n return {\n ...cur,\n servers: { ...cur.servers, [opts.id]: entry },\n };\n });\n this.scheduleBundlerReconcile();\n this.fireChange();\n return Promise.resolve();\n }\n\n /**\n * Remove a single server entry. No-op if the id isn't in the store.\n * Refuses to remove an entry whose owner doesn't match `expectedOwner`\n * when supplied — the CLI uses this to guard `alfe mcp remove` from\n * accidentally clobbering integration- or cli-owned entries.\n */\n removeServer(id: string, opts: { expectedOwner?: ServerOwner } = {}): Promise<boolean> {\n const current = this.store.read();\n const existing = lookupEntry(current.servers, id);\n if (!existing) return Promise.resolve(false);\n if (opts.expectedOwner && existing.owner !== opts.expectedOwner) {\n return Promise.reject(\n new Error(\n `Manager.removeServer: server \"${id}\" is owned by \"${existing.owner}\", not \"${opts.expectedOwner}\"`,\n ),\n );\n }\n this.store.update((cur) => ({\n ...cur,\n servers: Object.fromEntries(Object.entries(cur.servers).filter(([k]) => k !== id)),\n }));\n this.scheduleBundlerReconcile();\n this.fireChange();\n return Promise.resolve(true);\n }\n\n /** Drop every entry whose owner matches — used by integration uninstall. */\n async removeServersByOwner(owner: ServerOwner): Promise<string[]> {\n const removed: string[] = [];\n this.store.update((cur) => {\n const next: Record<string, StoredServerEntry> = {};\n for (const [id, entry] of Object.entries(cur.servers)) {\n if (entry.owner === owner) {\n removed.push(id);\n } else {\n next[id] = entry;\n }\n }\n if (removed.length === 0) return cur;\n return { ...cur, servers: next };\n });\n if (removed.length > 0) {\n this.scheduleBundlerReconcile();\n this.fireChange();\n }\n return Promise.resolve(removed);\n }\n\n /** Read-only snapshot for `alfe mcp list` and similar UIs. */\n listServers(): { id: string; entry: StoredServerEntry }[] {\n const snap = this.store.read();\n return Object.entries(snap.servers).map(([id, entry]) => ({ id, entry }));\n }\n\n /**\n * Push the current store contents into a bundler instance (which owns\n * connections / tools). Wires up a store watcher so external mutations\n * (e.g. another shell running `alfe mcp add`) re-reconcile.\n */\n async loadIntoBundler(bundler: McpBundler): Promise<void> {\n this.bundler = bundler;\n await this.reconcileBundler();\n this.storeUnsubscribe ??= this.store.watch(() => {\n void this.reconcileBundler().catch((err: unknown) => {\n this.logger?.warn('[mcp-bundler/manager] watcher reconcile failed', { err: errMsg(err) });\n });\n });\n }\n\n /** Subscribe to store mutations. Returns an unsubscribe fn. */\n onChange(cb: () => void): () => void {\n this.changeListeners.add(cb);\n return () => {\n this.changeListeners.delete(cb);\n };\n }\n\n /**\n * Detach from the bundler and stop watching the store. Safe to call\n * multiple times. Does not dispose the underlying `Store` so the\n * shared instance survives multi-manager environments (rare).\n */\n async dispose(): Promise<void> {\n if (this.storeUnsubscribe) {\n this.storeUnsubscribe();\n this.storeUnsubscribe = undefined;\n }\n this.store.dispose();\n this.changeListeners.clear();\n this.bundler = undefined;\n return Promise.resolve();\n }\n\n private scheduleBundlerReconcile(): void {\n if (!this.bundler) return;\n void this.reconcileBundler().catch((err: unknown) => {\n this.logger?.warn('[mcp-bundler/manager] bundler reconcile failed', { err: errMsg(err) });\n });\n }\n\n private async reconcileBundler(): Promise<void> {\n if (!this.bundler) return;\n const snap = this.store.read();\n const servers: Record<string, McpServerConfig> = {};\n for (const [id, entry] of Object.entries(snap.servers)) {\n servers[id] = toServerConfig(entry);\n }\n await this.bundler.reconcile(servers);\n }\n\n private fireChange(): void {\n for (const cb of this.changeListeners) {\n try {\n cb();\n } catch (err) {\n this.logger?.warn('[mcp-bundler/manager] onChange listener threw', { err: errMsg(err) });\n }\n }\n }\n}\n\nfunction errMsg(err: unknown): string {\n return err instanceof Error ? err.message : String(err);\n}\n\n/**\n * Indexed access on `Record<string, T>` returns `T` (not `T | undefined`)\n * unless `noUncheckedIndexedAccess` is set in tsconfig. These helpers\n * make the optional-ness explicit so the lint rules that hate\n * always-truthy conditionals stop firing on real lookups.\n */\nfunction lookupEntry(\n servers: Record<string, StoredServerEntry>,\n id: string,\n): StoredServerEntry | undefined {\n return Object.hasOwn(servers, id) ? servers[id] : undefined;\n}\n\nfunction lookupAddedAt(servers: Record<string, StoredServerEntry>, id: string): string | undefined {\n const entry = lookupEntry(servers, id);\n return entry ? entry.addedAt : undefined;\n}\n","/**\n * Pattern A validator — locks the \"explicit selector arg\" contract for\n * credential-touching tools across the openclaw-* plugin family.\n *\n * Background\n * ----------\n * Pattern A says every credential-touching tool on a multi-account-capable\n * provider MUST take a required selector arg in its JSON Schema so the LLM\n * picks the account deliberately. The reference implementation lives in\n * `@alfe.ai/openclaw-google` (`google_run_command` / `google_disconnect_\n * account` both require `email`). PR 7 of channels-and-credential-driven-\n * integrations sweeps the same shape across notion / xero / myob.\n *\n * Why a validator\n * ---------------\n * The contract is easy to break by accident — a new tool gets added, the\n * selector arg gets forgotten, the LLM silently dispatches to whichever\n * account was loaded first. There's no runtime safety net once the plugin\n * is published. This validator runs in plugin build steps (or CI) and\n * fails the build if a tool that declares itself credential-touching\n * doesn't carry the selector.\n *\n * Scope of this file\n * ------------------\n * Pure functions — no I/O. Plugin packages call into these helpers from\n * their own build scripts (e.g. `pnpm build` or a dedicated lint task) and\n * pass in their `ToolDef[]` or `McpToolDescriptor[]` collection. The\n * validator does NOT know how to read manifests or files — it only checks\n * the shape of the in-memory descriptor list. Wiring is up to each plugin.\n *\n * Consumers\n * ---------\n * - `@alfe.ai/myob-mcp` — direct MCP, explicit TypeBox schemas.\n * - `@alfe.ai/notion-mcp` — proxy MCP, injects selector at runtime.\n * - `@alfe.ai/xero-mcp` — proxy MCP, injects selector at runtime.\n * - `@alfe.ai/openclaw-google` — already compliant; can opt-in for regression.\n *\n * Future\n * ------\n * When PR 7-deferred lands (atlassian / github / microsoft openclaw\n * packages), they hook into the same validator. The atlassian / github\n * cases will likely run the validator over the proxied child server's\n * `listTools()` response after schema-injection, to confirm the injection\n * actually landed on every tool.\n */\n\nimport type { McpToolDescriptor } from \"./types.js\";\n\n// ── Public types ────────────────────────────────────────────\n\n/**\n * A tool descriptor that the validator can inspect. Plugins can pass\n * either {@link McpToolDescriptor} (for proxy plugins surfacing child\n * tools) or a leaner local shape (for direct-MCP plugins). Both come\n * down to a tool name and a JSON Schema parameter object.\n */\nexport interface ValidatableTool {\n /** Tool name as the LLM sees it (post-namespacing). */\n name: string;\n /** JSON Schema for tool parameters (the `inputSchema`). */\n parameters: Record<string, unknown>;\n}\n\nexport interface PatternAOptions {\n /**\n * The required selector property name. Provider-specific (Google uses\n * `email`; Notion will use `workspaceId`; Xero will use `xeroTenantId`;\n * MYOB will use `myobBusinessId`). Plugins MAY support more than one\n * acceptable name — pass an array.\n */\n selector: string | readonly string[];\n /**\n * Tool names exempt from the selector requirement — typically the\n * `list_accounts` discovery tool and any pure-utility tools that don't\n * touch credentials. Match is exact (post-namespacing).\n */\n exempt?: readonly string[];\n}\n\nexport interface PatternAViolation {\n tool: string;\n reason:\n | \"missing-selector-property\"\n | \"selector-not-required\"\n | \"selector-property-not-string\";\n detail: string;\n}\n\n// ── Core check ───────────────────────────────────────────────\n\n/**\n * Validate that every non-exempt tool's JSON Schema declares the selector\n * property AND lists it in `required`. Returns the full set of violations\n * so the caller can report them all in one pass — failing fast on the\n * first one tends to hide cascading bugs in real plugins.\n *\n * The check is intentionally schema-shape-only — it does NOT execute the\n * tool, call the LLM, or talk to the cloud. It's a fast structural pass\n * suitable for build-time use.\n */\nexport function checkPatternA(\n tools: readonly ValidatableTool[],\n options: PatternAOptions,\n): PatternAViolation[] {\n const selectorNames = typeof options.selector === \"string\"\n ? [options.selector]\n : options.selector;\n const exempt = new Set(options.exempt ?? []);\n const violations: PatternAViolation[] = [];\n\n for (const tool of tools) {\n if (exempt.has(tool.name)) continue;\n\n const schema = tool.parameters;\n const properties = (schema as { properties?: Record<string, unknown> }).properties ?? {};\n const required = (schema as { required?: unknown[] }).required ?? [];\n\n const matched = selectorNames.find((name) => name in properties);\n\n if (!matched) {\n violations.push({\n tool: tool.name,\n reason: \"missing-selector-property\",\n detail: `expected one of [${selectorNames.join(\", \")}] in inputSchema.properties`,\n });\n continue;\n }\n\n if (!required.includes(matched)) {\n violations.push({\n tool: tool.name,\n reason: \"selector-not-required\",\n detail: `selector \"${matched}\" present in properties but missing from inputSchema.required`,\n });\n continue;\n }\n\n const propSchema = properties[matched];\n const type = (propSchema as { type?: unknown }).type;\n if (type !== \"string\") {\n violations.push({\n tool: tool.name,\n reason: \"selector-property-not-string\",\n detail: `selector \"${matched}\" must be JSON Schema type=string (found ${JSON.stringify(type)})`,\n });\n }\n }\n\n return violations;\n}\n\n/**\n * Thin wrapper that throws an Error listing every violation if any are\n * present. Convenient for build scripts that want a single guard call.\n */\nexport function assertPatternA(\n tools: readonly ValidatableTool[],\n options: PatternAOptions,\n): void {\n const violations = checkPatternA(tools, options);\n if (violations.length === 0) return;\n const lines = violations.map((v) => ` - [${v.reason}] ${v.tool}: ${v.detail}`);\n throw new Error(\n `Pattern A validation failed for ${String(violations.length)} tool(s):\\n${lines.join(\"\\n\")}`,\n );\n}\n\n/**\n * Cast an {@link McpToolDescriptor} (proxy-plugin shape) to the leaner\n * {@link ValidatableTool} the validator accepts. Useful for proxy\n * plugins that already maintain a `cachedTools: McpToolDescriptor[]`\n * collection.\n */\nexport function fromMcpDescriptor(descriptor: McpToolDescriptor): ValidatableTool {\n return { name: descriptor.prefixed, parameters: descriptor.parameters };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["errMsg"],"sources":["../src/tool-naming.ts","../src/connection.ts","../src/bundler.ts","../src/store.ts","../src/manager.ts","../src/pattern-a-validator.ts"],"sourcesContent":["/**\n * Tool name sanitization and collision handling.\n *\n * OpenClaw constraint: tool names must match `[A-Za-z0-9_-]` and be ≤64 chars.\n * Pattern mirrored from `openclaw/src/agents/pi-bundle-mcp-names.ts`.\n *\n * Strategy: prefix every tool with its server name (`{server}__{tool}`),\n * sanitize disallowed chars to `_`, truncate, then suffix-disambiguate\n * (`-2`, `-3`, ...) on collision.\n */\n\nconst DISALLOWED = /[^A-Za-z0-9_-]/g;\nconst MAX_LEN = 64;\nconst SEPARATOR = '__';\n\nexport function sanitizeNameSegment(value: string): string {\n return value.replace(DISALLOWED, '_');\n}\n\nexport function buildNamespacedToolName(server: string, tool: string): string {\n const base = `${sanitizeNameSegment(server)}${SEPARATOR}${sanitizeNameSegment(tool)}`;\n if (base.length <= MAX_LEN) return base;\n // Truncate from the tool side first to keep the server prefix intact.\n const reservedForServer = sanitizeNameSegment(server).length + SEPARATOR.length;\n const toolBudget = Math.max(1, MAX_LEN - reservedForServer);\n return `${sanitizeNameSegment(server)}${SEPARATOR}${sanitizeNameSegment(tool).slice(0, toolBudget)}`;\n}\n\n/**\n * Disambiguate a candidate name against an existing set by appending `-2`, `-3`, etc.\n * Mutates nothing; returns the chosen name. Caller is responsible for inserting it\n * into the set.\n */\nexport function disambiguateAgainst(candidate: string, taken: ReadonlySet<string>): string {\n if (!taken.has(candidate)) return candidate;\n for (let i = 2; i < 1000; i += 1) {\n const suffix = `-${i.toString()}`;\n const room = MAX_LEN - suffix.length;\n const trimmed = candidate.length > room ? candidate.slice(0, room) : candidate;\n const next = `${trimmed}${suffix}`;\n if (!taken.has(next)) return next;\n }\n // Pathological: 998 collisions. Fall back to a deterministic-ish hash.\n return `${candidate.slice(0, MAX_LEN - 6)}-x${(taken.size % 1000).toString().padStart(3, '0')}`;\n}\n","import type { Logger, McpServerConfig, McpToolDescriptor, McpToolCallResult, StdioServerConfig } from './types.js';\nimport { buildNamespacedToolName } from './tool-naming.js';\n\n/** Env keys OpenClaw rejects from stdio MCP env blocks. Filter them out before spawning. */\nexport const STDIO_ENV_DENYLIST = new Set([\n 'NODE_OPTIONS',\n 'PYTHONSTARTUP',\n 'PYTHONPATH',\n 'PERL5OPT',\n 'RUBYOPT',\n 'SHELLOPTS',\n 'PS4',\n]);\n\nexport function sanitizeStdioEnv(env: Record<string, string> | undefined): Record<string, string> {\n if (!env) return {};\n const safe: Record<string, string> = {};\n for (const [k, v] of Object.entries(env)) {\n if (STDIO_ENV_DENYLIST.has(k)) continue;\n safe[k] = v;\n }\n return safe;\n}\n\n/** Per-connect context the Connection threads into the connect factory. */\nexport interface ConnectContext {\n /** Server name (store key) — for logging/attribution. */\n serverName: string;\n /**\n * When set, stdio children are spawned with `stderr: 'pipe'` and each stderr\n * line is delivered here. When absent, stderr stays `inherit` (host fd).\n */\n onStderrLine?: (line: string) => void;\n}\n\nexport interface ConnectionDeps {\n /**\n * Factory for an MCP Client connected to the given config. Injected so tests\n * can mock without spawning real processes. In production this wraps\n * `@modelcontextprotocol/sdk/client`. The context arg is optional so\n * existing test mocks keep working.\n */\n connect: (server: McpServerConfig, ctx?: ConnectContext) => Promise<McpClientHandle>;\n}\n\n/**\n * Minimal interface our connection layer needs from an MCP client. Mirrors\n * the @modelcontextprotocol/sdk Client surface but kept narrow so we can\n * mock cleanly in tests.\n */\nexport interface McpClientHandle {\n listTools(): Promise<{ name: string; description?: string; inputSchema: Record<string, unknown> }[]>;\n callTool(name: string, args: unknown, opts?: { signal?: AbortSignal }): Promise<McpToolCallResult>;\n close(): Promise<void>;\n /**\n * Register a callback fired when the underlying transport closes or errors\n * unexpectedly (e.g. the child process crashed). Lets the Connection drop\n * its dead client so the next call re-spawns. Optional so test mocks can\n * omit it.\n */\n onClose?(handler: () => void): void;\n}\n\n/**\n * One Connection per MCP server. Owns lifecycle (lazy-spawn, close, refresh-lock).\n * Refresh-lock pattern adapted from AIWerk `index.ts:219-250` — prevents\n * reconnect + `notifications/tools/list_changed` race.\n */\nexport class Connection {\n readonly name: string;\n readonly config: McpServerConfig;\n private readonly deps: ConnectionDeps;\n private readonly logger: Logger | undefined;\n\n private client: McpClientHandle | undefined;\n private tools: McpToolDescriptor[] = [];\n private connectInFlight: Promise<void> | undefined;\n private refreshInFlight = false;\n private refreshQueued = false;\n private lastUsedAt = Date.now();\n\n /** Set while `close()` runs so the transport's onclose isn't treated as a crash. */\n private closing = false;\n /** Consecutive failed connect attempts — drives reconnect backoff. */\n private consecutiveFailures = 0;\n /** Message from the most recent failed connect attempt; cleared on success. */\n private lastError: string | undefined;\n /** Epoch ms before which re-connect attempts fast-fail (crash-loop guard). */\n private reconnectBlockedUntilMs = 0;\n\n private static readonly RECONNECT_BACKOFF_BASE_MS = 500;\n private static readonly RECONNECT_BACKOFF_MAX_MS = 30_000;\n\n private readonly onUnexpectedClose: (() => void) | undefined;\n private readonly onStderrLine: ((line: string) => void) | undefined;\n\n constructor(params: {\n name: string;\n config: McpServerConfig;\n deps: ConnectionDeps;\n logger?: Logger;\n /** Fired when the transport closes unexpectedly (crash), after internal cleanup. */\n onUnexpectedClose?: () => void;\n /** Threaded to the connect factory — pipes stdio child stderr when set. */\n onStderrLine?: (line: string) => void;\n }) {\n this.name = params.name;\n this.config = params.config;\n this.deps = params.deps;\n this.logger = params.logger;\n this.onUnexpectedClose = params.onUnexpectedClose;\n this.onStderrLine = params.onStderrLine;\n }\n\n /** Returns the most recent known tool list. May be empty if the server hasn't connected yet. */\n snapshotTools(): McpToolDescriptor[] {\n return this.tools;\n }\n\n /** Whether an MCP child process / remote connection has been established. */\n isConnected(): boolean {\n return this.client !== undefined;\n }\n\n /** Tools currently advertised; 0 until the server connects + discovers. */\n toolCount(): number {\n return this.tools.length;\n }\n\n /** Consecutive failed connect attempts; 0 when healthy. */\n failureCount(): number {\n return this.consecutiveFailures;\n }\n\n /** Message from the most recent failed connect attempt, if any. */\n lastErrorMessage(): string | undefined {\n return this.lastError;\n }\n\n /** Idle timestamp for reaping. */\n idleSinceMs(): number {\n return Date.now() - this.lastUsedAt;\n }\n\n /**\n * Lazy connect + tool discovery. Safe to call concurrently; in-flight\n * connects coalesce.\n */\n async ensureConnected(): Promise<void> {\n if (this.client) return;\n if (this.connectInFlight) return this.connectInFlight;\n if (Date.now() < this.reconnectBlockedUntilMs) {\n throw new Error(\n `server \"${this.name}\" is in reconnect backoff after ${this.consecutiveFailures.toString()} failed attempt(s)`,\n );\n }\n this.connectInFlight = this.connectAndDiscover().finally(() => {\n this.connectInFlight = undefined;\n });\n return this.connectInFlight;\n }\n\n private async connectAndDiscover(): Promise<void> {\n const safeConfig = 'command' in this.config\n ? ({ ...this.config, env: sanitizeStdioEnv(this.config.env) } satisfies StdioServerConfig)\n : this.config;\n this.logger?.debug(`[mcp-bundler] connecting server \"${this.name}\"`);\n // `client` is undefined until connect() resolves; keep it here so the\n // catch can close a half-open handle. Widening the try to cover connect()\n // itself is load-bearing: a spawn/URL/auth failure throws HERE (before\n // listTools), and that is the COMMON failure mode for a freshly-added\n // server. Leaving it outside the try meant such failures never recorded\n // `lastError`, never incremented `consecutiveFailures`, and never armed\n // the reconnect backoff — so a bad server had no diagnostics and no\n // crash-loop guard.\n let client: McpClientHandle | undefined;\n try {\n client = await this.deps.connect(safeConfig, {\n serverName: this.name,\n onStderrLine: this.onStderrLine,\n });\n const advertised = await client.listTools();\n const connected = client;\n this.client = connected;\n this.closing = false;\n // Drop the dead client on an unexpected transport close so the next\n // call re-spawns instead of calling into a corpse. Bind the callback to\n // THIS handle so a late close from an already-replaced client can't wipe\n // out a freshly respawned one.\n connected.onClose?.(() => { this.handleUnexpectedClose(connected); });\n this.tools = advertised.map((t) => ({\n prefixed: buildNamespacedToolName(this.name, t.name),\n server: this.name,\n original: t.name,\n label: (t.description ?? t.name).slice(0, 80),\n description: t.description ?? '',\n parameters: t.inputSchema,\n }));\n this.lastUsedAt = Date.now();\n this.consecutiveFailures = 0;\n this.lastError = undefined;\n this.reconnectBlockedUntilMs = 0;\n this.logger?.info(`[mcp-bundler] server \"${this.name}\" connected, ${this.tools.length.toString()} tool(s)`);\n } catch (err) {\n if (client) await client.close().catch(() => undefined);\n this.consecutiveFailures += 1;\n this.lastError = err instanceof Error ? err.message : String(err);\n const backoff = Math.min(\n Connection.RECONNECT_BACKOFF_BASE_MS * 2 ** (this.consecutiveFailures - 1),\n Connection.RECONNECT_BACKOFF_MAX_MS,\n );\n this.reconnectBlockedUntilMs = Date.now() + backoff;\n throw err;\n }\n }\n\n /**\n * Handle an unexpected transport close (crash / network drop). Clears the\n * dead client + tools so the next `ensureConnected` re-spawns. No-op if we\n * initiated the close ourselves (idle reap / reconcile removal).\n */\n private handleUnexpectedClose(handle: McpClientHandle): void {\n // Ignore if we initiated the close, or if this callback belongs to a\n // client we've already replaced (stale late-fire after a respawn).\n if (this.closing || this.client !== handle) return;\n this.logger?.warn(`[mcp-bundler] server \"${this.name}\" connection closed unexpectedly; will re-spawn on next use`);\n this.client = undefined;\n this.tools = [];\n try {\n this.onUnexpectedClose?.();\n } catch {\n /* host hook must never break the connection lifecycle */\n }\n }\n\n /**\n * Re-discover tools. Used on reconnect or `tools/list_changed` notification.\n * Refresh-lock collapses concurrent refreshes; if one is in flight, the next\n * is queued (max 1 queued, since N>1 queued provides no extra freshness).\n */\n async refresh(): Promise<void> {\n if (!this.client) return this.ensureConnected();\n if (this.refreshInFlight) {\n this.refreshQueued = true;\n return;\n }\n this.refreshInFlight = true;\n try {\n const advertised = await this.client.listTools();\n this.tools = advertised.map((t) => ({\n prefixed: buildNamespacedToolName(this.name, t.name),\n server: this.name,\n original: t.name,\n label: (t.description ?? t.name).slice(0, 80),\n description: t.description ?? '',\n parameters: t.inputSchema,\n }));\n this.logger?.debug(`[mcp-bundler] server \"${this.name}\" refreshed, ${this.tools.length.toString()} tool(s)`);\n } finally {\n this.refreshInFlight = false;\n if (this.refreshQueued) {\n this.refreshQueued = false;\n // Trigger one more refresh; do not await so caller isn't blocked on cascading refreshes.\n void this.refresh().catch((err: unknown) => {\n this.logger?.warn(`[mcp-bundler] queued refresh for \"${this.name}\" failed`, { err: err instanceof Error ? err.message : String(err) });\n });\n }\n }\n }\n\n async callTool(originalName: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult> {\n await this.ensureConnected();\n if (!this.client) throw new Error(`server \"${this.name}\" failed to connect`);\n this.lastUsedAt = Date.now();\n return this.client.callTool(originalName, args, signal ? { signal } : undefined);\n }\n\n /**\n * Close the underlying transport. Idempotent. If a connect is in flight\n * (warmup racing with reconcile-removal), wait for it to settle and then\n * close the client it produced — otherwise the child process is orphaned.\n */\n async close(): Promise<void> {\n if (this.connectInFlight) {\n await this.connectInFlight.catch(() => undefined);\n }\n // Mark this close as intentional so the transport's onclose callback\n // doesn't trip the unexpected-close re-spawn path.\n this.closing = true;\n const c = this.client;\n this.client = undefined;\n this.tools = [];\n if (c) await c.close().catch((err: unknown) => {\n this.logger?.warn(`[mcp-bundler] close error for \"${this.name}\"`, { err: err instanceof Error ? err.message : String(err) });\n });\n }\n\n /**\n * Stable hash of the config for diff detection in `reconcile`.\n * Two configs with the same hash are equivalent (no restart needed).\n */\n configFingerprint(): string {\n return JSON.stringify(this.config);\n }\n}\n\n/**\n * Build the production `connect` factory using the official MCP SDK.\n * Kept in a separate function so tests can substitute a mock without\n * pulling the SDK into the test bundle.\n */\nexport async function defaultConnect(server: McpServerConfig, ctx?: ConnectContext): Promise<McpClientHandle> {\n const { Client } = await import('@modelcontextprotocol/sdk/client/index.js');\n const client = new Client({ name: 'alfe-mcp-bundler', version: '0.0.0' }, {});\n\n if ('command' in server) {\n const stdio = server;\n const { StdioClientTransport } = await import('@modelcontextprotocol/sdk/client/stdio.js');\n const onStderrLine = ctx?.onStderrLine;\n const transport = new StdioClientTransport({\n command: stdio.command,\n args: stdio.args ?? [],\n env: { ...sanitizeStdioEnv(stdio.env) } as Record<string, string>,\n cwd: stdio.cwd,\n // Default is 'inherit' (child stderr lands on the HOST's fd 2, invisible\n // to any output monitoring). Pipe only when the host consumes it — an\n // unread pipe would back-pressure the child's stderr writes.\n ...(onStderrLine ? { stderr: 'pipe' as const } : {}),\n });\n if (onStderrLine) {\n // The SDK exposes the PassThrough immediately when stderr:'pipe', so\n // attaching before connect() captures early startup output too.\n let carry = '';\n transport.stderr?.on('data', (chunk: Buffer) => {\n const parts = (carry + chunk.toString()).split('\\n');\n carry = parts.pop() ?? '';\n for (const line of parts) {\n if (line.trim() === '') continue;\n try {\n onStderrLine(line);\n } catch {\n /* host hook must never break the transport */\n }\n }\n });\n }\n await client.connect(transport);\n } else {\n const remote = server;\n if (remote.transport === 'streamable-http') {\n const { StreamableHTTPClientTransport } = await import('@modelcontextprotocol/sdk/client/streamableHttp.js');\n const transport = new StreamableHTTPClientTransport(new URL(remote.url), {\n requestInit: { headers: remote.headers ?? {} },\n });\n await client.connect(transport);\n } else {\n // SSE is deprecated in newer MCP SDK in favor of streamable-http, but\n // some servers still only support SSE — keep transport for back-compat.\n /* eslint-disable @typescript-eslint/no-deprecated */\n const { SSEClientTransport } = await import('@modelcontextprotocol/sdk/client/sse.js');\n const transport = new SSEClientTransport(new URL(remote.url), {\n requestInit: { headers: remote.headers ?? {} },\n });\n /* eslint-enable @typescript-eslint/no-deprecated */\n await client.connect(transport);\n }\n }\n\n let closeHandler: (() => void) | undefined;\n let closed = false;\n const fireClose = () => {\n if (closed) return;\n closed = true;\n closeHandler?.();\n };\n // The high-level SDK Client proxies its transport's lifecycle callbacks.\n client.onclose = fireClose;\n client.onerror = fireClose;\n\n return {\n async listTools() {\n const result = await client.listTools();\n return result.tools.map((t) => ({\n name: t.name,\n description: t.description,\n inputSchema: t.inputSchema as Record<string, unknown>,\n }));\n },\n async callTool(name, args, opts) {\n return (await client.callTool({ name, arguments: args as Record<string, unknown> | undefined }, undefined, opts)) as McpToolCallResult;\n },\n async close() {\n closed = true; // suppress the onClose callback for an intentional close\n await client.close();\n },\n onClose(handler: () => void) {\n closeHandler = handler;\n },\n };\n}\n","import { Connection, defaultConnect, type ConnectionDeps } from './connection.js';\nimport { disambiguateAgainst } from './tool-naming.js';\nimport type {\n BundlerOptions,\n Logger,\n McpServerConfig,\n McpServerStatus,\n McpToolCallResult,\n McpToolDescriptor,\n McpToolErrorInfo,\n ReconcileDiff,\n} from './types.js';\n\nconst DEFAULT_IDLE_TTL_MS = 10 * 60 * 1000;\nconst DEFAULT_IDLE_SWEEP_INTERVAL_MS = 60 * 1000;\n\n/** First text content of an error result, for host error reporting. */\nfunction extractErrorText(result: McpToolCallResult): string {\n for (const item of result.content) {\n if (item.type === 'text' && typeof item.text === 'string') return item.text.slice(0, 500);\n }\n return '(no error text)';\n}\n\n/**\n * Provider-agnostic MCP server bundler. Holds N MCP server connections,\n * exposes a unified namespaced tool catalog, and routes calls to the right\n * server.\n *\n * Designed to be embedded in any host (OpenClaw plugin, AI proxy, Lambda).\n * Public surface is intentionally synchronous where the host needs sync\n * (snapshot, listTools), async only where I/O is unavoidable.\n */\nexport class McpBundler {\n private readonly logger: Logger | undefined;\n private readonly connections = new Map<string, Connection>();\n private readonly idleTtlMs: number;\n private readonly idleSweepIntervalMs: number;\n private idleSweepTimer: ReturnType<typeof setInterval> | undefined;\n private readonly deps: ConnectionDeps;\n private readonly onToolError: ((info: McpToolErrorInfo) => void) | undefined;\n private readonly onServerCrash: ((server: string) => void) | undefined;\n private readonly onServerStderr: ((server: string, line: string) => void) | undefined;\n private disposed = false;\n // Serialize reconcile() so concurrent callers (multiple plugin tool factory\n // ticks within the same ms) don't interleave and orphan Connections, leaking\n // child processes. Acquired via a chain-of-promises latch.\n private reconcileLatch: Promise<unknown> = Promise.resolve();\n\n constructor(opts: BundlerOptions = {}, deps?: ConnectionDeps) {\n this.logger = opts.logger;\n this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;\n this.idleSweepIntervalMs = opts.idleSweepIntervalMs ?? DEFAULT_IDLE_SWEEP_INTERVAL_MS;\n this.deps = deps ?? { connect: defaultConnect };\n this.onToolError = opts.onToolError;\n this.onServerCrash = opts.onServerCrash;\n this.onServerStderr = opts.onServerStderr;\n if (this.idleTtlMs > 0) this.startIdleSweep();\n }\n\n /** Construct a Connection with the host hooks bound to its server name. */\n private buildConnection(name: string, config: McpServerConfig): Connection {\n const crash = this.onServerCrash;\n const stderr = this.onServerStderr;\n return new Connection({\n name,\n config,\n deps: this.deps,\n logger: this.logger,\n ...(crash ? { onUnexpectedClose: () => { crash(name); } } : {}),\n ...(stderr ? { onStderrLine: (line: string) => { stderr(name, line); } } : {}),\n });\n }\n\n /** Fire the host's tool-error hook; exceptions must never affect the call path. */\n private reportToolError(info: McpToolErrorInfo): void {\n try {\n this.onToolError?.(info);\n } catch {\n /* host hook must never break tool routing */\n }\n }\n\n /**\n * Diff `desired` against current connections, spawn newcomers, dispose\n * removals, hot-restart on config change. Pull-based — call whenever the\n * host's config snapshot may have changed. Cheap if no diff.\n *\n * Lazy: newly-added servers are NOT eagerly connected; they connect on the\n * first `callTool()` (or first `listTools()` after `forceDiscover()`).\n * This avoids paying spawn cost for servers the agent never uses.\n */\n async reconcile(desired: Record<string, McpServerConfig>): Promise<ReconcileDiff> {\n if (this.disposed) throw new Error('McpBundler: disposed');\n // Serialize reconciles. Caller awaits its slot; in-flight reconciles run\n // in declaration order. Errors don't poison the latch — `.catch` swallows\n // for chaining, the actual error rejects the awaited slot.\n const slot = this.reconcileLatch.then(async () => this.doReconcile(desired));\n this.reconcileLatch = slot.catch(() => undefined);\n return slot;\n }\n\n private async doReconcile(desired: Record<string, McpServerConfig>): Promise<ReconcileDiff> {\n if (this.disposed) throw new Error('McpBundler: disposed');\n const desiredNames = new Set(Object.keys(desired));\n const currentNames = new Set(this.connections.keys());\n\n const added: string[] = [];\n const removed: string[] = [];\n const changed: string[] = [];\n const unchanged: string[] = [];\n\n // Removals: dispose connections no longer in desired set.\n for (const name of currentNames) {\n if (!desiredNames.has(name)) {\n const conn = this.connections.get(name);\n this.connections.delete(name);\n if (conn) await conn.close();\n removed.push(name);\n }\n }\n\n // Additions and changes.\n for (const [name, config] of Object.entries(desired)) {\n const existing = this.connections.get(name);\n if (!existing) {\n this.connections.set(name, this.buildConnection(name, config));\n added.push(name);\n continue;\n }\n const nextFingerprint = JSON.stringify(config);\n if (existing.configFingerprint() !== nextFingerprint) {\n // Config changed — close old, replace with fresh (lazy reconnect).\n await existing.close();\n this.connections.set(name, this.buildConnection(name, config));\n changed.push(name);\n } else {\n unchanged.push(name);\n }\n }\n\n if (added.length || removed.length || changed.length) {\n this.logger?.info('[mcp-bundler] reconciled', {\n added: added.length,\n removed: removed.length,\n changed: changed.length,\n unchanged: unchanged.length,\n });\n }\n return { added, removed, changed, unchanged };\n }\n\n /**\n * Synchronous snapshot of all currently-known tools across connected servers.\n * Servers that have not connected yet contribute nothing. Intended for use\n * inside OpenClaw's plugin tool factory which must be sync.\n *\n * Tool names are namespaced and disambiguated (suffix `-2`, `-3` on collision)\n * so cross-server name clashes never produce duplicate registrations.\n */\n listTools(): McpToolDescriptor[] {\n const seen = new Set<string>();\n const out: McpToolDescriptor[] = [];\n for (const conn of this.connections.values()) {\n for (const tool of conn.snapshotTools()) {\n const finalName = disambiguateAgainst(tool.prefixed, seen);\n seen.add(finalName);\n out.push(finalName === tool.prefixed ? tool : { ...tool, prefixed: finalName });\n }\n }\n return out;\n }\n\n /**\n * Eagerly connect to every configured server and discover tools. Used by\n * hosts that want a hot list rather than the lazy default. Errors are\n * swallowed per-server (logged), so one bad server doesn't fail the batch.\n */\n async warmup(): Promise<void> {\n if (this.disposed) return;\n await Promise.allSettled(\n Array.from(this.connections.values()).map(async (conn) => {\n try {\n await conn.ensureConnected();\n } catch (err) {\n this.logger?.warn(`[mcp-bundler] warmup failed for \"${conn.name}\"`, {\n err: err instanceof Error ? err.message : String(err),\n });\n }\n }),\n );\n }\n\n /** Build the live status descriptor for one connection. */\n private statusOf(conn: Connection): McpServerStatus {\n const status: McpServerStatus = {\n name: conn.name,\n connected: conn.isConnected(),\n toolCount: conn.toolCount(),\n consecutiveFailures: conn.failureCount(),\n };\n const err = conn.lastErrorMessage();\n if (err !== undefined) status.lastError = err;\n return status;\n }\n\n /** Live status for every known server. Synchronous snapshot, no I/O. */\n statuses(): McpServerStatus[] {\n return Array.from(this.connections.values()).map((conn) => this.statusOf(conn));\n }\n\n /**\n * Eagerly connect ONE server and return its resulting status. Unlike\n * `warmup()` — which fans out over all servers and swallows failures with\n * no return value — this surfaces the outcome so a caller (e.g. the daemon\n * confirming an `alfe mcp add`) can report \"connected, N tools\" or the exact\n * connect error back to the agent.\n *\n * Never throws: a connect failure (or a warm timeout) is reflected in the\n * returned status (`connected: false`, `lastError` set). Returns `undefined`\n * only when the named server isn't present in the bundler.\n */\n async warmServer(name: string, timeoutMs?: number): Promise<McpServerStatus | undefined> {\n if (this.disposed) return undefined;\n const conn = this.connections.get(name);\n if (!conn) return undefined;\n const connect = conn.ensureConnected();\n // If the timeout wins the race below, `connect` stays pending and could\n // reject later — swallow that so it never becomes an unhandled rejection.\n // The connection records its own `lastError`, which `statusOf` reads.\n void connect.catch(() => undefined);\n try {\n if (timeoutMs !== undefined && timeoutMs > 0) {\n await this.raceTimeout(connect, timeoutMs, name);\n } else {\n await connect;\n }\n } catch (err) {\n const status = this.statusOf(conn);\n // A warm timeout is ours, not the connection's — make sure the status\n // carries a message even if the underlying connect hasn't failed yet.\n status.lastError ??= err instanceof Error ? err.message : String(err);\n return status;\n }\n return this.statusOf(conn);\n }\n\n /** Race a promise against a timeout, clearing the timer either way. */\n private async raceTimeout(p: Promise<void>, timeoutMs: number, name: string): Promise<void> {\n let timer: ReturnType<typeof setTimeout> | undefined;\n const timeout = new Promise<never>((_, reject) => {\n timer = setTimeout(() => {\n reject(new Error(`server \"${name}\" warm timed out after ${timeoutMs.toString()}ms`));\n }, timeoutMs);\n if (typeof timer === 'object' && 'unref' in timer) {\n (timer as { unref: () => void }).unref();\n }\n });\n try {\n await Promise.race([p, timeout]);\n } finally {\n // The Promise executor runs synchronously, so `timer` is always set here.\n clearTimeout(timer);\n }\n }\n\n /**\n * Invoke a tool by its namespaced name. Routes to the originating server.\n * Errors are returned as `{ isError: true, content: [...] }` so a failing\n * tool doesn't crash the host.\n */\n async callTool(prefixed: string, args: unknown, signal?: AbortSignal): Promise<McpToolCallResult> {\n if (this.disposed) {\n return { isError: true, content: [{ type: 'text', text: 'mcp-bundler disposed' }] };\n }\n const route = this.routeToolName(prefixed);\n if (!route) {\n return {\n isError: true,\n content: [{ type: 'text', text: `unknown tool: ${prefixed}` }],\n };\n }\n try {\n const result = await route.connection.callTool(route.original, args, signal);\n if (result.isError) {\n this.reportToolError({\n server: route.connection.name,\n tool: route.original,\n prefixed,\n kind: 'result-error',\n message: extractErrorText(result),\n });\n }\n return result;\n } catch (err) {\n const msg = err instanceof Error ? err.message : String(err);\n this.logger?.error(`[mcp-bundler] tool call failed for \"${prefixed}\"`, { err: msg });\n this.reportToolError({\n server: route.connection.name,\n tool: route.original,\n prefixed,\n kind: 'thrown',\n message: msg,\n });\n return {\n isError: true,\n content: [{ type: 'text', text: `tool ${prefixed} failed: ${msg}` }],\n };\n }\n }\n\n /**\n * Resolve a namespaced tool name back to its server connection and original\n * tool name. Returns undefined if the tool is not currently advertised.\n */\n private routeToolName(prefixed: string): { connection: Connection; original: string } | undefined {\n for (const conn of this.connections.values()) {\n for (const tool of conn.snapshotTools()) {\n if (tool.prefixed === prefixed) return { connection: conn, original: tool.original };\n }\n }\n return undefined;\n }\n\n /**\n * Tear down all connections and stop background tasks. Idempotent.\n * Call from `registerRuntimeLifecycle({ cleanup })` in the host plugin.\n */\n async dispose(): Promise<void> {\n if (this.disposed) return;\n this.disposed = true;\n if (this.idleSweepTimer) {\n clearInterval(this.idleSweepTimer);\n this.idleSweepTimer = undefined;\n }\n await Promise.allSettled(Array.from(this.connections.values()).map((c) => c.close()));\n this.connections.clear();\n }\n\n private startIdleSweep(): void {\n this.idleSweepTimer = setInterval(() => {\n void this.sweepIdle().catch((err: unknown) => {\n this.logger?.warn('[mcp-bundler] idle sweep error', {\n err: err instanceof Error ? err.message : String(err),\n });\n });\n }, this.idleSweepIntervalMs);\n // Don't keep the host process alive just for the sweep.\n if (typeof this.idleSweepTimer === 'object' && 'unref' in this.idleSweepTimer) {\n (this.idleSweepTimer as { unref: () => void }).unref();\n }\n }\n\n private async sweepIdle(): Promise<void> {\n if (this.idleTtlMs <= 0) return;\n const targets: Connection[] = [];\n for (const conn of this.connections.values()) {\n if (conn.isConnected() && conn.idleSinceMs() > this.idleTtlMs) {\n targets.push(conn);\n }\n }\n if (targets.length === 0) return;\n this.logger?.debug(`[mcp-bundler] reaping ${targets.length.toString()} idle server(s)`);\n await Promise.allSettled(targets.map((c) => c.close()));\n }\n}\n","import {\n closeSync,\n existsSync,\n mkdirSync,\n openSync,\n readFileSync,\n renameSync,\n statSync,\n unlinkSync,\n watch,\n writeFileSync,\n type FSWatcher,\n} from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { homedir } from 'node:os';\nimport type { Logger, McpServerConfig, StdioServerConfig, RemoteServerConfig, McpTransportKind } from './types.js';\n\n/**\n * Where a server entry came from. Used by `removeServersByOwner` so an\n * integration uninstall can drop only its own entries without touching\n * `cli`-owned (e.g. `alfe-platform`) or `manual`-owned (user-added) ones.\n */\nexport type ServerOwner = 'cli' | `integration:${string}` | 'manual';\n\ninterface StoredServerCommon {\n /** Where the entry came from — controls bulk-removal semantics. */\n owner: ServerOwner;\n /** ISO timestamp of first registration; preserved across updates. */\n addedAt: string;\n /** Optional semver of the providing package (e.g. `@alfe.ai/mcp-server` for `alfe-platform`). Used for drift detection on CLI upgrade. */\n version?: string;\n}\n\nexport type StoredServerEntry =\n | (StoredServerCommon & { transport: 'stdio' } & StdioServerConfig)\n | (StoredServerCommon & { transport: 'sse' | 'streamable-http' } & RemoteServerConfig);\n\nexport interface StoreSchema {\n servers: Record<string, StoredServerEntry>;\n config: {\n sessionIdleTtlMs?: number;\n };\n /**\n * Server names this manager has written into `openclaw.json#mcp.servers.*`.\n * Used to compute the mirror-write diff without re-reading openclaw.json\n * (which would be a second source of truth). Foreign keys not listed here\n * are preserved across mirror writes.\n */\n _ownedOpenclawKeys: string[];\n}\n\nconst DEFAULT_STORE_DIR = join(homedir(), '.alfe', 'mcp');\nconst DEFAULT_STORE_PATH = join(DEFAULT_STORE_DIR, 'servers.json');\n\n/** Inter-process lock tunings — exported as constants so tests can override. */\nconst LOCK_WAIT_MS = 5_000;\nconst LOCK_RETRY_INTERVAL_MS = 25;\nconst LOCK_STALE_MS = 10_000;\n\nexport interface StoreOptions {\n /** Absolute path to the store file. Defaults to `~/.alfe/mcp/servers.json`. */\n path?: string;\n logger?: Logger;\n}\n\n/**\n * On-disk source of truth for the bundler's configured servers.\n *\n * Mutations go through `update()` (read-modify-write with atomic\n * temp+rename) so a concurrent writer (e.g. two `alfe mcp add` invocations\n * racing) can't lose data — the second writer reads the first's state.\n *\n * Schema is owner-tagged so `removeServersByOwner` can implement\n * integration uninstall without touching CLI-owned or manual entries.\n */\nexport class Store {\n private readonly storePath: string;\n private readonly logger?: Logger;\n private watcher?: FSWatcher;\n private watcherListeners = new Set<() => void>();\n private rewatchTimer?: NodeJS.Timeout;\n\n constructor(opts: StoreOptions = {}) {\n this.storePath = opts.path ?? DEFAULT_STORE_PATH;\n this.logger = opts.logger;\n }\n\n get path(): string {\n return this.storePath;\n }\n\n read(): StoreSchema {\n if (!existsSync(this.storePath)) return cloneEmpty();\n try {\n const raw = readFileSync(this.storePath, 'utf8');\n const parsed: unknown = JSON.parse(raw);\n return normalize(parsed);\n } catch (err) {\n this.logger?.warn('[mcp-bundler/store] failed to read store; returning empty', {\n err: errMsg(err),\n path: this.storePath,\n });\n return cloneEmpty();\n }\n }\n\n /**\n * Read-modify-write with atomic temp+rename, guarded by an\n * inter-process lock file. Caller passes a pure function that\n * produces the next state; this serialises the mutation to disk in\n * one rename, which is atomic on POSIX and on Windows when the\n * target path is on the same volume.\n *\n * The lock guards the read-then-rename window so two processes\n * (e.g. two `alfe mcp add` shells, or the CLI racing the daemon)\n * can't drop each other's writes. The lock file is at\n * `<storePath>.lock`; stale locks (older than `LOCK_STALE_MS`) are\n * stolen so a crashed writer doesn't wedge the store.\n *\n * Pure-function shape (instead of a `read()` then `write(next)`\n * pair) intentionally — it keeps the read-modify-write contract\n * local to each caller so two updates back-to-back never see each\n * other's partial state.\n */\n update(fn: (cur: StoreSchema) => StoreSchema): StoreSchema {\n mkdirSync(dirname(this.storePath), { recursive: true });\n const release = this.acquireLock();\n try {\n const cur = this.read();\n const next = fn(cur);\n const tempPath = `${this.storePath}.${String(process.pid)}.${String(Date.now())}.tmp`;\n writeFileSync(tempPath, JSON.stringify(next, null, 2), { encoding: 'utf8', mode: 0o600 });\n try {\n renameSync(tempPath, this.storePath);\n } catch (err) {\n try {\n unlinkSync(tempPath);\n } catch {\n // Best-effort cleanup; the temp file's name has the pid + timestamp\n // so an orphan won't collide with future writers.\n }\n throw err;\n }\n return next;\n } finally {\n release();\n }\n }\n\n /**\n * Acquire an inter-process file lock by atomically creating a\n * sentinel via `openSync(lockPath, 'wx')`. Spins with bounded\n * backoff up to `LOCK_WAIT_MS`. If the lock file is older than\n * `LOCK_STALE_MS` it's assumed orphaned (writer crashed mid-update)\n * and stolen — the write window is sub-second in practice, so\n * holding the lock for >5s means something went wrong.\n *\n * Returns the release function. Single-process callers are\n * unaffected — re-entering the same process spins briefly while\n * the prior call's `finally` runs.\n */\n private acquireLock(): () => void {\n const lockPath = `${this.storePath}.lock`;\n const deadline = Date.now() + LOCK_WAIT_MS;\n let fd = -1;\n for (;;) {\n try {\n fd = openSync(lockPath, 'wx', 0o600);\n break;\n } catch (err) {\n const code = (err as NodeJS.ErrnoException).code;\n if (code !== 'EEXIST') throw err;\n if (this.lockIsStale(lockPath)) {\n try {\n unlinkSync(lockPath);\n } catch {\n // Another process may have just released it — fall through and retry.\n }\n continue;\n }\n if (Date.now() >= deadline) {\n throw new Error(\n `Store.update: timed out waiting for ${lockPath} (held by another writer or stale lock)`,\n );\n }\n // Synchronous spin — the lock window is sub-second under\n // normal load; busy-waiting briefly is simpler than wiring\n // async/await through every `update()` caller.\n const sleepUntil = Date.now() + LOCK_RETRY_INTERVAL_MS;\n while (Date.now() < sleepUntil) { /* spin */ }\n }\n }\n const held = fd;\n return () => {\n try {\n closeSync(held);\n } catch {\n // ignore — the unlink is what releases the lock for the next writer.\n }\n try {\n unlinkSync(lockPath);\n } catch {\n // ignore — already unlinked or stolen by a stale-lock breaker.\n }\n };\n }\n\n private lockIsStale(lockPath: string): boolean {\n try {\n const st = statSync(lockPath);\n return Date.now() - st.mtimeMs > LOCK_STALE_MS;\n } catch {\n return false;\n }\n }\n\n /**\n * Watch the store file for external changes (e.g. another `alfe mcp add`\n * shelling out from a separate process). Returns an unsubscribe fn.\n *\n * Coalesces bursts via a 50 ms debounce — editors and atomic-rename\n * writers commonly fire multiple events per logical save.\n */\n watch(cb: () => void): () => void {\n this.watcherListeners.add(cb);\n this.ensureWatcher();\n return () => {\n this.watcherListeners.delete(cb);\n if (this.watcherListeners.size === 0) this.disposeWatcher();\n };\n }\n\n dispose(): void {\n this.watcherListeners.clear();\n this.disposeWatcher();\n }\n\n private ensureWatcher(): void {\n if (this.watcher) return;\n mkdirSync(dirname(this.storePath), { recursive: true });\n // Some platforms / atomic renames make a per-file watch flaky after\n // a rename; watching the parent directory and filtering by basename\n // is more robust.\n const dir = dirname(this.storePath);\n const basename = this.storePath.slice(dir.length + 1);\n let pending: NodeJS.Timeout | undefined;\n const fire = (): void => {\n pending = undefined;\n for (const cb of this.watcherListeners) {\n try {\n cb();\n } catch (err) {\n this.logger?.warn('[mcp-bundler/store] watcher listener threw', { err: errMsg(err) });\n }\n }\n };\n try {\n this.watcher = watch(dir, (_event, fn) => {\n if (fn !== basename) return;\n if (pending) clearTimeout(pending);\n pending = setTimeout(fire, 50);\n });\n this.watcher.on('error', (err) => {\n this.logger?.warn('[mcp-bundler/store] watcher error; retrying in 1s', { err: errMsg(err) });\n this.disposeWatcher();\n if (!this.rewatchTimer && this.watcherListeners.size > 0) {\n this.rewatchTimer = setTimeout(() => {\n this.rewatchTimer = undefined;\n this.ensureWatcher();\n }, 1000);\n this.rewatchTimer.unref();\n }\n });\n } catch (err) {\n this.logger?.warn('[mcp-bundler/store] failed to start watcher', { err: errMsg(err) });\n }\n }\n\n private disposeWatcher(): void {\n if (this.watcher) {\n try {\n this.watcher.close();\n } catch {\n // close throws on already-disposed watchers; ignore.\n }\n this.watcher = undefined;\n }\n if (this.rewatchTimer) {\n clearTimeout(this.rewatchTimer);\n this.rewatchTimer = undefined;\n }\n }\n}\n\nexport function defaultStorePath(): string {\n return DEFAULT_STORE_PATH;\n}\n\n/** Pull the runtime config (transport + transport-specific fields) out of a stored entry. */\nexport function toServerConfig(entry: StoredServerEntry): McpServerConfig {\n if (entry.transport === 'stdio') {\n const { command, args, env, cwd } = entry;\n const cfg: StdioServerConfig = { command };\n if (args) cfg.args = args;\n if (env) cfg.env = env;\n if (cwd) cfg.cwd = cwd;\n return cfg;\n }\n const { url, transport, headers, connectionTimeoutMs } = entry;\n const cfg: RemoteServerConfig = { url, transport };\n if (headers) cfg.headers = headers;\n if (connectionTimeoutMs !== undefined) cfg.connectionTimeoutMs = connectionTimeoutMs;\n return cfg;\n}\n\n/** Build a stored entry from a runtime config + ownership metadata. */\nexport function toStoredEntry(\n config: McpServerConfig,\n meta: { owner: ServerOwner; transport?: McpTransportKind; version?: string; addedAt?: string },\n): StoredServerEntry {\n const addedAt = meta.addedAt ?? new Date().toISOString();\n if ('command' in config) {\n return {\n transport: 'stdio',\n owner: meta.owner,\n addedAt,\n ...(meta.version !== undefined ? { version: meta.version } : {}),\n ...config,\n };\n }\n const transport = meta.transport ?? config.transport ?? 'sse';\n if (transport === 'stdio') {\n throw new Error('toStoredEntry: transport=stdio specified but config is remote-shaped');\n }\n return {\n transport,\n owner: meta.owner,\n addedAt,\n ...(meta.version !== undefined ? { version: meta.version } : {}),\n ...config,\n };\n}\n\nfunction cloneEmpty(): StoreSchema {\n return { servers: {}, config: {}, _ownedOpenclawKeys: [] };\n}\n\nfunction normalize(raw: unknown): StoreSchema {\n if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return cloneEmpty();\n const r = raw as Partial<StoreSchema>;\n return {\n servers: r.servers && typeof r.servers === 'object' ? r.servers : {},\n config: r.config && typeof r.config === 'object' ? r.config : {},\n _ownedOpenclawKeys: Array.isArray(r._ownedOpenclawKeys) ? r._ownedOpenclawKeys.slice() : [],\n };\n}\n\nfunction errMsg(err: unknown): string {\n return err instanceof Error ? err.message : String(err);\n}\n","import type { McpBundler } from './bundler.js';\nimport { Store, toServerConfig, toStoredEntry, type ServerOwner, type StoredServerEntry } from './store.js';\nimport type { Logger, McpServerConfig, McpServerStatus, McpTransportKind } from './types.js';\n\nexport interface ManagerOptions {\n /** Pre-constructed store. If omitted, one is built with default options. */\n store?: Store;\n logger?: Logger;\n}\n\nexport interface AddServerOptions {\n /** Required — flat-namespace key under the bundler store. */\n id: string;\n /** Marks ownership for bulk removal. Defaults to `manual`. */\n owner?: ServerOwner;\n /** Semver of the providing package; used for CLI version-drift detection. */\n version?: string;\n /** Explicit transport hint for remote configs. Defaults to inferring from `config`. */\n transport?: McpTransportKind;\n}\n\n/**\n * Bundler manager — owns the `~/.alfe/mcp/servers.json` store and surfaces a\n * small CRUD API the CLI and integration applier both call into.\n *\n * Single source of truth: every consumer (daemon-hosted bundler, CLI `alfe mcp\n * list`, integration uninstall) reads from this store. Openclaw.json is no\n * longer kept in sync — the daemon hosts the bundler children and the\n * openclaw plugin reaches them via IPC, so the openclaw.json mirror became\n * dead weight and an active source of duplicate spawning on claude-cli /\n * codex-cli backends.\n *\n * Call `loadIntoBundler(bundler)` once at daemon startup to wire the store\n * into a live `McpBundler` — subsequent store mutations (including those\n * landed by other processes via the file watcher) re-reconcile automatically.\n */\nexport class Manager {\n private readonly store: Store;\n private readonly logger?: Logger;\n private bundler?: McpBundler;\n private changeListeners = new Set<() => void>();\n private storeUnsubscribe?: () => void;\n\n constructor(opts: ManagerOptions = {}) {\n this.store = opts.store ?? new Store({ logger: opts.logger });\n this.logger = opts.logger;\n }\n\n /** Direct accessor — handy for tests and the CLI's `alfe mcp list`. */\n getStore(): Store {\n return this.store;\n }\n\n /**\n * Register or overwrite a server entry. Mutation lands in the store\n * synchronously; if a bundler has been attached via `loadIntoBundler`,\n * it gets re-reconciled in the background (errors logged, never\n * thrown — the store is the source of truth, the bundler is derived).\n */\n async addServer(config: McpServerConfig, opts: AddServerOptions): Promise<void> {\n if (!opts.id) throw new Error('Manager.addServer: id is required');\n const owner = opts.owner ?? 'manual';\n this.store.update((cur) => {\n const previousAddedAt = lookupAddedAt(cur.servers, opts.id);\n const entry = toStoredEntry(config, {\n owner,\n transport: opts.transport,\n version: opts.version,\n addedAt: previousAddedAt,\n });\n return {\n ...cur,\n servers: { ...cur.servers, [opts.id]: entry },\n };\n });\n this.scheduleBundlerReconcile();\n this.fireChange();\n return Promise.resolve();\n }\n\n /**\n * Remove a single server entry. No-op if the id isn't in the store.\n * Refuses to remove an entry whose owner doesn't match `expectedOwner`\n * when supplied — the CLI uses this to guard `alfe mcp remove` from\n * accidentally clobbering integration- or cli-owned entries.\n */\n removeServer(id: string, opts: { expectedOwner?: ServerOwner } = {}): Promise<boolean> {\n const current = this.store.read();\n const existing = lookupEntry(current.servers, id);\n if (!existing) return Promise.resolve(false);\n if (opts.expectedOwner && existing.owner !== opts.expectedOwner) {\n return Promise.reject(\n new Error(\n `Manager.removeServer: server \"${id}\" is owned by \"${existing.owner}\", not \"${opts.expectedOwner}\"`,\n ),\n );\n }\n this.store.update((cur) => ({\n ...cur,\n servers: Object.fromEntries(Object.entries(cur.servers).filter(([k]) => k !== id)),\n }));\n this.scheduleBundlerReconcile();\n this.fireChange();\n return Promise.resolve(true);\n }\n\n /** Drop every entry whose owner matches — used by integration uninstall. */\n async removeServersByOwner(owner: ServerOwner): Promise<string[]> {\n const removed: string[] = [];\n this.store.update((cur) => {\n const next: Record<string, StoredServerEntry> = {};\n for (const [id, entry] of Object.entries(cur.servers)) {\n if (entry.owner === owner) {\n removed.push(id);\n } else {\n next[id] = entry;\n }\n }\n if (removed.length === 0) return cur;\n return { ...cur, servers: next };\n });\n if (removed.length > 0) {\n this.scheduleBundlerReconcile();\n this.fireChange();\n }\n return Promise.resolve(removed);\n }\n\n /** Read-only snapshot for `alfe mcp list` and similar UIs. */\n listServers(): { id: string; entry: StoredServerEntry }[] {\n const snap = this.store.read();\n return Object.entries(snap.servers).map(([id, entry]) => ({ id, entry }));\n }\n\n /**\n * Live connection status per server from the attached bundler. Empty when\n * no bundler is attached (e.g. a CLI-only manager). Lets callers show\n * whether each registered server actually connected and how many tools it\n * advertises, instead of only the stored config.\n */\n serverStatuses(): McpServerStatus[] {\n return this.bundler ? this.bundler.statuses() : [];\n }\n\n /**\n * Reconcile the bundler against the current store (so a just-added entry\n * has a connection object) then eagerly connect ONE server and return its\n * status. Used by the daemon to CONFIRM an `alfe mcp add` actually connected\n * before replying to the agent — turning the fire-and-forget warm into a\n * result the caller can report (\"connected, N tools\" or the real error).\n *\n * Returns `null` when no bundler is attached or the id isn't present; never\n * throws (a connect failure is carried in the returned status).\n */\n async warmServer(id: string, timeoutMs?: number): Promise<McpServerStatus | null> {\n if (!this.bundler) return null;\n await this.reconcileBundler();\n return (await this.bundler.warmServer(id, timeoutMs)) ?? null;\n }\n\n /**\n * Push the current store contents into a bundler instance (which owns\n * connections / tools). Wires up a store watcher so external mutations\n * (e.g. another shell running `alfe mcp add`) re-reconcile.\n */\n async loadIntoBundler(bundler: McpBundler): Promise<void> {\n this.bundler = bundler;\n await this.reconcileBundler();\n this.storeUnsubscribe ??= this.store.watch(() => {\n void this.reconcileBundler().catch((err: unknown) => {\n this.logger?.warn('[mcp-bundler/manager] watcher reconcile failed', { err: errMsg(err) });\n });\n });\n }\n\n /** Subscribe to store mutations. Returns an unsubscribe fn. */\n onChange(cb: () => void): () => void {\n this.changeListeners.add(cb);\n return () => {\n this.changeListeners.delete(cb);\n };\n }\n\n /**\n * Detach from the bundler and stop watching the store. Safe to call\n * multiple times. Does not dispose the underlying `Store` so the\n * shared instance survives multi-manager environments (rare).\n */\n async dispose(): Promise<void> {\n if (this.storeUnsubscribe) {\n this.storeUnsubscribe();\n this.storeUnsubscribe = undefined;\n }\n this.store.dispose();\n this.changeListeners.clear();\n this.bundler = undefined;\n return Promise.resolve();\n }\n\n private scheduleBundlerReconcile(): void {\n if (!this.bundler) return;\n void this.reconcileBundler().catch((err: unknown) => {\n this.logger?.warn('[mcp-bundler/manager] bundler reconcile failed', { err: errMsg(err) });\n });\n }\n\n private async reconcileBundler(): Promise<void> {\n if (!this.bundler) return;\n const snap = this.store.read();\n const servers: Record<string, McpServerConfig> = {};\n for (const [id, entry] of Object.entries(snap.servers)) {\n servers[id] = toServerConfig(entry);\n }\n await this.bundler.reconcile(servers);\n }\n\n private fireChange(): void {\n for (const cb of this.changeListeners) {\n try {\n cb();\n } catch (err) {\n this.logger?.warn('[mcp-bundler/manager] onChange listener threw', { err: errMsg(err) });\n }\n }\n }\n}\n\nfunction errMsg(err: unknown): string {\n return err instanceof Error ? err.message : String(err);\n}\n\n/**\n * Indexed access on `Record<string, T>` returns `T` (not `T | undefined`)\n * unless `noUncheckedIndexedAccess` is set in tsconfig. These helpers\n * make the optional-ness explicit so the lint rules that hate\n * always-truthy conditionals stop firing on real lookups.\n */\nfunction lookupEntry(\n servers: Record<string, StoredServerEntry>,\n id: string,\n): StoredServerEntry | undefined {\n return Object.hasOwn(servers, id) ? servers[id] : undefined;\n}\n\nfunction lookupAddedAt(servers: Record<string, StoredServerEntry>, id: string): string | undefined {\n const entry = lookupEntry(servers, id);\n return entry ? entry.addedAt : undefined;\n}\n","/**\n * Pattern A validator — locks the \"explicit selector arg\" contract for\n * credential-touching tools across the openclaw-* plugin family.\n *\n * Background\n * ----------\n * Pattern A says every credential-touching tool on a multi-account-capable\n * provider MUST take a required selector arg in its JSON Schema so the LLM\n * picks the account deliberately. The reference implementation lives in\n * `@alfe.ai/openclaw-google` (`google_run_command` / `google_disconnect_\n * account` both require `email`). PR 7 of channels-and-credential-driven-\n * integrations sweeps the same shape across notion / xero / myob.\n *\n * Why a validator\n * ---------------\n * The contract is easy to break by accident — a new tool gets added, the\n * selector arg gets forgotten, the LLM silently dispatches to whichever\n * account was loaded first. There's no runtime safety net once the plugin\n * is published. This validator runs in plugin build steps (or CI) and\n * fails the build if a tool that declares itself credential-touching\n * doesn't carry the selector.\n *\n * Scope of this file\n * ------------------\n * Pure functions — no I/O. Plugin packages call into these helpers from\n * their own build scripts (e.g. `pnpm build` or a dedicated lint task) and\n * pass in their `ToolDef[]` or `McpToolDescriptor[]` collection. The\n * validator does NOT know how to read manifests or files — it only checks\n * the shape of the in-memory descriptor list. Wiring is up to each plugin.\n *\n * Consumers\n * ---------\n * - `@alfe.ai/myob-mcp` — direct MCP, explicit TypeBox schemas.\n * - `@alfe.ai/notion-mcp` — proxy MCP, injects selector at runtime.\n * - `@alfe.ai/xero-mcp` — proxy MCP, injects selector at runtime.\n * - `@alfe.ai/openclaw-google` — already compliant; can opt-in for regression.\n *\n * Future\n * ------\n * When PR 7-deferred lands (atlassian / github / microsoft openclaw\n * packages), they hook into the same validator. The atlassian / github\n * cases will likely run the validator over the proxied child server's\n * `listTools()` response after schema-injection, to confirm the injection\n * actually landed on every tool.\n */\n\nimport type { McpToolDescriptor } from \"./types.js\";\n\n// ── Public types ────────────────────────────────────────────\n\n/**\n * A tool descriptor that the validator can inspect. Plugins can pass\n * either {@link McpToolDescriptor} (for proxy plugins surfacing child\n * tools) or a leaner local shape (for direct-MCP plugins). Both come\n * down to a tool name and a JSON Schema parameter object.\n */\nexport interface ValidatableTool {\n /** Tool name as the LLM sees it (post-namespacing). */\n name: string;\n /** JSON Schema for tool parameters (the `inputSchema`). */\n parameters: Record<string, unknown>;\n}\n\nexport interface PatternAOptions {\n /**\n * The required selector property name. Provider-specific (Google uses\n * `email`; Notion will use `workspaceId`; Xero will use `xeroTenantId`;\n * MYOB will use `myobBusinessId`). Plugins MAY support more than one\n * acceptable name — pass an array.\n */\n selector: string | readonly string[];\n /**\n * Tool names exempt from the selector requirement — typically the\n * `list_accounts` discovery tool and any pure-utility tools that don't\n * touch credentials. Match is exact (post-namespacing).\n */\n exempt?: readonly string[];\n}\n\nexport interface PatternAViolation {\n tool: string;\n reason:\n | \"missing-selector-property\"\n | \"selector-not-required\"\n | \"selector-property-not-string\";\n detail: string;\n}\n\n// ── Core check ───────────────────────────────────────────────\n\n/**\n * Validate that every non-exempt tool's JSON Schema declares the selector\n * property AND lists it in `required`. Returns the full set of violations\n * so the caller can report them all in one pass — failing fast on the\n * first one tends to hide cascading bugs in real plugins.\n *\n * The check is intentionally schema-shape-only — it does NOT execute the\n * tool, call the LLM, or talk to the cloud. It's a fast structural pass\n * suitable for build-time use.\n */\nexport function checkPatternA(\n tools: readonly ValidatableTool[],\n options: PatternAOptions,\n): PatternAViolation[] {\n const selectorNames = typeof options.selector === \"string\"\n ? [options.selector]\n : options.selector;\n const exempt = new Set(options.exempt ?? []);\n const violations: PatternAViolation[] = [];\n\n for (const tool of tools) {\n if (exempt.has(tool.name)) continue;\n\n const schema = tool.parameters;\n const properties = (schema as { properties?: Record<string, unknown> }).properties ?? {};\n const required = (schema as { required?: unknown[] }).required ?? [];\n\n const matched = selectorNames.find((name) => name in properties);\n\n if (!matched) {\n violations.push({\n tool: tool.name,\n reason: \"missing-selector-property\",\n detail: `expected one of [${selectorNames.join(\", \")}] in inputSchema.properties`,\n });\n continue;\n }\n\n if (!required.includes(matched)) {\n violations.push({\n tool: tool.name,\n reason: \"selector-not-required\",\n detail: `selector \"${matched}\" present in properties but missing from inputSchema.required`,\n });\n continue;\n }\n\n const propSchema = properties[matched];\n const type = (propSchema as { type?: unknown }).type;\n if (type !== \"string\") {\n violations.push({\n tool: tool.name,\n reason: \"selector-property-not-string\",\n detail: `selector \"${matched}\" must be JSON Schema type=string (found ${JSON.stringify(type)})`,\n });\n }\n }\n\n return violations;\n}\n\n/**\n * Thin wrapper that throws an Error listing every violation if any are\n * present. Convenient for build scripts that want a single guard call.\n */\nexport function assertPatternA(\n tools: readonly ValidatableTool[],\n options: PatternAOptions,\n): void {\n const violations = checkPatternA(tools, options);\n if (violations.length === 0) return;\n const lines = violations.map((v) => ` - [${v.reason}] ${v.tool}: ${v.detail}`);\n throw new Error(\n `Pattern A validation failed for ${String(violations.length)} tool(s):\\n${lines.join(\"\\n\")}`,\n );\n}\n\n/**\n * Cast an {@link McpToolDescriptor} (proxy-plugin shape) to the leaner\n * {@link ValidatableTool} the validator accepts. Useful for proxy\n * plugins that already maintain a `cachedTools: McpToolDescriptor[]`\n * collection.\n */\nexport function fromMcpDescriptor(descriptor: McpToolDescriptor): ValidatableTool {\n return { name: descriptor.prefixed, parameters: descriptor.parameters };\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alfe.ai/mcp-bundler",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"description": "Provider-agnostic MCP server bundler — connects to N MCP servers (stdio/SSE/streamable-http), aggregates their tools with namespacing, exposes a unified callable surface",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|