@migor/agentia 0.7.0 → 0.7.2
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/CHANGELOG.md +198 -1
- package/README.md +1 -1
- package/dist/AGENTS.md +160 -16
- package/dist/container/container.d.ts +8 -1
- package/dist/container/container.js +8 -1
- package/dist/container/container.js.map +1 -1
- package/dist/core/run.d.ts +5 -1
- package/dist/core/timeout.d.ts +8 -0
- package/dist/core/timeout.js +14 -3
- package/dist/core/timeout.js.map +1 -1
- package/dist/core/tool.d.ts +64 -0
- package/dist/engine/budget.d.ts +17 -4
- package/dist/engine/budget.js +3 -3
- package/dist/engine/budget.js.map +1 -1
- package/dist/engine/loop.d.ts +7 -0
- package/dist/engine/loop.js +102 -6
- package/dist/engine/loop.js.map +1 -1
- package/dist/engine/spec.d.ts +18 -2
- package/dist/engine/spec.js.map +1 -1
- package/dist/engine/tracer.d.ts +11 -0
- package/dist/engine/tracer.js +25 -12
- package/dist/engine/tracer.js.map +1 -1
- package/dist/engine/turn.d.ts +25 -3
- package/dist/engine/turn.js +63 -4
- package/dist/engine/turn.js.map +1 -1
- package/dist/engine/types.d.ts +28 -1
- package/dist/engine/types.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/integrations/anthropic.d.ts +5 -0
- package/dist/integrations/anthropic.js +57 -4
- package/dist/integrations/anthropic.js.map +1 -1
- package/dist/integrations/mcp-http.d.ts +43 -0
- package/dist/integrations/mcp-http.js +250 -0
- package/dist/integrations/mcp-http.js.map +1 -0
- package/dist/integrations/mcp-stdio.d.ts +46 -0
- package/dist/integrations/mcp-stdio.js +230 -0
- package/dist/integrations/mcp-stdio.js.map +1 -0
- package/dist/integrations/mcp.d.ts +46 -73
- package/dist/integrations/mcp.js +24 -421
- package/dist/integrations/mcp.js.map +1 -1
- package/dist/integrations/metrics-otlp.d.ts +42 -0
- package/dist/integrations/metrics-otlp.js +178 -0
- package/dist/integrations/metrics-otlp.js.map +1 -0
- package/dist/integrations/metrics-render.d.ts +2 -0
- package/dist/integrations/metrics-render.js +145 -0
- package/dist/integrations/metrics-render.js.map +1 -0
- package/dist/integrations/metrics-state.d.ts +191 -0
- package/dist/integrations/metrics-state.js +363 -0
- package/dist/integrations/metrics-state.js.map +1 -0
- package/dist/integrations/metrics.d.ts +3 -86
- package/dist/integrations/metrics.js +28 -650
- package/dist/integrations/metrics.js.map +1 -1
- package/dist/integrations/openai.js +25 -3
- package/dist/integrations/openai.js.map +1 -1
- package/dist/integrations/otlp.js +15 -6
- package/dist/integrations/otlp.js.map +1 -1
- package/dist/runtime/run.d.ts +6 -0
- package/dist/runtime/run.js +23 -0
- package/dist/runtime/run.js.map +1 -1
- package/dist/store/fsStore.d.ts +3 -2
- package/dist/store/fsStore.js +20 -6
- package/dist/store/fsStore.js.map +1 -1
- package/dist/store/sqliteStore.js +7 -5
- package/dist/store/sqliteStore.js.map +1 -1
- package/dist/store/store.d.ts +17 -1
- package/dist/store/store.js +3 -2
- package/dist/store/store.js.map +1 -1
- package/dist/toolkit/asset.d.ts +3 -2
- package/dist/toolkit/asset.js +11 -2
- package/dist/toolkit/asset.js.map +1 -1
- package/dist/toolkit/module.d.ts +3 -2
- package/dist/toolkit/module.js +3 -0
- package/dist/toolkit/module.js.map +1 -1
- package/dist/toolkit/skill.js +46 -8
- package/dist/toolkit/skill.js.map +1 -1
- package/dist/toolkit/subagent.js +26 -1
- package/dist/toolkit/subagent.js.map +1 -1
- package/dist/toolkit/tool.d.ts +6 -0
- package/dist/toolkit/tool.js +1 -0
- package/dist/toolkit/tool.js.map +1 -1
- package/dist/transport/async.d.ts +81 -1
- package/dist/transport/async.js +323 -11
- package/dist/transport/async.js.map +1 -1
- package/dist/transport/http.d.ts +5 -0
- package/dist/transport/http.js +74 -2
- package/dist/transport/http.js.map +1 -1
- package/dist/transport/scheduler.js +33 -2
- package/dist/transport/scheduler.js.map +1 -1
- package/package.json +9 -5
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
import { DEFAULT_CLIENT_INFO, DEFAULT_PROTOCOL_VERSION, MCP_DEFAULT_TIMEOUT_MS, brief, isJsonRpcResponse, unwrap, withDeadline, } from './mcp.js';
|
|
2
|
+
/**
|
|
3
|
+
* **StreamableHTTP 连接器**:一个 endpoint,POST JSON-RPC(MCP 2025-03-26 起的
|
|
4
|
+
* Streamable HTTP 传输)。
|
|
5
|
+
*
|
|
6
|
+
* - 两种响应形态**都要接**:`application/json`(整条报文)与 `text/event-stream`
|
|
7
|
+
* (报文按 SSE 帧下发,server 应在发完响应后关流);
|
|
8
|
+
* - 会话:`initialize` 响应里的 `Mcp-Session-Id` 会被记住并在后续请求上回带
|
|
9
|
+
* (后续响应不带该头时**不覆盖**);`close()` 尽力 `DELETE` 终止会话;
|
|
10
|
+
* **会话过期自愈**:带会话 id 收到 `404` ⇒ 视为「会话已终止、该请求未被 server 执行」
|
|
11
|
+
* ⇒ 丢会话 → 重新握手 → 把这一次**重试一次**(只一次,不再循环)。自愈是静默的,
|
|
12
|
+
* 所以给了 `onSessionExpired` 钩子给你计数 / 告警 —— 否则它和「静默失效」没区别。
|
|
13
|
+
* - 协议版本:请求头 `MCP-Protocol-Version` 带**协商到的**版本(2025-06-18 起要求,
|
|
14
|
+
* 老 server 忽略未知头);
|
|
15
|
+
* - HTTP 层失败**挂数值 `status`** ⇒ `engine/errors.ts::classifyError` 自动分流
|
|
16
|
+
* (429 → `rate_limit` 可重试 / ≥500 → `server` 可重试 / 其余 4xx → `api` 不可重试)。
|
|
17
|
+
*/
|
|
18
|
+
export function createStreamableHttpMcpConnector(url, opts = {}) {
|
|
19
|
+
if (typeof url !== 'string' || url === '') {
|
|
20
|
+
throw new Error('createStreamableHttpMcpConnector:url 不能为空');
|
|
21
|
+
}
|
|
22
|
+
const fetchImpl = opts.fetchImpl ?? fetch;
|
|
23
|
+
const timeoutMs = opts.timeoutMs ?? MCP_DEFAULT_TIMEOUT_MS;
|
|
24
|
+
const clientInfo = opts.clientInfo ?? DEFAULT_CLIENT_INFO;
|
|
25
|
+
const requestedVersion = opts.protocolVersion ?? DEFAULT_PROTOCOL_VERSION;
|
|
26
|
+
const baseHeaders = {
|
|
27
|
+
'content-type': 'application/json',
|
|
28
|
+
// MCP 规定客户端必须同时接受两种响应形态(否则 server 无法按规范回 SSE)
|
|
29
|
+
accept: 'application/json, text/event-stream',
|
|
30
|
+
...opts.headers,
|
|
31
|
+
};
|
|
32
|
+
let sessionId = null;
|
|
33
|
+
let negotiated = requestedVersion;
|
|
34
|
+
let closed = false;
|
|
35
|
+
let ready = null;
|
|
36
|
+
let reinit = null;
|
|
37
|
+
let nextId = 1;
|
|
38
|
+
const guard = (p, label) => withDeadline(p, timeoutMs, label);
|
|
39
|
+
/** HTTP 层失败:带上数值 `status`,让 `classifyError` 能按状态分流 */
|
|
40
|
+
const httpError = (status, method, body) => {
|
|
41
|
+
const e = new Error(`MCP ${method} HTTP ${status}${body ? `:${body}` : ''}`);
|
|
42
|
+
e.status = status;
|
|
43
|
+
return e;
|
|
44
|
+
};
|
|
45
|
+
const readText = async (res) => {
|
|
46
|
+
try {
|
|
47
|
+
return await res.text();
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return '';
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
const post = async (payload, o = {}) => {
|
|
54
|
+
if (closed)
|
|
55
|
+
throw new Error('MCP 连接器已 close —— 请重新创建一个');
|
|
56
|
+
const headers = { ...baseHeaders };
|
|
57
|
+
if (sessionId !== null)
|
|
58
|
+
headers['mcp-session-id'] = sessionId;
|
|
59
|
+
if (o.withVersion)
|
|
60
|
+
headers['mcp-protocol-version'] = negotiated;
|
|
61
|
+
const res = await fetchImpl(url, {
|
|
62
|
+
method: 'POST',
|
|
63
|
+
headers,
|
|
64
|
+
body: JSON.stringify(payload),
|
|
65
|
+
// 裁判(引擎 toolTimeoutMs / 桥兜底)的 abandoned 直达传输层:放弃等待时在飞 fetch
|
|
66
|
+
// 被真掐掉,不留泄漏(HTTP 侧没有 stdio 那样的 pending 簿记,掐连接就是清簿记)。
|
|
67
|
+
// exactOptionalPropertyTypes:无 signal 时不落这个键。
|
|
68
|
+
...(o.signal !== undefined ? { signal: o.signal } : {}),
|
|
69
|
+
});
|
|
70
|
+
// 会话 id 只在 initialize 响应里出现;后续响应不带时**不能**把它清成 null
|
|
71
|
+
const sid = res.headers.get('mcp-session-id');
|
|
72
|
+
if (sid !== null && sid !== '')
|
|
73
|
+
sessionId = sid;
|
|
74
|
+
return res;
|
|
75
|
+
};
|
|
76
|
+
/** 非 SSE 报文(单条 JSON-RPC)→ 取 result;SSE 里可能有别的通知帧,只取与 `id` 配对的 */
|
|
77
|
+
const pickResult = (msg, id, method) => {
|
|
78
|
+
// id 必须**等值**配对(与 SSE 分支同款):只验「是带 id 的响应」会把别的请求的
|
|
79
|
+
// 结果当本次的返回(代理串包/通知帧),静默错值比报错难查得多。
|
|
80
|
+
if (!isJsonRpcResponse(msg) || msg.id !== id) {
|
|
81
|
+
throw new Error(`MCP ${method}:响应里没有 id 为 ${id} 的 JSON-RPC 报文`);
|
|
82
|
+
}
|
|
83
|
+
return unwrap(msg, method);
|
|
84
|
+
};
|
|
85
|
+
/**
|
|
86
|
+
* 从响应取结果。SSE 分支一次性读完整个 body 再解析 —— StreamableHTTP 约定 server 发完
|
|
87
|
+
* 响应即关流,读全比手写增量解析器稳(`text/event-stream` 里 `data:` 行按规范可跨多行拼接)。
|
|
88
|
+
*/
|
|
89
|
+
const readResult = async (res, id, method) => {
|
|
90
|
+
const ct = (res.headers.get('content-type') ?? '').toLowerCase();
|
|
91
|
+
const text = await readText(res);
|
|
92
|
+
if (ct.includes('text/event-stream')) {
|
|
93
|
+
for (const frame of text.split(/\r?\n\r?\n/)) {
|
|
94
|
+
const data = frame
|
|
95
|
+
.split(/\r?\n/)
|
|
96
|
+
.filter((l) => l.startsWith('data:'))
|
|
97
|
+
.map((l) => l.slice(5).trim())
|
|
98
|
+
.join('');
|
|
99
|
+
if (data === '')
|
|
100
|
+
continue;
|
|
101
|
+
let msg;
|
|
102
|
+
try {
|
|
103
|
+
msg = JSON.parse(data);
|
|
104
|
+
}
|
|
105
|
+
catch {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
if (isJsonRpcResponse(msg) && msg.id === id)
|
|
109
|
+
return unwrap(msg, method);
|
|
110
|
+
}
|
|
111
|
+
throw new Error(`MCP ${method}:SSE 响应里没有 id 为 ${id} 的报文`);
|
|
112
|
+
}
|
|
113
|
+
if (text.trim() === '') {
|
|
114
|
+
throw new Error(`MCP ${method}:响应体为空(期望 id 为 ${id} 的 JSON-RPC 报文)`);
|
|
115
|
+
}
|
|
116
|
+
let msg;
|
|
117
|
+
try {
|
|
118
|
+
msg = JSON.parse(text);
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
throw new Error(`MCP ${method}:响应不是合法 JSON:${brief(text)}`);
|
|
122
|
+
}
|
|
123
|
+
return pickResult(msg, id, method);
|
|
124
|
+
};
|
|
125
|
+
/**
|
|
126
|
+
* 会话过期自愈的互斥:并发请求同时吃到 404 时**共享同一次重握手**。
|
|
127
|
+
* 没有这层时,两个并发调用各自执行 `ready = null`(第二个会把第一个刚建的握手
|
|
128
|
+
* Promise 抹掉)⇒ 双 initialize 并发跑、`sessionId` 互相覆盖,重试带着被覆盖的
|
|
129
|
+
* 会话再 404 且不再重试。`onSessionExpired` 仍按 404 逐次记(每个 404 都是事实),
|
|
130
|
+
* 共享的只是「重握手」这个动作。
|
|
131
|
+
*/
|
|
132
|
+
const reinitialize = () => {
|
|
133
|
+
if (reinit)
|
|
134
|
+
return reinit;
|
|
135
|
+
reinit = (async () => {
|
|
136
|
+
sessionId = null;
|
|
137
|
+
ready = null; // 下一次 ensureReady 会新建会话
|
|
138
|
+
await ensureReady();
|
|
139
|
+
})().finally(() => {
|
|
140
|
+
reinit = null;
|
|
141
|
+
});
|
|
142
|
+
return reinit;
|
|
143
|
+
};
|
|
144
|
+
/**
|
|
145
|
+
* 一次 JSON-RPC 往返,带**会话过期自愈**(2026-09-18;MCP Streamable HTTP 的规范语义)。
|
|
146
|
+
*
|
|
147
|
+
* 带会话 id 收到 `404` 的含义是「这个会话我不认识」⇒ **该请求没有被执行** ——
|
|
148
|
+
* 所以丢掉会话、重新握手、把这一次**重试一次**是安全的(不会重复执行副作用)。
|
|
149
|
+
* 规范也是这么要求的:客户端**必须**新建会话(不带会话 id 重新 `initialize`)。
|
|
150
|
+
*
|
|
151
|
+
* **只重试一次**:第二次再 404 说明对面不是「会话过期」而是别的问题,直接抛(不循环)。
|
|
152
|
+
* 自愈本身是静默的,但可通过 `onSessionExpired` 观测 —— 否则它和「静默失效」没区别。
|
|
153
|
+
*/
|
|
154
|
+
const rpc = async (method, params, withVersion, allowReinit = true, abandoned) => {
|
|
155
|
+
const id = nextId++;
|
|
156
|
+
const res = await post({ jsonrpc: '2.0', id, method, params }, { withVersion, ...(abandoned !== undefined ? { signal: abandoned } : {}) });
|
|
157
|
+
if (res.status === 404 && sessionId !== null && allowReinit) {
|
|
158
|
+
await readText(res); // 排空,别把连接晾着
|
|
159
|
+
opts.onSessionExpired?.();
|
|
160
|
+
await reinitialize();
|
|
161
|
+
// 自愈重试那次同样带上 abandoned —— 裁判放弃时两条在飞 fetch 都要被掐
|
|
162
|
+
return rpc(method, params, withVersion, false, abandoned);
|
|
163
|
+
}
|
|
164
|
+
if (!res.ok)
|
|
165
|
+
throw httpError(res.status, method, await readText(res));
|
|
166
|
+
// 计时裁判权在调用方(initialize / notifications / tools/list 都在调用点自带
|
|
167
|
+
// guard —— 它们是装配期路径、没有别的裁判);`tools/call` 不在此起计时器:
|
|
168
|
+
// 它的裁判是引擎的 `toolTimeoutMs`(spec §10 2026-09-17 ① 超时单源化)——
|
|
169
|
+
// 再包一层 guard 就是双计时器,同一事件两本账(stdio 侧就没有这层)。
|
|
170
|
+
return readResult(res, id, method);
|
|
171
|
+
};
|
|
172
|
+
const ensureReady = () => {
|
|
173
|
+
if (ready)
|
|
174
|
+
return ready;
|
|
175
|
+
ready = (async () => {
|
|
176
|
+
const init = await guard(rpc('initialize', { protocolVersion: requestedVersion, capabilities: {}, clientInfo }, false), 'initialize');
|
|
177
|
+
if (typeof init === 'object' && init !== null) {
|
|
178
|
+
const v = init.protocolVersion;
|
|
179
|
+
if (typeof v === 'string' && v !== '')
|
|
180
|
+
negotiated = v;
|
|
181
|
+
}
|
|
182
|
+
const res = await guard(post({ jsonrpc: '2.0', method: 'notifications/initialized', params: {} }, { withVersion: true }), 'notifications/initialized');
|
|
183
|
+
if (!res.ok) {
|
|
184
|
+
throw httpError(res.status, 'notifications/initialized', await readText(res));
|
|
185
|
+
}
|
|
186
|
+
await readText(res); // 排空:202 + 空体是合法应答,但别把连接晾着
|
|
187
|
+
})();
|
|
188
|
+
return ready;
|
|
189
|
+
};
|
|
190
|
+
const listTools = async () => {
|
|
191
|
+
await ensureReady();
|
|
192
|
+
const r = await guard(rpc('tools/list', {}, true), 'tools/list');
|
|
193
|
+
if (typeof r !== 'object' || r === null) {
|
|
194
|
+
throw new Error(`MCP tools/list 返回了非对象:${brief(r)}`);
|
|
195
|
+
}
|
|
196
|
+
const listed = r.tools;
|
|
197
|
+
if (listed === undefined)
|
|
198
|
+
return [];
|
|
199
|
+
if (!Array.isArray(listed)) {
|
|
200
|
+
throw new Error(`MCP tools/list 的 tools 不是数组:${brief(listed)}`);
|
|
201
|
+
}
|
|
202
|
+
return listed;
|
|
203
|
+
};
|
|
204
|
+
const callTool = async (name, args, callOpts) => {
|
|
205
|
+
await ensureReady();
|
|
206
|
+
const r = await rpc('tools/call', { name, arguments: args }, true, true, callOpts?.abandoned);
|
|
207
|
+
// 承重同 stdio:协议层 isError 只有连接器看得见
|
|
208
|
+
if (typeof r === 'object' && r !== null && r.isError) {
|
|
209
|
+
throw new Error(`MCP 工具 ${name} 返回 isError: ${brief(r.content)}`);
|
|
210
|
+
}
|
|
211
|
+
return r;
|
|
212
|
+
};
|
|
213
|
+
return {
|
|
214
|
+
listTools,
|
|
215
|
+
callTool,
|
|
216
|
+
async close() {
|
|
217
|
+
if (closed)
|
|
218
|
+
return;
|
|
219
|
+
closed = true;
|
|
220
|
+
const sid = sessionId;
|
|
221
|
+
sessionId = null;
|
|
222
|
+
if (sid === null)
|
|
223
|
+
return;
|
|
224
|
+
try {
|
|
225
|
+
// 尽力终止会话(MCP 约定的显式关闭);server 不认这个方法也不该让 close() 抛。
|
|
226
|
+
//
|
|
227
|
+
// ⚠️ **必须过 `guard`**:这里此前直接 `await fetchImpl(...)`。下面的 catch 只兜得住
|
|
228
|
+
// **抛错**,兜不住**挂死** —— server 接受连接后不回(半开 / 卡在代理后面),
|
|
229
|
+
// `close()` 就永久挂住,而调用方(宿主停机路径)会一直等它。**挂住比失败更糟**,
|
|
230
|
+
// 与「best-effort、不抛错」的承诺相悖。fetch 与排空**一起**进 guard:
|
|
231
|
+
// 只护住响应头、body 照样能卡(`readText` 读的是 body)。
|
|
232
|
+
await guard((async () => {
|
|
233
|
+
const res = await fetchImpl(url, {
|
|
234
|
+
method: 'DELETE',
|
|
235
|
+
headers: {
|
|
236
|
+
...baseHeaders,
|
|
237
|
+
'mcp-session-id': sid,
|
|
238
|
+
'mcp-protocol-version': negotiated,
|
|
239
|
+
},
|
|
240
|
+
});
|
|
241
|
+
await readText(res);
|
|
242
|
+
})(), 'close');
|
|
243
|
+
}
|
|
244
|
+
catch {
|
|
245
|
+
/* 关闭是尽力而为(超时也走这里 —— guard 抛 TimeoutError) */
|
|
246
|
+
}
|
|
247
|
+
},
|
|
248
|
+
};
|
|
249
|
+
}
|
|
250
|
+
//# sourceMappingURL=mcp-http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-http.js","sourceRoot":"","sources":["../../src/integrations/mcp-http.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { McpConnector } from './mcp.js';
|
|
2
|
+
/**
|
|
3
|
+
* MCP **stdio 连接器**(内置默认件之一):spawn 子进程、换行分隔 JSON-RPC。
|
|
4
|
+
* 桥与共享 helper 在 `mcp.ts`;本文件只含 stdio 传输。module 级 export,
|
|
5
|
+
* 公共面仍由 `mcp.ts` re-export(`src/index.ts` 不变)。
|
|
6
|
+
*/
|
|
7
|
+
/** `close()` 里 SIGTERM → SIGKILL 的宽限期(毫秒) */
|
|
8
|
+
export declare const MCP_CLOSE_GRACE_MS = 2000;
|
|
9
|
+
export interface StdioMcpConnectorOptions {
|
|
10
|
+
/** 追加 / 覆盖的环境变量(缺省继承 `process.env`) */
|
|
11
|
+
env?: Record<string, string>;
|
|
12
|
+
/** 子进程工作目录 */
|
|
13
|
+
cwd?: string;
|
|
14
|
+
/** 子进程 stderr 去向:`'inherit'`(缺省,server 日志直通终端)| `'ignore'` */
|
|
15
|
+
stderr?: 'inherit' | 'ignore';
|
|
16
|
+
/** 见 {@link DEFAULT_CLIENT_INFO} */
|
|
17
|
+
clientInfo?: {
|
|
18
|
+
name: string;
|
|
19
|
+
version: string;
|
|
20
|
+
};
|
|
21
|
+
/** 请求的协议版本,缺省 `'2024-11-05'` */
|
|
22
|
+
protocolVersion?: string;
|
|
23
|
+
/**
|
|
24
|
+
* 装配期超时(毫秒)—— 只作用于**握手 + `tools/list`**,缺省
|
|
25
|
+
* {@link MCP_DEFAULT_TIMEOUT_MS};非正数 = 不限。语义见 {@link Guard}。
|
|
26
|
+
*
|
|
27
|
+
* 超时同样只是一类账(`code='timeout'`):**不终止子进程**,与仓库其余「等待的终点」
|
|
28
|
+
* 一致(超时 = 放弃等待)。
|
|
29
|
+
*/
|
|
30
|
+
timeoutMs?: number;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* **stdio 连接器**:spawn 一个 MCP server 子进程,走换行分隔的 JSON-RPC 2.0
|
|
34
|
+
* (`initialize` → `notifications/initialized` → `tools/list` / `tools/call`)。
|
|
35
|
+
*
|
|
36
|
+
* 进程与握手都是**惰性**的 —— 构造不产生副作用,第一次 `listTools` / `callTool` 才 spawn;
|
|
37
|
+
* 握手只做一次(并发调用共享同一次握手)。
|
|
38
|
+
*
|
|
39
|
+
* 三处非显然的坑,这里都兜住了(此前 `scripts/e2e-mcp.ts` 内联的那 94 行踩过):
|
|
40
|
+
* 1. spawn **失败**(命令不存在 → `ENOENT`)是异步的 `'error'` 事件,不是抛出 ——
|
|
41
|
+
* 没有监听器就是未捕获异常、直接把宿主进程带崩,所以必须接住并拒绝在途请求;
|
|
42
|
+
* 2. 分帧:一条报文可能跨多个 chunk,必须自己攒 buffer 按 `\n` 切;
|
|
43
|
+
* 3. **协议层 `isError: true` 必须转成抛错** —— 否则模型收到一条「成功」的结果,
|
|
44
|
+
* trace 也把它记成成功的调用(`McpClientLike` 的约定,见其注释)。
|
|
45
|
+
*/
|
|
46
|
+
export declare function createStdioMcpConnector(cmd: readonly string[], opts?: StdioMcpConnectorOptions): McpConnector;
|
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process';
|
|
2
|
+
import { DEFAULT_CLIENT_INFO, DEFAULT_PROTOCOL_VERSION, MCP_DEFAULT_TIMEOUT_MS, brief, isJsonRpcResponse, unwrap, withDeadline, } from './mcp.js';
|
|
3
|
+
/**
|
|
4
|
+
* MCP **stdio 连接器**(内置默认件之一):spawn 子进程、换行分隔 JSON-RPC。
|
|
5
|
+
* 桥与共享 helper 在 `mcp.ts`;本文件只含 stdio 传输。module 级 export,
|
|
6
|
+
* 公共面仍由 `mcp.ts` re-export(`src/index.ts` 不变)。
|
|
7
|
+
*/
|
|
8
|
+
/** `close()` 里 SIGTERM → SIGKILL 的宽限期(毫秒) */
|
|
9
|
+
export const MCP_CLOSE_GRACE_MS = 2_000;
|
|
10
|
+
/**
|
|
11
|
+
* **stdio 连接器**:spawn 一个 MCP server 子进程,走换行分隔的 JSON-RPC 2.0
|
|
12
|
+
* (`initialize` → `notifications/initialized` → `tools/list` / `tools/call`)。
|
|
13
|
+
*
|
|
14
|
+
* 进程与握手都是**惰性**的 —— 构造不产生副作用,第一次 `listTools` / `callTool` 才 spawn;
|
|
15
|
+
* 握手只做一次(并发调用共享同一次握手)。
|
|
16
|
+
*
|
|
17
|
+
* 三处非显然的坑,这里都兜住了(此前 `scripts/e2e-mcp.ts` 内联的那 94 行踩过):
|
|
18
|
+
* 1. spawn **失败**(命令不存在 → `ENOENT`)是异步的 `'error'` 事件,不是抛出 ——
|
|
19
|
+
* 没有监听器就是未捕获异常、直接把宿主进程带崩,所以必须接住并拒绝在途请求;
|
|
20
|
+
* 2. 分帧:一条报文可能跨多个 chunk,必须自己攒 buffer 按 `\n` 切;
|
|
21
|
+
* 3. **协议层 `isError: true` 必须转成抛错** —— 否则模型收到一条「成功」的结果,
|
|
22
|
+
* trace 也把它记成成功的调用(`McpClientLike` 的约定,见其注释)。
|
|
23
|
+
*/
|
|
24
|
+
export function createStdioMcpConnector(cmd, opts = {}) {
|
|
25
|
+
const bin = cmd[0];
|
|
26
|
+
if (typeof bin !== 'string' || bin === '') {
|
|
27
|
+
throw new Error('createStdioMcpConnector:cmd 不能为空(需要可执行文件 + 参数)');
|
|
28
|
+
}
|
|
29
|
+
const rest = cmd.slice(1);
|
|
30
|
+
const timeoutMs = opts.timeoutMs ?? MCP_DEFAULT_TIMEOUT_MS;
|
|
31
|
+
const clientInfo = opts.clientInfo ?? DEFAULT_CLIENT_INFO;
|
|
32
|
+
const protocolVersion = opts.protocolVersion ?? DEFAULT_PROTOCOL_VERSION;
|
|
33
|
+
let proc = null;
|
|
34
|
+
let fatal = null;
|
|
35
|
+
let closed = false;
|
|
36
|
+
let exited = false;
|
|
37
|
+
let buf = '';
|
|
38
|
+
let nextId = 1;
|
|
39
|
+
let ready = null;
|
|
40
|
+
let resolveExit = null;
|
|
41
|
+
const exitPromise = new Promise((r) => {
|
|
42
|
+
resolveExit = r;
|
|
43
|
+
});
|
|
44
|
+
const pending = new Map();
|
|
45
|
+
const markExited = () => {
|
|
46
|
+
exited = true;
|
|
47
|
+
resolveExit?.();
|
|
48
|
+
};
|
|
49
|
+
/** 进程已死 / 已 close 时一次性拒绝全部在途请求 —— 不留永久挂起的 promise */
|
|
50
|
+
const fail = (err) => {
|
|
51
|
+
fatal = err;
|
|
52
|
+
for (const p of pending.values())
|
|
53
|
+
p.reject(err);
|
|
54
|
+
pending.clear();
|
|
55
|
+
};
|
|
56
|
+
const guard = (p, label) => withDeadline(p, timeoutMs, label);
|
|
57
|
+
const ensureProc = () => {
|
|
58
|
+
if (closed)
|
|
59
|
+
throw new Error('MCP 连接器已 close —— 请重新创建一个');
|
|
60
|
+
if (fatal)
|
|
61
|
+
throw fatal;
|
|
62
|
+
if (proc)
|
|
63
|
+
return proc;
|
|
64
|
+
const spawnOpts = {
|
|
65
|
+
stdio: ['pipe', 'pipe', opts.stderr ?? 'inherit'],
|
|
66
|
+
// exactOptionalPropertyTypes:可选字段不能赋 undefined,只能条件展开
|
|
67
|
+
...(opts.env ? { env: { ...process.env, ...opts.env } } : {}),
|
|
68
|
+
...(opts.cwd !== undefined ? { cwd: opts.cwd } : {}),
|
|
69
|
+
};
|
|
70
|
+
const p = spawn(bin, rest, spawnOpts);
|
|
71
|
+
proc = p;
|
|
72
|
+
p.on('error', (err) => {
|
|
73
|
+
// 见函数头第 1 条:这个监听器不是可选的
|
|
74
|
+
fail(err instanceof Error ? err : new Error(String(err)));
|
|
75
|
+
markExited();
|
|
76
|
+
});
|
|
77
|
+
p.on('exit', (code, signal) => {
|
|
78
|
+
if (!closed) {
|
|
79
|
+
fail(new Error(`MCP server 进程已退出(code=${code ?? 'null'} signal=${signal ?? 'null'})`));
|
|
80
|
+
}
|
|
81
|
+
markExited();
|
|
82
|
+
});
|
|
83
|
+
// 'exit' 在 spawn 失败时可能不触发,'close' 一定会 —— close() 靠它才不会白等
|
|
84
|
+
p.on('close', markExited);
|
|
85
|
+
// 进程已死时写 stdin 会异步报 EPIPE;真实原因由上面的 'error' / 'exit' 给出
|
|
86
|
+
p.stdin?.on('error', () => {
|
|
87
|
+
/* 吞掉:EPIPE 是「进程没了」的次生现象,不是根因 */
|
|
88
|
+
});
|
|
89
|
+
p.stdout?.setEncoding('utf8');
|
|
90
|
+
p.stdout?.on('data', (chunk) => {
|
|
91
|
+
buf += chunk;
|
|
92
|
+
for (;;) {
|
|
93
|
+
const nl = buf.indexOf('\n');
|
|
94
|
+
if (nl < 0)
|
|
95
|
+
break;
|
|
96
|
+
const line = buf.slice(0, nl);
|
|
97
|
+
buf = buf.slice(nl + 1);
|
|
98
|
+
if (line.trim() === '')
|
|
99
|
+
continue;
|
|
100
|
+
let msg;
|
|
101
|
+
try {
|
|
102
|
+
msg = JSON.parse(line);
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
continue; // MCP 规定 stdout 只走协议,但 server 混日志进来是常事
|
|
106
|
+
}
|
|
107
|
+
if (!isJsonRpcResponse(msg))
|
|
108
|
+
continue; // 通知(无 id)不配对
|
|
109
|
+
const waiter = pending.get(msg.id);
|
|
110
|
+
if (!waiter)
|
|
111
|
+
continue;
|
|
112
|
+
pending.delete(msg.id);
|
|
113
|
+
try {
|
|
114
|
+
waiter.resolve(unwrap(msg, 'response'));
|
|
115
|
+
}
|
|
116
|
+
catch (e) {
|
|
117
|
+
waiter.reject(e instanceof Error ? e : new Error(String(e)));
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
return p;
|
|
122
|
+
};
|
|
123
|
+
const write = (payload) => {
|
|
124
|
+
const p = ensureProc();
|
|
125
|
+
p.stdin?.write(`${JSON.stringify(payload)}\n`);
|
|
126
|
+
};
|
|
127
|
+
const send = (method, params, abandoned) => {
|
|
128
|
+
if (closed)
|
|
129
|
+
return Promise.reject(new Error('MCP 连接器已 close —— 请重新创建一个'));
|
|
130
|
+
if (fatal)
|
|
131
|
+
return Promise.reject(fatal);
|
|
132
|
+
const id = nextId++;
|
|
133
|
+
return new Promise((resolve, reject) => {
|
|
134
|
+
try {
|
|
135
|
+
ensureProc();
|
|
136
|
+
}
|
|
137
|
+
catch (e) {
|
|
138
|
+
reject(e instanceof Error ? e : new Error(String(e)));
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
pending.set(id, { resolve, reject });
|
|
142
|
+
// 裁判放弃等待 ≠ 条目自动回收:超时的调用(引擎 toolTimeoutMs 或桥兜底)只是
|
|
143
|
+
// 不再 await,pending 里的 {resolve,reject} 会留到「server 终于回包 / 进程死 /
|
|
144
|
+
// close」—— 对「活着但不回包」的 server 就是无界泄漏。裁判表过态就删条目:
|
|
145
|
+
// 之后回包到了也没人等(:441 的 pending.get 落空即忽略,语义安全)。
|
|
146
|
+
if (abandoned !== undefined) {
|
|
147
|
+
const drop = () => {
|
|
148
|
+
pending.delete(id);
|
|
149
|
+
};
|
|
150
|
+
if (abandoned.aborted)
|
|
151
|
+
drop();
|
|
152
|
+
else
|
|
153
|
+
abandoned.addEventListener('abort', drop, { once: true });
|
|
154
|
+
}
|
|
155
|
+
write({ jsonrpc: '2.0', id, method, params });
|
|
156
|
+
});
|
|
157
|
+
};
|
|
158
|
+
/** 握手只做一次;失败是**粘性**的(连接器已不可用 → 重建,而不是半初始化态) */
|
|
159
|
+
const ensureReady = () => {
|
|
160
|
+
if (ready)
|
|
161
|
+
return ready;
|
|
162
|
+
ready = (async () => {
|
|
163
|
+
const init = await guard(send('initialize', { protocolVersion, capabilities: {}, clientInfo }), 'initialize');
|
|
164
|
+
// 协商结果以 server 回的那个为准(协议允许 server 降级或选自己的版本)
|
|
165
|
+
void init;
|
|
166
|
+
write({ jsonrpc: '2.0', method: 'notifications/initialized', params: {} });
|
|
167
|
+
})();
|
|
168
|
+
return ready;
|
|
169
|
+
};
|
|
170
|
+
const request = async (method, params, abandoned) => {
|
|
171
|
+
await ensureReady();
|
|
172
|
+
return send(method, params, abandoned);
|
|
173
|
+
};
|
|
174
|
+
const listTools = async () => {
|
|
175
|
+
const r = await guard(request('tools/list', {}), 'tools/list');
|
|
176
|
+
if (typeof r !== 'object' || r === null) {
|
|
177
|
+
throw new Error(`MCP tools/list 返回了非对象:${brief(r)}`);
|
|
178
|
+
}
|
|
179
|
+
const listed = r.tools;
|
|
180
|
+
if (listed === undefined)
|
|
181
|
+
return [];
|
|
182
|
+
if (!Array.isArray(listed)) {
|
|
183
|
+
// 响亮失败:把协议不符吞成空菜单,用户看到的是「一个工具都没有」而不是「server 坏了」
|
|
184
|
+
throw new Error(`MCP tools/list 的 tools 不是数组:${brief(listed)}`);
|
|
185
|
+
}
|
|
186
|
+
return listed;
|
|
187
|
+
};
|
|
188
|
+
const callTool = async (name, args, callOpts) => {
|
|
189
|
+
const r = await request('tools/call', { name, arguments: args }, callOpts?.abandoned);
|
|
190
|
+
// 承重:协议层 isError 只有连接器看得见(见函数头第 3 条)
|
|
191
|
+
if (typeof r === 'object' && r !== null && r.isError) {
|
|
192
|
+
throw new Error(`MCP 工具 ${name} 返回 isError: ${brief(r.content)}`);
|
|
193
|
+
}
|
|
194
|
+
return r;
|
|
195
|
+
};
|
|
196
|
+
return {
|
|
197
|
+
listTools,
|
|
198
|
+
callTool,
|
|
199
|
+
async close() {
|
|
200
|
+
if (closed)
|
|
201
|
+
return;
|
|
202
|
+
closed = true;
|
|
203
|
+
fail(new Error('MCP 连接器已 close —— 请重新创建一个'));
|
|
204
|
+
const p = proc;
|
|
205
|
+
proc = null;
|
|
206
|
+
if (!p)
|
|
207
|
+
return;
|
|
208
|
+
p.kill('SIGTERM');
|
|
209
|
+
if (exited)
|
|
210
|
+
return;
|
|
211
|
+
const killTimer = setTimeout(() => {
|
|
212
|
+
try {
|
|
213
|
+
p.kill('SIGKILL');
|
|
214
|
+
}
|
|
215
|
+
catch {
|
|
216
|
+
/* 已经死了 */
|
|
217
|
+
}
|
|
218
|
+
// ⚠️ 这里**不** resolve:SIGKILL 不可被捕获,'exit'/'close' 必达 —— 继续等真的退出。
|
|
219
|
+
// 到点即返回是 2026-09-18 之前的行为:调用方以为进程没了,实际还留着一个孤儿。
|
|
220
|
+
}, MCP_CLOSE_GRACE_MS);
|
|
221
|
+
try {
|
|
222
|
+
await exitPromise;
|
|
223
|
+
}
|
|
224
|
+
finally {
|
|
225
|
+
clearTimeout(killTimer);
|
|
226
|
+
}
|
|
227
|
+
},
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
//# sourceMappingURL=mcp-stdio.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-stdio.js","sourceRoot":"","sources":["../../src/integrations/mcp-stdio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,sBAAsB,EACtB,KAAK,EACL,iBAAiB,EACjB,MAAM,EACN,YAAY,GACb,MAAM,UAAU,CAAC;AAGlB;;;;GAIG;AAEH,6CAA6C;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAuBxC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CACrC,GAAsB,EACtB,IAAI,GAA6B,EAAE;IAEnC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,sBAAsB,CAAC;IAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,mBAAmB,CAAC;IAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,wBAAwB,CAAC;IAEzE,IAAI,IAAI,GAAwB,IAAI,CAAC;IACrC,IAAI,KAAK,GAAiB,IAAI,CAAC;IAC/B,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,KAAK,GAAyB,IAAI,CAAC;IACvC,IAAI,WAAW,GAAwB,IAAI,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE;QAC1C,WAAW,GAAG,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyE,CAAC;IAEjG,MAAM,UAAU,GAAG,GAAS,EAAE;QAC5B,MAAM,GAAG,IAAI,CAAC;QACd,WAAW,EAAE,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,qDAAqD;IACrD,MAAM,IAAI,GAAG,CAAC,GAAU,EAAQ,EAAE;QAChC,KAAK,GAAG,GAAG,CAAC;QACZ,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE;YAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChD,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,KAAK,GAAU,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAErE,MAAM,UAAU,GAAG,GAAiB,EAAE;QACpC,IAAI,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACzD,IAAI,KAAK;YAAE,MAAM,KAAK,CAAC;QACvB,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAEtB,MAAM,SAAS,GAAiB;YAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;YACjD,sDAAsD;YACtD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7D,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD,CAAC;QACF,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACtC,IAAI,GAAG,CAAC,CAAC;QAET,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAY,EAAE,EAAE;YAC7B,uBAAuB;YACvB,IAAI,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC1D,UAAU,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,IAAI,CACF,IAAI,KAAK,CAAC,yBAAyB,IAAI,IAAI,MAAM,WAAW,MAAM,IAAI,MAAM,GAAG,CAAC,CACjF,CAAC;YACJ,CAAC;YACD,UAAU,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QACH,yDAAyD;QACzD,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1B,uDAAuD;QACvD,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACxB,gCAAgC;QAClC,CAAC,CAAC,CAAC;QAEH,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACrC,GAAG,IAAI,KAAK,CAAC;YACb,SAAS,CAAC;gBACR,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC7B,IAAI,EAAE,GAAG,CAAC;oBAAE,MAAM;gBAClB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACxB,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;oBAAE,SAAS;gBACjC,IAAI,GAAY,CAAC;gBACjB,IAAI,CAAC;oBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,CAAC;gBAAC,MAAM,CAAC;oBACP,SAAS,CAAC,uCAAuC;gBACnD,CAAC;gBACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;oBAAE,SAAS,CAAC,cAAc;gBACrD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACnC,IAAI,CAAC,MAAM;oBAAE,SAAS;gBACtB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,OAAgB,EAAQ,EAAE;QACvC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;QACvB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,MAAe,EAAE,SAAuB,EAAoB,EAAE;QAC1F,IAAI,MAAM;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAC1E,IAAI,KAAK;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;QACpB,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,UAAU,EAAE,CAAC;YACf,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtD,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACrC,iDAAiD;YACjD,+DAA+D;YAC/D,+CAA+C;YAC/C,6CAA6C;YAC7C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,IAAI,GAAG,GAAS,EAAE;oBACtB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACrB,CAAC,CAAC;gBACF,IAAI,SAAS,CAAC,OAAO;oBAAE,IAAI,EAAE,CAAC;;oBACzB,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;YACD,KAAK,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,+CAA+C;IAC/C,MAAM,WAAW,GAAG,GAAkB,EAAE;QACtC,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,KAAK,CACtB,IAAI,CAAC,YAAY,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EACrE,YAAY,CACb,CAAC;YACF,6CAA6C;YAC7C,KAAK,IAAI,CAAC;YACV,KAAK,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,EACnB,MAAc,EACd,MAAe,EACf,SAAuB,EACL,EAAE;QACpB,MAAM,WAAW,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,IAA4B,EAAE;QACnD,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QAC/D,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,MAAM,GAAI,CAAyB,CAAC,KAAK,CAAC;QAChD,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,gDAAgD;YAChD,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,MAAuB,CAAC;IACjC,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,KAAK,EACpB,IAAY,EACZ,IAA6B,EAC7B,QAAsC,EACpB,EAAE;QACpB,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACtF,qCAAqC;QACrC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAK,CAA2B,CAAC,OAAO,EAAE,CAAC;YAChF,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,gBAAgB,KAAK,CAAE,CAA2B,CAAC,OAAO,CAAC,EAAE,CAC5E,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IAEF,OAAO;QACL,SAAS;QACT,QAAQ;QACR,KAAK,CAAC,KAAK;YACT,IAAI,MAAM;gBAAE,OAAO;YACnB,MAAM,GAAG,IAAI,CAAC;YACd,IAAI,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,IAAI,CAAC;YACf,IAAI,GAAG,IAAI,CAAC;YACZ,IAAI,CAAC,CAAC;gBAAE,OAAO;YACf,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClB,IAAI,MAAM;gBAAE,OAAO;YACnB,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBAChC,IAAI,CAAC;oBACH,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpB,CAAC;gBAAC,MAAM,CAAC;oBACP,UAAU;gBACZ,CAAC;gBACD,iEAAiE;gBACjE,+CAA+C;YACjD,CAAC,EAAE,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC;YACpB,CAAC;oBAAS,CAAC;gBACT,YAAY,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|