@chatcops/core 0.5.0 → 1.0.0-rc.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/agent/index.d.ts +0 -1
- package/dist/agent/index.d.ts.map +1 -1
- package/dist/agent/index.js +0 -1
- package/dist/agent/index.js.map +1 -1
- package/dist/agent/run-turn.d.ts +11 -0
- package/dist/agent/run-turn.d.ts.map +1 -1
- package/dist/agent/run-turn.js +71 -12
- package/dist/agent/run-turn.js.map +1 -1
- package/dist/agent/tool-registry.d.ts +2 -0
- package/dist/agent/tool-registry.d.ts.map +1 -1
- package/dist/agent/tool-registry.js +4 -7
- package/dist/agent/tool-registry.js.map +1 -1
- package/dist/analytics/collector.d.ts +1 -1
- package/dist/analytics/collector.d.ts.map +1 -1
- package/dist/analytics/collector.js +9 -7
- package/dist/analytics/collector.js.map +1 -1
- package/dist/analytics/index.d.ts +1 -0
- package/dist/analytics/index.d.ts.map +1 -1
- package/dist/analytics/index.js +1 -0
- package/dist/analytics/index.js.map +1 -1
- package/dist/analytics/names.d.ts +13 -0
- package/dist/analytics/names.d.ts.map +1 -0
- package/dist/analytics/names.js +27 -0
- package/dist/analytics/names.js.map +1 -0
- package/dist/analytics/sink.d.ts +3 -0
- package/dist/analytics/sink.d.ts.map +1 -1
- package/dist/analytics/sink.js +13 -11
- package/dist/analytics/sink.js.map +1 -1
- package/dist/conversation/manager.d.ts +3 -0
- package/dist/conversation/manager.d.ts.map +1 -1
- package/dist/conversation/manager.js +2 -1
- package/dist/conversation/manager.js.map +1 -1
- package/dist/index.d.ts +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/knowledge/base.d.ts +8 -0
- package/dist/knowledge/base.d.ts.map +1 -1
- package/dist/knowledge/tokenize.d.ts.map +1 -1
- package/dist/knowledge/tokenize.js +4 -4
- package/dist/knowledge/tokenize.js.map +1 -1
- package/dist/logger.d.ts +36 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +40 -0
- package/dist/logger.js.map +1 -0
- package/dist/providers/base.d.ts +2 -1
- package/dist/providers/base.d.ts.map +1 -1
- package/dist/providers/base.js +2 -2
- package/dist/providers/base.js.map +1 -1
- package/dist/providers/claude.d.ts +16 -9
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +48 -20
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/gemini.d.ts +1 -8
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +0 -12
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/openai.d.ts +2 -8
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +6 -15
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/tool-execution.d.ts +3 -0
- package/dist/providers/tool-execution.d.ts.map +1 -1
- package/dist/providers/tool-execution.js +13 -3
- package/dist/providers/tool-execution.js.map +1 -1
- package/dist/providers/types.d.ts +26 -4
- package/dist/providers/types.d.ts.map +1 -1
- package/dist/retrieval/citations.d.ts +44 -0
- package/dist/retrieval/citations.d.ts.map +1 -0
- package/dist/retrieval/citations.js +97 -0
- package/dist/retrieval/citations.js.map +1 -0
- package/dist/retrieval/cohere-reranker.d.ts +13 -0
- package/dist/retrieval/cohere-reranker.d.ts.map +1 -0
- package/dist/retrieval/cohere-reranker.js +33 -0
- package/dist/retrieval/cohere-reranker.js.map +1 -0
- package/dist/retrieval/gemini-embedder.d.ts +26 -0
- package/dist/retrieval/gemini-embedder.d.ts.map +1 -0
- package/dist/retrieval/gemini-embedder.js +36 -0
- package/dist/retrieval/gemini-embedder.js.map +1 -0
- package/dist/retrieval/http.d.ts +20 -0
- package/dist/retrieval/http.d.ts.map +1 -0
- package/dist/retrieval/http.js +68 -0
- package/dist/retrieval/http.js.map +1 -0
- package/dist/retrieval/index.d.ts +14 -0
- package/dist/retrieval/index.d.ts.map +1 -0
- package/dist/retrieval/index.js +13 -0
- package/dist/retrieval/index.js.map +1 -0
- package/dist/retrieval/knowledge.d.ts +16 -0
- package/dist/retrieval/knowledge.d.ts.map +1 -0
- package/dist/retrieval/knowledge.js +21 -0
- package/dist/retrieval/knowledge.js.map +1 -0
- package/dist/retrieval/openai-embedder.d.ts +25 -0
- package/dist/retrieval/openai-embedder.d.ts.map +1 -0
- package/dist/retrieval/openai-embedder.js +30 -0
- package/dist/retrieval/openai-embedder.js.map +1 -0
- package/dist/retrieval/query.d.ts +8 -0
- package/dist/retrieval/query.d.ts.map +1 -0
- package/dist/retrieval/query.js +19 -0
- package/dist/retrieval/query.js.map +1 -0
- package/dist/retrieval/retrievers.d.ts +30 -0
- package/dist/retrieval/retrievers.d.ts.map +1 -0
- package/dist/retrieval/retrievers.js +89 -0
- package/dist/retrieval/retrievers.js.map +1 -0
- package/dist/retrieval/sources.d.ts +16 -0
- package/dist/retrieval/sources.d.ts.map +1 -0
- package/dist/retrieval/sources.js +37 -0
- package/dist/retrieval/sources.js.map +1 -0
- package/dist/retrieval/types.d.ts +50 -0
- package/dist/retrieval/types.d.ts.map +1 -0
- package/dist/retrieval/types.js +2 -0
- package/dist/retrieval/types.js.map +1 -0
- package/dist/retrieval/voyage-embedder.d.ts +33 -0
- package/dist/retrieval/voyage-embedder.d.ts.map +1 -0
- package/dist/retrieval/voyage-embedder.js +33 -0
- package/dist/retrieval/voyage-embedder.js.map +1 -0
- package/dist/retrieval/voyage-reranker.d.ts +13 -0
- package/dist/retrieval/voyage-reranker.d.ts.map +1 -0
- package/dist/retrieval/voyage-reranker.js +38 -0
- package/dist/retrieval/voyage-reranker.js.map +1 -0
- package/dist/retrieval/workers-ai-embedder.d.ts +21 -0
- package/dist/retrieval/workers-ai-embedder.d.ts.map +1 -0
- package/dist/retrieval/workers-ai-embedder.js +42 -0
- package/dist/retrieval/workers-ai-embedder.js.map +1 -0
- package/dist/retrieval/workers-ai-reranker.d.ts +11 -0
- package/dist/retrieval/workers-ai-reranker.d.ts.map +1 -0
- package/dist/retrieval/workers-ai-reranker.js +54 -0
- package/dist/retrieval/workers-ai-reranker.js.map +1 -0
- package/dist/storage/index.d.ts +2 -1
- package/dist/storage/index.d.ts.map +1 -1
- package/dist/storage/index.js +1 -0
- package/dist/storage/index.js.map +1 -1
- package/dist/storage/memory-vectors.d.ts +22 -0
- package/dist/storage/memory-vectors.d.ts.map +1 -0
- package/dist/storage/memory-vectors.js +140 -0
- package/dist/storage/memory-vectors.js.map +1 -0
- package/dist/storage/types.d.ts +70 -0
- package/dist/storage/types.d.ts.map +1 -1
- package/dist/testing/conformance.d.ts +4 -3
- package/dist/testing/conformance.d.ts.map +1 -1
- package/dist/testing/conformance.js +172 -2
- package/dist/testing/conformance.js.map +1 -1
- package/dist/testing/provider.d.ts +2 -0
- package/dist/testing/provider.d.ts.map +1 -1
- package/dist/testing/provider.js +1 -7
- package/dist/testing/provider.js.map +1 -1
- package/dist/tools/lead-capture.d.ts +2 -2
- package/dist/tools/lead-capture.d.ts.map +1 -1
- package/dist/tools/lead-capture.js +3 -2
- package/dist/tools/lead-capture.js.map +1 -1
- package/dist/types.d.ts +7 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/dist/agent/chat.d.ts +0 -13
- package/dist/agent/chat.d.ts.map +0 -1
- package/dist/agent/chat.js +0 -42
- package/dist/agent/chat.js.map +0 -1
package/dist/agent/index.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { runTurn, DEFAULT_MAX_STEPS, type RunTurnOptions, type TurnResult } from './run-turn.js';
|
|
2
2
|
export { toolRegistry, executorRegistry, toolOutput, MAX_TOOL_OUTPUT_CHARS, type ToolRegistry, type ToolRunContext, } from './tool-registry.js';
|
|
3
3
|
export { RefusalError, ContentFilterError, MaxStepsError } from './errors.js';
|
|
4
|
-
export { chatViaTurn, chatSyncViaTurn } from './chat.js';
|
|
5
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AACjG,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,qBAAqB,EACrB,KAAK,YAAY,EACjB,KAAK,cAAc,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AACjG,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,qBAAqB,EACrB,KAAK,YAAY,EACjB,KAAK,cAAc,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/agent/index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export { runTurn, DEFAULT_MAX_STEPS } from './run-turn.js';
|
|
2
2
|
export { toolRegistry, executorRegistry, toolOutput, MAX_TOOL_OUTPUT_CHARS, } from './tool-registry.js';
|
|
3
3
|
export { RefusalError, ContentFilterError, MaxStepsError } from './errors.js';
|
|
4
|
-
export { chatViaTurn, chatSyncViaTurn } from './chat.js';
|
|
5
4
|
//# sourceMappingURL=index.js.map
|
package/dist/agent/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAwC,MAAM,eAAe,CAAC;AACjG,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,qBAAqB,GAGtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAwC,MAAM,eAAe,CAAC;AACjG,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,qBAAqB,GAGtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/agent/run-turn.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { type Logger } from '../logger.js';
|
|
1
2
|
import { type WireFinishReason, type WirePart } from '../protocol/v1.js';
|
|
2
3
|
import type { AIProvider } from '../providers/types.js';
|
|
3
4
|
import type { ChatMessage, MessagePart, TokenUsage } from '../types.js';
|
|
4
5
|
import { type BudgetContext, type BudgetGuard } from '../limits/budget.js';
|
|
5
6
|
import { type ToolRegistry } from './tool-registry.js';
|
|
7
|
+
import type { RetrievedChunk } from '../retrieval/types.js';
|
|
6
8
|
/** Model requests per turn: five tool rounds and the answer after them, as in 0.5. */
|
|
7
9
|
export declare const DEFAULT_MAX_STEPS = 6;
|
|
8
10
|
export interface RunTurnOptions {
|
|
@@ -12,6 +14,13 @@ export interface RunTurnOptions {
|
|
|
12
14
|
systemPrompt: string;
|
|
13
15
|
/** Per-request instructions, sent after the system prompt and outside the cached prefix. */
|
|
14
16
|
systemContext?: string;
|
|
17
|
+
/**
|
|
18
|
+
* Retrieved chunks the reply can cite. Each one the model cites becomes a
|
|
19
|
+
* `source` part, once per page. Providers with native citations get them
|
|
20
|
+
* as content; others get a numbered block in the system context and cite
|
|
21
|
+
* with `[n]`, and numbers that match no source are removed from the text.
|
|
22
|
+
*/
|
|
23
|
+
sources?: RetrievedChunk[];
|
|
15
24
|
tools?: ToolRegistry;
|
|
16
25
|
conversationId: string;
|
|
17
26
|
/** The id to save the reply under. A new one by default. */
|
|
@@ -25,6 +34,8 @@ export interface RunTurnOptions {
|
|
|
25
34
|
signal?: AbortSignal;
|
|
26
35
|
/** Adds token usage to the `finish` part. */
|
|
27
36
|
exposeUsage?: boolean;
|
|
37
|
+
/** Where warnings and tool errors go. Default `consoleLogger()`. */
|
|
38
|
+
logger?: Logger;
|
|
28
39
|
/**
|
|
29
40
|
* Checked before each model request and charged after it. A used-up
|
|
30
41
|
* budget ends the reply with `budget_exceeded`, and the reply length is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-turn.d.ts","sourceRoot":"","sources":["../../src/agent/run-turn.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-turn.d.ts","sourceRoot":"","sources":["../../src/agent/run-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAwC,KAAK,gBAAgB,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC/G,OAAO,KAAK,EAAE,UAAU,EAAiB,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAGX,UAAU,EAIX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAuB,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGhG,OAAO,EAAoB,KAAK,YAAY,EAAc,MAAM,oBAAoB,CAAC;AAQrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,sFAAsF;AACtF,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,UAAU,CAAC;IACrB,4EAA4E;IAC5E,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,WAAW,CAAC;QAAC,OAAO,EAAE,aAAa,CAAA;KAAE,CAAC;IACxD;;;OAGG;IACH,SAAS,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjF,yFAAyF;IACzF,MAAM,CAAC,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,UAAU;IACzB,6FAA6F;IAC7F,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,WAAW,CAAC;IACrB,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,gBAAgB,CAAC;IAC/B,sEAAsE;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAID,2DAA2D;AAC3D,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/E;AA8DD;;;;;;;;GAQG;AACH,wBAAuB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CA8T5F"}
|
package/dist/agent/run-turn.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { consoleLogger } from '../logger.js';
|
|
1
2
|
import { messageText } from '../parts.js';
|
|
2
3
|
import { PROTOCOL_VERSION } from '../protocol/v1.js';
|
|
3
4
|
import { BudgetExceededError } from '../limits/budget.js';
|
|
4
5
|
import { DEFAULT_MAX_TOKENS } from '../providers/base.js';
|
|
5
6
|
import { ContentFilterError, MaxStepsError, RefusalError } from './errors.js';
|
|
6
7
|
import { executorRegistry, toolOutput } from './tool-registry.js';
|
|
8
|
+
import { CitationParser, NATIVE_SOURCES_INSTRUCTION, parseCitations, sourcesContext, sourcePart, } from '../retrieval/citations.js';
|
|
7
9
|
/** Model requests per turn: five tool rounds and the answer after them, as in 0.5. */
|
|
8
10
|
export const DEFAULT_MAX_STEPS = 6;
|
|
9
11
|
const NO_TOOLS = executorRegistry([]);
|
|
@@ -78,6 +80,7 @@ function toWire(part) {
|
|
|
78
80
|
* Only a failing `onPersist` throws.
|
|
79
81
|
*/
|
|
80
82
|
export async function* runTurn(options) {
|
|
83
|
+
const logger = options.logger ?? consoleLogger();
|
|
81
84
|
const { provider, signal } = options;
|
|
82
85
|
const tools = options.tools ?? NO_TOOLS;
|
|
83
86
|
const maxSteps = Math.max(1, options.maxSteps ?? DEFAULT_MAX_STEPS);
|
|
@@ -93,6 +96,27 @@ export async function* runTurn(options) {
|
|
|
93
96
|
};
|
|
94
97
|
const parts = message.parts;
|
|
95
98
|
let textCount = 0;
|
|
99
|
+
const sources = options.sources ?? [];
|
|
100
|
+
const nativeCitations = sources.length > 0 && provider.citations === 'native' && !!provider.step;
|
|
101
|
+
const systemContext = [
|
|
102
|
+
options.systemContext,
|
|
103
|
+
sources.length ? (nativeCitations ? NATIVE_SOURCES_INSTRUCTION : sourcesContext(sources)) : undefined,
|
|
104
|
+
]
|
|
105
|
+
.filter(Boolean)
|
|
106
|
+
.join('\n\n');
|
|
107
|
+
const citedPages = new Set();
|
|
108
|
+
/** `source` parts for newly cited chunks, at most one per page. */
|
|
109
|
+
function* cite(indexes) {
|
|
110
|
+
for (const index of indexes) {
|
|
111
|
+
const chunk = sources[index];
|
|
112
|
+
if (!chunk || citedPages.has(chunk.source.id))
|
|
113
|
+
continue;
|
|
114
|
+
citedPages.add(chunk.source.id);
|
|
115
|
+
const wire = add(sourcePart(chunk));
|
|
116
|
+
if (wire)
|
|
117
|
+
yield wire;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
96
120
|
const add = (part) => {
|
|
97
121
|
parts.push(part);
|
|
98
122
|
if (part.type !== 'text' && part.type !== 'reasoning')
|
|
@@ -155,13 +179,18 @@ export async function* runTurn(options) {
|
|
|
155
179
|
}
|
|
156
180
|
yield { type: 'start', protocol: PROTOCOL_VERSION, conversationId: options.conversationId, messageId: message.id };
|
|
157
181
|
if (!provider.step) {
|
|
158
|
-
|
|
182
|
+
const chat = provider.chat?.bind(provider);
|
|
183
|
+
if (!chat)
|
|
184
|
+
return yield* failed(new Error(`The provider "${provider.name}" has neither step() nor chat().`));
|
|
185
|
+
return yield* legacyTurn(chat);
|
|
159
186
|
}
|
|
160
187
|
const step = provider.step.bind(provider);
|
|
161
188
|
for (let stepNumber = 1;; stepNumber++) {
|
|
162
189
|
let textId = null;
|
|
163
190
|
let finish;
|
|
164
191
|
const calls = [];
|
|
192
|
+
const parser = sources.length && !nativeCitations ? new CitationParser(sources.length) : null;
|
|
193
|
+
const cited = [];
|
|
165
194
|
const budget = yield* checkBudget(stepNumber);
|
|
166
195
|
if (budget.ended)
|
|
167
196
|
return budget.ended;
|
|
@@ -170,8 +199,9 @@ export async function* runTurn(options) {
|
|
|
170
199
|
for await (const event of step({
|
|
171
200
|
messages: [...options.messages, message],
|
|
172
201
|
systemPrompt: options.systemPrompt,
|
|
173
|
-
...(
|
|
202
|
+
...(systemContext ? { systemContext } : {}),
|
|
174
203
|
...(tools.definitions.length ? { tools: tools.definitions } : {}),
|
|
204
|
+
...(nativeCitations ? { sources } : {}),
|
|
175
205
|
maxTokens: budget.maxTokens,
|
|
176
206
|
temperature: options.temperature,
|
|
177
207
|
signal,
|
|
@@ -183,7 +213,13 @@ export async function* runTurn(options) {
|
|
|
183
213
|
textId = `${message.id}-${++textCount}`;
|
|
184
214
|
yield { type: 'text-start', id: textId };
|
|
185
215
|
}
|
|
186
|
-
|
|
216
|
+
const read = parser ? parser.push(event.delta) : { text: event.delta, cited: [] };
|
|
217
|
+
cited.push(...read.cited);
|
|
218
|
+
if (read.text)
|
|
219
|
+
yield { type: 'text-delta', id: textId, delta: read.text };
|
|
220
|
+
}
|
|
221
|
+
else if (event.type === 'source') {
|
|
222
|
+
cited.push(event.index);
|
|
187
223
|
}
|
|
188
224
|
else if (event.type === 'tool-call') {
|
|
189
225
|
calls.push(event);
|
|
@@ -201,6 +237,12 @@ export async function* runTurn(options) {
|
|
|
201
237
|
yield { type: 'text-end', id: textId };
|
|
202
238
|
return yield* failed(error);
|
|
203
239
|
}
|
|
240
|
+
if (parser && textId) {
|
|
241
|
+
const rest = parser.flush();
|
|
242
|
+
cited.push(...rest.cited);
|
|
243
|
+
if (rest.text)
|
|
244
|
+
yield { type: 'text-delta', id: textId, delta: rest.text };
|
|
245
|
+
}
|
|
204
246
|
if (textId)
|
|
205
247
|
yield { type: 'text-end', id: textId };
|
|
206
248
|
addUsage(usage, finish.usage);
|
|
@@ -213,10 +255,13 @@ export async function* runTurn(options) {
|
|
|
213
255
|
});
|
|
214
256
|
}
|
|
215
257
|
for (const part of finish.parts) {
|
|
216
|
-
|
|
258
|
+
// Stored text gets the same cleanup as the streamed text.
|
|
259
|
+
const stored = parser && part.type === 'text' ? { ...part, text: parseCitations(part.text, sources.length).text } : part;
|
|
260
|
+
const wire = add(stored);
|
|
217
261
|
if (wire)
|
|
218
262
|
yield wire;
|
|
219
263
|
}
|
|
264
|
+
yield* cite(cited);
|
|
220
265
|
if (finish.reason === 'error') {
|
|
221
266
|
return yield* end('incomplete', {
|
|
222
267
|
error: new Error(`The ${provider.name} step stopped with an error.`),
|
|
@@ -224,7 +269,7 @@ export async function* runTurn(options) {
|
|
|
224
269
|
});
|
|
225
270
|
}
|
|
226
271
|
if (finish.reason === 'length') {
|
|
227
|
-
|
|
272
|
+
logger.warn('reply_truncated', 'The reply was cut off at the token limit. Raise `maxTokens` if this keeps happening.');
|
|
228
273
|
return yield* end('incomplete', { reason: 'length' });
|
|
229
274
|
}
|
|
230
275
|
if (finish.reason !== 'tool-calls' || calls.length === 0) {
|
|
@@ -245,7 +290,7 @@ export async function* runTurn(options) {
|
|
|
245
290
|
// Every call of the step runs at once; results are kept in call order.
|
|
246
291
|
const results = await Promise.all(calls.map(({ call, inputError }) => inputError
|
|
247
292
|
? Promise.resolve({ success: false, message: inputError })
|
|
248
|
-
: tools.run(call, { conversationId: options.conversationId, signal: toolSignal, timeoutMs: options.toolTimeoutMs })));
|
|
293
|
+
: tools.run(call, { conversationId: options.conversationId, signal: toolSignal, timeoutMs: options.toolTimeoutMs, logger })));
|
|
249
294
|
for (const [i, { call }] of calls.entries()) {
|
|
250
295
|
const result = results[i];
|
|
251
296
|
const callPart = callParts.get(call.id);
|
|
@@ -266,7 +311,7 @@ export async function* runTurn(options) {
|
|
|
266
311
|
* calls are recorded through the executor it's given, and their parts are
|
|
267
312
|
* streamed before the next text, the way the 0.5 server sent them.
|
|
268
313
|
*/
|
|
269
|
-
async function* legacyTurn() {
|
|
314
|
+
async function* legacyTurn(chat) {
|
|
270
315
|
// A 0.4 provider reports no usage, so its replies can only be checked, not charged.
|
|
271
316
|
const budget = yield* checkBudget(1);
|
|
272
317
|
if (budget.ended)
|
|
@@ -274,6 +319,8 @@ export async function* runTurn(options) {
|
|
|
274
319
|
const queued = [];
|
|
275
320
|
let textId = null;
|
|
276
321
|
let text = null;
|
|
322
|
+
const parser = sources.length ? new CitationParser(sources.length) : null;
|
|
323
|
+
const cited = [];
|
|
277
324
|
const toolExecutor = async (call) => {
|
|
278
325
|
text = null;
|
|
279
326
|
const callPart = {
|
|
@@ -282,7 +329,7 @@ export async function* runTurn(options) {
|
|
|
282
329
|
const callWire = add(callPart);
|
|
283
330
|
if (callWire)
|
|
284
331
|
queued.push(callWire);
|
|
285
|
-
const result = await tools.run(call, { conversationId: options.conversationId, signal: toolSignal, timeoutMs: options.toolTimeoutMs });
|
|
332
|
+
const result = await tools.run(call, { conversationId: options.conversationId, signal: toolSignal, timeoutMs: options.toolTimeoutMs, logger });
|
|
286
333
|
callPart.state = result.success ? 'done' : 'error';
|
|
287
334
|
for (const part of [resultPart(call, result), ...(result.success ? tools.emits(call, result) : [])]) {
|
|
288
335
|
const wire = add(part);
|
|
@@ -292,11 +339,11 @@ export async function* runTurn(options) {
|
|
|
292
339
|
return result;
|
|
293
340
|
};
|
|
294
341
|
try {
|
|
295
|
-
for await (const chunk of
|
|
342
|
+
for await (const chunk of chat({
|
|
296
343
|
// Providers written for 0.4 read `content` only, so a reply the
|
|
297
344
|
// visitor walked away from would look finished. Leave it out.
|
|
298
345
|
messages: options.messages.filter((m) => m.status !== 'aborted'),
|
|
299
|
-
systemPrompt: joinSystem(options.systemPrompt,
|
|
346
|
+
systemPrompt: joinSystem(options.systemPrompt, systemContext || undefined),
|
|
300
347
|
...(tools.definitions.length ? { tools: tools.definitions } : {}),
|
|
301
348
|
toolExecutor,
|
|
302
349
|
toolTimeoutMs: options.toolTimeoutMs,
|
|
@@ -323,8 +370,19 @@ export async function* runTurn(options) {
|
|
|
323
370
|
text = { type: 'text', text: '' };
|
|
324
371
|
parts.push(text);
|
|
325
372
|
}
|
|
326
|
-
|
|
327
|
-
|
|
373
|
+
const read = parser ? parser.push(chunk) : { text: chunk, cited: [] };
|
|
374
|
+
cited.push(...read.cited);
|
|
375
|
+
text.text += read.text;
|
|
376
|
+
if (read.text)
|
|
377
|
+
yield { type: 'text-delta', id: textId, delta: read.text };
|
|
378
|
+
}
|
|
379
|
+
if (parser && textId) {
|
|
380
|
+
const rest = parser.flush();
|
|
381
|
+
cited.push(...rest.cited);
|
|
382
|
+
if (text)
|
|
383
|
+
text.text += rest.text;
|
|
384
|
+
if (rest.text)
|
|
385
|
+
yield { type: 'text-delta', id: textId, delta: rest.text };
|
|
328
386
|
}
|
|
329
387
|
}
|
|
330
388
|
catch (error) {
|
|
@@ -338,6 +396,7 @@ export async function* runTurn(options) {
|
|
|
338
396
|
if (signal?.aborted)
|
|
339
397
|
return yield* end('aborted');
|
|
340
398
|
yield* queued.splice(0);
|
|
399
|
+
yield* cite(cited);
|
|
341
400
|
return yield* end('complete');
|
|
342
401
|
}
|
|
343
402
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-turn.js","sourceRoot":"","sources":["../../src/agent/run-turn.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-turn.js","sourceRoot":"","sources":["../../src/agent/run-turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAA4D,MAAM,mBAAmB,CAAC;AAY/G,OAAO,EAAE,mBAAmB,EAAwC,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAqB,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EACL,cAAc,EACd,0BAA0B,EAC1B,cAAc,EACd,cAAc,EACd,UAAU,GACX,MAAM,2BAA2B,CAAC;AAGnC,sFAAsF;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAwDnC,MAAM,QAAQ,GAAiB,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAEpD,2DAA2D;AAC3D,MAAM,UAAU,UAAU,CAAC,YAAoB,EAAE,aAAsB;IACrE,OAAO,aAAa,CAAC,CAAC,CAAC,GAAG,YAAY,OAAO,aAAa,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;AAC9E,CAAC;AAID,iFAAiF;AACjF,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,SAAS,QAAQ,CAAC,KAAiB,EAAE,IAAgB;IACnD,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;IACtC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;IACxC,IAAI,IAAI,CAAC,eAAe;QAAE,KAAK,CAAC,eAAe,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;IACtG,IAAI,IAAI,CAAC,gBAAgB;QAAE,KAAK,CAAC,gBAAgB,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;AAC5G,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,KAAoB;IAC7C,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,kBAAkB,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5D,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,SAAS;QACX,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrE,MAAM,UAAU,GAAG,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,MAAM,gBAAgB,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACtD,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAC9C,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE;YAAE,SAAS;QAC5D,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE;YAAE,SAAS;QACvD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAkB,CAAC,CAAC,CAAE,IAAoB,CAAC,CAAC;IAC1H,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CAAC,IAAsB,EAAE,MAAkB;IAC5D,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE,IAAI,CAAC,EAAE;QACnB,QAAQ,EAAE,IAAI,CAAC,IAAI;QACnB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;QAC1B,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,IAAI,kBAAkB,EAAE,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,IAAiB;IAC/B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjI,KAAK,aAAa;YAChB,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QACjI,KAAK,eAAe;YAClB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACpD,KAAK,QAAQ;YACX,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QACtK;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,OAAO,CAAC,OAAuB;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;IACjD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,IAAI,iBAAiB,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC;IAC1D,MAAM,KAAK,GAAe,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC9D,MAAM,OAAO,GAAgB;QAC3B,EAAE,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;QAC5C,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,WAAW,EAAE,IAAI;KAClB,CAAC;IACF,MAAM,KAAK,GAAG,OAAO,CAAC,KAAsB,CAAC;IAC7C,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IACjG,MAAM,aAAa,GAAG;QACpB,OAAO,CAAC,aAAa;QACrB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KACtG;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,mEAAmE;IACnE,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAiB;QAC9B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAAE,SAAS;YACxD,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAChC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YACpC,IAAI,IAAI;gBAAE,MAAM,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,CAAC,IAAiB,EAAmB,EAAE;QACjD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;QAC9E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,EAAE,KAAc,EAAE,EAAE;QACvC,OAAO,CAAC,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK;YAAE,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC;QAC1C,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,KAAK,SAAS,CAAC,CAAC,GAAG,CACjB,MAA4B,EAC5B,SAAgF,EAAE;QAElF,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,MAAM,CAAC,SAAS;YAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACnE,MAAM,MAAM,GACV,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;QAC5F,OAAO,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC7B,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,MAAM;YACJ,IAAI,EAAE,QAAQ;YACd,MAAM;YACN,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChH,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC1H,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE,CAChC,MAAM,EAAE,OAAO;QACb,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;QAChB,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE;YAChB,KAAK;YACL,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE;SACvD,CAAC,CAAC;IAET;;;OAGG;IACH,KAAK,SAAS,CAAC,CAAC,WAAW,CACzB,UAAkB;QAElB,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;QAC7D,IAAI,CAAC;YACH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC7F,IAAI,UAAU,KAAK,SAAS;gBAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;YACtE,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,IAAI,kBAAkB,CAAC;YACvD,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;QAChF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,mBAAmB,CAAC;gBAAE,MAAM,KAAK,CAAC;YACzD,OAAO;gBACL,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE;oBAC9B,KAAK;oBACL,SAAS,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;iBAC7E,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;IAEnH,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,kCAAkC,CAAC,CAAC,CAAC;QAC7G,OAAO,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE1C,KAAK,IAAI,UAAU,GAAG,CAAC,GAAI,UAAU,EAAE,EAAE,CAAC;QACxC,IAAI,MAAM,GAAkB,IAAI,CAAC;QACjC,IAAI,MAA8D,CAAC;QACnE,MAAM,KAAK,GAAoD,EAAE,CAAC;QAClE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9F,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,MAAM,CAAC,KAAK;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QAEtC,IAAI,CAAC;YACH,MAAM,EAAE,cAAc,EAAE,CAAC;YACzB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC;gBAC7B,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC;gBACxC,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,MAAM;aACP,CAAC,EAAE,CAAC;gBACH,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAChC,IAAI,CAAC,KAAK,CAAC,KAAK;wBAAE,SAAS;oBAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;wBACxC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;oBAC3C,CAAC;oBACD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;oBAClF,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC1B,IAAI,IAAI,CAAC,IAAI;wBAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC5E,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACnC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACtC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACnC,MAAM,GAAG,KAAK,CAAC;gBACjB,CAAC;gBACD,qEAAqE;YACvE,CAAC;YACD,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,OAAO,QAAQ,CAAC,IAAI,gCAAgC,CAAC,CAAC;QACrF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,MAAM;gBAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;YACnD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,IAAI,CAAC,IAAI;gBAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5E,CAAC;QACD,IAAI,MAAM;YAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;QACnD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAExE,6EAA6E;QAC7E,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;YACtE,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE;gBAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,kBAAkB,EAAE;gBAClF,SAAS,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,KAAK,EAAE;aAC1D,CAAC,CAAC;QACL,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,0DAA0D;YAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACzH,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,IAAI;gBAAE,MAAM,IAAI,CAAC;QACvB,CAAC;QACD,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnB,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE;gBAC9B,KAAK,EAAE,IAAI,KAAK,CAAC,OAAO,QAAQ,CAAC,IAAI,8BAA8B,CAAC;gBACpE,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE;aACvD,CAAC,CAAC;QACL,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,sFAAsF,CAAC,CAAC;YACvH,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAC/G,CAAC;QAEF,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;YAC3B,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;gBAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,kDAAkD,EAAE,CAAC,CAAC,CAAC;gBACpH,IAAI,IAAI;oBAAE,MAAM,IAAI,CAAC;YACvB,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE;gBAC9B,KAAK,EAAE,IAAI,aAAa,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACtC,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE;aACpD,CAAC,CAAC;QACL,CAAC;QAED,uEAAuE;QACvE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CACjC,UAAU;YACR,CAAC,CAAC,OAAO,CAAC,OAAO,CAAa,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YACtE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAC9H,CACF,CAAC;QAEF,KAAK,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,QAAQ;gBAAE,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACjE,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBACpG,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;gBACvB,IAAI,IAAI;oBAAE,MAAM,IAAI,CAAC;YACvB,CAAC;QACH,CAAC;QAED,IAAI,MAAM,EAAE,OAAO;YAAE,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACH,KAAK,SAAS,CAAC,CAAC,UAAU,CAAC,IAAqC;QAC9D,oFAAoF;QACpF,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,MAAM,CAAC,KAAK;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QACtC,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,IAAI,MAAM,GAAkB,IAAI,CAAC;QACjC,IAAI,IAAI,GAA0C,IAAI,CAAC;QACvD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1E,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,MAAM,YAAY,GAAyB,KAAK,EAAE,IAAI,EAAE,EAAE;YACxD,IAAI,GAAG,IAAI,CAAC;YACZ,MAAM,QAAQ,GAAiB;gBAC7B,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS;aACrH,CAAC;YACF,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC/B,IAAI,QAAQ;gBAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC;YAC/I,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACnD,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBACpG,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;gBACvB,IAAI,IAAI;oBAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC;gBAC7B,gEAAgE;gBAChE,8DAA8D;gBAC9D,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC;gBAChE,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,aAAa,IAAI,SAAS,CAAC;gBAC1E,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjE,YAAY;gBACZ,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,MAAM;aACP,CAAC,EAAE,CAAC;gBACH,IAAI,MAAM,EAAE,OAAO;oBAAE,MAAM;gBAC3B,IAAI,CAAC,KAAK;oBAAE,SAAS;gBACrB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAClB,IAAI,MAAM,EAAE,CAAC;wBACX,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;wBACvC,MAAM,GAAG,IAAI,CAAC;oBAChB,CAAC;oBACD,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;oBACxC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;gBAC3C,CAAC;gBACD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,IAAI,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;oBAClC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;gBACtE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;gBACvB,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5E,CAAC;YACD,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1B,IAAI,IAAI;oBAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5E,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,MAAM;gBAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;YACnD,oEAAoE;YACpE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QAED,IAAI,MAAM;YAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;QACnD,IAAI,MAAM,EAAE,OAAO;YAAE,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAClD,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;AACH,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import type { Logger } from '../logger.js';
|
|
1
2
|
import { type ChatTool } from '../tools/base.js';
|
|
2
3
|
import type { MessagePart, ProviderToolCall, ProviderToolExecutor, ToolDefinition, ToolResult } from '../types.js';
|
|
3
4
|
export interface ToolRunContext {
|
|
4
5
|
conversationId: string;
|
|
5
6
|
signal: AbortSignal;
|
|
6
7
|
timeoutMs?: number;
|
|
8
|
+
logger?: Logger;
|
|
7
9
|
}
|
|
8
10
|
/** The tools a turn can call, and how to run them. */
|
|
9
11
|
export interface ToolRegistry {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-registry.d.ts","sourceRoot":"","sources":["../../src/agent/tool-registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-registry.d.ts","sourceRoot":"","sources":["../../src/agent/tool-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAoB,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EACV,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,UAAU,EACX,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,sDAAsD;AACtD,MAAM,WAAW,YAAY;IAC3B,oCAAoC;IACpC,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,6EAA6E;IAC7E,GAAG,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1E,uDAAuD;IACvD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,CAAC;CAClE;AAYD,yEAAyE;AACzE,wBAAgB,YAAY,CAAC,KAAK,GAAE,QAAQ,EAAO,GAAG,YAAY,CAiBjE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,GAAE,cAAc,EAAO,EAAE,QAAQ,CAAC,EAAE,oBAAoB,GAAG,YAAY,CAWlH;AAED,oFAAoF;AACpF,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAE5C,sEAAsE;AACtE,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CActD"}
|
|
@@ -15,14 +15,11 @@ export function toolRegistry(tools = []) {
|
|
|
15
15
|
const byName = new Map(tools.map((tool) => [tool.name, tool]));
|
|
16
16
|
return {
|
|
17
17
|
definitions: tools.map(toolToDefinition),
|
|
18
|
-
run(call, { conversationId, signal, timeoutMs }) {
|
|
18
|
+
run(call, { conversationId, signal, timeoutMs, logger }) {
|
|
19
19
|
const tool = byName.get(call.name);
|
|
20
20
|
if (!tool)
|
|
21
21
|
return Promise.resolve({ success: false, message: `Unknown tool: ${call.name}` });
|
|
22
|
-
return runToolWithTimeout((toolSignal) => tool.execute(call.input, { conversationId, signal: toolSignal }), {
|
|
23
|
-
timeoutMs,
|
|
24
|
-
signal,
|
|
25
|
-
});
|
|
22
|
+
return runToolWithTimeout((toolSignal) => tool.execute(call.input, { conversationId, signal: toolSignal, ...(logger ? { logger } : {}) }), { timeoutMs, signal, name: call.name, ...(logger ? { logger } : {}) });
|
|
26
23
|
},
|
|
27
24
|
emits(call, result) {
|
|
28
25
|
const tool = byName.get(call.name);
|
|
@@ -37,11 +34,11 @@ export function toolRegistry(tools = []) {
|
|
|
37
34
|
export function executorRegistry(definitions = [], executor) {
|
|
38
35
|
return {
|
|
39
36
|
definitions,
|
|
40
|
-
run(call, { signal, timeoutMs }) {
|
|
37
|
+
run(call, { signal, timeoutMs, logger }) {
|
|
41
38
|
if (!executor) {
|
|
42
39
|
return Promise.resolve({ success: false, message: `No tool executor is configured for "${call.name}".` });
|
|
43
40
|
}
|
|
44
|
-
return runToolWithTimeout(() => executor(call), { timeoutMs, signal });
|
|
41
|
+
return runToolWithTimeout(() => executor(call), { timeoutMs, signal, name: call.name, ...(logger ? { logger } : {}) });
|
|
45
42
|
},
|
|
46
43
|
emits: (call, result) => legacyLeadPart(call.name, result),
|
|
47
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-registry.js","sourceRoot":"","sources":["../../src/agent/tool-registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-registry.js","sourceRoot":"","sources":["../../src/agent/tool-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { AnalyticsEvent } from '../types.js';
|
|
|
2
2
|
export interface AnalyticsStats {
|
|
3
3
|
totalConversations: number;
|
|
4
4
|
totalMessages: number;
|
|
5
|
-
|
|
5
|
+
leadsCaptured: number;
|
|
6
6
|
averageMessagesPerConversation: number;
|
|
7
7
|
eventCounts: Record<string, number>;
|
|
8
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/analytics/collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/analytics/collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,8BAA8B,EAAE,MAAM,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,eAAe,CAAqB;IAE5C,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAazD,QAAQ,IAAI,cAAc;IAkB1B,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,EAAE;IAK1C,KAAK,IAAI,IAAI;CAId"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ANALYTICS_EVENTS } from './names.js';
|
|
1
2
|
const MAX_EVENTS = 1000;
|
|
2
3
|
export class AnalyticsCollector {
|
|
3
4
|
events = [];
|
|
@@ -8,21 +9,22 @@ export class AnalyticsCollector {
|
|
|
8
9
|
if (this.events.length > MAX_EVENTS) {
|
|
9
10
|
this.events = this.events.slice(-MAX_EVENTS);
|
|
10
11
|
}
|
|
11
|
-
if (type ===
|
|
12
|
+
if (event.type === ANALYTICS_EVENTS.conversationStarted && data?.conversationId) {
|
|
12
13
|
this.conversationIds.add(data.conversationId);
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
getStats() {
|
|
16
|
-
const
|
|
17
|
-
for (const event of this.events)
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
const counts = new Map();
|
|
18
|
+
for (const event of this.events)
|
|
19
|
+
counts.set(event.type, (counts.get(event.type) ?? 0) + 1);
|
|
20
|
+
const eventCounts = Object.fromEntries(counts);
|
|
20
21
|
const totalConversations = this.conversationIds.size;
|
|
21
|
-
const totalMessages = (
|
|
22
|
+
const totalMessages = (counts.get(ANALYTICS_EVENTS.messageSent) ?? 0) + (counts.get(ANALYTICS_EVENTS.messageReceived) ?? 0);
|
|
23
|
+
const leadsCaptured = counts.get(ANALYTICS_EVENTS.leadCaptured) ?? 0;
|
|
22
24
|
return {
|
|
23
25
|
totalConversations,
|
|
24
26
|
totalMessages,
|
|
25
|
-
|
|
27
|
+
leadsCaptured,
|
|
26
28
|
averageMessagesPerConversation: totalConversations > 0 ? totalMessages / totalConversations : 0,
|
|
27
29
|
eventCounts,
|
|
28
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/analytics/collector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/analytics/collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,UAAU,GAAG,IAAI,CAAC;AAUxB,MAAM,OAAO,kBAAkB;IACrB,MAAM,GAAqB,EAAE,CAAC;IAC9B,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAE5C,KAAK,CAAC,IAAY,EAAE,IAA8B;QAChD,MAAM,KAAK,GAAmB,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,CAAC,mBAAmB,IAAI,IAAI,EAAE,cAAc,EAAE,CAAC;YAChF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,cAAwB,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,QAAQ;QACN,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE/C,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QACrD,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5H,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAErE,OAAO;YACL,kBAAkB;YAClB,aAAa;YACb,aAAa;YACb,8BAA8B,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAC/F,WAAW;SACZ,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,IAAa;QACrB,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/analytics/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/** The analytics events ChatCops tracks, named `noun.verb`. */
|
|
2
|
+
export declare const ANALYTICS_EVENTS: {
|
|
3
|
+
readonly conversationStarted: "conversation.started";
|
|
4
|
+
readonly messageSent: "message.sent";
|
|
5
|
+
readonly messageReceived: "message.received";
|
|
6
|
+
readonly leadCaptured: "lead.captured";
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Counts by type, with events a store saved under a name from before 0.8
|
|
10
|
+
* added to the current name, so totals don't drop for history from then.
|
|
11
|
+
*/
|
|
12
|
+
export declare function countsByCurrentName(counts: Iterable<[string, number]>): Map<string, number>;
|
|
13
|
+
//# sourceMappingURL=names.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../../src/analytics/names.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,eAAO,MAAM,gBAAgB;;;;;CAKnB,CAAC;AAUX;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAO3F"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/** The analytics events ChatCops tracks, named `noun.verb`. */
|
|
2
|
+
export const ANALYTICS_EVENTS = {
|
|
3
|
+
conversationStarted: 'conversation.started',
|
|
4
|
+
messageSent: 'message.sent',
|
|
5
|
+
messageReceived: 'message.received',
|
|
6
|
+
leadCaptured: 'lead.captured',
|
|
7
|
+
};
|
|
8
|
+
/** The names before 0.8, which a store may still hold events under. */
|
|
9
|
+
const STORED_BEFORE_0_8 = {
|
|
10
|
+
'conversation:started': ANALYTICS_EVENTS.conversationStarted,
|
|
11
|
+
'message:sent': ANALYTICS_EVENTS.messageSent,
|
|
12
|
+
'message:received': ANALYTICS_EVENTS.messageReceived,
|
|
13
|
+
'lead:captured': ANALYTICS_EVENTS.leadCaptured,
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Counts by type, with events a store saved under a name from before 0.8
|
|
17
|
+
* added to the current name, so totals don't drop for history from then.
|
|
18
|
+
*/
|
|
19
|
+
export function countsByCurrentName(counts) {
|
|
20
|
+
const merged = new Map();
|
|
21
|
+
for (const [type, count] of counts) {
|
|
22
|
+
const name = STORED_BEFORE_0_8[type] ?? type;
|
|
23
|
+
merged.set(name, (merged.get(name) ?? 0) + count);
|
|
24
|
+
}
|
|
25
|
+
return merged;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=names.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../src/analytics/names.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,mBAAmB,EAAE,sBAAsB;IAC3C,WAAW,EAAE,cAAc;IAC3B,eAAe,EAAE,kBAAkB;IACnC,YAAY,EAAE,eAAe;CACrB,CAAC;AAEX,uEAAuE;AACvE,MAAM,iBAAiB,GAA2B;IAChD,sBAAsB,EAAE,gBAAgB,CAAC,mBAAmB;IAC5D,cAAc,EAAE,gBAAgB,CAAC,WAAW;IAC5C,kBAAkB,EAAE,gBAAgB,CAAC,eAAe;IACpD,eAAe,EAAE,gBAAgB,CAAC,YAAY;CAC/C,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAkC;IACpE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;QAC7C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/analytics/sink.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Logger } from '../logger.js';
|
|
1
2
|
import type { EventSink } from '../storage/types.js';
|
|
2
3
|
import type { AnalyticsStats } from './collector.js';
|
|
3
4
|
export declare class BufferedEventSink {
|
|
@@ -7,9 +8,11 @@ export declare class BufferedEventSink {
|
|
|
7
8
|
private readonly flushMs;
|
|
8
9
|
private timer;
|
|
9
10
|
private flushPromise;
|
|
11
|
+
private readonly logger;
|
|
10
12
|
constructor(sink: EventSink, options?: {
|
|
11
13
|
maxBatch?: number;
|
|
12
14
|
flushMs?: number;
|
|
15
|
+
logger?: Logger;
|
|
13
16
|
});
|
|
14
17
|
track(type: string, data?: Record<string, unknown>): void;
|
|
15
18
|
flush(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sink.d.ts","sourceRoot":"","sources":["../../src/analytics/sink.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sink.d.ts","sourceRoot":"","sources":["../../src/analytics/sink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAMrD,qBAAa,iBAAiB;IAS1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IARvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGb,IAAI,EAAE,SAAS,EAChC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAcpE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAQzD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBtB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,mBAAmB;CAK5B;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,SAAS,EACf,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAClC,OAAO,CAAC,cAAc,CAAC,CAoBzB"}
|