@migor/agentia 0.10.0 → 0.10.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 +515 -1
- package/README.en.md +6 -4
- package/README.md +4 -3
- package/dist/AGENTS.md +47 -8
- package/dist/engine/mcp-server-http.js +68 -35
- package/dist/engine/mcp-server-http.js.map +1 -1
- package/dist/engine/mcp-server-stdio.d.ts +0 -13
- package/dist/engine/mcp-server-stdio.js +35 -22
- package/dist/engine/mcp-server-stdio.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/integrations/mcp-http.js +12 -86
- package/dist/integrations/mcp-http.js.map +1 -1
- package/dist/integrations/mcp-protocol.d.ts +51 -0
- package/dist/integrations/mcp-protocol.js +128 -0
- package/dist/integrations/mcp-protocol.js.map +1 -1
- package/dist/integrations/mcp-stdio.js +63 -48
- package/dist/integrations/mcp-stdio.js.map +1 -1
- package/dist/integrations/openai.d.ts +4 -1
- package/dist/integrations/openai.js +25 -6
- package/dist/integrations/openai.js.map +1 -1
- package/dist/runtime/memory.d.ts +5 -0
- package/dist/runtime/memory.js.map +1 -1
- package/dist/store/store.d.ts +6 -0
- package/dist/store/store.js.map +1 -1
- package/dist/transport/async.d.ts +2 -4
- package/dist/transport/async.js +38 -120
- package/dist/transport/async.js.map +1 -1
- package/dist/transport/run-call-options.d.ts +77 -0
- package/dist/transport/run-call-options.js +72 -0
- package/dist/transport/run-call-options.js.map +1 -0
- package/dist/transport/run-outcome.d.ts +109 -0
- package/dist/transport/run-outcome.js +100 -0
- package/dist/transport/run-outcome.js.map +1 -0
- package/package.json +3 -2
|
@@ -113,3 +113,54 @@ export declare function unwrap(msg: {
|
|
|
113
113
|
result?: unknown;
|
|
114
114
|
error?: unknown;
|
|
115
115
|
}, method: string): unknown;
|
|
116
|
+
/**
|
|
117
|
+
* 读响应体文本;读失败**返回空串而非抛**。
|
|
118
|
+
*
|
|
119
|
+
* 为什么吞:调用方用它的地方(排空、错误文案、SSE 解析)都不该因为「body 读不出来」二次失败
|
|
120
|
+
* —— 真正的原因由 `res.status` / 网络层给出,这里再抛只会把第一条错误盖掉。
|
|
121
|
+
*/
|
|
122
|
+
export declare function readMcpText(res: Response): Promise<string>;
|
|
123
|
+
/** HTTP 层失败:带上数值 `status`,让 `classifyError` 能按状态分流 */
|
|
124
|
+
export declare function mcpHttpError(status: number, method: string, body: string): Error;
|
|
125
|
+
/**
|
|
126
|
+
* 非 SSE 报文(单条 JSON-RPC)→ 取 result。
|
|
127
|
+
*
|
|
128
|
+
* ⚠️ id 必须**等值**配对(与 SSE 分支同款):只验「是带 id 的响应」会把别的请求的结果
|
|
129
|
+
* 当本次的返回(代理串包 / 通知帧),**静默错值比报错难查得多**。
|
|
130
|
+
*/
|
|
131
|
+
export declare function pickJsonRpcResult(msg: unknown, id: number, method: string): unknown;
|
|
132
|
+
/**
|
|
133
|
+
* 从 HTTP 响应取结果 —— 两种响应形态**都要接**(StreamableHTTP 的规范面)。
|
|
134
|
+
*
|
|
135
|
+
* SSE 分支一次性读完整个 body 再解析:StreamableHTTP 约定 server 发完响应即关流,
|
|
136
|
+
* 读全比手写增量解析器稳(`text/event-stream` 里 `data:` 行按规范可跨多行拼接)。
|
|
137
|
+
* SSE 里可能有别的通知帧或别的请求的应答,**只取与 `id` 配对的**那一条。
|
|
138
|
+
*/
|
|
139
|
+
export declare function readMcpResult(res: Response, id: number, method: string): Promise<unknown>;
|
|
140
|
+
/**
|
|
141
|
+
* `tools/list` 的应答 → 工具表。**两条连接器共用一份**(此前逐字写了两遍)。
|
|
142
|
+
*
|
|
143
|
+
* 形状不对一律**响亮失败**:把协议不符吞成空菜单,用户看到的是「这个 server 一个工具都没有」
|
|
144
|
+
* 而不是「server 坏了」—— 前者会被当成正常结果排错到别处去。只有 `tools` **缺席**才当空表
|
|
145
|
+
* (那是合法的「没有工具」)。
|
|
146
|
+
*/
|
|
147
|
+
export declare function parseToolList(r: unknown): McpToolInfo[];
|
|
148
|
+
/**
|
|
149
|
+
* `tools/call` 的结果里协议层 `isError: true` ⇒ **必须转成抛错**。
|
|
150
|
+
*
|
|
151
|
+
* 承重:这个位只有连接器看得见,吞了它模型会收到一条「成功」的结果、trace 也记成成功调用
|
|
152
|
+
* (见 `McpClientLike` 的约定)。两条连接器共用一份。
|
|
153
|
+
*/
|
|
154
|
+
export declare function assertToolResultNotError(r: unknown, name: string): void;
|
|
155
|
+
/**
|
|
156
|
+
* **会话过期自愈**的判定(MCP Streamable HTTP 的规范语义)。
|
|
157
|
+
*
|
|
158
|
+
* 带会话 id 收到 `404` 的含义是「这个会话我不认识」⇒ **该请求没有被执行** ⇒ 丢会话、
|
|
159
|
+
* 重新握手、把这一次**重试一次**是安全的(不会重复执行副作用);规范也要求客户端此时
|
|
160
|
+
* **必须**新建会话。`allowReinit` 那一位保证**只重试一次**:第二次再 404 说明对面不是
|
|
161
|
+
* 「会话过期」而是别的问题,直接抛(不循环)。
|
|
162
|
+
*
|
|
163
|
+
* 抽成纯函数是为了让这三条判据**可以被单独钉住** —— 它此前内联在 `rpc` 的 `if` 里,
|
|
164
|
+
* 三个条件任意一个写反都没有用例看得见(症状是「重试带着旧会话再 404」或「无限重握」)。
|
|
165
|
+
*/
|
|
166
|
+
export declare function canSelfHealSession(status: number, hasSessionId: boolean, allowReinit: boolean): boolean;
|
|
@@ -66,4 +66,132 @@ export function unwrap(msg, method) {
|
|
|
66
66
|
throw new Error(`MCP ${method}:响应里既没有 result 也没有 error`);
|
|
67
67
|
return msg.result;
|
|
68
68
|
}
|
|
69
|
+
// ───────────────────────── 下面这一组:两个内置连接器**共用**的纯件(2026-10-11 抽) ─────────────────────────
|
|
70
|
+
//
|
|
71
|
+
// 为什么抽在这里:它们此前**逐字重复**在两个连接器里(`tools/list` 与 `tools/call` 的结果校验
|
|
72
|
+
// 一字不差地写了两遍),或者只属于协议面的知识(SSE 帧 / JSON-RPC 信封 / id 配对)——
|
|
73
|
+
// 正是本文件头注那句「新增『桥与连接器都要用』的东西请加在这里」。
|
|
74
|
+
//
|
|
75
|
+
// ⚠️ 抽出去的另一半效果是**读数**:`integrations/mcp-http.ts` 与 `mcp-stdio.ts` 的
|
|
76
|
+
// 「最大可调用体」因此从 265 / 252 降下来(见 `tests/architecture/method-size.test.ts`)。
|
|
77
|
+
// 那不是目的、是副作用 —— 目的是这两条连接器从此只有「各自传输那一份」的代码。
|
|
78
|
+
/**
|
|
79
|
+
* 读响应体文本;读失败**返回空串而非抛**。
|
|
80
|
+
*
|
|
81
|
+
* 为什么吞:调用方用它的地方(排空、错误文案、SSE 解析)都不该因为「body 读不出来」二次失败
|
|
82
|
+
* —— 真正的原因由 `res.status` / 网络层给出,这里再抛只会把第一条错误盖掉。
|
|
83
|
+
*/
|
|
84
|
+
export async function readMcpText(res) {
|
|
85
|
+
try {
|
|
86
|
+
return await res.text();
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
return '';
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
/** HTTP 层失败:带上数值 `status`,让 `classifyError` 能按状态分流 */
|
|
93
|
+
export function mcpHttpError(status, method, body) {
|
|
94
|
+
const e = new Error(`MCP ${method} HTTP ${status}${body ? `:${body}` : ''}`);
|
|
95
|
+
e.status = status;
|
|
96
|
+
return e;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* 非 SSE 报文(单条 JSON-RPC)→ 取 result。
|
|
100
|
+
*
|
|
101
|
+
* ⚠️ id 必须**等值**配对(与 SSE 分支同款):只验「是带 id 的响应」会把别的请求的结果
|
|
102
|
+
* 当本次的返回(代理串包 / 通知帧),**静默错值比报错难查得多**。
|
|
103
|
+
*/
|
|
104
|
+
export function pickJsonRpcResult(msg, id, method) {
|
|
105
|
+
if (!isJsonRpcResponse(msg) || msg.id !== id) {
|
|
106
|
+
throw new Error(`MCP ${method}:响应里没有 id 为 ${id} 的 JSON-RPC 报文`);
|
|
107
|
+
}
|
|
108
|
+
return unwrap(msg, method);
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* 从 HTTP 响应取结果 —— 两种响应形态**都要接**(StreamableHTTP 的规范面)。
|
|
112
|
+
*
|
|
113
|
+
* SSE 分支一次性读完整个 body 再解析:StreamableHTTP 约定 server 发完响应即关流,
|
|
114
|
+
* 读全比手写增量解析器稳(`text/event-stream` 里 `data:` 行按规范可跨多行拼接)。
|
|
115
|
+
* SSE 里可能有别的通知帧或别的请求的应答,**只取与 `id` 配对的**那一条。
|
|
116
|
+
*/
|
|
117
|
+
export async function readMcpResult(res, id, method) {
|
|
118
|
+
const ct = (res.headers.get('content-type') ?? '').toLowerCase();
|
|
119
|
+
const text = await readMcpText(res);
|
|
120
|
+
if (ct.includes('text/event-stream')) {
|
|
121
|
+
for (const frame of text.split(/\r?\n\r?\n/)) {
|
|
122
|
+
const data = frame
|
|
123
|
+
.split(/\r?\n/)
|
|
124
|
+
.filter((l) => l.startsWith('data:'))
|
|
125
|
+
.map((l) => l.slice(5).trim())
|
|
126
|
+
.join('');
|
|
127
|
+
if (data === '')
|
|
128
|
+
continue;
|
|
129
|
+
let msg;
|
|
130
|
+
try {
|
|
131
|
+
msg = JSON.parse(data);
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
if (isJsonRpcResponse(msg) && msg.id === id)
|
|
137
|
+
return unwrap(msg, method);
|
|
138
|
+
}
|
|
139
|
+
throw new Error(`MCP ${method}:SSE 响应里没有 id 为 ${id} 的报文`);
|
|
140
|
+
}
|
|
141
|
+
if (text.trim() === '') {
|
|
142
|
+
throw new Error(`MCP ${method}:响应体为空(期望 id 为 ${id} 的 JSON-RPC 报文)`);
|
|
143
|
+
}
|
|
144
|
+
let msg;
|
|
145
|
+
try {
|
|
146
|
+
msg = JSON.parse(text);
|
|
147
|
+
}
|
|
148
|
+
catch {
|
|
149
|
+
throw new Error(`MCP ${method}:响应不是合法 JSON:${brief(text)}`);
|
|
150
|
+
}
|
|
151
|
+
return pickJsonRpcResult(msg, id, method);
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* `tools/list` 的应答 → 工具表。**两条连接器共用一份**(此前逐字写了两遍)。
|
|
155
|
+
*
|
|
156
|
+
* 形状不对一律**响亮失败**:把协议不符吞成空菜单,用户看到的是「这个 server 一个工具都没有」
|
|
157
|
+
* 而不是「server 坏了」—— 前者会被当成正常结果排错到别处去。只有 `tools` **缺席**才当空表
|
|
158
|
+
* (那是合法的「没有工具」)。
|
|
159
|
+
*/
|
|
160
|
+
export function parseToolList(r) {
|
|
161
|
+
if (typeof r !== 'object' || r === null) {
|
|
162
|
+
throw new Error(`MCP tools/list 返回了非对象:${brief(r)}`);
|
|
163
|
+
}
|
|
164
|
+
const listed = r.tools;
|
|
165
|
+
if (listed === undefined)
|
|
166
|
+
return [];
|
|
167
|
+
if (!Array.isArray(listed)) {
|
|
168
|
+
throw new Error(`MCP tools/list 的 tools 不是数组:${brief(listed)}`);
|
|
169
|
+
}
|
|
170
|
+
return listed;
|
|
171
|
+
}
|
|
172
|
+
/**
|
|
173
|
+
* `tools/call` 的结果里协议层 `isError: true` ⇒ **必须转成抛错**。
|
|
174
|
+
*
|
|
175
|
+
* 承重:这个位只有连接器看得见,吞了它模型会收到一条「成功」的结果、trace 也记成成功调用
|
|
176
|
+
* (见 `McpClientLike` 的约定)。两条连接器共用一份。
|
|
177
|
+
*/
|
|
178
|
+
export function assertToolResultNotError(r, name) {
|
|
179
|
+
if (typeof r === 'object' && r !== null && r.isError) {
|
|
180
|
+
throw new Error(`MCP 工具 ${name} 返回 isError: ${brief(r.content)}`);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
/**
|
|
184
|
+
* **会话过期自愈**的判定(MCP Streamable HTTP 的规范语义)。
|
|
185
|
+
*
|
|
186
|
+
* 带会话 id 收到 `404` 的含义是「这个会话我不认识」⇒ **该请求没有被执行** ⇒ 丢会话、
|
|
187
|
+
* 重新握手、把这一次**重试一次**是安全的(不会重复执行副作用);规范也要求客户端此时
|
|
188
|
+
* **必须**新建会话。`allowReinit` 那一位保证**只重试一次**:第二次再 404 说明对面不是
|
|
189
|
+
* 「会话过期」而是别的问题,直接抛(不循环)。
|
|
190
|
+
*
|
|
191
|
+
* 抽成纯函数是为了让这三条判据**可以被单独钉住** —— 它此前内联在 `rpc` 的 `if` 里,
|
|
192
|
+
* 三个条件任意一个写反都没有用例看得见(症状是「重试带着旧会话再 404」或「无限重握」)。
|
|
193
|
+
*/
|
|
194
|
+
export function canSelfHealSession(status, hasSessionId, allowReinit) {
|
|
195
|
+
return status === 404 && hasSessionId && allowReinit;
|
|
196
|
+
}
|
|
69
197
|
//# sourceMappingURL=mcp-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-protocol.js","sourceRoot":"","sources":["../../src/integrations/mcp-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAkF1E,qDAAqD;AACrD,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAsC;IACpE,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,OAAO;CACjB,CAAC;AAEF,2DAA2D;AAC3D,MAAM,CAAC,MAAM,wBAAwB,GAAG,YAAY,CAAC;AAErD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAI,CAAa,EAAE,SAAiB,EAAE,KAAa;IACnF,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAC5C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,+DAA+D;QAC/D,MAAM,IAAI,YAAY,CAAC,WAAW,KAAK,aAAa,SAAS,KAAK,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,2CAA2C;AAC3C,MAAM,UAAU,KAAK,CAAC,KAAc,EAAE,GAAG,GAAG,GAAG;IAC7C,IAAI,CAAS,CAAC;IACd,IAAI,CAAC;QACH,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,YAAY,CAAC,GAAY;IACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAA4C,CAAC;QACvE,OAAO,IAAI,KAAK,CAAC,aAAa,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,uCAAuC;AACvC,MAAM,UAAU,iBAAiB,CAAC,GAAY;IAK5C,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,OAAQ,GAAwB,CAAC,EAAE,KAAK,QAAQ,CAC5F,CAAC;AACJ,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,MAAM,CAAC,GAA0C,EAAE,MAAc;IAC/E,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS;QAAE,MAAM,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,OAAO,MAAM,0BAA0B,CAAC,CAAC;IACjF,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC"}
|
|
1
|
+
{"version":3,"file":"mcp-protocol.js","sourceRoot":"","sources":["../../src/integrations/mcp-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
-
import { DEFAULT_CLIENT_INFO, DEFAULT_PROTOCOL_VERSION, MCP_DEFAULT_TIMEOUT_MS,
|
|
2
|
+
import { DEFAULT_CLIENT_INFO, DEFAULT_PROTOCOL_VERSION, MCP_DEFAULT_TIMEOUT_MS, assertToolResultNotError, isJsonRpcResponse, parseToolList, unwrap, withDeadline, } from './mcp-protocol.js';
|
|
3
3
|
import { abortError } from '../core/timeout.js';
|
|
4
4
|
import { frameLimitText, MAX_FRAME_CHARS } from '../core/line-framing.js';
|
|
5
5
|
/**
|
|
@@ -9,6 +9,61 @@ import { frameLimitText, MAX_FRAME_CHARS } from '../core/line-framing.js';
|
|
|
9
9
|
*/
|
|
10
10
|
/** `close()` 里 SIGTERM → SIGKILL 的宽限期(毫秒) */
|
|
11
11
|
export const MCP_CLOSE_GRACE_MS = 2_000;
|
|
12
|
+
/**
|
|
13
|
+
* 建立一个子进程的「退出」观察面。
|
|
14
|
+
*
|
|
15
|
+
* ⚠️ **两个事件都要听**:`'exit'` 在 **spawn 失败**(ENOENT 那类)时可能不触发,`'close'`
|
|
16
|
+
* 一定会 —— `close()` 靠它才不会白等(等一个永不到来的承诺 = 停机路径永久挂住)。
|
|
17
|
+
*
|
|
18
|
+
* 2026-10-11 从 `close()` 里抽出来。此前这件事靠一个 `resolveExit` / `exited` / `markExited`
|
|
19
|
+
* 的闭包三元组维护,散落在 `ensureProc` 的三个监听器与 `close()` 里 —— 两处任意一处漏改
|
|
20
|
+
* 都是「关不掉」或「白等」,而**两者都没有用例看得见**。
|
|
21
|
+
*/
|
|
22
|
+
function trackChildExit(p) {
|
|
23
|
+
let exited = false;
|
|
24
|
+
let resolveDone = () => { };
|
|
25
|
+
const done = new Promise((r) => {
|
|
26
|
+
resolveDone = r;
|
|
27
|
+
});
|
|
28
|
+
const mark = () => {
|
|
29
|
+
exited = true;
|
|
30
|
+
resolveDone();
|
|
31
|
+
};
|
|
32
|
+
p.once('exit', mark);
|
|
33
|
+
p.once('close', mark);
|
|
34
|
+
// ⚠️ `'error'` 也要听 —— 外移前的 `markExited` 挂在三个监听器上(error / exit / close),
|
|
35
|
+
// 只搬两个就是**改了行为**,而 `close()` 只会表现为「多等一个宽限期」或「永不返回」,
|
|
36
|
+
// 用例看不见。实测 `spawn` ENOENT 时事件序 = `error:ENOENT` → `close:-2`(close 会到),
|
|
37
|
+
// 但那是**观察到的**行为、不是文档承诺;保持逐字等价比赌它安全。
|
|
38
|
+
p.once('error', mark);
|
|
39
|
+
return { done, exited: () => exited };
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* `close()` 的收尾:先 `SIGTERM`,宽限期到后 `SIGKILL`,然后**等真正的退出**。
|
|
43
|
+
*
|
|
44
|
+
* ⚠️ SIGKILL 之后**不** resolve:SIGKILL 不可被捕获,`'exit'` / `'close'` 必达 ——
|
|
45
|
+
* 继续等真的退出。到点即返回是 2026-09-18 之前的行为:调用方以为进程没了,
|
|
46
|
+
* 实际还留着一个孤儿。
|
|
47
|
+
*/
|
|
48
|
+
async function reapChild(p, tracker) {
|
|
49
|
+
p.kill('SIGTERM');
|
|
50
|
+
if (tracker?.exited() === true)
|
|
51
|
+
return;
|
|
52
|
+
const killTimer = setTimeout(() => {
|
|
53
|
+
try {
|
|
54
|
+
p.kill('SIGKILL');
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
/* 已经死了 */
|
|
58
|
+
}
|
|
59
|
+
}, MCP_CLOSE_GRACE_MS);
|
|
60
|
+
try {
|
|
61
|
+
await (tracker?.done ?? Promise.resolve());
|
|
62
|
+
}
|
|
63
|
+
finally {
|
|
64
|
+
clearTimeout(killTimer);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
12
67
|
/**
|
|
13
68
|
* **stdio 连接器**:spawn 一个 MCP server 子进程,走换行分隔的 JSON-RPC 2.0
|
|
14
69
|
* (`initialize` → `notifications/initialized` → `tools/list` / `tools/call`)。
|
|
@@ -35,19 +90,12 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
35
90
|
let proc = null;
|
|
36
91
|
let fatal = null;
|
|
37
92
|
let closed = false;
|
|
38
|
-
let exited = false;
|
|
39
93
|
let buf = '';
|
|
40
94
|
let nextId = 1;
|
|
41
95
|
let ready = null;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
resolveExit = r;
|
|
45
|
-
});
|
|
96
|
+
/** spawn 时建立(`close()` 靠它等真的退出);从未 spawn 过则为 null */
|
|
97
|
+
let exitTracker = null;
|
|
46
98
|
const pending = new Map();
|
|
47
|
-
const markExited = () => {
|
|
48
|
-
exited = true;
|
|
49
|
-
resolveExit?.();
|
|
50
|
-
};
|
|
51
99
|
/** 进程已死 / 已 close 时一次性拒绝全部在途请求 —— 不留永久挂起的 promise */
|
|
52
100
|
const fail = (err) => {
|
|
53
101
|
fatal = err;
|
|
@@ -71,19 +119,16 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
71
119
|
};
|
|
72
120
|
const p = spawn(bin, rest, spawnOpts);
|
|
73
121
|
proc = p;
|
|
122
|
+
exitTracker = trackChildExit(p);
|
|
74
123
|
p.on('error', (err) => {
|
|
75
124
|
// 见函数头第 1 条:这个监听器不是可选的
|
|
76
125
|
fail(err instanceof Error ? err : new Error(String(err)));
|
|
77
|
-
markExited();
|
|
78
126
|
});
|
|
79
127
|
p.on('exit', (code, signal) => {
|
|
80
128
|
if (!closed) {
|
|
81
129
|
fail(new Error(`MCP server 进程已退出(code=${code ?? 'null'} signal=${signal ?? 'null'})`));
|
|
82
130
|
}
|
|
83
|
-
markExited();
|
|
84
131
|
});
|
|
85
|
-
// 'exit' 在 spawn 失败时可能不触发,'close' 一定会 —— close() 靠它才不会白等
|
|
86
|
-
p.on('close', markExited);
|
|
87
132
|
// 进程已死时写 stdin 会异步报 EPIPE;真实原因由上面的 'error' / 'exit' 给出
|
|
88
133
|
p.stdin?.on('error', () => {
|
|
89
134
|
/* 吞掉:EPIPE 是「进程没了」的次生现象,不是根因 */
|
|
@@ -199,24 +244,12 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
199
244
|
};
|
|
200
245
|
const listTools = async () => {
|
|
201
246
|
const r = await guard(request('tools/list', {}), 'tools/list');
|
|
202
|
-
|
|
203
|
-
throw new Error(`MCP tools/list 返回了非对象:${brief(r)}`);
|
|
204
|
-
}
|
|
205
|
-
const listed = r.tools;
|
|
206
|
-
if (listed === undefined)
|
|
207
|
-
return [];
|
|
208
|
-
if (!Array.isArray(listed)) {
|
|
209
|
-
// 响亮失败:把协议不符吞成空菜单,用户看到的是「一个工具都没有」而不是「server 坏了」
|
|
210
|
-
throw new Error(`MCP tools/list 的 tools 不是数组:${brief(listed)}`);
|
|
211
|
-
}
|
|
212
|
-
return listed;
|
|
247
|
+
return parseToolList(r);
|
|
213
248
|
};
|
|
214
249
|
const callTool = async (name, args, callOpts) => {
|
|
215
250
|
const r = await request('tools/call', { name, arguments: args }, callOpts?.abandoned);
|
|
216
|
-
// 承重:协议层 isError 只有连接器看得见(见函数头第 3
|
|
217
|
-
|
|
218
|
-
throw new Error(`MCP 工具 ${name} 返回 isError: ${brief(r.content)}`);
|
|
219
|
-
}
|
|
251
|
+
// 承重:协议层 isError 只有连接器看得见(见函数头第 3 条;判定与文案在 mcp-protocol.ts)
|
|
252
|
+
assertToolResultNotError(r, name);
|
|
220
253
|
return r;
|
|
221
254
|
};
|
|
222
255
|
return {
|
|
@@ -231,25 +264,7 @@ export function createStdioMcpConnector(cmd, opts = {}) {
|
|
|
231
264
|
proc = null;
|
|
232
265
|
if (!p)
|
|
233
266
|
return;
|
|
234
|
-
p
|
|
235
|
-
if (exited)
|
|
236
|
-
return;
|
|
237
|
-
const killTimer = setTimeout(() => {
|
|
238
|
-
try {
|
|
239
|
-
p.kill('SIGKILL');
|
|
240
|
-
}
|
|
241
|
-
catch {
|
|
242
|
-
/* 已经死了 */
|
|
243
|
-
}
|
|
244
|
-
// ⚠️ 这里**不** resolve:SIGKILL 不可被捕获,'exit'/'close' 必达 —— 继续等真的退出。
|
|
245
|
-
// 到点即返回是 2026-09-18 之前的行为:调用方以为进程没了,实际还留着一个孤儿。
|
|
246
|
-
}, MCP_CLOSE_GRACE_MS);
|
|
247
|
-
try {
|
|
248
|
-
await exitPromise;
|
|
249
|
-
}
|
|
250
|
-
finally {
|
|
251
|
-
clearTimeout(killTimer);
|
|
252
|
-
}
|
|
267
|
+
await reapChild(p, exitTracker);
|
|
253
268
|
},
|
|
254
269
|
};
|
|
255
270
|
}
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"mcp-stdio.js","sourceRoot":"","sources":["../../src/integrations/mcp-stdio.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,10 @@ import type { ModelClient } from '../core/tool.js';
|
|
|
7
7
|
* executeRun / runAgent 的 client 选项。兼容端点(DeepSeek 等)换 baseURL 即可。
|
|
8
8
|
*
|
|
9
9
|
* 剩余边界(**协议层面无法对齐**,不是没做):
|
|
10
|
-
* -
|
|
10
|
+
* - cache_creation 恒 0:OpenAI 形态没有「缓存写」计量字段;
|
|
11
|
+
* 但 DeepSeek 的 `prompt_cache_hit_tokens` 会映射进 `cache_read_input_tokens`
|
|
12
|
+
* (且从 input_tokens 里**拆出**,不双计 —— 见 `inputUsageOf`);纯 OpenAI 端点
|
|
13
|
+
* 没有这两个字段,cache_read 仍恒 0;
|
|
11
14
|
* - refusal 为近似:finish_reason=content_filter 近似映射为 'refusal',
|
|
12
15
|
* 语义上接近但不等同 Anthropic 的流式分类器干预。
|
|
13
16
|
*
|
|
@@ -347,6 +347,23 @@ function applyChunk(acc, chunk, textCallbacks) {
|
|
|
347
347
|
if (choice.finish_reason)
|
|
348
348
|
acc.finish = choice.finish_reason;
|
|
349
349
|
}
|
|
350
|
+
/**
|
|
351
|
+
* OpenAI usage → `Message.usage` 输入侧口径对齐(DeepSeek 缓存计量,2026-10-09 外部审查)。
|
|
352
|
+
*
|
|
353
|
+
* DeepSeek 在 usage 里多回 `prompt_cache_hit_tokens`(agent loop 场景前缀缓存命中率常达
|
|
354
|
+
* 80–95%),此前被整个丢弃、cache_read 恒 0 ⇒ 成本/记账系统性失真。映射时的关键口径:
|
|
355
|
+
* **`prompt_tokens` 已含命中部分**(官方口径 `prompt_tokens = hit + miss`),而 Anthropic 形态的
|
|
356
|
+
* `input_tokens` **不含** cache_read、`costEstimate` 对两者分别计价 —— 直接透传会让命中部分
|
|
357
|
+
* 被计两次(一次全价 in、一次 0.1× cache_read)。所以拆出来:`input_tokens` 只留未命中部分
|
|
358
|
+
* (= prompt_tokens − hit,与 miss 同值),`cache_read_input_tokens` 记命中数。
|
|
359
|
+
* 纯 OpenAI 端点没有这两个字段 ⇒ hit 取 0,行为与旧版逐字一致。
|
|
360
|
+
*/
|
|
361
|
+
function inputUsageOf(u) {
|
|
362
|
+
const prompt = u?.prompt_tokens ?? 0;
|
|
363
|
+
const hit = typeof u?.prompt_cache_hit_tokens === 'number' ? u.prompt_cache_hit_tokens : 0;
|
|
364
|
+
// Math.max 只兜畸形回报(hit > prompt_tokens):宁可不拆,也别把 input_tokens 弄成负数
|
|
365
|
+
return { inputTokens: Math.max(0, prompt - hit), cacheReadTokens: hit };
|
|
366
|
+
}
|
|
350
367
|
/** 累积器 → Message */
|
|
351
368
|
function accumulatorToMessage(acc, fallbackModel) {
|
|
352
369
|
const content = [];
|
|
@@ -366,6 +383,7 @@ function accumulatorToMessage(acc, fallbackModel) {
|
|
|
366
383
|
});
|
|
367
384
|
}
|
|
368
385
|
const hasToolCalls = calls.length > 0;
|
|
386
|
+
const { inputTokens, cacheReadTokens } = inputUsageOf(acc.usage);
|
|
369
387
|
return {
|
|
370
388
|
id: acc.id ?? 'chatcmpl-unknown',
|
|
371
389
|
type: 'message',
|
|
@@ -375,11 +393,11 @@ function accumulatorToMessage(acc, fallbackModel) {
|
|
|
375
393
|
stop_reason: mapStopReason(acc.finish, hasToolCalls),
|
|
376
394
|
stop_sequence: null,
|
|
377
395
|
usage: {
|
|
378
|
-
input_tokens:
|
|
396
|
+
input_tokens: inputTokens,
|
|
379
397
|
output_tokens: acc.usage?.completion_tokens ?? 0,
|
|
380
|
-
// OpenAI
|
|
398
|
+
// OpenAI 形态无「缓存写」计量:恒 0;缓存读见 inputUsageOf(DeepSeek 命中数)
|
|
381
399
|
cache_creation_input_tokens: 0,
|
|
382
|
-
cache_read_input_tokens:
|
|
400
|
+
cache_read_input_tokens: cacheReadTokens,
|
|
383
401
|
// 端点忽略了 stream_options.include_usage(或压根没回)⇒ 上面是**替身 0**,
|
|
384
402
|
// 如实标出来让「成本恒 0」有信号(2026-09-28 外部深评 S2)
|
|
385
403
|
...(acc.usage ? {} : { unreported: true }),
|
|
@@ -428,6 +446,7 @@ function toAnthropicMessage(data, model) {
|
|
|
428
446
|
throw new OpenAICompatApiError(500, `OpenAI 兼容端点返回空补全(id=${data.id ?? 'unknown'},finish=${choice?.finish_reason ?? '缺失'});` +
|
|
429
447
|
'响应无可用补全,按上游故障处理');
|
|
430
448
|
}
|
|
449
|
+
const { inputTokens, cacheReadTokens } = inputUsageOf(data.usage);
|
|
431
450
|
return {
|
|
432
451
|
id: data.id ?? 'chatcmpl-unknown',
|
|
433
452
|
type: 'message',
|
|
@@ -437,11 +456,11 @@ function toAnthropicMessage(data, model) {
|
|
|
437
456
|
stop_reason: mapStopReason(choice?.finish_reason, (msg.tool_calls?.length ?? 0) > 0),
|
|
438
457
|
stop_sequence: null,
|
|
439
458
|
usage: {
|
|
440
|
-
input_tokens:
|
|
459
|
+
input_tokens: inputTokens,
|
|
441
460
|
output_tokens: data.usage?.completion_tokens ?? 0,
|
|
442
|
-
// OpenAI
|
|
461
|
+
// OpenAI 形态无「缓存写」计量:恒 0;缓存读见 inputUsageOf(DeepSeek 命中数)
|
|
443
462
|
cache_creation_input_tokens: 0,
|
|
444
|
-
cache_read_input_tokens:
|
|
463
|
+
cache_read_input_tokens: cacheReadTokens,
|
|
445
464
|
// 非流式同理:没回 usage 时不静默填 0(2026-09-28 外部深评 S2)
|
|
446
465
|
...(data.usage ? {} : { unreported: true }),
|
|
447
466
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/integrations/openai.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/integrations/openai.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/memory.d.ts
CHANGED
|
@@ -20,6 +20,11 @@ export interface MemorySnapshot {
|
|
|
20
20
|
* 不透明版本句柄:框架**不解释它**(不认识、也不比较),只在回写时原样递给 `saveIfRev`。
|
|
21
21
|
* 内容由 store 决定:整店单调计数、逐键 hash、数据库的 row version 都行 ——
|
|
22
22
|
* **粒度越细误报越少**(粗粒度会把「别人写了别的键」也报成冲突,方向是宁可多报)。
|
|
23
|
+
*
|
|
24
|
+
* ⚠️ 契约(实现方的义务):**水合成功时 rev 不得为 `undefined`** —— `undefined` 是保留值,
|
|
25
|
+
* 只表示「没读到 / 读失败」。`run.ts` 的 `flushMemory` 正是用 `rev === undefined` 判
|
|
26
|
+
* 「水合失败 ⇒ 跳过 CAS 回写」:若 store 水合**成功**却回了 undefined,那一次本可成功的
|
|
27
|
+
* 回写会被跳过,且收到一条归因错误的 warn(被说成「水合失败」,实际是 store 违约)。
|
|
23
28
|
*/
|
|
24
29
|
rev: unknown;
|
|
25
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/runtime/memory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/runtime/memory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAyDH;;;;;;;GAOG;AACH,MAAM,OAAO,mBAAmB;IACb,IAAI,GAAG,IAAI,GAAG,EAAmB,CAAC;IACnD,kCAAkC;IAC1B,QAAQ,GAAG,CAAC,CAAC;IAErB,IAAI,CAAC,IAAc;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,WAAW,CAAC,IAAc;QACxB,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChE,CAAC;IAED,IAAI,CAAC,OAAgC;QACnC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,SAAS,CAAC,OAAgC,EAAE,GAAY;QACtD,2CAA2C;QAC3C,2CAA2C;QAC3C,IAAI,GAAG,KAAK,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QAC3E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnB,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,8CAA8C;IACtC,IAAI,CAAC,IAAc;QACzB,4DAA4D;QAC5D,8CAA8C;QAC9C,MAAM,GAAG,GAA4B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;CACF"}
|
package/dist/store/store.d.ts
CHANGED
|
@@ -87,6 +87,12 @@ export interface TaskRecord {
|
|
|
87
87
|
}
|
|
88
88
|
export interface TaskStore {
|
|
89
89
|
save(rec: TaskRecord): MaybePromise<void>;
|
|
90
|
+
/**
|
|
91
|
+
* 取任务记录。返回的必须是**反序列化副本 / 快照,不是内部活引用** ——
|
|
92
|
+
* engine/transport 的纪律是「先变异 rec、再 `await save` 落库」(如 resume-scanner /
|
|
93
|
+
* approval-supervisor 的「重读 → 改 status → 先落库再派发」):若 `get` 交出活引用,
|
|
94
|
+
* 变异会在 `save` 之前就被其他读者看见,「未落库的中间态」直接对外可见。
|
|
95
|
+
*/
|
|
90
96
|
get(taskId: string): MaybePromise<TaskRecord | undefined>;
|
|
91
97
|
/** 幂等键 → 最近一次任务(last-wins) */
|
|
92
98
|
byIdempotency(key: string): MaybePromise<TaskRecord | undefined>;
|
package/dist/store/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/store/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAqBzC,oDAAoD;AACpD,MAAM,UAAU,UAAU,CAAI,CAAkB;IAC9C,OAAO,CAAC,CAAC,CAAC,IAAI,OAAQ,CAAgB,CAAC,IAAI,KAAK,UAAU,CAAC;AAC7D,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,UAAU;IACxB,OAAO,QAAQ,UAAU,EAAE,EAAE,CAAC;AAChC,CAAC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/store/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAqBzC,oDAAoD;AACpD,MAAM,UAAU,UAAU,CAAI,CAAkB;IAC9C,OAAO,CAAC,CAAC,CAAC,IAAI,OAAQ,CAAgB,CAAC,IAAI,KAAK,UAAU,CAAC;AAC7D,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,UAAU;IACxB,OAAO,QAAQ,UAAU,EAAE,EAAE,CAAC;AAChC,CAAC;AAmHD,MAAM,OAAO,iBAAiB;IAC5B,oEAAoE;IACpE,uDAAuD;IACvD,2CAA2C;IAC1B,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IACvC,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,0BAA0B;IAC9E,qCAAqC;IACpB,UAAU,CAAS;IAEpC;;;;;OAKG;IACH,YAAY,IAAI,GAA4B,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,iBAAiB,CAAC;QACxD,IAAI,GAAG,KAAK,MAAM,CAAC,iBAAiB,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CACb,qDAAqD,IAAI,CAAC,UAAU,EAAE,CACvE,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,GAAe;QAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,IAAI,GAAG,CAAC,cAAc;YAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACvE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;IAED,+CAA+C;IACvC,KAAK;QACX,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU;gBAAE,MAAM;YAC/C,6CAA6C;YAC7C,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW;gBACnF,SAAS;YACX,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,MAAM,EAAE,CAAC;gBACxE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,MAAc;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,aAAa,CAAC,GAAW;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,CAAC;IACD,IAAI;QACF,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACnC,CAAC;IACD,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}
|