@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,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ClarifySignal, NeedInfoSignal, terminalRunError, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { OrchestratorError } from '../../agent.js';
|
|
3
3
|
import { PassthroughFinalizer } from '../../coordinator/dag/passthrough-finalizer.js';
|
|
4
4
|
import { AbortErrorStrategy } from '../../coordinator/index.js';
|
|
5
|
+
import { withUsageCalls } from '../../logger/llm-call-usage.js';
|
|
5
6
|
import { summaryToUsage } from '../../logger/session-request-logger.js';
|
|
7
|
+
import { logRoleUsage } from './role-usage.js';
|
|
8
|
+
import { meterWorkers } from './worker-usage.js';
|
|
6
9
|
/** Canonical terminal-usage object: flat triple + per-model breakdown. */
|
|
7
10
|
export function terminalUsage(ctx, traceId) {
|
|
8
11
|
if (!traceId)
|
|
@@ -59,36 +62,18 @@ export class DagCoordinatorHandler {
|
|
|
59
62
|
// delta AND in the session-cumulative buckets (categorized as
|
|
60
63
|
// 'auxiliary' via CATEGORY_MAP). Non-LLM strategies omit `usage`, so
|
|
61
64
|
// this is a no-op for them.
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
return;
|
|
65
|
-
ctx.requestLogger.logLlmCall({
|
|
66
|
-
component,
|
|
67
|
-
model: model ?? 'unknown',
|
|
68
|
-
...addCacheTokenUsage(undefined, usage),
|
|
69
|
-
promptTokens: usage.promptTokens,
|
|
70
|
-
completionTokens: usage.completionTokens,
|
|
71
|
-
totalTokens: usage.totalTokens,
|
|
72
|
-
durationMs,
|
|
73
|
-
requestId: ctx.options?.trace?.traceId,
|
|
74
|
-
});
|
|
75
|
-
};
|
|
76
|
-
// Generic role runner. Owns logging for BOTH happy path AND signal paths
|
|
77
|
-
// (HIGH finding: a role that throws ClarifySignal/NeedInfoSignal still
|
|
78
|
-
// consumed LLM tokens — discarding them was invisible spend). Per-role
|
|
79
|
-
// adapters set `signal.usage` on the signal before throwing; `runRole`
|
|
80
|
-
// reads it here and routes it through the same `logRoleUsage`.
|
|
81
|
-
const runRole = async (component, model, thunk) => {
|
|
65
|
+
// The role runner also logs usage attached to signals and failures.
|
|
66
|
+
const runRole = async (component, role, thunk) => {
|
|
82
67
|
for (;;) {
|
|
83
68
|
const start = Date.now();
|
|
84
69
|
try {
|
|
85
70
|
const value = await thunk();
|
|
86
|
-
logRoleUsage(
|
|
71
|
+
logRoleUsage(ctx, component, value, role?.model, Date.now() - start);
|
|
87
72
|
return { value };
|
|
88
73
|
}
|
|
89
74
|
catch (err) {
|
|
90
75
|
if (err instanceof ClarifySignal) {
|
|
91
|
-
logRoleUsage(
|
|
76
|
+
logRoleUsage(ctx, component, err, role?.model, Date.now() - start);
|
|
92
77
|
ctx.options?.sessionLogger?.logStep('coordinator_clarify', {
|
|
93
78
|
question: err.question,
|
|
94
79
|
});
|
|
@@ -117,24 +102,31 @@ export class DagCoordinatorHandler {
|
|
|
117
102
|
return { ended: true };
|
|
118
103
|
}
|
|
119
104
|
if (err instanceof NeedInfoSignal) {
|
|
120
|
-
logRoleUsage(
|
|
105
|
+
logRoleUsage(ctx, component, err, role?.model, Date.now() - start);
|
|
121
106
|
if (!this.deps.stateOracle) {
|
|
122
107
|
throw new OrchestratorError(`coordinator: role requested info but no stateOracle is configured: ${err.query}`, 'COORDINATOR_NEEDINFO_UNRESOLVED');
|
|
123
108
|
}
|
|
124
109
|
if (++roundTrips > maxRoundTrips) {
|
|
125
110
|
throw new OrchestratorError('coordinator: round-trip budget exhausted', 'COORDINATOR_BUDGET_EXHAUSTED');
|
|
126
111
|
}
|
|
112
|
+
const oracle = this.deps.stateOracle;
|
|
127
113
|
const oracleStart = Date.now();
|
|
128
|
-
const ans = await
|
|
114
|
+
const ans = await oracle
|
|
115
|
+
.query({
|
|
129
116
|
query: err.query,
|
|
130
117
|
sessionId: ctx.sessionId,
|
|
131
|
-
caller
|
|
118
|
+
caller,
|
|
132
119
|
usage: ctx.options?.usage,
|
|
133
120
|
signal: ctx.options?.signal,
|
|
134
121
|
trace: ctx.options?.trace,
|
|
122
|
+
requestLogger: ctx.requestLogger,
|
|
135
123
|
sessionLogger: ctx.options?.sessionLogger,
|
|
124
|
+
})
|
|
125
|
+
.catch((error) => {
|
|
126
|
+
const calls = logRoleUsage(ctx, 'oracle', error, oracle.model, Date.now() - oracleStart);
|
|
127
|
+
throw withUsageCalls(error, calls);
|
|
136
128
|
});
|
|
137
|
-
logRoleUsage('oracle',
|
|
129
|
+
logRoleUsage(ctx, 'oracle', ans, oracle.model, Date.now() - oracleStart);
|
|
138
130
|
ancestorContext.oracleObservations.push({
|
|
139
131
|
query: err.query,
|
|
140
132
|
answer: ans.answer,
|
|
@@ -147,18 +139,16 @@ export class DagCoordinatorHandler {
|
|
|
147
139
|
// Bill it here before rethrowing so the failed call is still visible
|
|
148
140
|
// in /v1/usage and the per-request delta (otherwise: real spend,
|
|
149
141
|
// invisible).
|
|
150
|
-
const
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
}
|
|
154
|
-
throw err;
|
|
142
|
+
const failure = err;
|
|
143
|
+
const calls = logRoleUsage(ctx, component, failure, role?.model, Date.now() - start);
|
|
144
|
+
throw withUsageCalls(err, calls);
|
|
155
145
|
}
|
|
156
146
|
}
|
|
157
147
|
};
|
|
158
148
|
let planRes;
|
|
159
|
-
const
|
|
149
|
+
const workers = meterWorkers(this.deps.workers, ctx);
|
|
160
150
|
try {
|
|
161
|
-
planRes = await runRole('planner',
|
|
151
|
+
planRes = await runRole('planner', this.deps.planner, () => this.deps.planner.plan({
|
|
162
152
|
prompt: ctx.inputText,
|
|
163
153
|
agents,
|
|
164
154
|
ancestorContext,
|
|
@@ -188,9 +178,8 @@ export class DagCoordinatorHandler {
|
|
|
188
178
|
const reviewer = this.deps.reviewer;
|
|
189
179
|
if (reviewer) {
|
|
190
180
|
let gate;
|
|
191
|
-
const reviewerModel = reviewer.model;
|
|
192
181
|
try {
|
|
193
|
-
gate = await runRole('reviewer',
|
|
182
|
+
gate = await runRole('reviewer', reviewer, () => reviewer.review({
|
|
194
183
|
prompt: ctx.inputText,
|
|
195
184
|
plan,
|
|
196
185
|
agents,
|
|
@@ -217,7 +206,7 @@ export class DagCoordinatorHandler {
|
|
|
217
206
|
return true;
|
|
218
207
|
const verdict = gate.value.verdict;
|
|
219
208
|
if (!verdict.pass) {
|
|
220
|
-
const replanned = await runRole('planner',
|
|
209
|
+
const replanned = await runRole('planner', this.deps.planner, () => this.deps.planner.plan({
|
|
221
210
|
prompt: ctx.inputText,
|
|
222
211
|
agents,
|
|
223
212
|
ancestorContext,
|
|
@@ -283,13 +272,20 @@ export class DagCoordinatorHandler {
|
|
|
283
272
|
if (chunk.kind === 'content') {
|
|
284
273
|
ctx.yield({ ok: true, value: { content: chunk.delta } });
|
|
285
274
|
}
|
|
275
|
+
else if (chunk.kind === 'iteration-end' &&
|
|
276
|
+
chunk.outcome === 'retry') {
|
|
277
|
+
ctx.yield({
|
|
278
|
+
ok: true,
|
|
279
|
+
value: { content: '', iterationEnd: 'retry' },
|
|
280
|
+
});
|
|
281
|
+
}
|
|
286
282
|
ctx.options?.sessionLogger?.logStep('dag_stream', chunk);
|
|
287
283
|
};
|
|
288
284
|
let result;
|
|
289
285
|
try {
|
|
290
286
|
result = await this.deps.interpreter.interpret(plan, {
|
|
291
287
|
inputText: ctx.inputText,
|
|
292
|
-
workers
|
|
288
|
+
workers,
|
|
293
289
|
sessionId: ctx.sessionId,
|
|
294
290
|
caller: caller,
|
|
295
291
|
usage: ctx.options?.usage,
|
|
@@ -363,7 +359,7 @@ export class DagCoordinatorHandler {
|
|
|
363
359
|
goal: nodeIndex.get(id)?.goal ?? '',
|
|
364
360
|
output: result.nodeResults[id]?.output ?? '',
|
|
365
361
|
}));
|
|
366
|
-
const finalRes = await runRole('finalizer', this.finalizer
|
|
362
|
+
const finalRes = await runRole('finalizer', this.finalizer, () => this.finalizer.finalize({
|
|
367
363
|
prompt: ctx.inputText,
|
|
368
364
|
objective: executedPlan.objective ?? ctx.inputText,
|
|
369
365
|
ancestorContext,
|
|
@@ -407,7 +403,7 @@ export class DagCoordinatorHandler {
|
|
|
407
403
|
.map((n) => result.nodeResults[n.id])
|
|
408
404
|
.filter((r) => Boolean(r));
|
|
409
405
|
const failedId = result.failedNodeId ?? execPlan.nodes[0]?.id ?? '';
|
|
410
|
-
const recovery = await runRole('reviewer', reviewer
|
|
406
|
+
const recovery = await runRole('reviewer', reviewer, () => reviewExecutionFailure({
|
|
411
407
|
objective: execPlan.objective,
|
|
412
408
|
plan: execPlan,
|
|
413
409
|
trace,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dag-coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dag-coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pass-through.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,IAAI,EACJ,cAAc,EACd,cAAc,EACd,OAAO,
|
|
1
|
+
{"version":3,"file":"pass-through.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,IAAI,EACJ,cAAc,EACd,cAAc,EACd,OAAO,EAEP,OAAO,EACP,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EAEjB,KAAK,SAAS,EAGf,MAAM,yBAAyB,CAAC;AAQjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAEL,0BAA0B,EAC3B,MAAM,+CAA+C,CAAC;AAGvD,wBAAuB,cAAc,CACnC,GAAG,EAAE,IAAI,EACT,aAAa,EAAE,cAAc,EAC7B,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,OAAO,EAAE,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,SAAS,CAAC,EAAE,SAAS,EACrB,kBAAkB,GAAE,0BAA6D,EACjF,QAAQ,GAAE,gBAAwC,GACjD,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CA6L1D"}
|
|
@@ -1,42 +1,29 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { OrchestratorError, scopedUsage, toModelToolMessages, toToolCallDelta, } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
import { withUsageCalls } from '../../logger/llm-call-usage.js';
|
|
2
3
|
import { summaryToUsage } from '../../logger/session-request-logger.js';
|
|
4
|
+
import { logToolLoopAttempt, recordThrownLlmUsage, StreamAttemptUsage, } from '../../logger/stream-attempt-usage.js';
|
|
3
5
|
import { createPendingToolCallsEntry, PendingToolResultsRegistry, } from '../../policy/pending-tool-results-registry.js';
|
|
4
6
|
import { ToolResponseRound } from './tool-response-round.js';
|
|
5
7
|
export async function* runPassThrough(llm, requestLogger, messages, externalTools, opts, toolTrust, pendingToolResults = new PendingToolResultsRegistry(), identity = { kind: 'anonymous' }) {
|
|
6
8
|
for (;;) {
|
|
7
|
-
const passStart = Date.now();
|
|
8
9
|
const traceId2 = opts?.trace?.traceId;
|
|
9
10
|
opts?.sessionLogger?.logStep('llm_request_pass', { messages, tools: externalTools ?? [] }, 'llm');
|
|
10
|
-
const stream = llm.streamChat(toModelToolMessages(messages, toolTrust), externalTools, {
|
|
11
|
+
const stream = () => llm.streamChat(toModelToolMessages(messages, toolTrust), externalTools, {
|
|
11
12
|
...opts,
|
|
12
13
|
usage: scopedUsage(opts?.usage, { component: 'tool-loop' }),
|
|
14
|
+
includeStreamRetryUsage: true,
|
|
13
15
|
});
|
|
14
16
|
let passContent = '';
|
|
15
17
|
const calls = new Map();
|
|
16
18
|
let finishReason;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const logPassUsage = () => {
|
|
23
|
-
// Log only if a usage chunk was actually seen (mirrors
|
|
24
|
-
// LoggingLlm.streamChat) — avoids creating a zero tool-loop bucket.
|
|
25
|
-
if (!hasUsage)
|
|
26
|
-
return;
|
|
27
|
-
requestLogger.logLlmCall({
|
|
28
|
-
component: 'tool-loop',
|
|
29
|
-
model: llm.model ?? 'unknown',
|
|
30
|
-
...cache,
|
|
31
|
-
promptTokens: accPrompt,
|
|
32
|
-
completionTokens: accCompletion,
|
|
33
|
-
totalTokens: accTotal,
|
|
34
|
-
durationMs: Date.now() - passStart,
|
|
35
|
-
requestId: traceId2,
|
|
36
|
-
});
|
|
19
|
+
const attemptUsage = new StreamAttemptUsage();
|
|
20
|
+
const logAttempt = (reported, countEmpty = true) => {
|
|
21
|
+
const calls = attemptUsage.records('tool-loop', llm.model, reported, opts?.signal, countEmpty);
|
|
22
|
+
logToolLoopAttempt(requestLogger, calls, traceId2);
|
|
23
|
+
return calls;
|
|
37
24
|
};
|
|
38
25
|
let chunksSeen = 0;
|
|
39
|
-
for await (const chunk of stream) {
|
|
26
|
+
for await (const chunk of recordThrownLlmUsage(stream, (failure) => logAttempt(failure, false))) {
|
|
40
27
|
if (!chunk.ok) {
|
|
41
28
|
// process() returns on the first error chunk → post-loop code never
|
|
42
29
|
// runs. Log accumulated (partial) spend BEFORE yielding the error, and
|
|
@@ -52,17 +39,24 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
52
39
|
partialContent: passContent,
|
|
53
40
|
chunksSeen,
|
|
54
41
|
}, 'llm');
|
|
55
|
-
|
|
56
|
-
yield
|
|
42
|
+
const failure = chunk.error;
|
|
43
|
+
yield {
|
|
44
|
+
ok: false,
|
|
45
|
+
error: withUsageCalls(failure, logAttempt(failure, false)),
|
|
46
|
+
};
|
|
57
47
|
return;
|
|
58
48
|
}
|
|
59
49
|
chunksSeen += 1;
|
|
60
50
|
if (chunk.value.reset) {
|
|
51
|
+
const { retryUsage } = chunk.value;
|
|
52
|
+
logAttempt(retryUsage);
|
|
53
|
+
attemptUsage.reset();
|
|
61
54
|
passContent = '';
|
|
62
55
|
calls.clear();
|
|
63
56
|
finishReason = undefined;
|
|
64
57
|
continue;
|
|
65
58
|
}
|
|
59
|
+
attemptUsage.add(chunk.value.usage, llm.model, chunk.value.usageCalls);
|
|
66
60
|
if (chunk.value.content)
|
|
67
61
|
passContent += chunk.value.content;
|
|
68
62
|
if (chunk.value.finishReason)
|
|
@@ -78,20 +72,13 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
78
72
|
});
|
|
79
73
|
}
|
|
80
74
|
}
|
|
81
|
-
if (chunk.value.usage) {
|
|
82
|
-
cache = addCacheTokenUsage(cache, chunk.value.usage);
|
|
83
|
-
accPrompt += chunk.value.usage.promptTokens;
|
|
84
|
-
accCompletion += chunk.value.usage.completionTokens;
|
|
85
|
-
accTotal += chunk.value.usage.totalTokens;
|
|
86
|
-
hasUsage = true;
|
|
87
|
-
}
|
|
88
75
|
// Strip usage from the forwarded chunk: the single usage-bearing chunk
|
|
89
76
|
// is the terminal getSummary chunk below (one usage chunk per request).
|
|
90
77
|
// Buffer tool-call fragments until the suspension has its own returned IDs.
|
|
91
78
|
const { usage: _omitUsage, toolCalls: _omitCalls, finishReason: _omitFinish, ...rest } = chunk.value;
|
|
92
79
|
yield { ok: true, value: rest };
|
|
93
80
|
}
|
|
94
|
-
|
|
81
|
+
logAttempt();
|
|
95
82
|
const hasToolCalls = finishReason === 'tool_calls' && calls.size > 0;
|
|
96
83
|
const round = new ToolResponseRound(passContent, calls.values(), () => true);
|
|
97
84
|
const executable = hasToolCalls ? round.executableCalls() : [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pass-through.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pass-through.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { LlmCallRecord, LlmComponent, LlmUsageAttribution } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
import type { PipelineContext } from '../context.js';
|
|
3
|
+
export declare function logRoleUsage(ctx: PipelineContext, component: LlmComponent, attribution?: LlmUsageAttribution | null, fallbackModel?: string, durationMs?: number): readonly LlmCallRecord[];
|
|
4
|
+
//# sourceMappingURL=role-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"role-usage.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/role-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,eAAe,EACpB,SAAS,EAAE,YAAY,EACvB,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI,EACxC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,SAAI,GACb,SAAS,aAAa,EAAE,CAc1B"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { errorUsage, usageCallRecords } from '../../logger/llm-call-usage.js';
|
|
2
|
+
export function logRoleUsage(ctx, component, attribution, fallbackModel, durationMs = 0) {
|
|
3
|
+
if (!attribution)
|
|
4
|
+
return [];
|
|
5
|
+
const calls = usageCallRecords({ ...errorUsage(attribution), model: attribution.model ?? fallbackModel }, component, durationMs);
|
|
6
|
+
for (const call of calls) {
|
|
7
|
+
ctx.requestLogger.logLlmCall({
|
|
8
|
+
...call,
|
|
9
|
+
requestId: ctx.options?.trace?.traceId,
|
|
10
|
+
});
|
|
11
|
+
}
|
|
12
|
+
return calls;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=role-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"role-usage.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/role-usage.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAG9E,MAAM,UAAU,YAAY,CAC1B,GAAoB,EACpB,SAAuB,EACvB,WAAwC,EACxC,aAAsB,EACtB,UAAU,GAAG,CAAC;IAEd,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,gBAAgB,CAC5B,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,aAAa,EAAE,EACzE,SAAS,EACT,UAAU,CACX,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC;YAC3B,GAAG,IAAI;YACP,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO;SACvC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-loop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-loop.ts"],"names":[],"mappings":"AA+DA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAsFzD,qBAAa,eAAgB,YAAW,aAAa;IAC7C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,OAAO,CAAC;CA45BpB"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { addCacheTokenUsage, toModelToolMessages, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { normalizeLoopLimit } from '../../config/normalize-max-iterations.js';
|
|
3
3
|
import { withSubmitReport } from '../../coordinator/dialogue/submit-report-tool.js';
|
|
4
|
+
import { llmWithChatUsage, withUsageCalls, } from '../../logger/llm-call-usage.js';
|
|
5
|
+
import { logToolLoopAttempt, recordThrownLlmUsage, StreamAttemptUsage, } from '../../logger/stream-attempt-usage.js';
|
|
4
6
|
import { denyRagAccess, ownerBoundQuery } from '../../rag/owner-bound-query.js';
|
|
5
7
|
import { ToolResponseRound } from './tool-response-round.js';
|
|
6
8
|
import { buildNamespacedTools, defaultToolNamespace, mergeOfferedTools, scopedUsage, toolNameFromRecord, toToolCallDelta, } from '@mcp-abap-adt/llm-agent';
|
|
@@ -104,6 +106,13 @@ export class ToolLoopHandler {
|
|
|
104
106
|
let lastToolsAvailable;
|
|
105
107
|
let messages = ctx.assembledMessages;
|
|
106
108
|
const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0 };
|
|
109
|
+
const addUsage = (attempt) => {
|
|
110
|
+
Object.assign(usage, addCacheTokenUsage(usage, attempt));
|
|
111
|
+
usage.promptTokens += attempt.promptTokens;
|
|
112
|
+
usage.completionTokens += attempt.completionTokens;
|
|
113
|
+
usage.totalTokens += attempt.totalTokens;
|
|
114
|
+
ctx.sessionManager.addTokens(attempt.totalTokens);
|
|
115
|
+
};
|
|
107
116
|
const timingLog = [];
|
|
108
117
|
const loopStart = Date.now();
|
|
109
118
|
let currentTools = ctx.activeTools;
|
|
@@ -120,9 +129,10 @@ export class ToolLoopHandler {
|
|
|
120
129
|
toolTrust: ctx.config.toolTrust,
|
|
121
130
|
queryText: ctx.inputText,
|
|
122
131
|
}));
|
|
132
|
+
const requestId = ctx.options?.trace?.traceId;
|
|
123
133
|
const finalize = (content, finishReason) => {
|
|
124
134
|
ctx.assistantText = content;
|
|
125
|
-
const summary = ctx.requestLogger.getSummary();
|
|
135
|
+
const summary = ctx.requestLogger.getSummary(requestId);
|
|
126
136
|
ctx.options?.sessionLogger?.logStep('final_response', {
|
|
127
137
|
content,
|
|
128
138
|
usage,
|
|
@@ -139,9 +149,9 @@ export class ToolLoopHandler {
|
|
|
139
149
|
finishReason: finishReason || 'stop',
|
|
140
150
|
usage: {
|
|
141
151
|
...usage,
|
|
142
|
-
models: ctx.requestLogger.getSummary().byModel,
|
|
143
|
-
components: ctx.requestLogger.getSummary().byComponent,
|
|
144
|
-
categories: ctx.requestLogger.getSummary().byCategory,
|
|
152
|
+
models: ctx.requestLogger.getSummary(requestId).byModel,
|
|
153
|
+
components: ctx.requestLogger.getSummary(requestId).byComponent,
|
|
154
|
+
categories: ctx.requestLogger.getSummary(requestId).byCategory,
|
|
145
155
|
},
|
|
146
156
|
timing: timingLog,
|
|
147
157
|
},
|
|
@@ -178,9 +188,9 @@ export class ToolLoopHandler {
|
|
|
178
188
|
stopped: true,
|
|
179
189
|
usage: {
|
|
180
190
|
...usage,
|
|
181
|
-
models: ctx.requestLogger.getSummary().byModel,
|
|
182
|
-
components: ctx.requestLogger.getSummary().byComponent,
|
|
183
|
-
categories: ctx.requestLogger.getSummary().byCategory,
|
|
191
|
+
models: ctx.requestLogger.getSummary(requestId).byModel,
|
|
192
|
+
components: ctx.requestLogger.getSummary(requestId).byComponent,
|
|
193
|
+
categories: ctx.requestLogger.getSummary(requestId).byCategory,
|
|
184
194
|
},
|
|
185
195
|
timing: timingLog,
|
|
186
196
|
},
|
|
@@ -198,8 +208,8 @@ export class ToolLoopHandler {
|
|
|
198
208
|
finishReason: 'length',
|
|
199
209
|
usage: {
|
|
200
210
|
...usage,
|
|
201
|
-
models: ctx.requestLogger.getSummary().byModel,
|
|
202
|
-
components: ctx.requestLogger.getSummary().byComponent,
|
|
211
|
+
models: ctx.requestLogger.getSummary(requestId).byModel,
|
|
212
|
+
components: ctx.requestLogger.getSummary(requestId).byComponent,
|
|
203
213
|
},
|
|
204
214
|
timing: timingLog,
|
|
205
215
|
},
|
|
@@ -362,10 +372,6 @@ export class ToolLoopHandler {
|
|
|
362
372
|
},
|
|
363
373
|
});
|
|
364
374
|
}
|
|
365
|
-
let iterCache = {};
|
|
366
|
-
let iterPromptTokens = 0;
|
|
367
|
-
let iterCompletionTokens = 0;
|
|
368
|
-
let iterTotalTokens = 0;
|
|
369
375
|
ctx.options?.sessionLogger?.logStep(`llm_request_iter_${iteration + 1}`, {
|
|
370
376
|
messages,
|
|
371
377
|
tools: currentTools,
|
|
@@ -430,13 +436,22 @@ export class ToolLoopHandler {
|
|
|
430
436
|
ctx.metrics.llmCallCount.add();
|
|
431
437
|
const llmCallStart = Date.now();
|
|
432
438
|
// Delegate to ILlmCallStrategy — handles streaming, non-streaming, or fallback
|
|
433
|
-
const llmStream = ctx.llmCallStrategy.call(ctx.mainLlm, toModelToolMessages(messages, ctx.config.toolTrust), currentTools, {
|
|
439
|
+
const llmStream = () => ctx.llmCallStrategy.call(llmWithChatUsage(ctx.mainLlm, 'tool-loop'), toModelToolMessages(messages, ctx.config.toolTrust), currentTools, {
|
|
434
440
|
...ctx.options,
|
|
435
441
|
usage: scopedUsage(ctx.options?.usage, { component: 'tool-loop' }),
|
|
442
|
+
includeStreamRetryUsage: true,
|
|
436
443
|
});
|
|
444
|
+
const attemptUsage = new StreamAttemptUsage();
|
|
445
|
+
const logAttempt = (reported, countEmpty = true) => {
|
|
446
|
+
const calls = attemptUsage.records('tool-loop', ctx.mainLlm.model, reported, ctx.options?.signal, countEmpty);
|
|
447
|
+
logToolLoopAttempt(ctx.requestLogger, calls, requestId, addUsage);
|
|
448
|
+
return calls;
|
|
449
|
+
};
|
|
437
450
|
let chunksSeen = 0;
|
|
438
|
-
for await (const chunkResult of llmStream) {
|
|
451
|
+
for await (const chunkResult of recordThrownLlmUsage(llmStream, logAttempt)) {
|
|
439
452
|
if (!chunkResult.ok) {
|
|
453
|
+
const failure = chunkResult.error;
|
|
454
|
+
const error = withUsageCalls(failure, logAttempt(failure, false));
|
|
440
455
|
llmSpan.setStatus('error', chunkResult.error.message);
|
|
441
456
|
llmSpan.end();
|
|
442
457
|
// The failure gets a response trace too (#290). This is the case the
|
|
@@ -455,14 +470,16 @@ export class ToolLoopHandler {
|
|
|
455
470
|
finishReason,
|
|
456
471
|
chunksSeen,
|
|
457
472
|
}, 'llm');
|
|
458
|
-
ctx.error =
|
|
459
|
-
ctx.yield(
|
|
473
|
+
ctx.error = error;
|
|
474
|
+
ctx.yield({ ok: false, error });
|
|
460
475
|
return false;
|
|
461
476
|
}
|
|
462
477
|
chunksSeen += 1;
|
|
463
478
|
const chunk = chunkResult.value;
|
|
464
479
|
// Mid-stream retry or fallback reset: discard accumulated state
|
|
465
480
|
if (chunk.reset) {
|
|
481
|
+
logAttempt(chunk.retryUsage);
|
|
482
|
+
attemptUsage.reset();
|
|
466
483
|
ctx.yield({
|
|
467
484
|
ok: true,
|
|
468
485
|
value: { content: '', iterationEnd: 'retry' },
|
|
@@ -471,11 +488,9 @@ export class ToolLoopHandler {
|
|
|
471
488
|
content = '';
|
|
472
489
|
toolCallsMap.clear();
|
|
473
490
|
finishReason = undefined;
|
|
474
|
-
iterPromptTokens = 0;
|
|
475
|
-
iterCompletionTokens = 0;
|
|
476
|
-
iterTotalTokens = 0;
|
|
477
491
|
continue;
|
|
478
492
|
}
|
|
493
|
+
attemptUsage.add(chunk.usage, ctx.mainLlm.model, chunk.usageCalls);
|
|
479
494
|
if (chunk.content) {
|
|
480
495
|
content += chunk.content;
|
|
481
496
|
if (!ctx.clientAdapter && ctx.config.streamMode !== 'final') {
|
|
@@ -525,17 +540,6 @@ export class ToolLoopHandler {
|
|
|
525
540
|
}
|
|
526
541
|
if (chunk.finishReason)
|
|
527
542
|
finishReason = chunk.finishReason;
|
|
528
|
-
if (chunk.usage) {
|
|
529
|
-
Object.assign(usage, addCacheTokenUsage(usage, chunk.usage));
|
|
530
|
-
usage.promptTokens += chunk.usage.promptTokens;
|
|
531
|
-
usage.completionTokens += chunk.usage.completionTokens;
|
|
532
|
-
usage.totalTokens += chunk.usage.totalTokens;
|
|
533
|
-
iterCache = addCacheTokenUsage(iterCache, chunk.usage);
|
|
534
|
-
iterPromptTokens += chunk.usage.promptTokens;
|
|
535
|
-
iterCompletionTokens += chunk.usage.completionTokens;
|
|
536
|
-
iterTotalTokens += chunk.usage.totalTokens;
|
|
537
|
-
ctx.sessionManager.addTokens(chunk.usage.totalTokens);
|
|
538
|
-
}
|
|
539
543
|
}
|
|
540
544
|
llmSpan.setStatus('ok');
|
|
541
545
|
llmSpan.end();
|
|
@@ -545,16 +549,7 @@ export class ToolLoopHandler {
|
|
|
545
549
|
phase: `llm_call_${iteration + 1}`,
|
|
546
550
|
duration: llmCallDuration,
|
|
547
551
|
});
|
|
548
|
-
|
|
549
|
-
component: 'tool-loop',
|
|
550
|
-
model: ctx.mainLlm.model ?? 'unknown',
|
|
551
|
-
...iterCache,
|
|
552
|
-
promptTokens: iterPromptTokens,
|
|
553
|
-
completionTokens: iterCompletionTokens,
|
|
554
|
-
totalTokens: iterTotalTokens,
|
|
555
|
-
durationMs: llmCallDuration,
|
|
556
|
-
requestId: ctx.options?.trace?.traceId,
|
|
557
|
-
});
|
|
552
|
+
logAttempt();
|
|
558
553
|
const hasToolCalls = finishReason === 'tool_calls' && toolCallsMap.size > 0;
|
|
559
554
|
const responseRound = new ToolResponseRound(content, toolCallsMap.values(), (name) => externalToolNames.has(name) && !ctx.toolClientMap.has(name));
|
|
560
555
|
const toolCalls = hasToolCalls ? responseRound.executableCalls() : [];
|
|
@@ -683,8 +678,8 @@ export class ToolLoopHandler {
|
|
|
683
678
|
finishReason: 'tool_calls',
|
|
684
679
|
usage: {
|
|
685
680
|
...usage,
|
|
686
|
-
models: ctx.requestLogger.getSummary().byModel,
|
|
687
|
-
components: ctx.requestLogger.getSummary().byComponent,
|
|
681
|
+
models: ctx.requestLogger.getSummary(requestId).byModel,
|
|
682
|
+
components: ctx.requestLogger.getSummary(requestId).byComponent,
|
|
688
683
|
},
|
|
689
684
|
timing: timingLog,
|
|
690
685
|
},
|