@modelprofile.com/flexharness 10.20.0 → 10.21.0
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/interfaces.d.ts +21 -0
- package/dist_ts/interfaces.js +1 -1
- package/dist_ts/utils.json.js +19 -1
- package/dist_ts/utils.sessionmetrics.d.ts +5 -0
- package/dist_ts/utils.sessionmetrics.js +26 -1
- package/dist_ts_mcp/index.d.ts +53 -0
- package/dist_ts_mcp/index.js +140 -44
- package/dist_ts_mcp/plugins.d.ts +3 -0
- package/dist_ts_mcp/plugins.js +4 -1
- package/package.json +3 -3
- package/readme.md +9 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/interfaces.ts +21 -0
- package/ts/readme.md +9 -2
- package/ts/utils.json.ts +19 -0
- package/ts/utils.sessionmetrics.ts +30 -0
- package/ts_mcp/index.ts +222 -52
- package/ts_mcp/plugins.ts +6 -0
- package/ts_mcp/readme.md +8 -0
package/dist_ts_mcp/index.d.ts
CHANGED
|
@@ -77,5 +77,58 @@ export interface ICreateMcpToolsResult {
|
|
|
77
77
|
close: () => Promise<void>;
|
|
78
78
|
}
|
|
79
79
|
export declare const createMcpTools: (options: ICreateMcpToolsOptions) => Promise<ICreateMcpToolsResult>;
|
|
80
|
+
/** The tools one MCP server lists, as `listTools` answered them. `IMcpConnectedServer` is one. */
|
|
81
|
+
export interface IMcpToolCatalogServer {
|
|
82
|
+
name: string;
|
|
83
|
+
tools: readonly TMcpToolMetadata[];
|
|
84
|
+
}
|
|
85
|
+
export interface IMcpToolCatalogToolContext extends IMcpToolFormatContext {
|
|
86
|
+
tool: TMcpToolMetadata;
|
|
87
|
+
}
|
|
88
|
+
/** A catalog call of an MCP tool: the run's `call` context names the scope, session, run and `requestPermission`. */
|
|
89
|
+
export interface IMcpToolCatalogCallContext<TScope = unknown> extends IMcpToolFormatContext {
|
|
90
|
+
call: plugins.IFlexCatalogRunContext<TScope>;
|
|
91
|
+
}
|
|
92
|
+
export interface IMcpToolCatalogAuthorizeToolCallContext<TScope = unknown> extends IMcpAuthorizeToolCallContext {
|
|
93
|
+
abortSignal: AbortSignal;
|
|
94
|
+
call: plugins.IFlexCatalogRunContext<TScope>;
|
|
95
|
+
}
|
|
96
|
+
export interface ICreateMcpToolCatalogOptions<TScope = unknown> {
|
|
97
|
+
/** The servers and the tools they list, in the order `createMcpTools` was given them. */
|
|
98
|
+
servers: readonly IMcpToolCatalogServer[];
|
|
99
|
+
/**
|
|
100
|
+
* The client that runs a call: the one connected for the call's run, which `call.provider.runId`
|
|
101
|
+
* names. The catalog stays the same object across runs; only the clients change.
|
|
102
|
+
*/
|
|
103
|
+
resolveClient(context: IMcpToolCatalogCallContext<TScope>): IMcpClientLike | PromiseLike<IMcpClientLike>;
|
|
104
|
+
/** As for `createMcpTools`: `<server>__<tool>`, by default when there is more than one server. */
|
|
105
|
+
prefixToolNames?: boolean;
|
|
106
|
+
requestOptions?: plugins.RequestOptions;
|
|
107
|
+
callToolRequestOptions?: plugins.RequestOptions;
|
|
108
|
+
formatResult?: (result: TMcpCallToolResult, context: IMcpToolFormatContext) => unknown;
|
|
109
|
+
/**
|
|
110
|
+
* Resolve to allow the call, or throw to deny it, before the client is resolved. It sees `execute`
|
|
111
|
+
* and `run_code` calls as `createMcpTools`' hook sees tool calls. Omission allows all calls.
|
|
112
|
+
*/
|
|
113
|
+
authorizeToolCall?: (context: IMcpToolCatalogAuthorizeToolCallContext<TScope>) => PromiseLike<void> | void;
|
|
114
|
+
/**
|
|
115
|
+
* Declares a tool's method read-only: its calls run concurrently with other reads and a turn
|
|
116
|
+
* answers identical ones once. A tool whose calls ask for permission must not be. Omission
|
|
117
|
+
* declares none; a server's `readOnlyHint` annotation is not trusted for it.
|
|
118
|
+
*/
|
|
119
|
+
isReadOnly?: (context: IMcpToolCatalogToolContext) => boolean;
|
|
120
|
+
}
|
|
121
|
+
export interface ICreateMcpToolCatalogResult<TScope = unknown> {
|
|
122
|
+
catalog: plugins.IFlexToolCatalog<TScope>;
|
|
123
|
+
/** The server and tool of each method path. */
|
|
124
|
+
toolNameMap: Record<string, IMcpToolNameMapping>;
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* The MCP tools of `servers` as a tool catalog, which the model searches, describes and calls through
|
|
128
|
+
* `execute` and `run_code`. A method's path is the name `createMcpTools` gives the tool; a name that
|
|
129
|
+
* is no identifier (with `-`, or a reserved word) is declared as `FlexToolCatalog.identifierOf()`
|
|
130
|
+
* makes it. Create one catalog per set of tool definitions and return the same object on every run.
|
|
131
|
+
*/
|
|
132
|
+
export declare const createMcpToolCatalog: <TScope = unknown>(options: ICreateMcpToolCatalogOptions<TScope>) => ICreateMcpToolCatalogResult<TScope>;
|
|
80
133
|
export declare const sanitizeMcpToolName: (name: string, fallback?: string) => string;
|
|
81
134
|
export declare const formatMcpToolResult: (result: TMcpCallToolResult) => unknown;
|
package/dist_ts_mcp/index.js
CHANGED
|
@@ -17,52 +17,28 @@ export const createMcpTools = async (options) => {
|
|
|
17
17
|
}
|
|
18
18
|
const exposedTools = {};
|
|
19
19
|
const toolNameMap = {};
|
|
20
|
-
const usedToolNames = new Set(['invalid']);
|
|
21
|
-
const formatResult = options.formatResult ?? formatMcpToolResult;
|
|
22
20
|
const shouldPrefixToolNames = options.prefixToolNames ?? connectedServers.length > 1;
|
|
23
|
-
for (const server of connectedServers) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
21
|
+
for (const { server, tool: mcpTool, exposedToolName } of nameMcpTools(connectedServers, shouldPrefixToolNames)) {
|
|
22
|
+
toolNameMap[exposedToolName] = {
|
|
23
|
+
serverName: server.name,
|
|
24
|
+
toolName: mcpTool.name,
|
|
25
|
+
};
|
|
26
|
+
exposedTools[exposedToolName] = plugins.tool({
|
|
27
|
+
description: mcpTool.description ?? `MCP tool ${mcpTool.name} from ${server.name}`,
|
|
28
|
+
inputSchema: plugins.jsonSchema(mcpTool.inputSchema),
|
|
29
|
+
execute: async (input, invocationOptions) => callMcpTool({
|
|
29
30
|
serverName: server.name,
|
|
30
31
|
toolName: mcpTool.name,
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
arguments: normalizedArguments,
|
|
42
|
-
tool: mcpTool,
|
|
43
|
-
toolCallId: invocationOptions?.toolCallId ?? '',
|
|
44
|
-
abortSignal: invocationOptions?.abortSignal,
|
|
45
|
-
});
|
|
46
|
-
const configuredCallToolOptions = {
|
|
47
|
-
...options.requestOptions,
|
|
48
|
-
...options.callToolRequestOptions,
|
|
49
|
-
};
|
|
50
|
-
const result = await withMcpRequestOptions(configuredCallToolOptions, invocationOptions?.abortSignal, (requestOptions) => server.client.callTool({
|
|
51
|
-
name: mcpTool.name,
|
|
52
|
-
arguments: normalizedArguments,
|
|
53
|
-
}, undefined, requestOptions));
|
|
54
|
-
const formattedResult = formatResult(result, {
|
|
55
|
-
serverName: server.name,
|
|
56
|
-
toolName: mcpTool.name,
|
|
57
|
-
exposedToolName,
|
|
58
|
-
});
|
|
59
|
-
if (result.isError === true) {
|
|
60
|
-
throw new Error(formatMcpError(formattedResult));
|
|
61
|
-
}
|
|
62
|
-
return formattedResult;
|
|
63
|
-
},
|
|
64
|
-
});
|
|
65
|
-
}
|
|
32
|
+
tool: mcpTool,
|
|
33
|
+
exposedToolName,
|
|
34
|
+
arguments: normalizeMcpArguments(input),
|
|
35
|
+
toolCallId: invocationOptions?.toolCallId ?? '',
|
|
36
|
+
abortSignal: invocationOptions?.abortSignal,
|
|
37
|
+
authorize: (context) => options.authorizeToolCall?.(context),
|
|
38
|
+
client: () => server.client,
|
|
39
|
+
options,
|
|
40
|
+
}),
|
|
41
|
+
});
|
|
66
42
|
}
|
|
67
43
|
return {
|
|
68
44
|
tools: exposedTools,
|
|
@@ -75,6 +51,59 @@ export const createMcpTools = async (options) => {
|
|
|
75
51
|
return rethrowAfterCleanup(error, () => closeMcpClients(connectedServers), 'Failed to create MCP tools and clean up connected clients.');
|
|
76
52
|
}
|
|
77
53
|
};
|
|
54
|
+
/**
|
|
55
|
+
* The MCP tools of `servers` as a tool catalog, which the model searches, describes and calls through
|
|
56
|
+
* `execute` and `run_code`. A method's path is the name `createMcpTools` gives the tool; a name that
|
|
57
|
+
* is no identifier (with `-`, or a reserved word) is declared as `FlexToolCatalog.identifierOf()`
|
|
58
|
+
* makes it. Create one catalog per set of tool definitions and return the same object on every run.
|
|
59
|
+
*/
|
|
60
|
+
export const createMcpToolCatalog = (options) => {
|
|
61
|
+
if (typeof options?.resolveClient !== 'function') {
|
|
62
|
+
throw new Error('createMcpToolCatalog requires resolveClient().');
|
|
63
|
+
}
|
|
64
|
+
const shouldPrefixToolNames = options.prefixToolNames ?? options.servers.length > 1;
|
|
65
|
+
const named = nameMcpTools(options.servers, shouldPrefixToolNames);
|
|
66
|
+
// A name that is an identifier is its path; a mapped one gets a path no such name has.
|
|
67
|
+
const usedPaths = new Set(named.map(({ exposedToolName }) => exposedToolName)
|
|
68
|
+
.filter((exposedToolName) => catalogPathOf(exposedToolName) === exposedToolName));
|
|
69
|
+
const toolNameMap = {};
|
|
70
|
+
const methods = [];
|
|
71
|
+
for (const { server, tool: mcpTool, exposedToolName } of named) {
|
|
72
|
+
const identifier = catalogPathOf(exposedToolName);
|
|
73
|
+
const path = identifier === exposedToolName ? identifier : createUniqueToolName(identifier, usedPaths);
|
|
74
|
+
usedPaths.add(path);
|
|
75
|
+
toolNameMap[path] = { serverName: server.name, toolName: mcpTool.name };
|
|
76
|
+
const toolContext = {
|
|
77
|
+
serverName: server.name,
|
|
78
|
+
toolName: mcpTool.name,
|
|
79
|
+
exposedToolName: path,
|
|
80
|
+
tool: mcpTool,
|
|
81
|
+
};
|
|
82
|
+
const text = mcpTool.description?.trim() || `MCP tool ${mcpTool.name} from ${server.name}`;
|
|
83
|
+
const summary = summaryOf(text);
|
|
84
|
+
const description = text === summary ? undefined : truncateUtf8(text, plugins.FLEX_TOOL_CATALOG_LIMITS.maxDescriptionBytes);
|
|
85
|
+
methods.push({
|
|
86
|
+
method: path,
|
|
87
|
+
summary,
|
|
88
|
+
...(description ? { description } : {}),
|
|
89
|
+
inputSchema: mcpTool.inputSchema,
|
|
90
|
+
...(options.isReadOnly?.(toolContext) ? { readOnly: true } : {}),
|
|
91
|
+
run: (params, call) => callMcpTool({
|
|
92
|
+
serverName: server.name,
|
|
93
|
+
toolName: mcpTool.name,
|
|
94
|
+
tool: mcpTool,
|
|
95
|
+
exposedToolName: path,
|
|
96
|
+
arguments: normalizeMcpArguments(params),
|
|
97
|
+
toolCallId: call.toolCallId,
|
|
98
|
+
abortSignal: call.abortSignal,
|
|
99
|
+
authorize: (context) => options.authorizeToolCall?.({ ...context, abortSignal: call.abortSignal, call }),
|
|
100
|
+
client: () => options.resolveClient({ serverName: server.name, toolName: mcpTool.name, exposedToolName: path, call }),
|
|
101
|
+
options,
|
|
102
|
+
}),
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
return { catalog: { methods }, toolNameMap };
|
|
106
|
+
};
|
|
78
107
|
export const sanitizeMcpToolName = (name, fallback = 'mcp_tool') => {
|
|
79
108
|
const sanitized = name
|
|
80
109
|
.trim()
|
|
@@ -177,6 +206,73 @@ const normalizeMaxListToolsPages = (maxPages = DEFAULT_MAX_LIST_TOOLS_PAGES) =>
|
|
|
177
206
|
}
|
|
178
207
|
return maxPages;
|
|
179
208
|
};
|
|
209
|
+
/** Every tool of `servers` with the name it is exposed under, unique across them, in order. */
|
|
210
|
+
const nameMcpTools = (servers, prefixToolNames) => {
|
|
211
|
+
const usedToolNames = new Set(['invalid']);
|
|
212
|
+
const named = [];
|
|
213
|
+
for (const server of servers) {
|
|
214
|
+
for (const mcpTool of server.tools) {
|
|
215
|
+
const exposedToolName = createUniqueToolName(createExposedToolName(server.name, mcpTool.name, prefixToolNames), usedToolNames);
|
|
216
|
+
usedToolNames.add(exposedToolName);
|
|
217
|
+
named.push({ server, tool: mcpTool, exposedToolName });
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
return named;
|
|
221
|
+
};
|
|
222
|
+
/** Authorizes a call, runs it on the client and formats its result; an MCP error result throws. */
|
|
223
|
+
const callMcpTool = async (call) => {
|
|
224
|
+
await call.authorize({
|
|
225
|
+
serverName: call.serverName,
|
|
226
|
+
toolName: call.toolName,
|
|
227
|
+
exposedToolName: call.exposedToolName,
|
|
228
|
+
arguments: call.arguments,
|
|
229
|
+
tool: call.tool,
|
|
230
|
+
toolCallId: call.toolCallId,
|
|
231
|
+
abortSignal: call.abortSignal,
|
|
232
|
+
});
|
|
233
|
+
const client = await call.client();
|
|
234
|
+
const configuredCallToolOptions = {
|
|
235
|
+
...call.options.requestOptions,
|
|
236
|
+
...call.options.callToolRequestOptions,
|
|
237
|
+
};
|
|
238
|
+
const result = await withMcpRequestOptions(configuredCallToolOptions, call.abortSignal, (requestOptions) => client.callTool({
|
|
239
|
+
name: call.toolName,
|
|
240
|
+
arguments: call.arguments,
|
|
241
|
+
}, undefined, requestOptions));
|
|
242
|
+
const formattedResult = (call.options.formatResult ?? formatMcpToolResult)(result, {
|
|
243
|
+
serverName: call.serverName,
|
|
244
|
+
toolName: call.toolName,
|
|
245
|
+
exposedToolName: call.exposedToolName,
|
|
246
|
+
});
|
|
247
|
+
if (result.isError === true) {
|
|
248
|
+
throw new Error(formatMcpError(formattedResult));
|
|
249
|
+
}
|
|
250
|
+
return formattedResult;
|
|
251
|
+
};
|
|
252
|
+
/** A catalog method path: the exposed name where it is an identifier, else the identifier made of it. */
|
|
253
|
+
const catalogPathOf = (exposedToolName) => plugins.FlexToolCatalog.identifierOf(exposedToolName);
|
|
254
|
+
/** The first line of a description, as one line of at most the catalog's summary length. */
|
|
255
|
+
const summaryOf = (text) => {
|
|
256
|
+
const line = text.split(/\r?\n/).find((candidate) => candidate.trim()).replace(/[\s\u0000-\u001f\u007f]+/g, ' ').trim();
|
|
257
|
+
const characters = [...line];
|
|
258
|
+
const max = plugins.FLEX_TOOL_CATALOG_LIMITS.maxSummaryCharacters;
|
|
259
|
+
return characters.length <= max ? line : `${characters.slice(0, max - 1).join('').trimEnd()}…`;
|
|
260
|
+
};
|
|
261
|
+
/** The text cut to at most `maxBytes` UTF-8 bytes on a character boundary, marked with `…` when cut. */
|
|
262
|
+
const truncateUtf8 = (text, maxBytes) => {
|
|
263
|
+
const encoder = new TextEncoder();
|
|
264
|
+
if (encoder.encode(text).length <= maxBytes)
|
|
265
|
+
return text;
|
|
266
|
+
let bytes = encoder.encode('…').length;
|
|
267
|
+
let kept = '';
|
|
268
|
+
for (const character of text) {
|
|
269
|
+
bytes += encoder.encode(character).length;
|
|
270
|
+
if (bytes > maxBytes)
|
|
271
|
+
break;
|
|
272
|
+
kept += character;
|
|
273
|
+
}
|
|
274
|
+
return `${kept}…`;
|
|
275
|
+
};
|
|
180
276
|
const createExposedToolName = (serverName, toolName, prefixToolName) => {
|
|
181
277
|
const safeToolName = sanitizeMcpToolName(toolName);
|
|
182
278
|
if (!prefixToolName) {
|
|
@@ -278,4 +374,4 @@ const rethrowAfterCleanup = async (originalError, cleanup, message) => {
|
|
|
278
374
|
}
|
|
279
375
|
throw originalError;
|
|
280
376
|
};
|
|
281
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts_mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,kCAAkC,EAClC,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAgGzC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,OAA+B,EACC,EAAE;IAClC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEhF,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IACnD,IAAI,CAAC;QACH,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACnE,MAAM,eAAe,GAAwB,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACrF,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvC,eAAe,CAAC,KAAK,GAAG,MAAM,eAAe,CAC3C,MAAM,EACN,OAAO,CAAC,uBAAuB,IAAI,uBAAuB,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,cAAc,EAC5F,iBAAiB,CAClB,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAoB,EAAE,CAAC;QACzC,MAAM,WAAW,GAAwC,EAAE,CAAC;QAC5D,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,mBAAmB,CAAC;QACjE,MAAM,qBAAqB,GAAG,OAAO,CAAC,eAAe,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;QAErF,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;YACtC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACnC,MAAM,YAAY,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;gBAC7F,MAAM,eAAe,GAAG,oBAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBAC1E,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACnC,WAAW,CAAC,eAAe,CAAC,GAAG;oBAC7B,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;iBACvB,CAAC;gBAEF,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC3C,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,YAAY,OAAO,CAAC,IAAI,SAAS,MAAM,CAAC,IAAI,EAAE;oBAClF,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,WAAoB,CAAC;oBAC7D,OAAO,EAAE,KAAK,EAAE,KAAc,EAAE,iBAAyD,EAAE,EAAE;wBAC3F,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;wBACzD,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;4BAChC,UAAU,EAAE,MAAM,CAAC,IAAI;4BACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;4BACtB,eAAe;4BACf,SAAS,EAAE,mBAAmB;4BAC9B,IAAI,EAAE,OAAO;4BACb,UAAU,EAAE,iBAAiB,EAAE,UAAU,IAAI,EAAE;4BAC/C,WAAW,EAAE,iBAAiB,EAAE,WAAW;yBAC5C,CAAC,CAAC;wBACH,MAAM,yBAAyB,GAA2B;4BACxD,GAAG,OAAO,CAAC,cAAc;4BACzB,GAAG,OAAO,CAAC,sBAAsB;yBAClC,CAAC;wBACF,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,yBAAyB,EACzB,iBAAiB,EAAE,WAAW,EAC9B,CAAC,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CACxC;4BACE,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,SAAS,EAAE,mBAAmB;yBAC/B,EACD,SAAS,EACT,cAAc,CACf,CACF,CAAC;wBACF,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,EAAE;4BAC3C,UAAU,EAAE,MAAM,CAAC,IAAI;4BACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;4BACtB,eAAe;yBAChB,CAAC,CAAC;wBACH,IAAK,MAAkC,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;4BACzD,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC;wBACnD,CAAC;wBACD,OAAO,eAAe,CAAC;oBACzB,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,gBAAgB;YACzB,WAAW;YACX,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC;SACrD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,mBAAmB,CACxB,KAAK,EACL,GAAG,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC,EACvC,4DAA4D,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,QAAQ,GAAG,UAAU,EAAU,EAAE;IACjF,MAAM,SAAS,GAAG,IAAI;SACnB,IAAI,EAAE;SACN,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC;SAChC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAG,SAAS,IAAI,QAAQ,CAAC;IACvC,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAA0B,EAAW,EAAE;IACzE,MAAM,YAAY,GAAG,MAAiC,CAAC;IACvD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QACrE,OAAO,YAAY,CAAC,UAAU,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;QACjD,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7E,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,IAAI,OAAO;QACtD,CAAC,CAAC,gCAAgC,OAAO,EAAE;QAC3C,CAAC,CAAC,OAAO,CAAC;IACZ,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;IAEzD,IAAI,iBAAiB,KAAK,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACxD,OAAO,GAAG,gBAAgB,4BAA4B,aAAa,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAC3F,CAAC;IACD,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAkB,EAClB,MAAwB,EACxB,OAA+B,EACN,EAAE;IAC3B,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAC/B;QACE,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,IAAI,gBAAgB;QACjE,OAAO,EAAE,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO;KAClE,EACD,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CACtE,CAAC;IACF,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,kCAAkC,CACtC,MAAM,EACN,SAAS,EACT,MAAM,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAChD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,mBAAmB,CACvB,KAAK,EACL,KAAK,IAAI,EAAE;YACT,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACvB,CAAC;YAAC,OAAO,gBAAgB,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;gBAC1B,CAAC;gBAAC,OAAO,mBAAmB,EAAE,CAAC;oBAC7B,MAAM,IAAI,cAAc,CACtB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,EACvC,iDAAiD,UAAU,IAAI,CAChE,CAAC;gBACJ,CAAC;gBACD,MAAM,gBAAgB,CAAC;YACzB,CAAC;QACH,CAAC,EACD,iCAAiC,UAAU,4BAA4B,CACxE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,MAAyD,EACtC,EAAE;IACrB,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC;QACvG,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC/D,OAAO,IAAI,OAAO,CAAC,6BAA6B,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjG,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,MAAwB,EAAsC,EAAE;IAC/F,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,EAC3B,MAAsB,EACtB,cAAuC,EACvC,QAAQ,GAAG,4BAA4B,EACV,EAAE;IAC/B,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,IAAI,MAA0B,CAAC;IAC/B,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,cAAc,EACd,SAAS,EACT,CAAC,sBAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,EAC/B,sBAAsB,CACvB,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,2CAA2C,UAAU,IAAI,CAAC,CAAC;QAC7E,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5B,MAAM,GAAG,UAAU,CAAC;IACtB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,SAAS,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,QAAQ,GAAG,4BAA4B,EAAU,EAAE;IACrF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,UAAkB,EAClB,QAAgB,EAChB,cAAuB,EACf,EAAE;IACV,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,YAAY,EAAE,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,YAAoB,EAAE,aAA0B,EAAU,EAAE;IACxF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QACrC,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,OAAO,aAAa,CAAC,GAAG,CAAC,GAAG,YAAY,IAAI,MAAM,EAAE,CAAC,EAAE,CAAC;QACtD,MAAM,EAAE,CAAC;IACX,CAAC;IACD,OAAO,GAAG,YAAY,IAAI,MAAM,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,KAAc,EAA2B,EAAE;IACxE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,KAAgC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,eAAwB,EAAU,EAAE;IAC1D,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,eAAe,EAAE,CAAC;QAC3D,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,SAAS,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC;IACjD,OAAO,SAAS,IAAI,6BAA6B,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,IAAa,EAAU,EAAE;IACrD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IACD,MAAM,UAAU,GAAG,IAA+B,CAAC;IACnD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC7B,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,OAAO,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,CAAC;IACD,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,MAAM,QAAQ,GAAG,OAAO,UAAU,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC;QAC5G,OAAO,IAAI,IAAI,KAAK,QAAQ,mBAAmB,IAAI,CAAC,MAAM,GAAG,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,OAAO,qBAAqB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAChF,MAAM,GAAG,GAAG,OAAO,UAAU,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,iBAAiB,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACzD,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAU,EAAE;IAC1D,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC9C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,cAAc,GAAG,QAAmC,CAAC;IAC3D,MAAM,GAAG,GAAG,OAAO,cAAc,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;IACrF,IAAI,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5C,OAAO,YAAY,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;IACpD,CAAC;IACD,IAAI,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,OAAO,cAAc,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC;QACpH,OAAO,aAAa,GAAG,KAAK,QAAQ,mBAAmB,cAAc,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;IACvF,CAAC;IACD,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAU,EAAE;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,EAAE,OAA8B,EAAiB,EAAE;IAC9E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3F,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC;SACjF,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,cAAc,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;IAC/E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,KAAK,EAC/B,aAAsB,EACtB,OAA4B,EAC5B,OAAe,EACC,EAAE;IAClB,IAAI,CAAC;QACH,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,MAAM,aAAa,GAAG,YAAY,YAAY,cAAc;YAC1D,CAAC,CAAC,YAAY,CAAC,MAAM;YACrB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACnB,MAAM,IAAI,cAAc,CAAC,CAAC,aAAa,EAAE,GAAG,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,aAAa,CAAC;AACtB,CAAC,CAAC"}
|
|
377
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts_mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,kCAAkC,EAClC,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAgGzC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,OAA+B,EACC,EAAE;IAClC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEhF,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IACnD,IAAI,CAAC;QACH,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACnE,MAAM,eAAe,GAAwB,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACrF,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvC,eAAe,CAAC,KAAK,GAAG,MAAM,eAAe,CAC3C,MAAM,EACN,OAAO,CAAC,uBAAuB,IAAI,uBAAuB,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,cAAc,EAC5F,iBAAiB,CAClB,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAoB,EAAE,CAAC;QACzC,MAAM,WAAW,GAAwC,EAAE,CAAC;QAC5D,MAAM,qBAAqB,GAAG,OAAO,CAAC,eAAe,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;QAErF,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,IAAI,YAAY,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,EAAE,CAAC;YAC/G,WAAW,CAAC,eAAe,CAAC,GAAG;gBAC7B,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;aACvB,CAAC;YAEF,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;gBAC3C,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,YAAY,OAAO,CAAC,IAAI,SAAS,MAAM,CAAC,IAAI,EAAE;gBAClF,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,WAAoB,CAAC;gBAC7D,OAAO,EAAE,KAAK,EAAE,KAAc,EAAE,iBAAyD,EAAE,EAAE,CAAC,WAAW,CAAC;oBACxG,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;oBACtB,IAAI,EAAE,OAAO;oBACb,eAAe;oBACf,SAAS,EAAE,qBAAqB,CAAC,KAAK,CAAC;oBACvC,UAAU,EAAE,iBAAiB,EAAE,UAAU,IAAI,EAAE;oBAC/C,WAAW,EAAE,iBAAiB,EAAE,WAAW;oBAC3C,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC;oBAC5D,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM;oBAC3B,OAAO;iBACR,CAAC;aACH,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,gBAAgB;YACzB,WAAW;YACX,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC;SACrD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,mBAAmB,CACxB,KAAK,EACL,GAAG,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC,EACvC,4DAA4D,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAsDF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAA6C,EACR,EAAE;IACvC,IAAI,OAAO,OAAO,EAAE,aAAa,KAAK,UAAU,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,qBAAqB,GAAG,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACpF,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IACnE,uFAAuF;IACvF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC;SAC1E,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC;IACpF,MAAM,WAAW,GAAwC,EAAE,CAAC;IAC5D,MAAM,OAAO,GAAkE,EAAE,CAAC;IAClF,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,IAAI,KAAK,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACxE,MAAM,WAAW,GAA+B;YAC9C,UAAU,EAAE,MAAM,CAAC,IAAI;YACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;YACtB,eAAe,EAAE,IAAI;YACrB,IAAI,EAAE,OAAO;SACd,CAAC;QACF,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,YAAY,OAAO,CAAC,IAAI,SAAS,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3F,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,WAAW,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;QAC5H,OAAO,CAAC,IAAI,CAAC;YACX,MAAM,EAAE,IAAI;YACZ,OAAO;YACP,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC;gBACjC,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,QAAQ,EAAE,OAAO,CAAC,IAAI;gBACtB,IAAI,EAAE,OAAO;gBACb,eAAe,EAAE,IAAI;gBACrB,SAAS,EAAE,qBAAqB,CAAC,MAAM,CAAC;gBACxC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;gBACxG,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACrH,OAAO;aACR,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,QAAQ,GAAG,UAAU,EAAU,EAAE;IACjF,MAAM,SAAS,GAAG,IAAI;SACnB,IAAI,EAAE;SACN,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC;SAChC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAG,SAAS,IAAI,QAAQ,CAAC;IACvC,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAA0B,EAAW,EAAE;IACzE,MAAM,YAAY,GAAG,MAAiC,CAAC;IACvD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QACrE,OAAO,YAAY,CAAC,UAAU,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;QACjD,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7E,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,IAAI,OAAO;QACtD,CAAC,CAAC,gCAAgC,OAAO,EAAE;QAC3C,CAAC,CAAC,OAAO,CAAC;IACZ,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;IAEzD,IAAI,iBAAiB,KAAK,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACxD,OAAO,GAAG,gBAAgB,4BAA4B,aAAa,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAC3F,CAAC;IACD,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAkB,EAClB,MAAwB,EACxB,OAA+B,EACN,EAAE;IAC3B,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,CAC/B;QACE,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,IAAI,gBAAgB;QACjE,OAAO,EAAE,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO;KAClE,EACD,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CACtE,CAAC;IACF,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,kCAAkC,CACtC,MAAM,EACN,SAAS,EACT,MAAM,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAChD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,mBAAmB,CACvB,KAAK,EACL,KAAK,IAAI,EAAE;YACT,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACvB,CAAC;YAAC,OAAO,gBAAgB,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;gBAC1B,CAAC;gBAAC,OAAO,mBAAmB,EAAE,CAAC;oBAC7B,MAAM,IAAI,cAAc,CACtB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,EACvC,iDAAiD,UAAU,IAAI,CAChE,CAAC;gBACJ,CAAC;gBACD,MAAM,gBAAgB,CAAC;YACzB,CAAC;QACH,CAAC,EACD,iCAAiC,UAAU,4BAA4B,CACxE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,MAAyD,EACtC,EAAE;IACrB,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC;QACvG,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC/D,OAAO,IAAI,OAAO,CAAC,6BAA6B,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjG,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,MAAwB,EAAsC,EAAE;IAC/F,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,EAC3B,MAAsB,EACtB,cAAuC,EACvC,QAAQ,GAAG,4BAA4B,EACV,EAAE;IAC/B,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,IAAI,MAA0B,CAAC;IAC/B,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,cAAc,EACd,SAAS,EACT,CAAC,sBAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,EAC/B,sBAAsB,CACvB,CACF,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,2CAA2C,UAAU,IAAI,CAAC,CAAC;QAC7E,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5B,MAAM,GAAG,UAAU,CAAC;IACtB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,SAAS,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,QAAQ,GAAG,4BAA4B,EAAU,EAAE;IACrF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,+FAA+F;AAC/F,MAAM,YAAY,GAAG,CACnB,OAA2B,EAC3B,eAAwB,EACqD,EAAE;IAC/E,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IACnD,MAAM,KAAK,GAAgF,EAAE,CAAC;IAC9F,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACnC,MAAM,eAAe,GAAG,oBAAoB,CAC1C,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,EACjE,aAAa,CACd,CAAC;YACF,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAYF,mGAAmG;AACnG,MAAM,WAAW,GAAG,KAAK,EAAE,IAAkB,EAAoB,EAAE;IACjE,MAAM,IAAI,CAAC,SAAS,CAAC;QACnB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACnC,MAAM,yBAAyB,GAA2B;QACxD,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc;QAC9B,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB;KACvC,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,yBAAyB,EACzB,IAAI,CAAC,WAAW,EAChB,CAAC,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CACjC;QACE,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,EACD,SAAS,EACT,cAAc,CACf,CACF,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,mBAAmB,CAAC,CAAC,MAAM,EAAE;QACjF,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,eAAe,EAAE,IAAI,CAAC,eAAe;KACtC,CAAC,CAAC;IACH,IAAK,MAAkC,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,yGAAyG;AACzG,MAAM,aAAa,GAAG,CAAC,eAAuB,EAAU,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;AAEjH,4FAA4F;AAC5F,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE;IACzC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAE,CAAC,OAAO,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACzH,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,oBAAoB,CAAC;IAClE,OAAO,UAAU,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC;AACjG,CAAC,CAAC;AAEF,wGAAwG;AACxG,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAU,EAAE;IAC9D,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,QAAQ;QAAE,OAAO,IAAI,CAAC;IACzD,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QAC1C,IAAI,KAAK,GAAG,QAAQ;YAAE,MAAM;QAC5B,IAAI,IAAI,SAAS,CAAC;IACpB,CAAC;IACD,OAAO,GAAG,IAAI,GAAG,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,UAAkB,EAClB,QAAgB,EAChB,cAAuB,EACf,EAAE;IACV,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,YAAY,EAAE,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,YAAoB,EAAE,aAA0B,EAAU,EAAE;IACxF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QACrC,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,OAAO,aAAa,CAAC,GAAG,CAAC,GAAG,YAAY,IAAI,MAAM,EAAE,CAAC,EAAE,CAAC;QACtD,MAAM,EAAE,CAAC;IACX,CAAC;IACD,OAAO,GAAG,YAAY,IAAI,MAAM,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,KAAc,EAA2B,EAAE;IACxE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,KAAgC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,eAAwB,EAAU,EAAE;IAC1D,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,eAAe,EAAE,CAAC;QAC3D,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,SAAS,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC;IACjD,OAAO,SAAS,IAAI,6BAA6B,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,IAAa,EAAU,EAAE;IACrD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IACD,MAAM,UAAU,GAAG,IAA+B,CAAC;IACnD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC7B,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,OAAO,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,CAAC;IACD,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,MAAM,QAAQ,GAAG,OAAO,UAAU,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC;QAC5G,OAAO,IAAI,IAAI,KAAK,QAAQ,mBAAmB,IAAI,CAAC,MAAM,GAAG,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,OAAO,qBAAqB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAChF,MAAM,GAAG,GAAG,OAAO,UAAU,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,iBAAiB,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACzD,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAU,EAAE;IAC1D,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC9C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,cAAc,GAAG,QAAmC,CAAC;IAC3D,MAAM,GAAG,GAAG,OAAO,cAAc,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;IACrF,IAAI,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5C,OAAO,YAAY,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;IACpD,CAAC;IACD,IAAI,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,OAAO,cAAc,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC;QACpH,OAAO,aAAa,GAAG,KAAK,QAAQ,mBAAmB,cAAc,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;IACvF,CAAC;IACD,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAU,EAAE;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,EAAE,OAA8B,EAAiB,EAAE;IAC9E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3F,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC;SACjF,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,cAAc,CAAC,MAAM,EAAE,0CAA0C,CAAC,CAAC;IAC/E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,KAAK,EAC/B,aAAsB,EACtB,OAA4B,EAC5B,OAAe,EACC,EAAE;IAClB,IAAI,CAAC;QACH,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,MAAM,aAAa,GAAG,YAAY,YAAY,cAAc;YAC1D,CAAC,CAAC,YAAY,CAAC,MAAM;YACrB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACnB,MAAM,IAAI,cAAc,CAAC,CAAC,aAAa,EAAE,GAAG,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,aAAa,CAAC;AACtB,CAAC,CAAC"}
|
package/dist_ts_mcp/plugins.d.ts
CHANGED
|
@@ -7,6 +7,9 @@ export type { StdioServerParameters } from '@modelcontextprotocol/sdk/client/std
|
|
|
7
7
|
export type { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
8
8
|
export type { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
|
|
9
9
|
export type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
|
|
10
|
+
import { FLEX_TOOL_CATALOG_LIMITS, FlexToolCatalog } from '@modelprofile.com/flexharness';
|
|
11
|
+
export { FLEX_TOOL_CATALOG_LIMITS, FlexToolCatalog };
|
|
12
|
+
export type { IFlexCatalogMethod, IFlexCatalogRunContext, IFlexToolCatalog } from '@modelprofile.com/flexharness';
|
|
10
13
|
import { jsonSchema, tool } from 'ai';
|
|
11
14
|
export { jsonSchema, tool };
|
|
12
15
|
export type { ToolExecutionOptions, ToolSet } from 'ai';
|
package/dist_ts_mcp/plugins.js
CHANGED
|
@@ -3,7 +3,10 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
|
3
3
|
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
4
4
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
5
5
|
export { Client, StdioClientTransport, StreamableHTTPClientTransport };
|
|
6
|
+
// @modelprofile.com scope
|
|
7
|
+
import { FLEX_TOOL_CATALOG_LIMITS, FlexToolCatalog } from '@modelprofile.com/flexharness';
|
|
8
|
+
export { FLEX_TOOL_CATALOG_LIMITS, FlexToolCatalog };
|
|
6
9
|
// ai-sdk core
|
|
7
10
|
import { jsonSchema, tool } from 'ai';
|
|
8
11
|
export { jsonSchema, tool };
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX21jcC9wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDbkUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDakYsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sb0RBQW9ELENBQUM7QUFFbkcsT0FBTyxFQUFFLE1BQU0sRUFBRSxvQkFBb0IsRUFBRSw2QkFBNkIsRUFBRSxDQUFDO0FBT3ZFLDBCQUEwQjtBQUMxQixPQUFPLEVBQUUsd0JBQXdCLEVBQUUsZUFBZSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFMUYsT0FBTyxFQUFFLHdCQUF3QixFQUFFLGVBQWUsRUFBRSxDQUFDO0FBR3JELGNBQWM7QUFDZCxPQUFPLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQztBQUV0QyxPQUFPLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness",
|
|
5
|
-
"version": "10.
|
|
5
|
+
"version": "10.21.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Managed agent sessions with tools, MCP, chat, OCR, documents and browser control through focused subpath imports.",
|
|
8
8
|
"main": "./dist_ts/index.js",
|
|
@@ -87,8 +87,8 @@
|
|
|
87
87
|
},
|
|
88
88
|
"dependencies": {
|
|
89
89
|
"@cfworker/json-schema": "^4.1.1",
|
|
90
|
-
"@modelprofile.com/flexharness-agent": "10.
|
|
91
|
-
"@modelprofile.com/flexharness-models": "10.
|
|
90
|
+
"@modelprofile.com/flexharness-agent": "10.21.0",
|
|
91
|
+
"@modelprofile.com/flexharness-models": "10.21.0",
|
|
92
92
|
"@push.rocks/smartrequest": "^5.5.1",
|
|
93
93
|
"ai": "^7.0.111",
|
|
94
94
|
"zod": "^4.6.5"
|
package/readme.md
CHANGED
|
@@ -65,7 +65,7 @@ or provider SDKs.
|
|
|
65
65
|
| `/chat/harness` | `FlexHarnessTranscript` and intents for the `@design.estate/dees-catalog` harness components, browser-safe | `@design.estate/dees-catalog` `^17.0.0 \|\| ^19.5.0 \|\| ^20.0.0 \|\| ^21.0.0` (types only) |
|
|
66
66
|
| `/kvm` | Browser control, terminal framing and OCR observation | `puppeteer` |
|
|
67
67
|
| `/documents` | PDF and image documents, `extractTextFromPdf` | `@push.rocks/smartpdf`; for image documents `sharp` |
|
|
68
|
-
| `/mcp` | MCP clients
|
|
68
|
+
| `/mcp` | MCP clients, AI SDK tool conversion and `createMcpToolCatalog`, the tool catalog of MCP tools | `@modelcontextprotocol/sdk` |
|
|
69
69
|
| `/migration` | Existing versioned harness migrations | None |
|
|
70
70
|
| `/stores/nosqldb` | `NoSqlFlexHarnessStores`: cross-process CAS stores on `@lossless.org/client/nosqldb` | `@lossless.org/client` |
|
|
71
71
|
|
|
@@ -108,6 +108,9 @@ A warm read joins outstanding projection writes and surfaces accounting failures
|
|
|
108
108
|
| `inFlight` | A generation or actual compactor invocation has not settled its accounting yet. |
|
|
109
109
|
| `lastObservedInputTokens`, `lastObservedInputTokensAt` | Input count and observation time of the last settled generation call with complete input/output totals. |
|
|
110
110
|
| `lastObservedInputTokensFreshness` | Always `historical`. This is **not** current context size: output, steering, compaction and reversion can change context. |
|
|
111
|
+
| `reportedLifetimeInputTokens` | Sum of the settled per-call reports' input tokens, prompt-cache reads included. |
|
|
112
|
+
| `reportedLifetimeCacheReadTokens`, `reportedLifetimeCacheWriteTokens` | Sums of the settled per-call reports' input tokens read from and written to the prompt cache. |
|
|
113
|
+
| `lifetimeTokenBreakdownComplete` | The three sums cover every call `lifetimeUsedTokens` covers: lifetime usage is complete and the session's calls were counted by input and cache since it began. Otherwise they are lower bounds. |
|
|
111
114
|
|
|
112
115
|
Accounting covers this session's generation calls and reported compaction calls,
|
|
113
116
|
including failure, cancellation and retries. Child sessions own their own spend;
|
|
@@ -122,6 +125,10 @@ conservative: unresolved operations are cleared without certifying their unknown
|
|
|
122
125
|
spend. Undo, redo, compaction and transcript archiving never subtract lifetime
|
|
123
126
|
spend. Importing visible history does not reconstruct historical billing.
|
|
124
127
|
|
|
128
|
+
Sessions whose metrics were written before input and cache tokens were counted count
|
|
129
|
+
them from their next settled call on and never report the breakdown complete; their
|
|
130
|
+
lifetime total keeps its completeness.
|
|
131
|
+
|
|
125
132
|
Conversational runs that exhaust `maxSteps` with tool work or unseen input remaining
|
|
126
133
|
fail with `FlexHarnessStepLimitError` (`FLEX_STEP_LIMIT`), rather than being marked
|
|
127
134
|
completed with an empty answer. Standalone Agent callers retain tool-only results
|
|
@@ -1137,7 +1144,7 @@ Each domain serializes its own mutations. A successful run first persists a hidd
|
|
|
1137
1144
|
|
|
1138
1145
|
Projection stores accept schema version 1, 2, or 3 from `load()`, but every `save()` receives the current schema-3 shape. Schema 3 records explicit reversion protocol, transcript/workspace provenance, and V2 disposition. A terminal V2 segment must be conclusively `revertible`, `no-change`, or `nonrevertible`; a pending V2 capture remains owned by its capture WAL and is never treated as transcript history.
|
|
1139
1146
|
|
|
1140
|
-
Current schema-3 projections also persist optional `metrics` state. Older strict readers that do not recognize this key cannot reopen a projection after
|
|
1147
|
+
Current schema-3 projections also persist optional `metrics` state. Older strict readers that do not recognize this key, or the token breakdown keys inside it (`reportedLifetimeInputTokens`, `reportedLifetimeCacheReadTokens`, `reportedLifetimeCacheWriteTokens`, `lifetimeTokenBreakdownComplete`), cannot reopen a projection after they have been written; downgrade or mixed-version access to that session is unsupported.
|
|
1141
1148
|
|
|
1142
1149
|
A loaded schema-1 projection has no reversion state. Schema-2 `workspaceCaptured` segments migrate as protocol-1 workspace/revertible history without discarding references; transcript-only segments migrate as protocol-1 transcript provenance. Under `workspace-required`, that legacy transcript history is a barrier. The next projection mutation writes schema 3. Custom stores must preserve strict compare-and-swap revisions across schema-1 and schema-2 read-upgrade-write cycles, including uncertain-save reconciliation.
|
|
1143
1150
|
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/interfaces.ts
CHANGED
|
@@ -73,6 +73,16 @@ export interface IFlexSessionMetricsState {
|
|
|
73
73
|
pendingCompactionId?: string;
|
|
74
74
|
lastObservedInputTokens?: number;
|
|
75
75
|
lastObservedInputTokensAt?: string;
|
|
76
|
+
/**
|
|
77
|
+
* Sums of the settled per-call reports' input (cache reads included), cache-read and cache-write
|
|
78
|
+
* tokens. All four breakdown keys are present together; metrics written before they were counted
|
|
79
|
+
* have none of them.
|
|
80
|
+
*/
|
|
81
|
+
reportedLifetimeInputTokens?: number;
|
|
82
|
+
reportedLifetimeCacheReadTokens?: number;
|
|
83
|
+
reportedLifetimeCacheWriteTokens?: number;
|
|
84
|
+
/** The breakdown counts every call since the session began, without saturation. */
|
|
85
|
+
lifetimeTokenBreakdownComplete?: boolean;
|
|
76
86
|
}
|
|
77
87
|
|
|
78
88
|
/** No member estimates current context size or includes child-session / tool-owned model calls. */
|
|
@@ -90,6 +100,17 @@ export interface IFlexSessionMetrics {
|
|
|
90
100
|
lastObservedInputTokensAt?: string;
|
|
91
101
|
/** Always historical: output, steering, compaction and reversion can change context. */
|
|
92
102
|
lastObservedInputTokensFreshness?: 'historical';
|
|
103
|
+
/** Sum of the settled per-call reports' input tokens, cache reads included; a lower bound when incomplete. */
|
|
104
|
+
reportedLifetimeInputTokens: number;
|
|
105
|
+
/** Sum of the settled per-call reports' input tokens read from the prompt cache; a lower bound when incomplete. */
|
|
106
|
+
reportedLifetimeCacheReadTokens: number;
|
|
107
|
+
/** Sum of the settled per-call reports' input tokens written to the prompt cache; a lower bound when incomplete. */
|
|
108
|
+
reportedLifetimeCacheWriteTokens: number;
|
|
109
|
+
/**
|
|
110
|
+
* The three sums cover every call `lifetimeUsedTokens` covers: lifetime usage is complete and
|
|
111
|
+
* the session's calls were counted by input and cache since it began.
|
|
112
|
+
*/
|
|
113
|
+
lifetimeTokenBreakdownComplete: boolean;
|
|
93
114
|
}
|
|
94
115
|
|
|
95
116
|
export interface IFlexModelIdentity {
|
package/ts/readme.md
CHANGED
|
@@ -65,7 +65,7 @@ or provider SDKs.
|
|
|
65
65
|
| `/chat/harness` | `FlexHarnessTranscript` and intents for the `@design.estate/dees-catalog` harness components, browser-safe | `@design.estate/dees-catalog` `^17.0.0 \|\| ^19.5.0 \|\| ^20.0.0 \|\| ^21.0.0` (types only) |
|
|
66
66
|
| `/kvm` | Browser control, terminal framing and OCR observation | `puppeteer` |
|
|
67
67
|
| `/documents` | PDF and image documents, `extractTextFromPdf` | `@push.rocks/smartpdf`; for image documents `sharp` |
|
|
68
|
-
| `/mcp` | MCP clients
|
|
68
|
+
| `/mcp` | MCP clients, AI SDK tool conversion and `createMcpToolCatalog`, the tool catalog of MCP tools | `@modelcontextprotocol/sdk` |
|
|
69
69
|
| `/migration` | Existing versioned harness migrations | None |
|
|
70
70
|
| `/stores/nosqldb` | `NoSqlFlexHarnessStores`: cross-process CAS stores on `@lossless.org/client/nosqldb` | `@lossless.org/client` |
|
|
71
71
|
|
|
@@ -108,6 +108,9 @@ A warm read joins outstanding projection writes and surfaces accounting failures
|
|
|
108
108
|
| `inFlight` | A generation or actual compactor invocation has not settled its accounting yet. |
|
|
109
109
|
| `lastObservedInputTokens`, `lastObservedInputTokensAt` | Input count and observation time of the last settled generation call with complete input/output totals. |
|
|
110
110
|
| `lastObservedInputTokensFreshness` | Always `historical`. This is **not** current context size: output, steering, compaction and reversion can change context. |
|
|
111
|
+
| `reportedLifetimeInputTokens` | Sum of the settled per-call reports' input tokens, prompt-cache reads included. |
|
|
112
|
+
| `reportedLifetimeCacheReadTokens`, `reportedLifetimeCacheWriteTokens` | Sums of the settled per-call reports' input tokens read from and written to the prompt cache. |
|
|
113
|
+
| `lifetimeTokenBreakdownComplete` | The three sums cover every call `lifetimeUsedTokens` covers: lifetime usage is complete and the session's calls were counted by input and cache since it began. Otherwise they are lower bounds. |
|
|
111
114
|
|
|
112
115
|
Accounting covers this session's generation calls and reported compaction calls,
|
|
113
116
|
including failure, cancellation and retries. Child sessions own their own spend;
|
|
@@ -122,6 +125,10 @@ conservative: unresolved operations are cleared without certifying their unknown
|
|
|
122
125
|
spend. Undo, redo, compaction and transcript archiving never subtract lifetime
|
|
123
126
|
spend. Importing visible history does not reconstruct historical billing.
|
|
124
127
|
|
|
128
|
+
Sessions whose metrics were written before input and cache tokens were counted count
|
|
129
|
+
them from their next settled call on and never report the breakdown complete; their
|
|
130
|
+
lifetime total keeps its completeness.
|
|
131
|
+
|
|
125
132
|
Conversational runs that exhaust `maxSteps` with tool work or unseen input remaining
|
|
126
133
|
fail with `FlexHarnessStepLimitError` (`FLEX_STEP_LIMIT`), rather than being marked
|
|
127
134
|
completed with an empty answer. Standalone Agent callers retain tool-only results
|
|
@@ -1137,7 +1144,7 @@ Each domain serializes its own mutations. A successful run first persists a hidd
|
|
|
1137
1144
|
|
|
1138
1145
|
Projection stores accept schema version 1, 2, or 3 from `load()`, but every `save()` receives the current schema-3 shape. Schema 3 records explicit reversion protocol, transcript/workspace provenance, and V2 disposition. A terminal V2 segment must be conclusively `revertible`, `no-change`, or `nonrevertible`; a pending V2 capture remains owned by its capture WAL and is never treated as transcript history.
|
|
1139
1146
|
|
|
1140
|
-
Current schema-3 projections also persist optional `metrics` state. Older strict readers that do not recognize this key cannot reopen a projection after
|
|
1147
|
+
Current schema-3 projections also persist optional `metrics` state. Older strict readers that do not recognize this key, or the token breakdown keys inside it (`reportedLifetimeInputTokens`, `reportedLifetimeCacheReadTokens`, `reportedLifetimeCacheWriteTokens`, `lifetimeTokenBreakdownComplete`), cannot reopen a projection after they have been written; downgrade or mixed-version access to that session is unsupported.
|
|
1141
1148
|
|
|
1142
1149
|
A loaded schema-1 projection has no reversion state. Schema-2 `workspaceCaptured` segments migrate as protocol-1 workspace/revertible history without discarding references; transcript-only segments migrate as protocol-1 transcript provenance. Under `workspace-required`, that legacy transcript history is a barrier. The next projection mutation writes schema 3. Custom stores must preserve strict compare-and-swap revisions across schema-1 and schema-2 read-upgrade-write cycles, including uncertain-save reconciliation.
|
|
1143
1150
|
|
package/ts/utils.json.ts
CHANGED
|
@@ -1516,6 +1516,7 @@ function assertSessionMetrics(value: unknown): void {
|
|
|
1516
1516
|
requireOnlyKeys(metrics, [
|
|
1517
1517
|
'reportedLifetimeUsedTokens', 'reportedLifetimeUsedTokensExact', 'lifetimeUsageComplete',
|
|
1518
1518
|
'pendingGenerationId', 'pendingCompactionId', 'lastObservedInputTokens', 'lastObservedInputTokensAt',
|
|
1519
|
+
...sessionMetricsBreakdownKeys,
|
|
1519
1520
|
], path);
|
|
1520
1521
|
requireNonNegativeInteger(metrics.reportedLifetimeUsedTokens, `${path}.reportedLifetimeUsedTokens`);
|
|
1521
1522
|
for (const key of ['reportedLifetimeUsedTokensExact', 'lifetimeUsageComplete']) {
|
|
@@ -1537,8 +1538,26 @@ function assertSessionMetrics(value: unknown): void {
|
|
|
1537
1538
|
throw new FlexHarnessStoreFormatError(`${path}.lastObservedInputTokensAt must be an ISO timestamp.`);
|
|
1538
1539
|
}
|
|
1539
1540
|
}
|
|
1541
|
+
// Metrics written before the breakdown was counted have none of its keys.
|
|
1542
|
+
const breakdownKeys = sessionMetricsBreakdownKeys.filter((breakdownKey) => Object.hasOwn(metrics, breakdownKey));
|
|
1543
|
+
if (breakdownKeys.length > 0) {
|
|
1544
|
+
if (breakdownKeys.length !== sessionMetricsBreakdownKeys.length) {
|
|
1545
|
+
throw new FlexHarnessStoreFormatError(`${path} has a partial token breakdown.`);
|
|
1546
|
+
}
|
|
1547
|
+
for (const counter of ['reportedLifetimeInputTokens', 'reportedLifetimeCacheReadTokens', 'reportedLifetimeCacheWriteTokens']) {
|
|
1548
|
+
requireNonNegativeInteger(metrics[counter], `${path}.${counter}`);
|
|
1549
|
+
}
|
|
1550
|
+
if (typeof metrics.lifetimeTokenBreakdownComplete !== 'boolean') {
|
|
1551
|
+
throw new FlexHarnessStoreFormatError(`${path}.lifetimeTokenBreakdownComplete must be boolean.`);
|
|
1552
|
+
}
|
|
1553
|
+
}
|
|
1540
1554
|
}
|
|
1541
1555
|
|
|
1556
|
+
const sessionMetricsBreakdownKeys = [
|
|
1557
|
+
'reportedLifetimeInputTokens', 'reportedLifetimeCacheReadTokens', 'reportedLifetimeCacheWriteTokens',
|
|
1558
|
+
'lifetimeTokenBreakdownComplete',
|
|
1559
|
+
];
|
|
1560
|
+
|
|
1542
1561
|
export function assertFlexProjectionSnapshotV3(
|
|
1543
1562
|
value: unknown,
|
|
1544
1563
|
): asserts value is IFlexProjectionSnapshotV3 {
|
|
@@ -12,6 +12,11 @@ export interface ISessionMetricsOperation {
|
|
|
12
12
|
reportedTokensExact: boolean;
|
|
13
13
|
complete: boolean;
|
|
14
14
|
sawCall: boolean;
|
|
15
|
+
inputTokens: number;
|
|
16
|
+
cacheReadTokens: number;
|
|
17
|
+
cacheWriteTokens: number;
|
|
18
|
+
/** No breakdown sum saturated. */
|
|
19
|
+
breakdownExact: boolean;
|
|
15
20
|
lastObservedInputTokens?: number;
|
|
16
21
|
lastObservedInputTokensAt?: string;
|
|
17
22
|
}
|
|
@@ -20,6 +25,10 @@ export const createSessionMetricsState = (complete: boolean): IFlexSessionMetric
|
|
|
20
25
|
reportedLifetimeUsedTokens: 0,
|
|
21
26
|
reportedLifetimeUsedTokensExact: true,
|
|
22
27
|
lifetimeUsageComplete: complete,
|
|
28
|
+
reportedLifetimeInputTokens: 0,
|
|
29
|
+
reportedLifetimeCacheReadTokens: 0,
|
|
30
|
+
reportedLifetimeCacheWriteTokens: 0,
|
|
31
|
+
lifetimeTokenBreakdownComplete: complete,
|
|
23
32
|
});
|
|
24
33
|
|
|
25
34
|
export const createSessionMetricsOperation = (
|
|
@@ -27,6 +36,7 @@ export const createSessionMetricsOperation = (
|
|
|
27
36
|
source: ISessionMetricsOperation['source'],
|
|
28
37
|
): ISessionMetricsOperation => ({
|
|
29
38
|
id, source, reportedTokens: 0, reportedTokensExact: true, complete: true, sawCall: false,
|
|
39
|
+
inputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0, breakdownExact: true,
|
|
30
40
|
});
|
|
31
41
|
|
|
32
42
|
const isTokenCount = (value: unknown): value is number =>
|
|
@@ -60,6 +70,13 @@ export function observeSessionMetricsCall(
|
|
|
60
70
|
const sum = addTokens(operation.reportedTokens, usage.totalTokens);
|
|
61
71
|
operation.reportedTokens = sum.tokens;
|
|
62
72
|
operation.reportedTokensExact &&= sum.exact;
|
|
73
|
+
const input = addTokens(operation.inputTokens, usage.inputTokens);
|
|
74
|
+
const cacheRead = addTokens(operation.cacheReadTokens, usage.cacheReadTokens);
|
|
75
|
+
const cacheWrite = addTokens(operation.cacheWriteTokens, usage.cacheWriteTokens);
|
|
76
|
+
operation.inputTokens = input.tokens;
|
|
77
|
+
operation.cacheReadTokens = cacheRead.tokens;
|
|
78
|
+
operation.cacheWriteTokens = cacheWrite.tokens;
|
|
79
|
+
operation.breakdownExact &&= input.exact && cacheRead.exact && cacheWrite.exact;
|
|
63
80
|
if (operation.source === 'generation' && call.usageComplete !== false) {
|
|
64
81
|
operation.lastObservedInputTokens = usage.inputTokens;
|
|
65
82
|
operation.lastObservedInputTokensAt = new Date().toISOString();
|
|
@@ -79,6 +96,15 @@ export function settleSessionMetricsOperation(
|
|
|
79
96
|
&& metrics.reportedLifetimeUsedTokensExact
|
|
80
97
|
// An arbitrary compactor may make uninstrumented calls. No report is not proof of zero spend.
|
|
81
98
|
&& (operation.source === 'generation' || operation.sawCall);
|
|
99
|
+
// Metrics written before the breakdown was counted start it now, short of the calls before.
|
|
100
|
+
const input = addTokens(metrics.reportedLifetimeInputTokens ?? 0, operation.inputTokens);
|
|
101
|
+
const cacheRead = addTokens(metrics.reportedLifetimeCacheReadTokens ?? 0, operation.cacheReadTokens);
|
|
102
|
+
const cacheWrite = addTokens(metrics.reportedLifetimeCacheWriteTokens ?? 0, operation.cacheWriteTokens);
|
|
103
|
+
metrics.lifetimeTokenBreakdownComplete = (metrics.lifetimeTokenBreakdownComplete ?? false)
|
|
104
|
+
&& operation.breakdownExact && input.exact && cacheRead.exact && cacheWrite.exact;
|
|
105
|
+
metrics.reportedLifetimeInputTokens = input.tokens;
|
|
106
|
+
metrics.reportedLifetimeCacheReadTokens = cacheRead.tokens;
|
|
107
|
+
metrics.reportedLifetimeCacheWriteTokens = cacheWrite.tokens;
|
|
82
108
|
if (operation.lastObservedInputTokens !== undefined) {
|
|
83
109
|
metrics.lastObservedInputTokens = operation.lastObservedInputTokens;
|
|
84
110
|
metrics.lastObservedInputTokensAt = operation.lastObservedInputTokensAt;
|
|
@@ -95,6 +121,10 @@ export function sessionMetricsView(metrics: IFlexSessionMetricsState): IFlexSess
|
|
|
95
121
|
lifetimeUsageComplete,
|
|
96
122
|
inFlight,
|
|
97
123
|
...(lifetimeUsageComplete ? { lifetimeUsedTokens: metrics.reportedLifetimeUsedTokens } : {}),
|
|
124
|
+
reportedLifetimeInputTokens: metrics.reportedLifetimeInputTokens ?? 0,
|
|
125
|
+
reportedLifetimeCacheReadTokens: metrics.reportedLifetimeCacheReadTokens ?? 0,
|
|
126
|
+
reportedLifetimeCacheWriteTokens: metrics.reportedLifetimeCacheWriteTokens ?? 0,
|
|
127
|
+
lifetimeTokenBreakdownComplete: lifetimeUsageComplete && metrics.lifetimeTokenBreakdownComplete === true,
|
|
98
128
|
...(metrics.lastObservedInputTokens === undefined ? {} : {
|
|
99
129
|
lastObservedInputTokens: metrics.lastObservedInputTokens,
|
|
100
130
|
lastObservedInputTokensAt: metrics.lastObservedInputTokensAt,
|