@mcp-abap-adt/llm-agent-libs 36.0.0 → 38.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/usage-logging-decision-model.d.ts.map +1 -1
- package/dist/adapters/usage-logging-decision-model.js +2 -0
- package/dist/adapters/usage-logging-decision-model.js.map +1 -1
- package/dist/adapters/usage-logging-embedder.d.ts.map +1 -1
- package/dist/adapters/usage-logging-embedder.js +3 -0
- package/dist/adapters/usage-logging-embedder.js.map +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +71 -24
- package/dist/agent.js.map +1 -1
- package/dist/builder.d.ts.map +1 -1
- package/dist/builder.js +13 -24
- package/dist/builder.js.map +1 -1
- package/dist/classifier/llm-classifier.d.ts.map +1 -1
- package/dist/classifier/llm-classifier.js +5 -2
- package/dist/classifier/llm-classifier.js.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.d.ts.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.js +4 -3
- package/dist/coordinator/adaptive/adaptive-interpreter.js.map +1 -1
- package/dist/coordinator/adaptive/llm-adaptive-controller.d.ts +12 -4
- package/dist/coordinator/adaptive/llm-adaptive-controller.d.ts.map +1 -1
- package/dist/coordinator/adaptive/llm-adaptive-controller.js +43 -23
- package/dist/coordinator/adaptive/llm-adaptive-controller.js.map +1 -1
- package/dist/coordinator/dag/llm-dag-planner.d.ts +1 -3
- package/dist/coordinator/dag/llm-dag-planner.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-dag-planner.js +14 -5
- package/dist/coordinator/dag/llm-dag-planner.js.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.d.ts +1 -1
- package/dist/coordinator/dag/llm-finalizer.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.js +63 -21
- package/dist/coordinator/dag/llm-finalizer.js.map +1 -1
- package/dist/coordinator/dag/llm-review-strategy.d.ts +1 -3
- package/dist/coordinator/dag/llm-review-strategy.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-review-strategy.js +35 -22
- package/dist/coordinator/dag/llm-review-strategy.js.map +1 -1
- package/dist/coordinator/dag/subagent-state-oracle.d.ts +1 -11
- package/dist/coordinator/dag/subagent-state-oracle.d.ts.map +1 -1
- package/dist/coordinator/dag/subagent-state-oracle.js +9 -12
- package/dist/coordinator/dag/subagent-state-oracle.js.map +1 -1
- package/dist/logger/default-request-logger.d.ts +8 -4
- package/dist/logger/default-request-logger.d.ts.map +1 -1
- package/dist/logger/default-request-logger.js +30 -4
- package/dist/logger/default-request-logger.js.map +1 -1
- package/dist/logger/llm-call-usage.d.ts +26 -0
- package/dist/logger/llm-call-usage.d.ts.map +1 -0
- package/dist/logger/llm-call-usage.js +214 -0
- package/dist/logger/llm-call-usage.js.map +1 -0
- package/dist/logger/pipeline-request-logger.d.ts +5 -0
- package/dist/logger/pipeline-request-logger.d.ts.map +1 -0
- package/dist/logger/pipeline-request-logger.js +38 -0
- package/dist/logger/pipeline-request-logger.js.map +1 -0
- package/dist/logger/request-call-scope.d.ts +5 -0
- package/dist/logger/request-call-scope.d.ts.map +1 -0
- package/dist/logger/request-call-scope.js +36 -0
- package/dist/logger/request-call-scope.js.map +1 -0
- package/dist/logger/session-request-logger.d.ts +2 -1
- package/dist/logger/session-request-logger.d.ts.map +1 -1
- package/dist/logger/session-request-logger.js +17 -6
- package/dist/logger/session-request-logger.js.map +1 -1
- package/dist/logger/stream-attempt-usage.d.ts +18 -0
- package/dist/logger/stream-attempt-usage.d.ts.map +1 -0
- package/dist/logger/stream-attempt-usage.js +68 -0
- package/dist/logger/stream-attempt-usage.js.map +1 -0
- package/dist/logger/worker-request-logger.d.ts +25 -0
- package/dist/logger/worker-request-logger.d.ts.map +1 -0
- package/dist/logger/worker-request-logger.js +93 -0
- package/dist/logger/worker-request-logger.js.map +1 -0
- package/dist/mcp/vectorize-mcp-tools.d.ts.map +1 -1
- package/dist/mcp/vectorize-mcp-tools.js +3 -0
- package/dist/mcp/vectorize-mcp-tools.js.map +1 -1
- package/dist/pipeline/default-pipeline.js +2 -2
- package/dist/pipeline/default-pipeline.js.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.d.ts +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.js +15 -23
- package/dist/pipeline/handlers/adaptive-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.js +36 -40
- package/dist/pipeline/handlers/dag-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/pass-through.d.ts.map +1 -1
- package/dist/pipeline/handlers/pass-through.js +21 -34
- package/dist/pipeline/handlers/pass-through.js.map +1 -1
- package/dist/pipeline/handlers/role-usage.d.ts +4 -0
- package/dist/pipeline/handlers/role-usage.d.ts.map +1 -0
- package/dist/pipeline/handlers/role-usage.js +14 -0
- package/dist/pipeline/handlers/role-usage.js.map +1 -0
- package/dist/pipeline/handlers/tool-loop.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-loop.js +38 -43
- package/dist/pipeline/handlers/tool-loop.js.map +1 -1
- package/dist/pipeline/handlers/translate.d.ts.map +1 -1
- package/dist/pipeline/handlers/translate.js +2 -0
- package/dist/pipeline/handlers/translate.js.map +1 -1
- package/dist/pipeline/handlers/worker-usage.d.ts +5 -0
- package/dist/pipeline/handlers/worker-usage.d.ts.map +1 -0
- package/dist/pipeline/handlers/worker-usage.js +59 -0
- package/dist/pipeline/handlers/worker-usage.js.map +1 -0
- package/dist/pipeline/pipeline-to-stream.d.ts +2 -2
- package/dist/pipeline/pipeline-to-stream.d.ts.map +1 -1
- package/dist/pipeline/pipeline-to-stream.js +36 -20
- package/dist/pipeline/pipeline-to-stream.js.map +1 -1
- package/dist/reranker/llm-reranker.d.ts.map +1 -1
- package/dist/reranker/llm-reranker.js +2 -0
- package/dist/reranker/llm-reranker.js.map +1 -1
- package/dist/resilience/retry-llm.d.ts.map +1 -1
- package/dist/resilience/retry-llm.js +41 -9
- package/dist/resilience/retry-llm.js.map +1 -1
- package/dist/retrieval/strategy-rag.d.ts +14 -7
- package/dist/retrieval/strategy-rag.d.ts.map +1 -1
- package/dist/retrieval/strategy-rag.js +49 -21
- package/dist/retrieval/strategy-rag.js.map +1 -1
- package/dist/subagent/direct-llm-subagent.d.ts +4 -1
- package/dist/subagent/direct-llm-subagent.d.ts.map +1 -1
- package/dist/subagent/direct-llm-subagent.js +10 -6
- package/dist/subagent/direct-llm-subagent.js.map +1 -1
- package/dist/subagent/smart-agent-subagent.d.ts +2 -1
- package/dist/subagent/smart-agent-subagent.d.ts.map +1 -1
- package/dist/subagent/smart-agent-subagent.js +19 -4
- package/dist/subagent/smart-agent-subagent.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-llm.d.ts","sourceRoot":"","sources":["../../src/resilience/retry-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACL,KAAK,WAAW,EAMhB,QAAQ,EACR,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"retry-llm.d.ts","sourceRoot":"","sources":["../../src/resilience/retry-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACL,KAAK,WAAW,EAMhB,QAAQ,EACR,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,OAAO,EAEZ,KAAK,MAAM,EAKZ,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,YAAY;IAC3B,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,2FAA2F;IAC3F,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,sGAAsG;IACtG,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAwBD,qBAAa,QAAS,YAAW,IAAI;IAMjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAe;IACpC,WAAW,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBAGf,KAAK,EAAE,IAAI,EAC5B,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAQjC,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,IAAI,CACR,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAgDlC,UAAU,CACf,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAoFlD;;;;OAIG;YACY,aAAa;IAY5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,UAAU;YAOJ,YAAY;CAQ3B;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,EACT,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC9B,IAAI,CAQN"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { setImmediate } from 'node:timers/promises';
|
|
10
10
|
import { CircuitBreakerLlm, DefaultWaitStrategy, exponentialBackoffMs, findThrottled, httpStatusOf, LlmError, retryAfterSecondsOf, startOperation, terminalRunError, withOuterAttempt, } from '@mcp-abap-adt/llm-agent';
|
|
11
|
+
import { errorUsage, recordChatAttempt } from '../logger/llm-call-usage.js';
|
|
11
12
|
const DEFAULT_OPTIONS = {
|
|
12
13
|
backoffMs: 2000,
|
|
13
14
|
retryOn: [408, 500, 502, 503],
|
|
@@ -17,7 +18,10 @@ function toLlmError(cause) {
|
|
|
17
18
|
return cause instanceof LlmError
|
|
18
19
|
? cause
|
|
19
20
|
: (terminalRunError(cause) ??
|
|
20
|
-
Object.assign(new LlmError(String(cause), 'LLM_ERROR'), {
|
|
21
|
+
Object.assign(new LlmError(String(cause), 'LLM_ERROR'), {
|
|
22
|
+
cause,
|
|
23
|
+
...errorUsage(cause),
|
|
24
|
+
}));
|
|
21
25
|
}
|
|
22
26
|
function abortError(signal) {
|
|
23
27
|
return Object.assign(new LlmError('Aborted', 'ABORTED'), {
|
|
@@ -50,10 +54,10 @@ export class RetryLlm {
|
|
|
50
54
|
}
|
|
51
55
|
let result;
|
|
52
56
|
try {
|
|
53
|
-
result = await this.inner.chat(messages, tools, {
|
|
57
|
+
result = await recordChatAttempt(this.inner, () => this.inner.chat(messages, tools, {
|
|
54
58
|
...options,
|
|
55
59
|
usageOp: withOuterAttempt(op, attempt),
|
|
56
|
-
});
|
|
60
|
+
}), true);
|
|
57
61
|
}
|
|
58
62
|
catch (error) {
|
|
59
63
|
result = { ok: false, error: toLlmError(error) };
|
|
@@ -89,22 +93,34 @@ export class RetryLlm {
|
|
|
89
93
|
}
|
|
90
94
|
let chunksYielded = 0;
|
|
91
95
|
let retryDelay;
|
|
96
|
+
let retryUsage;
|
|
92
97
|
for await (const chunk of this.attemptStream(messages, tools, {
|
|
93
98
|
...options,
|
|
94
99
|
usageOp: withOuterAttempt(op, attempt),
|
|
95
100
|
})) {
|
|
96
|
-
if (signal?.aborted) {
|
|
97
|
-
|
|
101
|
+
if (signal?.aborted && !(chunk.ok && chunk.value.reset)) {
|
|
102
|
+
const usage = chunk.ok
|
|
103
|
+
? { usage: chunk.value.usage, usageCalls: chunk.value.usageCalls }
|
|
104
|
+
: errorUsage(chunk.error);
|
|
105
|
+
yield {
|
|
106
|
+
ok: false,
|
|
107
|
+
error: Object.assign(abortError(signal), usage),
|
|
108
|
+
};
|
|
98
109
|
return;
|
|
99
110
|
}
|
|
100
111
|
if (chunk.ok) {
|
|
101
|
-
|
|
112
|
+
// An inner retry can report an attempt before any response chunk.
|
|
113
|
+
if (!chunk.value.reset)
|
|
114
|
+
chunksYielded++;
|
|
102
115
|
yield chunk;
|
|
103
116
|
}
|
|
104
117
|
else {
|
|
105
118
|
const terminal = terminalRunError(chunk.error);
|
|
106
119
|
if (terminal) {
|
|
107
|
-
yield {
|
|
120
|
+
yield {
|
|
121
|
+
ok: false,
|
|
122
|
+
error: Object.assign(terminal, errorUsage(chunk.error)),
|
|
123
|
+
};
|
|
108
124
|
return;
|
|
109
125
|
}
|
|
110
126
|
const status = httpStatusOf(chunk.error);
|
|
@@ -121,13 +137,29 @@ export class RetryLlm {
|
|
|
121
137
|
yield chunk;
|
|
122
138
|
return;
|
|
123
139
|
}
|
|
140
|
+
if (options?.includeStreamRetryUsage) {
|
|
141
|
+
const failure = chunk.error;
|
|
142
|
+
retryUsage = {
|
|
143
|
+
usage: failure.usage,
|
|
144
|
+
model: failure.model ?? (chunksYielded === 0 ? this.model : undefined),
|
|
145
|
+
usageByModel: failure.usageByModel,
|
|
146
|
+
usageCalls: failure.usageCalls,
|
|
147
|
+
};
|
|
148
|
+
}
|
|
124
149
|
break;
|
|
125
150
|
}
|
|
126
151
|
}
|
|
127
152
|
if (retryDelay === undefined)
|
|
128
153
|
return;
|
|
129
|
-
if (chunksYielded > 0)
|
|
130
|
-
yield {
|
|
154
|
+
if (chunksYielded > 0 || retryUsage)
|
|
155
|
+
yield {
|
|
156
|
+
ok: true,
|
|
157
|
+
value: {
|
|
158
|
+
content: '',
|
|
159
|
+
reset: true,
|
|
160
|
+
...(retryUsage && { retryUsage }),
|
|
161
|
+
},
|
|
162
|
+
};
|
|
131
163
|
await this.waitForRetry(retryDelay, signal);
|
|
132
164
|
}
|
|
133
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-llm.js","sourceRoot":"","sources":["../../src/resilience/retry-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAEL,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,QAAQ,
|
|
1
|
+
{"version":3,"file":"retry-llm.js","sourceRoot":"","sources":["../../src/resilience/retry-llm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,27 @@
|
|
|
1
|
-
import { type CallOptions, type IQueryEmbedding, type IRag, type
|
|
1
|
+
import { type CallOptions, type IQueryEmbedding, type IRag, type IRagCatalogUpdater, type IRagDecorator, type IRagFilteredDeleter, type IRagScanner, type IRetrievalEmbedder, type IRetrievalStrategy, type RagError, type RagResult, type Result } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
declare const BRAND: unique symbol;
|
|
3
3
|
/** IRag decorator: `query` goes through the strategy, everything else to `inner` (spec §13.3). */
|
|
4
|
-
export declare class StrategyRag implements IRag, IRagDecorator {
|
|
5
|
-
readonly inner:
|
|
4
|
+
export declare class StrategyRag<Store extends IRag = IRag> implements IRag, IRagDecorator {
|
|
5
|
+
readonly inner: Store;
|
|
6
6
|
readonly strategy: IRetrievalStrategy;
|
|
7
|
+
private readonly relocated?;
|
|
7
8
|
readonly [BRAND] = true;
|
|
8
|
-
|
|
9
|
+
readonly list?: IRag['list'];
|
|
10
|
+
readonly writer: Store['writer'];
|
|
11
|
+
readonly scan?: IRagScanner['scan'];
|
|
12
|
+
readonly deleteWhere?: IRagFilteredDeleter['deleteWhere'];
|
|
13
|
+
readonly updateCollection?: IRagCatalogUpdater['updateCollection'];
|
|
14
|
+
readonly embedder?: IRetrievalEmbedder;
|
|
15
|
+
readonly fragmentSizeChars?: number;
|
|
16
|
+
constructor(inner: Store, strategy: IRetrievalStrategy, relocated?: StrategyRag | undefined);
|
|
9
17
|
query(embedding: IQueryEmbedding, k: number, options?: CallOptions): Promise<Result<RagResult[], RagError>>;
|
|
10
18
|
healthCheck(options?: CallOptions): Promise<Result<void, RagError>>;
|
|
11
19
|
getById(id: string, options?: CallOptions): Promise<Result<RagResult | null, RagError>>;
|
|
12
|
-
writer(): IRagBackendWriter | undefined;
|
|
13
20
|
}
|
|
14
21
|
/** True when `rag`, or any store it decorates, carries a retrieval strategy. */
|
|
15
22
|
export declare function hasRetrievalStrategy(rag: IRag): boolean;
|
|
16
|
-
/**
|
|
17
|
-
export declare function applyRetrievalStrategy(rag: IRag, strategy
|
|
23
|
+
/** Apply an explicit strategy or lift an existing one above fallback routing. */
|
|
24
|
+
export declare function applyRetrievalStrategy(rag: IRag, strategy?: IRetrievalStrategy): IRag;
|
|
18
25
|
/**
|
|
19
26
|
* The store an agent queries for one of its built-in slots (`tools`, `history`).
|
|
20
27
|
* The agent's OWN store always has priority: the projected entry is used only
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy-rag.d.ts","sourceRoot":"","sources":["../../src/retrieval/strategy-rag.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"strategy-rag.d.ts","sourceRoot":"","sources":["../../src/retrieval/strategy-rag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,eAAe,EACpB,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAIvB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,MAAM,EAEZ,MAAM,yBAAyB,CAAC;AAEjC,QAAA,MAAM,KAAK,eAA2C,CAAC;AAQvD,kGAAkG;AAClG,qBAAa,WAAW,CAAC,KAAK,SAAS,IAAI,GAAG,IAAI,CAChD,YAAW,IAAI,EAAE,aAAa;IAY5B,QAAQ,CAAC,KAAK,EAAE,KAAK;IACrB,QAAQ,CAAC,QAAQ,EAAE,kBAAkB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAZ7B,QAAQ,CAAC,CAAC,KAAK,CAAC,QAAQ;IACxB,SAAiB,IAAI,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACrC,SAAiB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACzC,SAAiB,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5C,SAAiB,WAAW,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAClE,SAAiB,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAC3E,SAAiB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC/C,SAAiB,iBAAiB,CAAC,EAAE,MAAM,CAAC;gBAGjC,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,kBAAkB,EACpB,SAAS,CAAC,EAAE,WAAW,YAAA;IAgB1C,KAAK,CACH,SAAS,EAAE,eAAe,EAC1B,CAAC,EAAE,MAAM,EACT,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;IAoBzC,WAAW,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAGnE,OAAO,CACL,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,EAAE,QAAQ,CAAC,CAAC;CAG/C;AAMD,gFAAgF;AAChF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,IAAI,GAAG,OAAO,CAEvD;AAED,iFAAiF;AACjF,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,IAAI,EACT,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,IAAI,CAaN;AAOD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,IAAI,EACT,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,IAAI,GAAG,SAAS,GAC1B,IAAI,CAMN"}
|
|
@@ -1,15 +1,46 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
2
|
+
import { FallbackRag, isRagCatalogUpdater, isRagFilteredDeleter, isRagScanner, ragDecoratorChain, } from '@mcp-abap-adt/llm-agent';
|
|
2
3
|
const BRAND = Symbol.for('@mcp-abap-adt/strategy-rag');
|
|
4
|
+
const relocatedStrategies = new AsyncLocalStorage();
|
|
3
5
|
/** IRag decorator: `query` goes through the strategy, everything else to `inner` (spec §13.3). */
|
|
4
6
|
export class StrategyRag {
|
|
5
7
|
inner;
|
|
6
8
|
strategy;
|
|
9
|
+
relocated;
|
|
7
10
|
[BRAND] = true;
|
|
8
|
-
constructor(inner, strategy) {
|
|
11
|
+
constructor(inner, strategy, relocated) {
|
|
9
12
|
this.inner = inner;
|
|
10
13
|
this.strategy = strategy;
|
|
14
|
+
this.relocated = relocated;
|
|
15
|
+
if (typeof inner.list === 'function')
|
|
16
|
+
this.list = inner.list.bind(inner);
|
|
17
|
+
if (typeof inner.writer === 'function')
|
|
18
|
+
this.writer = inner.writer.bind(inner);
|
|
19
|
+
if (isRagScanner(inner))
|
|
20
|
+
this.scan = inner.scan.bind(inner);
|
|
21
|
+
if (isRagFilteredDeleter(inner))
|
|
22
|
+
this.deleteWhere = inner.deleteWhere.bind(inner);
|
|
23
|
+
if (isRagCatalogUpdater(inner)) {
|
|
24
|
+
this.updateCollection = inner.updateCollection.bind(inner);
|
|
25
|
+
}
|
|
26
|
+
const { embedder, fragmentSizeChars } = inner;
|
|
27
|
+
if (embedder !== undefined)
|
|
28
|
+
this.embedder = embedder;
|
|
29
|
+
if (fragmentSizeChars !== undefined)
|
|
30
|
+
this.fragmentSizeChars = fragmentSizeChars;
|
|
11
31
|
}
|
|
12
32
|
query(embedding, k, options) {
|
|
33
|
+
const active = relocatedStrategies.getStore();
|
|
34
|
+
if (active?.has(this)) {
|
|
35
|
+
return this.inner.query(embedding, k, options);
|
|
36
|
+
}
|
|
37
|
+
if (this.relocated) {
|
|
38
|
+
const suppressed = new Set(active);
|
|
39
|
+
for (let relocated = this.relocated; relocated; relocated = relocated.relocated) {
|
|
40
|
+
suppressed.add(relocated);
|
|
41
|
+
}
|
|
42
|
+
return relocatedStrategies.run(suppressed, () => this.strategy.retrieve(this.inner, embedding, k, options));
|
|
43
|
+
}
|
|
13
44
|
return this.strategy.retrieve(this.inner, embedding, k, options);
|
|
14
45
|
}
|
|
15
46
|
healthCheck(options) {
|
|
@@ -18,33 +49,30 @@ export class StrategyRag {
|
|
|
18
49
|
getById(id, options) {
|
|
19
50
|
return this.inner.getById(id, options);
|
|
20
51
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
52
|
+
}
|
|
53
|
+
function isStrategyRag(rag) {
|
|
54
|
+
return rag[BRAND] === true;
|
|
24
55
|
}
|
|
25
56
|
/** True when `rag`, or any store it decorates, carries a retrieval strategy. */
|
|
26
57
|
export function hasRetrievalStrategy(rag) {
|
|
27
|
-
|
|
28
|
-
for (let depth = 0; cur && depth < 16; depth++) {
|
|
29
|
-
if (cur[BRAND])
|
|
30
|
-
return true;
|
|
31
|
-
cur = isRagDecorator(cur) ? cur.inner : undefined;
|
|
32
|
-
}
|
|
33
|
-
return false;
|
|
58
|
+
return ragDecoratorChain(rag).some(isStrategyRag);
|
|
34
59
|
}
|
|
35
|
-
/**
|
|
60
|
+
/** Apply an explicit strategy or lift an existing one above fallback routing. */
|
|
36
61
|
export function applyRetrievalStrategy(rag, strategy) {
|
|
37
|
-
|
|
62
|
+
const chain = ragDecoratorChain(rag);
|
|
63
|
+
const existing = chain.find(isStrategyRag);
|
|
64
|
+
if (!existing)
|
|
65
|
+
return strategy ? new StrategyRag(rag, strategy) : rag;
|
|
66
|
+
const fallbackIndex = chain.findIndex((store) => store instanceof FallbackRag);
|
|
67
|
+
if (fallbackIndex === -1 || fallbackIndex > chain.indexOf(existing))
|
|
68
|
+
return rag;
|
|
69
|
+
// Leave the routing chain intact and link to the previous wrapper so the
|
|
70
|
+
// query can suppress every wrapper from earlier lifts.
|
|
71
|
+
return new StrategyRag(rag, existing.strategy, existing);
|
|
38
72
|
}
|
|
39
73
|
/** True when `rag` is `target` or decorates it (through `IRagDecorator.inner`). */
|
|
40
74
|
function decorates(rag, target) {
|
|
41
|
-
|
|
42
|
-
for (let depth = 0; cur && depth < 16; depth++) {
|
|
43
|
-
if (cur === target)
|
|
44
|
-
return true;
|
|
45
|
-
cur = isRagDecorator(cur) ? cur.inner : undefined;
|
|
46
|
-
}
|
|
47
|
-
return false;
|
|
75
|
+
return ragDecoratorChain(rag).includes(target);
|
|
48
76
|
}
|
|
49
77
|
/**
|
|
50
78
|
* The store an agent queries for one of its built-in slots (`tools`, `history`).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy-rag.js","sourceRoot":"","sources":["../../src/retrieval/strategy-rag.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"strategy-rag.js","sourceRoot":"","sources":["../../src/retrieval/strategy-rag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { type ILlm, type ISubAgent, type ISubAgentInput, type ISubAgentResult, type SubAgentCapabilities } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import { type ILlm, type ISubAgent, type ISubAgentInput, type ISubAgentResult, type LlmComponent, type SubAgentCapabilities } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
export interface DirectLlmSubAgentOptions {
|
|
3
3
|
/** Deployment IANA time zone. Default: UTC. */
|
|
4
4
|
timeZone?: string;
|
|
5
5
|
systemPrompt: string;
|
|
6
|
+
component?: LlmComponent;
|
|
6
7
|
workerBase?: string;
|
|
7
8
|
description?: string;
|
|
8
9
|
contextPolicy?: 'required' | 'optional' | 'forbidden';
|
|
@@ -21,7 +22,9 @@ export declare class DirectLlmSubAgent implements ISubAgent {
|
|
|
21
22
|
readonly description?: string;
|
|
22
23
|
readonly capabilities: SubAgentCapabilities;
|
|
23
24
|
private readonly assembler;
|
|
25
|
+
private readonly component;
|
|
24
26
|
constructor(name: string, llm: ILlm, opts: DirectLlmSubAgentOptions);
|
|
27
|
+
get model(): string | undefined;
|
|
25
28
|
run(input: ISubAgentInput): Promise<ISubAgentResult>;
|
|
26
29
|
}
|
|
27
30
|
//# sourceMappingURL=direct-llm-subagent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-llm-subagent.d.ts","sourceRoot":"","sources":["../../src/subagent/direct-llm-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"direct-llm-subagent.d.ts","sourceRoot":"","sources":["../../src/subagent/direct-llm-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,YAAY,EAEjB,KAAK,oBAAoB,EAC1B,MAAM,yBAAyB,CAAC;AAKjC,MAAM,WAAW,wBAAwB;IACvC,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,UAAU,GAAG,UAAU,GAAG,WAAW,CAAC;CACvD;AAED;;;;;;;GAOG;AACH,qBAAa,iBAAkB,YAAW,SAAS;aAO/B,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAPtB,SAAgB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrC,SAAgB,YAAY,EAAE,oBAAoB,CAAC;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;gBAGvB,IAAI,EAAE,MAAM,EACX,GAAG,EAAE,IAAI,EAC1B,IAAI,EAAE,wBAAwB;IAehC,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,GAAG,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAwD3D"}
|
|
@@ -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":"AAAA,OAAO,EAML,iBAAiB,GAElB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAY5D;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAiB;IAOV;IACC;IAPH,WAAW,CAAU;IACrB,YAAY,CAAuB;IAClC,SAAS,CAAmB;IAC5B,SAAS,CAAe;IAEzC,YACkB,IAAY,EACX,GAAS,EAC1B,IAA8B;QAFd,SAAI,GAAJ,IAAI,CAAQ;QACX,QAAG,GAAH,GAAG,CAAM;QAG1B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,gBAAgB,CAAC;YACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,oBAAoB,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC;iBACvD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;iBACpC,IAAI,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,GAAG;YAClB,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,UAAU;SAChD,CAAC;IACJ,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAqB;QAC7B,IACE,IAAI,CAAC,YAAY,CAAC,aAAa,KAAK,UAAU;YAC9C,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,EAC9C,CAAC;YACD,MAAM,IAAI,KAAK,CACb,sBAAsB,IAAI,CAAC,IAAI,6CAA6C,CAC7E,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GACf,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACvC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,OAAO,KAAK,CAAC,IAAI,EAAE;YACrC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAEjB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAC7C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,EACrC,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAC7B,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EAClE,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CACnE,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,MAAM,SAAS,CAAC,KAAK,CAAC;QAEzC,IAAI,CAAC;YACH,KAAK,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,sEAAsE;QACxE,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GACvD,MAAM,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,EAAE;YACjE,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC,CAAC;QACL,MAAM,KAAK,GACT,YAAY,KAAK,QAAQ;YACvB,CAAC,CAAC,IAAI,iBAAiB,CACnB,8CAA8C,EAC9C,sBAAsB,CACvB;YACH,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE;gBACf,CAAC,CAAC,IAAI,iBAAiB,CACnB,6CAA6C,EAC7C,qBAAqB,CACtB;gBACH,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,KAAK;YAAE,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QAEpE,OAAO;YACL,MAAM,EAAE,OAAO;YACf,KAAK;YACL,KAAK;YACL,UAAU;SACX,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -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
|
}
|