@mcp-abap-adt/llm-agent-libs 37.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 +4 -1
- 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 +1 -1
- 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/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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-request-logger.js","sourceRoot":"","sources":["../../src/logger/default-request-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default-request-logger.js","sourceRoot":"","sources":["../../src/logger/default-request-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { CallOptions, ILlm, LlmCallRecord, LlmComponent, LlmError, LlmResponse, LlmTool, LlmUsage, LlmUsageAttribution, Message, ModelUsageEntry, Result } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
export declare function usageCallRecords(attribution: LlmUsageAttribution, component: LlmComponent, durationMs: number, callId?: string, countEmpty?: boolean): readonly LlmCallRecord[];
|
|
3
|
+
export declare function mergeUsageCalls(calls: readonly LlmCallRecord[], other: readonly LlmCallRecord[]): readonly LlmCallRecord[];
|
|
4
|
+
/** Preserve each identified call and import only the uncovered returned usage. */
|
|
5
|
+
export declare function completeUsageCalls(attribution: LlmUsageAttribution, component: LlmComponent, durationMs: number, observed?: readonly LlmCallRecord[]): readonly LlmCallRecord[];
|
|
6
|
+
/** Read telemetry from external errors without copying their error code or cause. */
|
|
7
|
+
export declare function errorUsage<T>(error: T): LlmUsageAttribution;
|
|
8
|
+
/** Keep the error type and telemetry without changing a provider-owned error. */
|
|
9
|
+
export declare function withUsageAttribution<T>(error: T, attribution: LlmUsageAttribution): T;
|
|
10
|
+
export declare function withUsageCalls<T>(error: T, calls: readonly LlmCallRecord[]): T;
|
|
11
|
+
/** Record the innermost retry attempts through any intervening LLM decorators. */
|
|
12
|
+
export declare function recordChatAttempt(llm: ILlm, run: () => Promise<Result<LlmResponse, LlmError>>, countFailed?: boolean): Promise<Result<LlmResponse, LlmError>>;
|
|
13
|
+
/** Capture chat attempts for a strategy that can also stream. */
|
|
14
|
+
export declare function llmWithChatUsage(llm: ILlm, component: LlmComponent): ILlm;
|
|
15
|
+
/** Capture usage at a non-streaming role or worker call boundary. */
|
|
16
|
+
export declare function chatWithUsage(llm: ILlm, component: LlmComponent, messages: Message[], tools?: LlmTool[], options?: CallOptions): Promise<{
|
|
17
|
+
usage: LlmUsage | undefined;
|
|
18
|
+
model: string | undefined;
|
|
19
|
+
content: string;
|
|
20
|
+
toolCalls?: import("@mcp-abap-adt/llm-agent").LlmToolCall[];
|
|
21
|
+
finishReason: import("@mcp-abap-adt/llm-agent").LlmFinishReason;
|
|
22
|
+
raw?: unknown;
|
|
23
|
+
usageCalls?: readonly LlmCallRecord[];
|
|
24
|
+
usageByModel?: Record<string, ModelUsageEntry>;
|
|
25
|
+
}>;
|
|
26
|
+
//# sourceMappingURL=llm-call-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-call-usage.d.ts","sourceRoot":"","sources":["../../src/logger/llm-call-usage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,WAAW,EACX,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,OAAO,EACP,QAAQ,EACR,mBAAmB,EACnB,OAAO,EACP,eAAe,EACf,MAAM,EACP,MAAM,yBAAyB,CAAC;AAGjC,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,mBAAmB,EAChC,SAAS,EAAE,YAAY,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,UAAQ,GACjB,SAAS,aAAa,EAAE,CAyB1B;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,SAAS,aAAa,EAAE,EAC/B,KAAK,EAAE,SAAS,aAAa,EAAE,GAC9B,SAAS,aAAa,EAAE,CAM1B;AAyCD,kFAAkF;AAClF,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,mBAAmB,EAChC,SAAS,EAAE,YAAY,EACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,GAAE,SAAS,aAAa,EAAO,GACtC,SAAS,aAAa,EAAE,CAqD1B;AAED,qFAAqF;AACrF,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,mBAAmB,CAU3D;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,KAAK,EAAE,CAAC,EACR,WAAW,EAAE,mBAAmB,GAC/B,CAAC,CAoBH;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC9B,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,SAAS,aAAa,EAAE,GAC9B,CAAC,CAMH;AASD,kFAAkF;AAClF,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,EACjD,WAAW,UAAQ,GAClB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CA8BxC;AAyBD,iEAAiE;AACjE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,GAAG,IAAI,CAYzE;AAED,qEAAqE;AACrE,wBAAsB,aAAa,CACjC,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW;;;;;;;;;GAWtB"}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
3
|
+
import { addCacheTokenUsage } from '@mcp-abap-adt/llm-agent';
|
|
4
|
+
export function usageCallRecords(attribution, component, durationMs, callId, countEmpty = false) {
|
|
5
|
+
if (attribution.usageCalls)
|
|
6
|
+
return attribution.usageCalls;
|
|
7
|
+
if (attribution.usageByModel) {
|
|
8
|
+
return Object.entries(attribution.usageByModel).map(([model, usage]) => ({
|
|
9
|
+
...usage,
|
|
10
|
+
callId: randomUUID(),
|
|
11
|
+
component,
|
|
12
|
+
model,
|
|
13
|
+
durationMs: 0,
|
|
14
|
+
}));
|
|
15
|
+
}
|
|
16
|
+
if (!attribution.usage && !countEmpty)
|
|
17
|
+
return [];
|
|
18
|
+
return [
|
|
19
|
+
{
|
|
20
|
+
...(attribution.usage ?? {
|
|
21
|
+
promptTokens: 0,
|
|
22
|
+
completionTokens: 0,
|
|
23
|
+
totalTokens: 0,
|
|
24
|
+
}),
|
|
25
|
+
callId: callId ?? randomUUID(),
|
|
26
|
+
component,
|
|
27
|
+
model: attribution.model ?? 'unknown',
|
|
28
|
+
durationMs,
|
|
29
|
+
},
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
export function mergeUsageCalls(calls, other) {
|
|
33
|
+
const merged = new Map();
|
|
34
|
+
for (const call of [...calls, ...other]) {
|
|
35
|
+
if (!merged.has(call.callId))
|
|
36
|
+
merged.set(call.callId, call);
|
|
37
|
+
}
|
|
38
|
+
return [...merged.values()];
|
|
39
|
+
}
|
|
40
|
+
function addCall(bucket, call) {
|
|
41
|
+
Object.assign(bucket, addCacheTokenUsage(bucket, call));
|
|
42
|
+
bucket.promptTokens += call.promptTokens;
|
|
43
|
+
bucket.completionTokens += call.completionTokens;
|
|
44
|
+
bucket.totalTokens += call.totalTokens;
|
|
45
|
+
bucket.requests += call.requests ?? 1;
|
|
46
|
+
}
|
|
47
|
+
const emptyUsage = {
|
|
48
|
+
promptTokens: 0,
|
|
49
|
+
completionTokens: 0,
|
|
50
|
+
totalTokens: 0,
|
|
51
|
+
requests: 0,
|
|
52
|
+
};
|
|
53
|
+
function usageRemainder(usage, covered) {
|
|
54
|
+
return {
|
|
55
|
+
promptTokens: Math.max(0, usage.promptTokens - covered.promptTokens),
|
|
56
|
+
completionTokens: Math.max(0, usage.completionTokens - covered.completionTokens),
|
|
57
|
+
totalTokens: Math.max(0, usage.totalTokens - covered.totalTokens),
|
|
58
|
+
...(usage.cachedInputTokens !== undefined && {
|
|
59
|
+
cachedInputTokens: Math.max(0, usage.cachedInputTokens - (covered.cachedInputTokens ?? 0)),
|
|
60
|
+
}),
|
|
61
|
+
...(usage.cacheCreationInputTokens !== undefined && {
|
|
62
|
+
cacheCreationInputTokens: Math.max(0, usage.cacheCreationInputTokens -
|
|
63
|
+
(covered.cacheCreationInputTokens ?? 0)),
|
|
64
|
+
}),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
/** Preserve each identified call and import only the uncovered returned usage. */
|
|
68
|
+
export function completeUsageCalls(attribution, component, durationMs, observed = []) {
|
|
69
|
+
const calls = [...mergeUsageCalls(observed, attribution.usageCalls ?? [])];
|
|
70
|
+
const byModel = attribution.usageByModel;
|
|
71
|
+
const covered = new Map();
|
|
72
|
+
const flat = { ...emptyUsage };
|
|
73
|
+
for (const call of calls) {
|
|
74
|
+
if (byModel) {
|
|
75
|
+
if (!Object.hasOwn(byModel, call.model))
|
|
76
|
+
continue;
|
|
77
|
+
let bucket = covered.get(call.model);
|
|
78
|
+
if (!bucket) {
|
|
79
|
+
bucket = { ...emptyUsage };
|
|
80
|
+
covered.set(call.model, bucket);
|
|
81
|
+
}
|
|
82
|
+
addCall(bucket, call);
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
addCall(flat, call);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (byModel) {
|
|
89
|
+
for (const [model, usage] of Object.entries(byModel)) {
|
|
90
|
+
const accounted = covered.get(model) ?? emptyUsage;
|
|
91
|
+
const remaining = usageRemainder(usage, accounted);
|
|
92
|
+
const requests = Math.max(0, usage.requests - accounted.requests);
|
|
93
|
+
if (requests > 0 ||
|
|
94
|
+
Object.values(remaining).some((tokens) => tokens > 0)) {
|
|
95
|
+
calls.push({
|
|
96
|
+
...remaining,
|
|
97
|
+
requests,
|
|
98
|
+
callId: randomUUID(),
|
|
99
|
+
component,
|
|
100
|
+
model,
|
|
101
|
+
durationMs: 0,
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
else if (attribution.usage) {
|
|
107
|
+
const remaining = usageRemainder(attribution.usage, flat);
|
|
108
|
+
if (calls.length === 0 ||
|
|
109
|
+
Object.values(remaining).some((tokens) => tokens > 0)) {
|
|
110
|
+
calls.push(...usageCallRecords({ usage: remaining, model: attribution.model }, component, durationMs));
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
return calls;
|
|
114
|
+
}
|
|
115
|
+
/** Read telemetry from external errors without copying their error code or cause. */
|
|
116
|
+
export function errorUsage(error) {
|
|
117
|
+
if (typeof error !== 'object' || error === null)
|
|
118
|
+
return {};
|
|
119
|
+
const { usage, usageByModel, usageCalls, model } = error;
|
|
120
|
+
return {
|
|
121
|
+
...(usage && { usage }),
|
|
122
|
+
...(usageByModel && { usageByModel }),
|
|
123
|
+
...(usageCalls && { usageCalls }),
|
|
124
|
+
...(model !== undefined && { model }),
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
/** Keep the error type and telemetry without changing a provider-owned error. */
|
|
128
|
+
export function withUsageAttribution(error, attribution) {
|
|
129
|
+
if (typeof error !== 'object' ||
|
|
130
|
+
error === null ||
|
|
131
|
+
Object.keys(attribution).length === 0)
|
|
132
|
+
return error;
|
|
133
|
+
const copy = error instanceof DOMException
|
|
134
|
+
? new DOMException(error.message, error.name)
|
|
135
|
+
: error instanceof Error
|
|
136
|
+
? new Error()
|
|
137
|
+
: {};
|
|
138
|
+
return Object.defineProperties(Object.setPrototypeOf(copy, Object.getPrototypeOf(error)), {
|
|
139
|
+
...Object.getOwnPropertyDescriptors(error),
|
|
140
|
+
...Object.getOwnPropertyDescriptors(attribution),
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
export function withUsageCalls(error, calls) {
|
|
144
|
+
const { usageCalls } = errorUsage(error);
|
|
145
|
+
if (calls.length === 0 || calls === usageCalls)
|
|
146
|
+
return error;
|
|
147
|
+
return withUsageAttribution(error, {
|
|
148
|
+
usageCalls: usageCalls ? mergeUsageCalls(calls, usageCalls) : calls,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
const chatUsage = new AsyncLocalStorage();
|
|
152
|
+
/** Record the innermost retry attempts through any intervening LLM decorators. */
|
|
153
|
+
export async function recordChatAttempt(llm, run, countFailed = false) {
|
|
154
|
+
const parent = chatUsage.getStore();
|
|
155
|
+
if (!parent)
|
|
156
|
+
return run();
|
|
157
|
+
const scope = { component: parent.component, calls: [] };
|
|
158
|
+
const start = Date.now();
|
|
159
|
+
const callId = randomUUID();
|
|
160
|
+
let attribution = {};
|
|
161
|
+
let succeeded = false;
|
|
162
|
+
try {
|
|
163
|
+
const result = await chatUsage.run(scope, run);
|
|
164
|
+
succeeded = result.ok;
|
|
165
|
+
attribution = result.ok ? result.value : errorUsage(result.error);
|
|
166
|
+
return result;
|
|
167
|
+
}
|
|
168
|
+
catch (error) {
|
|
169
|
+
attribution = errorUsage(error);
|
|
170
|
+
throw error;
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
const calls = scope.calls.length > 0
|
|
174
|
+
? scope.calls
|
|
175
|
+
: usageCallRecords({ ...attribution, model: attribution.model ?? llm.model }, scope.component, Date.now() - start, callId, succeeded || countFailed);
|
|
176
|
+
for (const call of calls)
|
|
177
|
+
parent.calls.push(call);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
async function chatResultWithUsage(llm, component, messages, tools, options) {
|
|
181
|
+
const scope = { component, calls: [] };
|
|
182
|
+
try {
|
|
183
|
+
const result = await chatUsage.run(scope, () => recordChatAttempt(llm, () => llm.chat(messages, tools, options)));
|
|
184
|
+
if (!result.ok)
|
|
185
|
+
return { ok: false, error: withUsageCalls(result.error, scope.calls) };
|
|
186
|
+
return {
|
|
187
|
+
ok: true,
|
|
188
|
+
value: { ...result.value, usageCalls: scope.calls },
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
catch (error) {
|
|
192
|
+
throw withUsageCalls(error, scope.calls);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
/** Capture chat attempts for a strategy that can also stream. */
|
|
196
|
+
export function llmWithChatUsage(llm, component) {
|
|
197
|
+
return {
|
|
198
|
+
get model() {
|
|
199
|
+
return llm.model;
|
|
200
|
+
},
|
|
201
|
+
chat: (messages, tools, options) => chatResultWithUsage(llm, component, messages, tools, options),
|
|
202
|
+
streamChat: (messages, tools, options) => llm.streamChat(messages, tools, options),
|
|
203
|
+
healthCheck: llm.healthCheck?.bind(llm),
|
|
204
|
+
getModels: llm.getModels?.bind(llm),
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
/** Capture usage at a non-streaming role or worker call boundary. */
|
|
208
|
+
export async function chatWithUsage(llm, component, messages, tools, options) {
|
|
209
|
+
const result = await chatResultWithUsage(llm, component, messages, tools, options);
|
|
210
|
+
if (!result.ok)
|
|
211
|
+
throw result.error;
|
|
212
|
+
return { ...result.value, usage: result.value.usage, model: llm.model };
|
|
213
|
+
}
|
|
214
|
+
//# sourceMappingURL=llm-call-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-call-usage.js","sourceRoot":"","sources":["../../src/logger/llm-call-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { IRequestLogger } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
/** Binds legacy pipelines that read their logger from initialize() to each worker run. */
|
|
3
|
+
export declare function pipelineRequestLogger(configured: IRequestLogger): IRequestLogger;
|
|
4
|
+
export declare function withPipelineRequestLogger<T>(configured: IRequestLogger | undefined, scoped: IRequestLogger | undefined, execute: () => T): T;
|
|
5
|
+
//# sourceMappingURL=pipeline-request-logger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pipeline-request-logger.d.ts","sourceRoot":"","sources":["../../src/logger/pipeline-request-logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAO9D,0FAA0F;AAC1F,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,cAAc,GACzB,cAAc,CAwBhB;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EACzC,UAAU,EAAE,cAAc,GAAG,SAAS,EACtC,MAAM,EAAE,cAAc,GAAG,SAAS,EAClC,OAAO,EAAE,MAAM,CAAC,GACf,CAAC,CAIH"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
2
|
+
const pipelineRequest = new AsyncLocalStorage();
|
|
3
|
+
/** Binds legacy pipelines that read their logger from initialize() to each worker run. */
|
|
4
|
+
export function pipelineRequestLogger(configured) {
|
|
5
|
+
const activeLogger = () => {
|
|
6
|
+
const scope = pipelineRequest.getStore();
|
|
7
|
+
return scope?.configured === configured ? scope.scoped : configured;
|
|
8
|
+
};
|
|
9
|
+
return {
|
|
10
|
+
logLlmCall: (entry) => activeLogger().logLlmCall(entry),
|
|
11
|
+
logRagQuery: (entry) => activeLogger().logRagQuery(entry),
|
|
12
|
+
logToolCall: (entry) => activeLogger().logToolCall(entry),
|
|
13
|
+
// The agent owns the scoped logger's lifecycle.
|
|
14
|
+
startRequest: (requestId) => {
|
|
15
|
+
if (activeLogger() === configured)
|
|
16
|
+
configured.startRequest(requestId);
|
|
17
|
+
},
|
|
18
|
+
endRequest: (requestId) => {
|
|
19
|
+
if (activeLogger() === configured)
|
|
20
|
+
configured.endRequest(requestId);
|
|
21
|
+
},
|
|
22
|
+
dropRequest: (requestId) => {
|
|
23
|
+
if (activeLogger() === configured)
|
|
24
|
+
configured.dropRequest(requestId);
|
|
25
|
+
},
|
|
26
|
+
getSummary: (requestId) => activeLogger().getSummary(requestId),
|
|
27
|
+
reset: () => {
|
|
28
|
+
if (activeLogger() === configured)
|
|
29
|
+
configured.reset();
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
export function withPipelineRequestLogger(configured, scoped, execute) {
|
|
34
|
+
return configured && scoped
|
|
35
|
+
? pipelineRequest.run({ configured, scoped }, execute)
|
|
36
|
+
: execute();
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=pipeline-request-logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pipeline-request-logger.js","sourceRoot":"","sources":["../../src/logger/pipeline-request-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAGzC,CAAC;AAEL,0FAA0F;AAC1F,MAAM,UAAU,qBAAqB,CACnC,UAA0B;IAE1B,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QACzC,OAAO,KAAK,EAAE,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;IACtE,CAAC,CAAC;IACF,OAAO;QACL,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;QACvD,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC;QACzD,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC;QACzD,gDAAgD;QAChD,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE;YAC1B,IAAI,YAAY,EAAE,KAAK,UAAU;gBAAE,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACxE,CAAC;QACD,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE;YACxB,IAAI,YAAY,EAAE,KAAK,UAAU;gBAAE,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACtE,CAAC;QACD,WAAW,EAAE,CAAC,SAAS,EAAE,EAAE;YACzB,IAAI,YAAY,EAAE,KAAK,UAAU;gBAAE,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACvE,CAAC;QACD,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;QAC/D,KAAK,EAAE,GAAG,EAAE;YACV,IAAI,YAAY,EAAE,KAAK,UAAU;gBAAE,UAAU,CAAC,KAAK,EAAE,CAAC;QACxD,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,UAAsC,EACtC,MAAkC,EAClC,OAAgB;IAEhB,OAAO,UAAU,IAAI,MAAM;QACzB,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC;QACtD,CAAC,CAAC,OAAO,EAAE,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { IRequestLogger, LlmCallEntry, LlmCallRecord } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
/** Follow a dispatch through awaits, including workers that close over the shared logger. */
|
|
3
|
+
export declare function observeRequestCalls<T>(loggers: ReadonlySet<IRequestLogger>, requestId: string | undefined, calls: Map<string, LlmCallRecord>, run: () => Promise<T>): Promise<T>;
|
|
4
|
+
export declare function identifyRequestCall(logger: IRequestLogger, entry: LlmCallEntry): LlmCallEntry;
|
|
5
|
+
//# sourceMappingURL=request-call-scope.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-call-scope.d.ts","sourceRoot":"","sources":["../../src/logger/request-call-scope.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACd,MAAM,yBAAyB,CAAC;AAajC,6FAA6F;AAC7F,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,EACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACjC,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACpB,OAAO,CAAC,CAAC,CAAC,CAUZ;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,YAAY,GAClB,YAAY,CAmBd"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
3
|
+
const requestCalls = new AsyncLocalStorage();
|
|
4
|
+
/** Follow a dispatch through awaits, including workers that close over the shared logger. */
|
|
5
|
+
export async function observeRequestCalls(loggers, requestId, calls, run) {
|
|
6
|
+
const scope = {
|
|
7
|
+
capture: { loggers, requestId, calls },
|
|
8
|
+
parent: requestCalls.getStore(),
|
|
9
|
+
};
|
|
10
|
+
try {
|
|
11
|
+
return await requestCalls.run(scope, run);
|
|
12
|
+
}
|
|
13
|
+
finally {
|
|
14
|
+
scope.capture = undefined;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export function identifyRequestCall(logger, entry) {
|
|
18
|
+
if (entry.scope === 'initialization')
|
|
19
|
+
return entry;
|
|
20
|
+
let record;
|
|
21
|
+
for (let scope = requestCalls.getStore(); scope; scope = scope.parent) {
|
|
22
|
+
const capture = scope.capture;
|
|
23
|
+
if (!capture?.loggers.has(logger) ||
|
|
24
|
+
(entry.requestId !== undefined && entry.requestId !== capture.requestId))
|
|
25
|
+
continue;
|
|
26
|
+
record ??= {
|
|
27
|
+
...entry,
|
|
28
|
+
callId: entry.callId ?? randomUUID(),
|
|
29
|
+
requestId: entry.requestId ?? capture.requestId,
|
|
30
|
+
};
|
|
31
|
+
if (!capture.calls.has(record.callId))
|
|
32
|
+
capture.calls.set(record.callId, record);
|
|
33
|
+
}
|
|
34
|
+
return record ?? entry;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=request-call-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-call-scope.js","sourceRoot":"","sources":["../../src/logger/request-call-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAgBzC,MAAM,YAAY,GAAG,IAAI,iBAAiB,EAAoB,CAAC;AAE/D,6FAA6F;AAC7F,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAoC,EACpC,SAA6B,EAC7B,KAAiC,EACjC,GAAqB;IAErB,MAAM,KAAK,GAAqB;QAC9B,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;QACtC,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;KAChC,CAAC;IACF,IAAI,CAAC;QACH,OAAO,MAAM,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;YAAS,CAAC;QACT,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAsB,EACtB,KAAmB;IAEnB,IAAI,KAAK,CAAC,KAAK,KAAK,gBAAgB;QAAE,OAAO,KAAK,CAAC;IACnD,IAAI,MAAiC,CAAC;IACtC,KAAK,IAAI,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,IACE,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;YAC7B,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC;YAExE,SAAS;QACX,MAAM,KAAK;YACT,GAAG,KAAK;YACR,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,UAAU,EAAE;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS;SAChD,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,IAAI,KAAK,CAAC;AACzB,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import type { IRequestLogger, LlmCallEntry, LlmUsage, RagQueryEntry, RequestSummary, ToolCallEntry } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
interface Bucket {
|
|
3
3
|
llm: LlmCallEntry[];
|
|
4
|
+
callIds: Set<string>;
|
|
4
5
|
rag: number;
|
|
5
6
|
tool: number;
|
|
6
7
|
}
|
|
7
8
|
/** Shared aggregation (DRY with DefaultRequestLogger.getSummary). */
|
|
8
|
-
export declare function aggregate(b: Bucket): RequestSummary;
|
|
9
|
+
export declare function aggregate(b: Omit<Bucket, 'callIds'>): RequestSummary;
|
|
9
10
|
/** Sum a summary's components into a flat usage triple for response.usage. */
|
|
10
11
|
export declare function summaryToUsage(s: RequestSummary): LlmUsage;
|
|
11
12
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-request-logger.d.ts","sourceRoot":"","sources":["../../src/logger/session-request-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-request-logger.d.ts","sourceRoot":"","sources":["../../src/logger/session-request-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAC;AAKjC,UAAU,MAAM;IACd,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAcD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,cAAc,CA+DpE;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,CAAC,EAAE,cAAc,GAAG,QAAQ,CAY1D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IACpD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IAEnD,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAMtC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAUpC,4EAA4E;IAC5E,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAMrC,UAAU,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAMrC,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKhE,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKhE,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,cAAc;IAM9C,KAAK,IAAI,IAAI;IASb;qEACiE;IACjE,OAAO,CAAC,QAAQ;CAQjB"}
|
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
import { addCacheTokenUsage } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { CATEGORY_MAP } from './default-request-logger.js';
|
|
3
|
+
import { identifyRequestCall } from './request-call-scope.js';
|
|
3
4
|
function emptyBucket() {
|
|
4
|
-
return { llm: [], rag: 0, tool: 0 };
|
|
5
|
+
return { llm: [], callIds: new Set(), rag: 0, tool: 0 };
|
|
6
|
+
}
|
|
7
|
+
function recordCall(bucket, entry) {
|
|
8
|
+
if (entry.callId !== undefined) {
|
|
9
|
+
if (bucket.callIds.has(entry.callId))
|
|
10
|
+
return;
|
|
11
|
+
bucket.callIds.add(entry.callId);
|
|
12
|
+
}
|
|
13
|
+
bucket.llm.push(entry);
|
|
5
14
|
}
|
|
6
15
|
/** Shared aggregation (DRY with DefaultRequestLogger.getSummary). */
|
|
7
16
|
export function aggregate(b) {
|
|
@@ -23,14 +32,14 @@ export function aggregate(b) {
|
|
|
23
32
|
m.promptTokens += c.promptTokens;
|
|
24
33
|
m.completionTokens += c.completionTokens;
|
|
25
34
|
m.totalTokens += c.totalTokens;
|
|
26
|
-
m.requests
|
|
35
|
+
m.requests += c.requests ?? 1;
|
|
27
36
|
byComponent[c.component] ??= zeroBucket();
|
|
28
37
|
const comp = byComponent[c.component];
|
|
29
38
|
Object.assign(comp, addCacheTokenUsage(comp, c));
|
|
30
39
|
comp.promptTokens += c.promptTokens;
|
|
31
40
|
comp.completionTokens += c.completionTokens;
|
|
32
41
|
comp.totalTokens += c.totalTokens;
|
|
33
|
-
comp.requests
|
|
42
|
+
comp.requests += c.requests ?? 1;
|
|
34
43
|
// Use the component-keyed CATEGORY_MAP — same semantics as
|
|
35
44
|
// DefaultRequestLogger.getSummary (review MEDIUM #4). Previously this
|
|
36
45
|
// categorized via `c.scope ?? 'request'`, which dropped most aux calls
|
|
@@ -45,7 +54,7 @@ export function aggregate(b) {
|
|
|
45
54
|
cat.promptTokens += c.promptTokens;
|
|
46
55
|
cat.completionTokens += c.completionTokens;
|
|
47
56
|
cat.totalTokens += c.totalTokens;
|
|
48
|
-
cat.requests
|
|
57
|
+
cat.requests += c.requests ?? 1;
|
|
49
58
|
}
|
|
50
59
|
// Derive totals as the faithful sum of byComponent so that /v1/usage always
|
|
51
60
|
// has a non-null rollup regardless of which path (DAG/Stepper/flat) was used.
|
|
@@ -130,9 +139,10 @@ export class SessionRequestLogger {
|
|
|
130
139
|
this.depth.delete(requestId);
|
|
131
140
|
}
|
|
132
141
|
logLlmCall(entry) {
|
|
133
|
-
this
|
|
142
|
+
entry = identifyRequestCall(this, entry);
|
|
143
|
+
recordCall(this.cumulative, entry);
|
|
134
144
|
if (entry.requestId)
|
|
135
|
-
this.deltaFor(entry.requestId)
|
|
145
|
+
recordCall(this.deltaFor(entry.requestId), entry);
|
|
136
146
|
}
|
|
137
147
|
logRagQuery(entry) {
|
|
138
148
|
this.cumulative.rag++;
|
|
@@ -151,6 +161,7 @@ export class SessionRequestLogger {
|
|
|
151
161
|
}
|
|
152
162
|
reset() {
|
|
153
163
|
this.cumulative.llm.length = 0;
|
|
164
|
+
this.cumulative.callIds.clear();
|
|
154
165
|
this.cumulative.rag = 0;
|
|
155
166
|
this.cumulative.tool = 0;
|
|
156
167
|
this.deltas.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-request-logger.js","sourceRoot":"","sources":["../../src/logger/session-request-logger.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"session-request-logger.js","sourceRoot":"","sources":["../../src/logger/session-request-logger.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAS9D,SAAS,WAAW;IAClB,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,UAAU,CAAC,MAAc,EAAE,KAAmB;IACrD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO;QAC7C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,SAAS,CAAC,CAA0B;IAClD,MAAM,OAAO,GAA8B,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAkC,EAAE,CAAC;IACtD,MAAM,UAAU,GAAiC,EAAE,CAAC;IACpD,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC;QACxB,YAAY,EAAE,CAAC;QACf,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,CAAC;QACd,QAAQ,EAAE,CAAC;KACZ,CAAC,CAAC;IACH,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;QACtB,eAAe,IAAI,CAAC,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,UAAU,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC;QACjC,CAAC,CAAC,gBAAgB,IAAI,CAAC,CAAC,gBAAgB,CAAC;QACzC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC;QAC/B,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC;QAC9B,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,UAAU,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC;QACpC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,gBAAgB,CAAC;QAC5C,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC;QAClC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC;QACjC,2DAA2D;QAC3D,sEAAsE;QACtE,uEAAuE;QACvE,oEAAoE;QACpE,gDAAgD;QAChD,MAAM,MAAM,GACV,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS;YAClD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC;QAC/C,UAAU,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,GAAG,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC;QACnC,GAAG,CAAC,gBAAgB,IAAI,CAAC,CAAC,gBAAgB,CAAC;QAC3C,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC;QACjC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,4EAA4E;IAC5E,8EAA8E;IAC9E,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QACxD,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;QACzC,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC;QACjD,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;QACvC,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;IACnC,CAAC;IACD,OAAO;QACL,MAAM;QACN,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,CAAC,CAAC,GAAG;QACjB,SAAS,EAAE,CAAC,CAAC,IAAI;QACjB,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,cAAc,CAAC,CAAiB;IAC9C,IAAI,KAAK,GAA0C,EAAE,CAAC;IACtD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,KAAK,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC;QAC/B,gBAAgB,IAAI,CAAC,CAAC,gBAAgB,CAAC;QACvC,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC;IAC/B,CAAC;IACD,OAAO,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,oBAAoB;IACd,UAAU,GAAG,WAAW,EAAE,CAAC;IAC3B,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACnC,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEnD,YAAY,CAAC,SAAkB;QAC7B,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,UAAU,CAAC,SAAkB;QAC3B,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO;QAC5B,IAAI,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;;YACpC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,0EAA0E;QAC1E,8CAA8C;IAChD,CAAC;IAED,4EAA4E;IAC5E,WAAW,CAAC,SAAkB;QAC5B,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAED,UAAU,CAAC,KAAmB;QAC5B,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,SAAS;YAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IACzE,CAAC;IAED,WAAW,CAAC,KAA6C;QACvD,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,SAAS;YAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;IAC5D,CAAC;IAED,WAAW,CAAC,KAA6C;QACvD,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,KAAK,CAAC,SAAS;YAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,CAAC;IAED,UAAU,CAAC,SAAkB;QAC3B,IAAI,SAAS;YACX,OAAO,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;QAChE,OAAO,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAED;qEACiE;IACzD,QAAQ,CAAC,SAAiB;QAChC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,CAAC,GAAG,WAAW,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;CACF"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { type IRequestLogger, type LlmCallRecord, type LlmComponent, type LlmUsage, type LlmUsageAttribution } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
/** A stream attempt owns its id until a retry reset closes the attempt. */
|
|
3
|
+
export declare class StreamAttemptUsage {
|
|
4
|
+
private callId;
|
|
5
|
+
private usage?;
|
|
6
|
+
private readonly usageCalls;
|
|
7
|
+
private model?;
|
|
8
|
+
private awaitingRetry;
|
|
9
|
+
private startedAt;
|
|
10
|
+
add(usage: LlmUsage | undefined, model: string | undefined, usageCalls?: readonly LlmCallRecord[]): void;
|
|
11
|
+
reset(): void;
|
|
12
|
+
resolve(fallbackModel: string | undefined, reported?: LlmUsageAttribution): LlmUsageAttribution;
|
|
13
|
+
records(component: LlmComponent, fallbackModel: string | undefined, reported?: LlmUsageAttribution, signal?: AbortSignal, countEmpty?: boolean): readonly LlmCallRecord[];
|
|
14
|
+
}
|
|
15
|
+
/** A provider may throw instead of yielding an error result. */
|
|
16
|
+
export declare function recordThrownLlmUsage<T>(run: () => AsyncIterable<T>, record: (attribution: LlmUsageAttribution) => readonly LlmCallRecord[]): AsyncIterable<T>;
|
|
17
|
+
export declare function logToolLoopAttempt(logger: IRequestLogger, calls: readonly LlmCallRecord[], requestId: string | undefined, onUsage?: (usage: LlmUsage) => void): void;
|
|
18
|
+
//# sourceMappingURL=stream-attempt-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-attempt-usage.d.ts","sourceRoot":"","sources":["../../src/logger/stream-attempt-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACzB,MAAM,yBAAyB,CAAC;AAOjC,2EAA2E;AAC3E,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,KAAK,CAAC,CAAW;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAc;IAE/B,GAAG,CACD,KAAK,EAAE,QAAQ,GAAG,SAAS,EAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,aAAa,EAAE,GACpC,IAAI;IAUP,KAAK,IAAI,IAAI;IASb,OAAO,CACL,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,QAAQ,CAAC,EAAE,mBAAmB,GAC7B,mBAAmB;IAYtB,OAAO,CACL,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,QAAQ,CAAC,EAAE,mBAAmB,EAC9B,MAAM,CAAC,EAAE,WAAW,EACpB,UAAU,UAAO,GAChB,SAAS,aAAa,EAAE;CAmB5B;AAED,gEAAgE;AAChE,wBAAuB,oBAAoB,CAAC,CAAC,EAC3C,GAAG,EAAE,MAAM,aAAa,CAAC,CAAC,CAAC,EAC3B,MAAM,EAAE,CAAC,WAAW,EAAE,mBAAmB,KAAK,SAAS,aAAa,EAAE,GACrE,aAAa,CAAC,CAAC,CAAC,CAMlB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,SAAS,aAAa,EAAE,EAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAClC,IAAI,CAKN"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { addTokenUsage, } from '@mcp-abap-adt/llm-agent';
|
|
3
|
+
import { errorUsage, usageCallRecords, withUsageCalls, } from './llm-call-usage.js';
|
|
4
|
+
/** A stream attempt owns its id until a retry reset closes the attempt. */
|
|
5
|
+
export class StreamAttemptUsage {
|
|
6
|
+
callId = randomUUID();
|
|
7
|
+
usage;
|
|
8
|
+
usageCalls = new Map();
|
|
9
|
+
model;
|
|
10
|
+
awaitingRetry = false;
|
|
11
|
+
startedAt = Date.now();
|
|
12
|
+
add(usage, model, usageCalls) {
|
|
13
|
+
for (const call of usageCalls ?? []) {
|
|
14
|
+
if (!this.usageCalls.has(call.callId))
|
|
15
|
+
this.usageCalls.set(call.callId, call);
|
|
16
|
+
}
|
|
17
|
+
this.awaitingRetry = false;
|
|
18
|
+
if (usage || !this.usage)
|
|
19
|
+
this.model = model ?? this.model;
|
|
20
|
+
if (usage)
|
|
21
|
+
this.usage = addTokenUsage(this.usage, usage);
|
|
22
|
+
}
|
|
23
|
+
reset() {
|
|
24
|
+
this.callId = randomUUID();
|
|
25
|
+
this.usage = undefined;
|
|
26
|
+
this.usageCalls.clear();
|
|
27
|
+
this.model = undefined;
|
|
28
|
+
this.awaitingRetry = true;
|
|
29
|
+
this.startedAt = Date.now();
|
|
30
|
+
}
|
|
31
|
+
resolve(fallbackModel, reported) {
|
|
32
|
+
// Retry/error metadata describes the whole attempt, including streamed usage.
|
|
33
|
+
return {
|
|
34
|
+
usageCalls: reported?.usageCalls ??
|
|
35
|
+
(this.usageCalls.size > 0 ? [...this.usageCalls.values()] : undefined),
|
|
36
|
+
usageByModel: reported?.usageByModel,
|
|
37
|
+
usage: reported?.usage ?? this.usage,
|
|
38
|
+
model: reported?.model ?? this.model ?? fallbackModel,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
records(component, fallbackModel, reported, signal, countEmpty = true) {
|
|
42
|
+
if (this.awaitingRetry &&
|
|
43
|
+
signal?.aborted &&
|
|
44
|
+
!reported?.usage &&
|
|
45
|
+
!reported?.usageByModel &&
|
|
46
|
+
!reported?.usageCalls &&
|
|
47
|
+
!reported?.model) {
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
return usageCallRecords(this.resolve(fallbackModel, reported), component, Date.now() - this.startedAt, this.callId, countEmpty);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
/** A provider may throw instead of yielding an error result. */
|
|
54
|
+
export async function* recordThrownLlmUsage(run, record) {
|
|
55
|
+
try {
|
|
56
|
+
yield* run();
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
throw withUsageCalls(error, record(errorUsage(error)));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
export function logToolLoopAttempt(logger, calls, requestId, onUsage) {
|
|
63
|
+
for (const call of calls) {
|
|
64
|
+
logger.logLlmCall({ ...call, requestId });
|
|
65
|
+
onUsage?.(call);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=stream-attempt-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-attempt-usage.js","sourceRoot":"","sources":["../../src/logger/stream-attempt-usage.ts"],"names":[],"mappings":"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"}
|