@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,5 +1,6 @@
|
|
|
1
1
|
import { OrchestratorError, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { ContextAssembler } from '../context/context-assembler.js';
|
|
3
|
+
import { chatWithUsage } from '../logger/llm-call-usage.js';
|
|
3
4
|
/**
|
|
4
5
|
* A leaf-node subagent that performs one LLM chat call over the provided
|
|
5
6
|
* (system prompt + context + task). No RAG, no MCP, no tool-loop, no skills.
|
|
@@ -14,10 +15,12 @@ export class DirectLlmSubAgent {
|
|
|
14
15
|
description;
|
|
15
16
|
capabilities;
|
|
16
17
|
assembler;
|
|
18
|
+
component;
|
|
17
19
|
constructor(name, llm, opts) {
|
|
18
20
|
this.name = name;
|
|
19
21
|
this.llm = llm;
|
|
20
22
|
this.description = opts.description;
|
|
23
|
+
this.component = opts.component ?? 'executor';
|
|
21
24
|
this.assembler = new ContextAssembler({
|
|
22
25
|
timeZone: opts.timeZone,
|
|
23
26
|
systemPromptPreamble: [opts.workerBase, opts.systemPrompt]
|
|
@@ -28,6 +31,9 @@ export class DirectLlmSubAgent {
|
|
|
28
31
|
contextPolicy: opts.contextPolicy ?? 'required',
|
|
29
32
|
};
|
|
30
33
|
}
|
|
34
|
+
get model() {
|
|
35
|
+
return this.llm.model;
|
|
36
|
+
}
|
|
31
37
|
async run(input) {
|
|
32
38
|
if (this.capabilities.contextPolicy === 'required' &&
|
|
33
39
|
(!input.context || input.context.length === 0)) {
|
|
@@ -45,26 +51,24 @@ export class DirectLlmSubAgent {
|
|
|
45
51
|
catch {
|
|
46
52
|
// Supervision is informational: an observer must never fail the work.
|
|
47
53
|
}
|
|
48
|
-
const
|
|
54
|
+
const { content, finishReason, usage, model, usageCalls } = await chatWithUsage(this.llm, this.component, assembled.value, [], {
|
|
49
55
|
caller: input.caller,
|
|
50
56
|
usage: input.usage,
|
|
51
57
|
signal: input.signal,
|
|
52
58
|
sessionId: input.sessionId,
|
|
53
59
|
});
|
|
54
|
-
if (!res.ok) {
|
|
55
|
-
throw res.error;
|
|
56
|
-
}
|
|
57
|
-
const { content, finishReason, usage } = res.value;
|
|
58
60
|
const error = finishReason === 'length'
|
|
59
61
|
? new OrchestratorError('LLM response was truncated at a token limit.', 'LLM_OUTPUT_TRUNCATED')
|
|
60
62
|
: !content.trim()
|
|
61
63
|
? new OrchestratorError('Worker returned an empty terminal response.', 'EMPTY_WORKER_OUTPUT')
|
|
62
64
|
: undefined;
|
|
63
65
|
if (error)
|
|
64
|
-
throw Object.assign(error, { usage });
|
|
66
|
+
throw Object.assign(error, { usage, model, usageCalls });
|
|
65
67
|
return {
|
|
66
68
|
output: content,
|
|
67
69
|
usage,
|
|
70
|
+
model,
|
|
71
|
+
usageCalls,
|
|
68
72
|
};
|
|
69
73
|
}
|
|
70
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-llm-subagent.js","sourceRoot":"","sources":["../../src/subagent/direct-llm-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"direct-llm-subagent.js","sourceRoot":"","sources":["../../src/subagent/direct-llm-subagent.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,10 @@ export declare class SmartAgentSubAgent implements ISubAgent {
|
|
|
5
5
|
private readonly agent;
|
|
6
6
|
readonly description?: string;
|
|
7
7
|
readonly capabilities: SubAgentCapabilities;
|
|
8
|
-
constructor(name: string, agent: Pick<SmartAgent, 'process' | 'maxToolCalls'
|
|
8
|
+
constructor(name: string, agent: Pick<SmartAgent, 'process' | 'maxToolCalls'> & Partial<Pick<SmartAgent, 'currentMainLlm'>>, opts?: {
|
|
9
9
|
description?: string;
|
|
10
10
|
});
|
|
11
|
+
get model(): string | undefined;
|
|
11
12
|
run(input: ISubAgentInput): Promise<ISubAgentResult>;
|
|
12
13
|
}
|
|
13
14
|
//# sourceMappingURL=smart-agent-subagent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart-agent-subagent.d.ts","sourceRoot":"","sources":["../../src/subagent/smart-agent-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EAIpB,KAAK,oBAAoB,EAG1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"smart-agent-subagent.d.ts","sourceRoot":"","sources":["../../src/subagent/smart-agent-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EAIpB,KAAK,oBAAoB,EAG1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAO9C,qBAAa,kBAAmB,YAAW,SAAS;aAOhC,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,SAAgB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrC,SAAgB,YAAY,EAAE,oBAAoB,CAEhD;gBAGgB,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,cAAc,CAAC,GAClE,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,EAC7C,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IASjC,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,GAAG,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAoK3D"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { addCacheTokenUsage, hasExternalTraceGap, normalizeToolTraceEntry, OrchestratorError, ToolTraceCollector, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { resolveWorkerSummary } from '../coordinator/dialogue/submit-report-tool.js';
|
|
3
|
+
import { withUsageAttribution } from '../logger/llm-call-usage.js';
|
|
4
|
+
import { NoopRequestLogger } from '../logger/noop-request-logger.js';
|
|
5
|
+
const noopRequestLogger = new NoopRequestLogger();
|
|
3
6
|
export class SmartAgentSubAgent {
|
|
4
7
|
name;
|
|
5
8
|
agent;
|
|
@@ -16,6 +19,9 @@ export class SmartAgentSubAgent {
|
|
|
16
19
|
maxToolCalls: agent.maxToolCalls,
|
|
17
20
|
};
|
|
18
21
|
}
|
|
22
|
+
get model() {
|
|
23
|
+
return this.agent.currentMainLlm?.model;
|
|
24
|
+
}
|
|
19
25
|
async run(input) {
|
|
20
26
|
if (input.sessionId !== undefined &&
|
|
21
27
|
input.sessionId !== input.caller.sessionId)
|
|
@@ -23,6 +29,7 @@ export class SmartAgentSubAgent {
|
|
|
23
29
|
const collector = new ToolTraceCollector();
|
|
24
30
|
const assistantTexts = [];
|
|
25
31
|
let observing = true;
|
|
32
|
+
let attribution;
|
|
26
33
|
const onToolTrace = (entry) => {
|
|
27
34
|
if (!observing)
|
|
28
35
|
return;
|
|
@@ -46,6 +53,7 @@ export class SmartAgentSubAgent {
|
|
|
46
53
|
caller: input.caller,
|
|
47
54
|
userId: input.caller.userId,
|
|
48
55
|
usage: input.usage,
|
|
56
|
+
parentRequestLogger: input.requestLogger ?? noopRequestLogger,
|
|
49
57
|
signal: input.signal,
|
|
50
58
|
stopSignal: input.stopSignal,
|
|
51
59
|
dialogueTask: input.dialogueTask,
|
|
@@ -77,7 +85,7 @@ export class SmartAgentSubAgent {
|
|
|
77
85
|
if (!res.ok) {
|
|
78
86
|
throw res.error;
|
|
79
87
|
}
|
|
80
|
-
const { content, toolCalls, stopReason, usage, stopped } = res.value;
|
|
88
|
+
const { content, toolCalls, stopReason, usage, usageCalls, stopped } = res.value;
|
|
81
89
|
const finish = input.dialogueTask?.readFinish();
|
|
82
90
|
const output = finish?.output ??
|
|
83
91
|
(assistantTexts.length > 0 ? assistantTexts.join('\n\n') : content);
|
|
@@ -90,6 +98,10 @@ export class SmartAgentSubAgent {
|
|
|
90
98
|
...(usage.models ? { models: usage.models } : {}),
|
|
91
99
|
}
|
|
92
100
|
: undefined;
|
|
101
|
+
attribution = {
|
|
102
|
+
usage: mappedUsage,
|
|
103
|
+
...(usageCalls ? { usageCalls } : {}),
|
|
104
|
+
};
|
|
93
105
|
// Issue #171: when the worker tool-loop stops on a client-provided
|
|
94
106
|
// (consumer-executed) external tool call, it surfaces the call instead of
|
|
95
107
|
// executing it. Translate that stop into a typed awaiting-external result
|
|
@@ -112,7 +124,7 @@ export class SmartAgentSubAgent {
|
|
|
112
124
|
toolTrace: collector.finalize(!hasExternalTraceGap(onToolTrace)),
|
|
113
125
|
output,
|
|
114
126
|
summary: resolveWorkerSummary(output, finish?.summary).summary,
|
|
115
|
-
|
|
127
|
+
...attribution,
|
|
116
128
|
status: 'awaiting-external',
|
|
117
129
|
budgetExhausted: res.value.budgetExhausted,
|
|
118
130
|
toolCallCount: res.value.toolCallCount,
|
|
@@ -122,7 +134,7 @@ export class SmartAgentSubAgent {
|
|
|
122
134
|
}
|
|
123
135
|
}
|
|
124
136
|
if (!stopped && !(finish?.output ?? content).trim()) {
|
|
125
|
-
throw
|
|
137
|
+
throw new OrchestratorError('Worker returned an empty terminal response.', 'EMPTY_WORKER_OUTPUT');
|
|
126
138
|
}
|
|
127
139
|
const mappedToolCalls = toolCalls?.map((tc) => ({
|
|
128
140
|
id: tc.id,
|
|
@@ -137,11 +149,14 @@ export class SmartAgentSubAgent {
|
|
|
137
149
|
toolCallCount: res.value.toolCallCount,
|
|
138
150
|
maxToolCalls: res.value.maxToolCalls,
|
|
139
151
|
toolCalls: mappedToolCalls,
|
|
140
|
-
|
|
152
|
+
...attribution,
|
|
141
153
|
status: 'complete',
|
|
142
154
|
...(stopped ? { stopped } : {}),
|
|
143
155
|
};
|
|
144
156
|
}
|
|
157
|
+
catch (error) {
|
|
158
|
+
throw attribution ? withUsageAttribution(error, attribution) : error;
|
|
159
|
+
}
|
|
145
160
|
finally {
|
|
146
161
|
observing = false;
|
|
147
162
|
collector.finalize(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart-agent-subagent.js","sourceRoot":"","sources":["../../src/subagent/smart-agent-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EAKnB,uBAAuB,EACvB,iBAAiB,EAEjB,kBAAkB,GAEnB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"smart-agent-subagent.js","sourceRoot":"","sources":["../../src/subagent/smart-agent-subagent.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mcp-abap-adt/llm-agent-libs",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "38.0.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"license": "LGPL-3.0-only",
|
|
45
45
|
"peerDependencies": {
|
|
46
46
|
"@mcp-abap-adt/interfaces-auth": "^2.1.0",
|
|
47
|
-
"@mcp-abap-adt/llm-agent": "^35.
|
|
47
|
+
"@mcp-abap-adt/llm-agent": "^35.2.0",
|
|
48
48
|
"@mcp-abap-adt/llm-agent-mcp": "^30.9.1",
|
|
49
49
|
"@mcp-abap-adt/llm-agent-rag": "^31.0.0"
|
|
50
50
|
}
|