@mcp-abap-adt/llm-agent-libs 36.0.0 → 38.0.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/adapters/usage-logging-decision-model.d.ts.map +1 -1
- package/dist/adapters/usage-logging-decision-model.js +2 -0
- package/dist/adapters/usage-logging-decision-model.js.map +1 -1
- package/dist/adapters/usage-logging-embedder.d.ts.map +1 -1
- package/dist/adapters/usage-logging-embedder.js +3 -0
- package/dist/adapters/usage-logging-embedder.js.map +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +71 -24
- package/dist/agent.js.map +1 -1
- package/dist/builder.d.ts.map +1 -1
- package/dist/builder.js +13 -24
- package/dist/builder.js.map +1 -1
- package/dist/classifier/llm-classifier.d.ts.map +1 -1
- package/dist/classifier/llm-classifier.js +5 -2
- package/dist/classifier/llm-classifier.js.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.d.ts.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.js +4 -3
- package/dist/coordinator/adaptive/adaptive-interpreter.js.map +1 -1
- package/dist/coordinator/adaptive/llm-adaptive-controller.d.ts +12 -4
- package/dist/coordinator/adaptive/llm-adaptive-controller.d.ts.map +1 -1
- package/dist/coordinator/adaptive/llm-adaptive-controller.js +43 -23
- package/dist/coordinator/adaptive/llm-adaptive-controller.js.map +1 -1
- package/dist/coordinator/dag/llm-dag-planner.d.ts +1 -3
- package/dist/coordinator/dag/llm-dag-planner.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-dag-planner.js +14 -5
- package/dist/coordinator/dag/llm-dag-planner.js.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.d.ts +1 -1
- package/dist/coordinator/dag/llm-finalizer.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.js +63 -21
- package/dist/coordinator/dag/llm-finalizer.js.map +1 -1
- package/dist/coordinator/dag/llm-review-strategy.d.ts +1 -3
- package/dist/coordinator/dag/llm-review-strategy.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-review-strategy.js +35 -22
- package/dist/coordinator/dag/llm-review-strategy.js.map +1 -1
- package/dist/coordinator/dag/subagent-state-oracle.d.ts +1 -11
- package/dist/coordinator/dag/subagent-state-oracle.d.ts.map +1 -1
- package/dist/coordinator/dag/subagent-state-oracle.js +9 -12
- package/dist/coordinator/dag/subagent-state-oracle.js.map +1 -1
- package/dist/logger/default-request-logger.d.ts +8 -4
- package/dist/logger/default-request-logger.d.ts.map +1 -1
- package/dist/logger/default-request-logger.js +30 -4
- package/dist/logger/default-request-logger.js.map +1 -1
- package/dist/logger/llm-call-usage.d.ts +26 -0
- package/dist/logger/llm-call-usage.d.ts.map +1 -0
- package/dist/logger/llm-call-usage.js +214 -0
- package/dist/logger/llm-call-usage.js.map +1 -0
- package/dist/logger/pipeline-request-logger.d.ts +5 -0
- package/dist/logger/pipeline-request-logger.d.ts.map +1 -0
- package/dist/logger/pipeline-request-logger.js +38 -0
- package/dist/logger/pipeline-request-logger.js.map +1 -0
- package/dist/logger/request-call-scope.d.ts +5 -0
- package/dist/logger/request-call-scope.d.ts.map +1 -0
- package/dist/logger/request-call-scope.js +36 -0
- package/dist/logger/request-call-scope.js.map +1 -0
- package/dist/logger/session-request-logger.d.ts +2 -1
- package/dist/logger/session-request-logger.d.ts.map +1 -1
- package/dist/logger/session-request-logger.js +17 -6
- package/dist/logger/session-request-logger.js.map +1 -1
- package/dist/logger/stream-attempt-usage.d.ts +18 -0
- package/dist/logger/stream-attempt-usage.d.ts.map +1 -0
- package/dist/logger/stream-attempt-usage.js +68 -0
- package/dist/logger/stream-attempt-usage.js.map +1 -0
- package/dist/logger/worker-request-logger.d.ts +25 -0
- package/dist/logger/worker-request-logger.d.ts.map +1 -0
- package/dist/logger/worker-request-logger.js +93 -0
- package/dist/logger/worker-request-logger.js.map +1 -0
- package/dist/mcp/vectorize-mcp-tools.d.ts.map +1 -1
- package/dist/mcp/vectorize-mcp-tools.js +3 -0
- package/dist/mcp/vectorize-mcp-tools.js.map +1 -1
- package/dist/pipeline/default-pipeline.js +2 -2
- package/dist/pipeline/default-pipeline.js.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.d.ts +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.js +15 -23
- package/dist/pipeline/handlers/adaptive-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.js +36 -40
- package/dist/pipeline/handlers/dag-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/pass-through.d.ts.map +1 -1
- package/dist/pipeline/handlers/pass-through.js +21 -34
- package/dist/pipeline/handlers/pass-through.js.map +1 -1
- package/dist/pipeline/handlers/role-usage.d.ts +4 -0
- package/dist/pipeline/handlers/role-usage.d.ts.map +1 -0
- package/dist/pipeline/handlers/role-usage.js +14 -0
- package/dist/pipeline/handlers/role-usage.js.map +1 -0
- package/dist/pipeline/handlers/tool-loop.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-loop.js +38 -43
- package/dist/pipeline/handlers/tool-loop.js.map +1 -1
- package/dist/pipeline/handlers/translate.d.ts.map +1 -1
- package/dist/pipeline/handlers/translate.js +2 -0
- package/dist/pipeline/handlers/translate.js.map +1 -1
- package/dist/pipeline/handlers/worker-usage.d.ts +5 -0
- package/dist/pipeline/handlers/worker-usage.d.ts.map +1 -0
- package/dist/pipeline/handlers/worker-usage.js +59 -0
- package/dist/pipeline/handlers/worker-usage.js.map +1 -0
- package/dist/pipeline/pipeline-to-stream.d.ts +2 -2
- package/dist/pipeline/pipeline-to-stream.d.ts.map +1 -1
- package/dist/pipeline/pipeline-to-stream.js +36 -20
- package/dist/pipeline/pipeline-to-stream.js.map +1 -1
- package/dist/reranker/llm-reranker.d.ts.map +1 -1
- package/dist/reranker/llm-reranker.js +2 -0
- package/dist/reranker/llm-reranker.js.map +1 -1
- package/dist/resilience/retry-llm.d.ts.map +1 -1
- package/dist/resilience/retry-llm.js +41 -9
- package/dist/resilience/retry-llm.js.map +1 -1
- package/dist/retrieval/strategy-rag.d.ts +14 -7
- package/dist/retrieval/strategy-rag.d.ts.map +1 -1
- package/dist/retrieval/strategy-rag.js +49 -21
- package/dist/retrieval/strategy-rag.js.map +1 -1
- package/dist/subagent/direct-llm-subagent.d.ts +4 -1
- package/dist/subagent/direct-llm-subagent.d.ts.map +1 -1
- package/dist/subagent/direct-llm-subagent.js +10 -6
- package/dist/subagent/direct-llm-subagent.js.map +1 -1
- package/dist/subagent/smart-agent-subagent.d.ts +2 -1
- package/dist/subagent/smart-agent-subagent.d.ts.map +1 -1
- package/dist/subagent/smart-agent-subagent.js +19 -4
- package/dist/subagent/smart-agent-subagent.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
import { chatWithUsage } from '../../logger/llm-call-usage.js';
|
|
2
3
|
import { lastObject, parsePlan, parseVerdict } from './parse-plan.js';
|
|
3
4
|
/** Planning instructions shared by the default adaptive controller. */
|
|
4
5
|
export const ADAPTIVE_CONTROLLER_SYSTEM = `You control a sequential adaptive plan. Size the plan to the request.
|
|
@@ -33,30 +34,29 @@ Simple one-work-step example (executor must be registered):
|
|
|
33
34
|
{"steps":[{"id":"exec","kind":"work","goal":"Explain this object","worker":"executor"},{"id":"answer","kind":"answer","from":"exec"}]}
|
|
34
35
|
Create/check/fix/recheck example (executor must be registered):
|
|
35
36
|
{"spec":{"objective":"Create a correct draft"},"steps":[{"id":"create","kind":"work","goal":"Create draft","worker":"executor"},{"id":"check","kind":"check","goal":"Review draft","worker":"self","targets":["create"],"onPass":"answer","onFail":"fix"},{"id":"fix","kind":"work","goal":"Fix draft using review","worker":"executor","context":{"results":["create","check"]}},{"id":"recheck","kind":"check","goal":"Review fixed draft","worker":"self","targets":["fix"],"onPass":"fixedAnswer","onFail":"fix"},{"id":"fixedAnswer","kind":"answer","from":"fix"},{"id":"answer","kind":"answer","from":"create"}]}`;
|
|
36
|
-
function withUsage(error, usage) {
|
|
37
|
-
return
|
|
37
|
+
function withUsage(error, { usage, model, usageCalls }) {
|
|
38
|
+
return Object.assign(error, { usage, model, usageCalls });
|
|
38
39
|
}
|
|
39
40
|
/** An ILlm-backed planner and reviewer; execution and fallback stay with callers. */
|
|
40
41
|
export class LlmAdaptiveController {
|
|
41
42
|
llm;
|
|
42
43
|
name = 'llm-adaptive';
|
|
43
|
-
model;
|
|
44
44
|
systemPrompt;
|
|
45
45
|
constructor(llm, opts) {
|
|
46
46
|
this.llm = llm;
|
|
47
|
-
this.model = llm.model;
|
|
48
47
|
this.systemPrompt = opts?.systemPrompt ?? ADAPTIVE_CONTROLLER_SYSTEM;
|
|
49
48
|
}
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
get model() {
|
|
50
|
+
return this.llm.model;
|
|
51
|
+
}
|
|
52
|
+
async chat(component, system, content, options) {
|
|
53
|
+
const result = await chatWithUsage(this.llm, component, [
|
|
52
54
|
{ role: 'system', content: system },
|
|
53
55
|
{ role: 'user', content },
|
|
54
56
|
], undefined, options);
|
|
55
|
-
if (
|
|
56
|
-
throw result
|
|
57
|
-
|
|
58
|
-
throw withUsage(new OrchestratorError('LLM response was truncated at a token limit.', 'LLM_OUTPUT_TRUNCATED'), result.value.usage);
|
|
59
|
-
return result.value;
|
|
57
|
+
if (result.finishReason === 'length')
|
|
58
|
+
throw withUsage(new OrchestratorError('LLM response was truncated at a token limit.', 'LLM_OUTPUT_TRUNCATED'), result);
|
|
59
|
+
return result;
|
|
60
60
|
}
|
|
61
61
|
async plan(input) {
|
|
62
62
|
const history = input.history;
|
|
@@ -73,7 +73,7 @@ export class LlmAdaptiveController {
|
|
|
73
73
|
output: record.output,
|
|
74
74
|
})),
|
|
75
75
|
};
|
|
76
|
-
const response = await this.chat(this.systemPrompt, [
|
|
76
|
+
const response = await this.chat('planner', this.systemPrompt, [
|
|
77
77
|
`Workers:\n${input.workers.map((worker) => `${worker.name}: ${worker.description ?? ''}`).join('\n')}`,
|
|
78
78
|
`Conversation:\n${JSON.stringify(history)}`,
|
|
79
79
|
`Previous run:\n${JSON.stringify(previousRun ?? null)}`,
|
|
@@ -83,40 +83,60 @@ export class LlmAdaptiveController {
|
|
|
83
83
|
workers: input.workers.map((worker) => worker.name),
|
|
84
84
|
});
|
|
85
85
|
if (!parsed.ok)
|
|
86
|
-
throw withUsage(new Error(parsed.error), response
|
|
87
|
-
return {
|
|
86
|
+
throw withUsage(new Error(parsed.error), response);
|
|
87
|
+
return {
|
|
88
|
+
plan: parsed.value,
|
|
89
|
+
usage: response.usage,
|
|
90
|
+
model: response.model,
|
|
91
|
+
usageCalls: response.usageCalls,
|
|
92
|
+
};
|
|
88
93
|
}
|
|
89
94
|
async check(input) {
|
|
90
95
|
const { signal, usage, ...context } = input;
|
|
91
|
-
const response = await this.chat('Judge the target records against the request, spec and check goal. Return JSON only: {"verdict":"pass|fail|partial","reason":"..."}.', JSON.stringify(context), { signal, usage: usage?.with({ role: 'reviewer' }) });
|
|
96
|
+
const response = await this.chat('reviewer', 'Judge the target records against the request, spec and check goal. Return JSON only: {"verdict":"pass|fail|partial","reason":"..."}.', JSON.stringify(context), { signal, usage: usage?.with({ role: 'reviewer' }) });
|
|
92
97
|
const verdict = parseVerdict(response.content);
|
|
93
98
|
if (!verdict)
|
|
94
|
-
throw withUsage(new OrchestratorError(`Check ${input.step.id} failed to retrieve a verdict: Unparsable verdict`, 'VERDICT_RETRIEVAL_FAILED'), response
|
|
95
|
-
return {
|
|
99
|
+
throw withUsage(new OrchestratorError(`Check ${input.step.id} failed to retrieve a verdict: Unparsable verdict`, 'VERDICT_RETRIEVAL_FAILED'), response);
|
|
100
|
+
return {
|
|
101
|
+
verdict,
|
|
102
|
+
usage: response.usage,
|
|
103
|
+
model: response.model,
|
|
104
|
+
usageCalls: response.usageCalls,
|
|
105
|
+
};
|
|
96
106
|
}
|
|
97
107
|
async revise(input) {
|
|
98
108
|
const { signal, usage, ...context } = input;
|
|
99
|
-
const response = await this.chat(`${this.systemPrompt}\nFor this call return {"steps":[...]} with steps for the remainder only. Do not reuse executed ids in records or the current revise step's id. References may use retained step ids.`, JSON.stringify(context), { signal, usage: usage?.with({ role: 'planner' }) });
|
|
109
|
+
const response = await this.chat('planner', `${this.systemPrompt}\nFor this call return {"steps":[...]} with steps for the remainder only. Do not reuse executed ids in records or the current revise step's id. References may use retained step ids.`, JSON.stringify(context), { signal, usage: usage?.with({ role: 'planner' }) });
|
|
100
110
|
let parsed;
|
|
101
111
|
try {
|
|
102
112
|
parsed = lastObject(response.content);
|
|
103
113
|
}
|
|
104
114
|
catch (error) {
|
|
105
|
-
throw withUsage(error instanceof Error ? error : new Error(String(error)), response
|
|
115
|
+
throw withUsage(error instanceof Error ? error : new Error(String(error)), response);
|
|
106
116
|
}
|
|
107
117
|
if (typeof parsed !== 'object' ||
|
|
108
118
|
parsed === null ||
|
|
109
119
|
!('steps' in parsed) ||
|
|
110
120
|
!Array.isArray(parsed.steps)) {
|
|
111
|
-
throw withUsage(new Error('Revision requires a steps array'), response
|
|
121
|
+
throw withUsage(new Error('Revision requires a steps array'), response);
|
|
112
122
|
}
|
|
113
123
|
// The interpreter validates workers, references, and taken ids before execution.
|
|
114
|
-
return {
|
|
124
|
+
return {
|
|
125
|
+
steps: parsed.steps,
|
|
126
|
+
usage: response.usage,
|
|
127
|
+
model: response.model,
|
|
128
|
+
usageCalls: response.usageCalls,
|
|
129
|
+
};
|
|
115
130
|
}
|
|
116
131
|
async report(input) {
|
|
117
132
|
const { signal, usage, ...context } = input;
|
|
118
|
-
const response = await this.chat("Report in plain text in the request's language: what was done, what was not, and why the run stopped. Ground claims in the records; do not present unfinished work as complete.", JSON.stringify(context), { signal, usage: usage?.with({ role: 'finalizer' }) });
|
|
119
|
-
return {
|
|
133
|
+
const response = await this.chat('finalizer', "Report in plain text in the request's language: what was done, what was not, and why the run stopped. Ground claims in the records; do not present unfinished work as complete.", JSON.stringify(context), { signal, usage: usage?.with({ role: 'finalizer' }) });
|
|
134
|
+
return {
|
|
135
|
+
text: response.content,
|
|
136
|
+
usage: response.usage,
|
|
137
|
+
model: response.model,
|
|
138
|
+
usageCalls: response.usageCalls,
|
|
139
|
+
};
|
|
120
140
|
}
|
|
121
141
|
}
|
|
122
142
|
//# sourceMappingURL=llm-adaptive-controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-adaptive-controller.js","sourceRoot":"","sources":["../../../src/coordinator/adaptive/llm-adaptive-controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"llm-adaptive-controller.js","sourceRoot":"","sources":["../../../src/coordinator/adaptive/llm-adaptive-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,11 +23,9 @@ export declare function parseDagPlan(content: string, usage?: LlmUsage, fallback
|
|
|
23
23
|
*/
|
|
24
24
|
export declare class LlmDagPlanner implements IPlanner {
|
|
25
25
|
readonly name = "llm-dag";
|
|
26
|
-
/** Best-effort model identifier from the underlying ILlm (for logger
|
|
27
|
-
* attribution). May be undefined for ILlm impls that do not expose one. */
|
|
28
|
-
readonly model?: string;
|
|
29
26
|
private readonly agent;
|
|
30
27
|
constructor(llm: ILlm);
|
|
28
|
+
get model(): string | undefined;
|
|
31
29
|
plan(input: PlannerInput): Promise<PlannerResult>;
|
|
32
30
|
}
|
|
33
31
|
//# sourceMappingURL=llm-dag-planner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-dag-planner.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-dag-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,QAAQ,EAER,YAAY,EACZ,aAAa,EACd,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"llm-dag-planner.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-dag-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,QAAQ,EAER,YAAY,EACZ,aAAa,EACd,MAAM,yBAAyB,CAAC;AAoBjC,eAAO,MAAM,cAAc,q+CAqBmE,CAAC;AAE/F;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,QAAQ,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CA6HT;AAED;;;;GAIG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAC5C,QAAQ,CAAC,IAAI,aAAa;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;gBAE9B,GAAG,EAAE,IAAI;IAQrB,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;CAgDxD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ClarifySignal, NeedInfoSignal } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
import { withUsageCalls } from '../../logger/llm-call-usage.js';
|
|
2
3
|
import { DirectLlmSubAgent } from '../../subagent/direct-llm-subagent.js';
|
|
3
4
|
import { renderAncestorContext } from './render-ancestor-context.js';
|
|
4
5
|
/**
|
|
@@ -131,17 +132,17 @@ export function parseDagPlan(content, usage, fallbackGoal) {
|
|
|
131
132
|
*/
|
|
132
133
|
export class LlmDagPlanner {
|
|
133
134
|
name = 'llm-dag';
|
|
134
|
-
/** Best-effort model identifier from the underlying ILlm (for logger
|
|
135
|
-
* attribution). May be undefined for ILlm impls that do not expose one. */
|
|
136
|
-
model;
|
|
137
135
|
agent;
|
|
138
136
|
constructor(llm) {
|
|
139
|
-
this.model = llm.model;
|
|
140
137
|
this.agent = new DirectLlmSubAgent('planner', llm, {
|
|
141
138
|
systemPrompt: PLANNER_SYSTEM,
|
|
139
|
+
component: 'planner',
|
|
142
140
|
contextPolicy: 'optional',
|
|
143
141
|
});
|
|
144
142
|
}
|
|
143
|
+
get model() {
|
|
144
|
+
return this.agent.model;
|
|
145
|
+
}
|
|
145
146
|
async plan(input) {
|
|
146
147
|
const catalog = input.agents
|
|
147
148
|
.map((a) => `- ${a.name}: ${a.description ?? '(no description)'}`)
|
|
@@ -171,7 +172,13 @@ export class LlmDagPlanner {
|
|
|
171
172
|
// decompose the request (e.g. a bare "call external tool X") and returns
|
|
172
173
|
// zero nodes, parseDagPlan synthesizes one node carrying the prompt so a
|
|
173
174
|
// worker still runs and can surface the external tool_call (#171 obs 2c).
|
|
174
|
-
|
|
175
|
+
let plan;
|
|
176
|
+
try {
|
|
177
|
+
plan = parseDagPlan(res.output, res.usage, input.prompt);
|
|
178
|
+
}
|
|
179
|
+
catch (error) {
|
|
180
|
+
throw withUsageCalls(error, res.usageCalls ?? []);
|
|
181
|
+
}
|
|
175
182
|
return {
|
|
176
183
|
plan,
|
|
177
184
|
// Forward the underlying ILlm.chat usage on the WRAPPER (not on the
|
|
@@ -179,6 +186,8 @@ export class LlmDagPlanner {
|
|
|
179
186
|
// the session/request logger without polluting the plan domain type
|
|
180
187
|
// (which the reviewer serializes via JSON.stringify into its prompt).
|
|
181
188
|
usage: res.usage,
|
|
189
|
+
model: res.model,
|
|
190
|
+
usageCalls: res.usageCalls,
|
|
182
191
|
};
|
|
183
192
|
}
|
|
184
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-dag-planner.js","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-dag-planner.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"llm-dag-planner.js","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-dag-planner.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export interface LlmFinalizerOptions {
|
|
|
6
6
|
model?: string;
|
|
7
7
|
}
|
|
8
8
|
/**
|
|
9
|
-
* Synthesizes the final answer via
|
|
9
|
+
* Synthesizes the final answer via an LLM stream. NO tools are wired:
|
|
10
10
|
* the LLM cannot escape into another tool-loop. The user message is a
|
|
11
11
|
* deterministic rendering of prompt + objective + ancestorContext + trace.
|
|
12
12
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-finalizer.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-finalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,UAAU,EACV,IAAI,
|
|
1
|
+
{"version":3,"file":"llm-finalizer.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-finalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,UAAU,EACV,IAAI,EAKL,MAAM,yBAAyB,CAAC;AASjC,eAAO,MAAM,gBAAgB,QAM6C,CAAC;AAE3E,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAkCD;;;;GAIG;AACH,qBAAa,YAAa,YAAW,UAAU;IAM3C,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAGnB,GAAG,EAAE,IAAI,EAC1B,IAAI,GAAE,mBAAwB;IAO1B,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAiFhE"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import { addTokenUsage, OrchestratorError } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
import { errorUsage, mergeUsageCalls, withUsageAttribution, } from '../../logger/llm-call-usage.js';
|
|
3
|
+
import { StreamAttemptUsage } from '../../logger/stream-attempt-usage.js';
|
|
2
4
|
export const FINALIZER_SYSTEM = 'You synthesize the final user-facing answer for a DAG-coordinated task. ' +
|
|
3
5
|
'You will receive: (1) the user prompt, (2) the plan objective, (3) an ' +
|
|
4
6
|
'ordered execution trace of completed DAG nodes (each with its goal and ' +
|
|
@@ -37,7 +39,7 @@ function renderUserMessage(input) {
|
|
|
37
39
|
return lines.join('\n');
|
|
38
40
|
}
|
|
39
41
|
/**
|
|
40
|
-
* Synthesizes the final answer via
|
|
42
|
+
* Synthesizes the final answer via an LLM stream. NO tools are wired:
|
|
41
43
|
* the LLM cannot escape into another tool-loop. The user message is a
|
|
42
44
|
* deterministic rendering of prompt + objective + ancestorContext + trace.
|
|
43
45
|
*/
|
|
@@ -59,27 +61,67 @@ export class LlmFinalizer {
|
|
|
59
61
|
];
|
|
60
62
|
const { signal, sessionId, caller } = input;
|
|
61
63
|
let buf = '';
|
|
62
|
-
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
for await (const chunk of stream) {
|
|
70
|
-
if (!chunk.ok)
|
|
71
|
-
throw chunk.error;
|
|
72
|
-
if (chunk.value.finishReason === 'length')
|
|
73
|
-
throw new OrchestratorError('LLM response was truncated at a token limit.', 'LLM_OUTPUT_TRUNCATED');
|
|
74
|
-
const content = chunk.value?.content ?? '';
|
|
75
|
-
if (content) {
|
|
76
|
-
buf += content;
|
|
77
|
-
input.onPartial?.({ kind: 'content', delta: content });
|
|
64
|
+
const attemptUsage = new StreamAttemptUsage();
|
|
65
|
+
const retryCalls = [];
|
|
66
|
+
const model = () => this.llm.model ?? this.model;
|
|
67
|
+
const finishUsage = (failure) => {
|
|
68
|
+
const calls = attemptUsage.records('finalizer', model(), failure, signal, retryCalls.length > 0);
|
|
69
|
+
if (retryCalls.length === 0) {
|
|
70
|
+
return { ...attemptUsage.resolve(model(), failure), usageCalls: calls };
|
|
78
71
|
}
|
|
79
|
-
|
|
80
|
-
|
|
72
|
+
const usageCalls = mergeUsageCalls(retryCalls, calls);
|
|
73
|
+
const byModel = new Map();
|
|
74
|
+
for (const { model, requests = 1, ...usage } of usageCalls) {
|
|
75
|
+
const previous = byModel.get(model);
|
|
76
|
+
const totals = addTokenUsage(previous, usage);
|
|
77
|
+
if (totals)
|
|
78
|
+
byModel.set(model, {
|
|
79
|
+
...totals,
|
|
80
|
+
requests: (previous?.requests ?? 0) + requests,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
return { usageCalls, usageByModel: Object.fromEntries(byModel) };
|
|
84
|
+
};
|
|
85
|
+
try {
|
|
86
|
+
const stream = this.llm.streamChat(messages, [], {
|
|
87
|
+
signal,
|
|
88
|
+
sessionId,
|
|
89
|
+
caller,
|
|
90
|
+
usage: input.usage?.with({ role: 'finalizer' }),
|
|
91
|
+
includeStreamRetryUsage: true,
|
|
92
|
+
});
|
|
93
|
+
for await (const chunk of stream) {
|
|
94
|
+
if (!chunk.ok)
|
|
95
|
+
throw chunk.error;
|
|
96
|
+
const { content, finishReason, reset, retryUsage, usage } = chunk.value;
|
|
97
|
+
if (reset) {
|
|
98
|
+
for (const call of attemptUsage.records('finalizer', model(), retryUsage)) {
|
|
99
|
+
retryCalls.push(call);
|
|
100
|
+
}
|
|
101
|
+
attemptUsage.reset();
|
|
102
|
+
if (buf)
|
|
103
|
+
input.onPartial?.({ kind: 'iteration-end', outcome: 'retry' });
|
|
104
|
+
buf = '';
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
attemptUsage.add(usage, this.llm.model, chunk.value.usageCalls);
|
|
108
|
+
if (finishReason === 'length')
|
|
109
|
+
throw new OrchestratorError('LLM response was truncated at a token limit.', 'LLM_OUTPUT_TRUNCATED');
|
|
110
|
+
if (content) {
|
|
111
|
+
buf += content;
|
|
112
|
+
input.onPartial?.({ kind: 'content', delta: content });
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
if (typeof error !== 'object' || error === null)
|
|
118
|
+
throw error;
|
|
119
|
+
const attribution = finishUsage(errorUsage(error));
|
|
120
|
+
throw attribution.usageCalls?.length
|
|
121
|
+
? withUsageAttribution(error, attribution)
|
|
122
|
+
: error;
|
|
81
123
|
}
|
|
82
|
-
return { output: buf,
|
|
124
|
+
return { output: buf, ...finishUsage() };
|
|
83
125
|
}
|
|
84
126
|
}
|
|
85
127
|
//# sourceMappingURL=llm-finalizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-finalizer.js","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-finalizer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"llm-finalizer.js","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-finalizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,10 @@ import type { ExecutionFailureInput, ExecutionReviewResult, ILlm, IReviewStrateg
|
|
|
5
5
|
*/
|
|
6
6
|
export declare class LlmReviewStrategy implements IReviewStrategy {
|
|
7
7
|
readonly name = "llm-review";
|
|
8
|
-
/** Best-effort model identifier from the underlying ILlm (for logger
|
|
9
|
-
* attribution). May be undefined for ILlm impls that do not expose one. */
|
|
10
|
-
readonly model?: string;
|
|
11
8
|
private readonly agent;
|
|
12
9
|
private readonly executionAgent;
|
|
13
10
|
constructor(llm: ILlm);
|
|
11
|
+
get model(): string | undefined;
|
|
14
12
|
review(input: ReviewInput): Promise<ReviewResult>;
|
|
15
13
|
reviewExecutionFailure(input: ExecutionFailureInput): Promise<ExecutionReviewResult>;
|
|
16
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-review-strategy.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-review-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,qBAAqB,EACrB,qBAAqB,EACrB,IAAI,EACJ,eAAe,EAEf,WAAW,EACX,YAAY,EACb,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"llm-review-strategy.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-review-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,qBAAqB,EACrB,qBAAqB,EACrB,IAAI,EACJ,eAAe,EAEf,WAAW,EACX,YAAY,EACb,MAAM,yBAAyB,CAAC;AAiCjC;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,eAAe;IACvD,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;gBAEvC,GAAG,EAAE,IAAI;IAarB,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAsFjD,sBAAsB,CAC1B,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,qBAAqB,CAAC;CAgGlC"}
|
|
@@ -5,10 +5,8 @@ import { renderAncestorContext } from './render-ancestor-context.js';
|
|
|
5
5
|
* Attach LLM usage to a thrown Error so the coordinator's runRole catch can
|
|
6
6
|
* still bill the spend. Same rationale as the planner-side helper.
|
|
7
7
|
*/
|
|
8
|
-
function withUsage(
|
|
9
|
-
|
|
10
|
-
err.usage = usage;
|
|
11
|
-
return err;
|
|
8
|
+
function withUsage(error, { usage, model, usageCalls }) {
|
|
9
|
+
return Object.assign(error, { usage, model, usageCalls });
|
|
12
10
|
}
|
|
13
11
|
// Static critic instructions. The user prompt, plan and catalog are dynamic and
|
|
14
12
|
// go into the per-call `task` (see review()).
|
|
@@ -31,22 +29,23 @@ The revised plan MUST treat the current state as the starting point: do not redo
|
|
|
31
29
|
*/
|
|
32
30
|
export class LlmReviewStrategy {
|
|
33
31
|
name = 'llm-review';
|
|
34
|
-
/** Best-effort model identifier from the underlying ILlm (for logger
|
|
35
|
-
* attribution). May be undefined for ILlm impls that do not expose one. */
|
|
36
|
-
model;
|
|
37
32
|
agent;
|
|
38
33
|
executionAgent;
|
|
39
34
|
constructor(llm) {
|
|
40
|
-
this.model = llm.model;
|
|
41
35
|
this.agent = new DirectLlmSubAgent('reviewer', llm, {
|
|
42
36
|
systemPrompt: REVIEWER_SYSTEM,
|
|
37
|
+
component: 'reviewer',
|
|
43
38
|
contextPolicy: 'optional',
|
|
44
39
|
});
|
|
45
40
|
this.executionAgent = new DirectLlmSubAgent('recovery-reviewer', llm, {
|
|
46
41
|
systemPrompt: EXECUTION_REVIEW_SYSTEM,
|
|
42
|
+
component: 'reviewer',
|
|
47
43
|
contextPolicy: 'optional',
|
|
48
44
|
});
|
|
49
45
|
}
|
|
46
|
+
get model() {
|
|
47
|
+
return this.agent.model;
|
|
48
|
+
}
|
|
50
49
|
async review(input) {
|
|
51
50
|
const catalog = input.agents
|
|
52
51
|
.map((a) => `- ${a.name}: ${a.description ?? '(no description)'}`)
|
|
@@ -64,36 +63,43 @@ export class LlmReviewStrategy {
|
|
|
64
63
|
});
|
|
65
64
|
const match = res.output.match(/\{[\s\S]*\}/);
|
|
66
65
|
if (!match)
|
|
67
|
-
throw withUsage(new Error(`Reviewer output did not contain a JSON object: ${res.output.slice(0, 200)}`), res
|
|
66
|
+
throw withUsage(new Error(`Reviewer output did not contain a JSON object: ${res.output.slice(0, 200)}`), res);
|
|
68
67
|
let parsed;
|
|
69
68
|
try {
|
|
70
69
|
parsed = JSON.parse(match[0]);
|
|
71
70
|
}
|
|
72
71
|
catch {
|
|
73
|
-
throw withUsage(new Error(`Reviewer output contained malformed JSON: ${match[0].slice(0, 200)}`), res
|
|
72
|
+
throw withUsage(new Error(`Reviewer output contained malformed JSON: ${match[0].slice(0, 200)}`), res);
|
|
74
73
|
}
|
|
75
74
|
if (typeof parsed.needInfo === 'string' && parsed.needInfo.trim()) {
|
|
76
75
|
// Forward LLM usage on the signal path so the coordinator can attribute
|
|
77
76
|
// reviewer spend even when the critic short-circuits with a signal.
|
|
78
|
-
throw new NeedInfoSignal(parsed.needInfo, res.usage);
|
|
77
|
+
throw withUsage(new NeedInfoSignal(parsed.needInfo, res.usage), res);
|
|
79
78
|
}
|
|
80
79
|
if (typeof parsed.clarify === 'string' && parsed.clarify.trim()) {
|
|
81
|
-
throw new ClarifySignal(parsed.clarify, res.usage);
|
|
80
|
+
throw withUsage(new ClarifySignal(parsed.clarify, res.usage), res);
|
|
82
81
|
}
|
|
83
82
|
if (typeof parsed.pass !== 'boolean') {
|
|
84
|
-
throw withUsage(new Error(`Reviewer verdict must have a boolean 'pass': ${match[0].slice(0, 200)}`), res
|
|
83
|
+
throw withUsage(new Error(`Reviewer verdict must have a boolean 'pass': ${match[0].slice(0, 200)}`), res);
|
|
85
84
|
}
|
|
86
85
|
if (parsed.pass === false) {
|
|
87
86
|
if (typeof parsed.feedback !== 'string' ||
|
|
88
87
|
parsed.feedback.trim() === '') {
|
|
89
|
-
throw withUsage(new Error(`Reviewer rejection must include a non-empty 'feedback' string: ${match[0].slice(0, 200)}`), res
|
|
88
|
+
throw withUsage(new Error(`Reviewer rejection must include a non-empty 'feedback' string: ${match[0].slice(0, 200)}`), res);
|
|
90
89
|
}
|
|
91
90
|
return {
|
|
92
91
|
verdict: { pass: false, feedback: parsed.feedback },
|
|
93
92
|
usage: res.usage,
|
|
93
|
+
model: res.model,
|
|
94
|
+
usageCalls: res.usageCalls,
|
|
94
95
|
};
|
|
95
96
|
}
|
|
96
|
-
return {
|
|
97
|
+
return {
|
|
98
|
+
verdict: { pass: true },
|
|
99
|
+
usage: res.usage,
|
|
100
|
+
model: res.model,
|
|
101
|
+
usageCalls: res.usageCalls,
|
|
102
|
+
};
|
|
97
103
|
}
|
|
98
104
|
async reviewExecutionFailure(input) {
|
|
99
105
|
const catalog = input.agents
|
|
@@ -115,25 +121,30 @@ export class LlmReviewStrategy {
|
|
|
115
121
|
});
|
|
116
122
|
const match = res.output.match(/\{[\s\S]*\}/);
|
|
117
123
|
if (!match)
|
|
118
|
-
throw withUsage(new Error(`Recovery reviewer output did not contain a JSON object: ${res.output.slice(0, 200)}`), res
|
|
124
|
+
throw withUsage(new Error(`Recovery reviewer output did not contain a JSON object: ${res.output.slice(0, 200)}`), res);
|
|
119
125
|
let parsed;
|
|
120
126
|
try {
|
|
121
127
|
parsed = JSON.parse(match[0]);
|
|
122
128
|
}
|
|
123
129
|
catch {
|
|
124
|
-
throw withUsage(new Error(`Recovery reviewer output contained malformed JSON: ${match[0].slice(0, 200)}`), res
|
|
130
|
+
throw withUsage(new Error(`Recovery reviewer output contained malformed JSON: ${match[0].slice(0, 200)}`), res);
|
|
125
131
|
}
|
|
126
132
|
if (typeof parsed.needInfo === 'string' && parsed.needInfo.trim()) {
|
|
127
|
-
throw new NeedInfoSignal(parsed.needInfo, res.usage);
|
|
133
|
+
throw withUsage(new NeedInfoSignal(parsed.needInfo, res.usage), res);
|
|
128
134
|
}
|
|
129
135
|
if (typeof parsed.clarify === 'string' && parsed.clarify.trim()) {
|
|
130
|
-
throw new ClarifySignal(parsed.clarify, res.usage);
|
|
136
|
+
throw withUsage(new ClarifySignal(parsed.clarify, res.usage), res);
|
|
131
137
|
}
|
|
132
138
|
if (parsed.action === 'abort') {
|
|
133
|
-
return {
|
|
139
|
+
return {
|
|
140
|
+
decision: { action: 'abort' },
|
|
141
|
+
usage: res.usage,
|
|
142
|
+
model: res.model,
|
|
143
|
+
usageCalls: res.usageCalls,
|
|
144
|
+
};
|
|
134
145
|
}
|
|
135
146
|
if (parsed.action !== 'revise') {
|
|
136
|
-
throw withUsage(new Error(`Recovery reviewer action must be 'abort' | 'revise': ${match[0].slice(0, 200)}`), res
|
|
147
|
+
throw withUsage(new Error(`Recovery reviewer action must be 'abort' | 'revise': ${match[0].slice(0, 200)}`), res);
|
|
137
148
|
}
|
|
138
149
|
const plan = parsed.plan;
|
|
139
150
|
if (!plan ||
|
|
@@ -142,11 +153,13 @@ export class LlmReviewStrategy {
|
|
|
142
153
|
plan.nodes.some((n) => typeof n.id !== 'string' ||
|
|
143
154
|
typeof n.goal !== 'string' ||
|
|
144
155
|
(n.goal ?? '').trim() === '')) {
|
|
145
|
-
throw withUsage(new Error(`Recovery reviewer revise plan must have non-empty nodes with string id+goal: ${match[0].slice(0, 200)}`), res
|
|
156
|
+
throw withUsage(new Error(`Recovery reviewer revise plan must have non-empty nodes with string id+goal: ${match[0].slice(0, 200)}`), res);
|
|
146
157
|
}
|
|
147
158
|
return {
|
|
148
159
|
decision: { action: 'revise', revisedPlan: plan },
|
|
149
160
|
usage: res.usage,
|
|
161
|
+
model: res.model,
|
|
162
|
+
usageCalls: res.usageCalls,
|
|
150
163
|
};
|
|
151
164
|
}
|
|
152
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-review-strategy.js","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-review-strategy.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;;GAGG;AACH,SAAS,SAAS,
|
|
1
|
+
{"version":3,"file":"llm-review-strategy.js","sourceRoot":"","sources":["../../../src/coordinator/dag/llm-review-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,5 @@
|
|
|
1
1
|
import type { IStateOracle, ISubAgent, StateOracleInput, StateOracleResult } from '@mcp-abap-adt/llm-agent';
|
|
2
|
-
/**
|
|
3
|
-
* Adapter wrapping a raw ISubAgent as an IStateOracle. The wrapped
|
|
4
|
-
* subagent runs a full pipeline whose LLM activity is logged by its
|
|
5
|
-
* own handlers under their own component labels (`tool-loop`,
|
|
6
|
-
* `classifier`, …) via the SHARED session requestLogger keyed on the
|
|
7
|
-
* forwarded traceId. To avoid double-counting, this adapter
|
|
8
|
-
* intentionally returns `usage: undefined`; the handler's
|
|
9
|
-
* `logRoleUsage('oracle', …)` is therefore a no-op for subagent-backed
|
|
10
|
-
* oracles. A pure-LLM IStateOracle implementation that bypasses
|
|
11
|
-
* pipeline logging would populate `usage` normally.
|
|
12
|
-
*/
|
|
2
|
+
/** Exposes a subagent's answer and call records as a state-oracle result. */
|
|
13
3
|
export declare class SubAgentStateOracle implements IStateOracle {
|
|
14
4
|
private readonly inner;
|
|
15
5
|
constructor(inner: ISubAgent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-state-oracle.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/subagent-state-oracle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AAEjC
|
|
1
|
+
{"version":3,"file":"subagent-state-oracle.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dag/subagent-state-oracle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AAEjC,6EAA6E;AAC7E,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,SAAS;IAE7C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAEK,KAAK,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAmBjE"}
|