@mcp-abap-adt/llm-agent-libs 33.1.0 → 35.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/README.md +72 -22
- package/dist/adapters/llm-adapter.d.ts +2 -2
- package/dist/adapters/llm-adapter.d.ts.map +1 -1
- package/dist/adapters/llm-adapter.js +51 -34
- package/dist/adapters/llm-adapter.js.map +1 -1
- package/dist/adapters/llm-provider-bridge.d.ts.map +1 -1
- package/dist/adapters/llm-provider-bridge.js +13 -20
- package/dist/adapters/llm-provider-bridge.js.map +1 -1
- package/dist/adapters/normalize-finish-reason.d.ts +3 -0
- package/dist/adapters/normalize-finish-reason.d.ts.map +1 -0
- package/dist/adapters/normalize-finish-reason.js +17 -0
- package/dist/adapters/normalize-finish-reason.js.map +1 -0
- package/dist/agent/rag-helpers.d.ts +4 -6
- package/dist/agent/rag-helpers.d.ts.map +1 -1
- package/dist/agent/rag-helpers.js +3 -43
- package/dist/agent/rag-helpers.js.map +1 -1
- package/dist/agent/rag-orchestrator-types.d.ts +3 -0
- package/dist/agent/rag-orchestrator-types.d.ts.map +1 -1
- package/dist/agent/rag-orchestrator.d.ts +0 -1
- package/dist/agent/rag-orchestrator.d.ts.map +1 -1
- package/dist/agent/rag-orchestrator.js +9 -29
- package/dist/agent/rag-orchestrator.js.map +1 -1
- package/dist/agent.d.ts +12 -3
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +178 -245
- package/dist/agent.js.map +1 -1
- package/dist/builder-types.d.ts +1 -1
- package/dist/builder-types.d.ts.map +1 -1
- package/dist/builder.d.ts +7 -7
- package/dist/builder.d.ts.map +1 -1
- package/dist/builder.js +16 -26
- package/dist/builder.js.map +1 -1
- package/dist/config/config-watcher.d.ts +3 -0
- package/dist/config/config-watcher.d.ts.map +1 -1
- package/dist/config/config-watcher.js +1 -0
- package/dist/config/config-watcher.js.map +1 -1
- package/dist/context/context-assembler.d.ts.map +1 -1
- package/dist/context/context-assembler.js +23 -23
- package/dist/context/context-assembler.js.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.d.ts +2 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.d.ts.map +1 -1
- package/dist/coordinator/adaptive/adaptive-interpreter.js +46 -22
- package/dist/coordinator/adaptive/adaptive-interpreter.js.map +1 -1
- package/dist/coordinator/adaptive/compose-step-input.d.ts +1 -5
- package/dist/coordinator/adaptive/compose-step-input.d.ts.map +1 -1
- package/dist/coordinator/adaptive/compose-step-input.js +6 -17
- package/dist/coordinator/adaptive/compose-step-input.js.map +1 -1
- package/dist/coordinator/adaptive/index.d.ts +2 -2
- package/dist/coordinator/adaptive/index.d.ts.map +1 -1
- package/dist/coordinator/adaptive/index.js +2 -2
- package/dist/coordinator/adaptive/index.js.map +1 -1
- package/dist/coordinator/adaptive/llm-adaptive-controller.d.ts.map +1 -1
- package/dist/coordinator/adaptive/llm-adaptive-controller.js +14 -20
- package/dist/coordinator/adaptive/llm-adaptive-controller.js.map +1 -1
- package/dist/coordinator/adaptive/parse-plan.d.ts +0 -2
- package/dist/coordinator/adaptive/parse-plan.d.ts.map +1 -1
- package/dist/coordinator/adaptive/parse-plan.js +4 -6
- package/dist/coordinator/adaptive/parse-plan.js.map +1 -1
- package/dist/coordinator/dag/dag-plan-interpreter.d.ts.map +1 -1
- package/dist/coordinator/dag/dag-plan-interpreter.js +7 -1
- package/dist/coordinator/dag/dag-plan-interpreter.js.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.d.ts.map +1 -1
- package/dist/coordinator/dag/llm-finalizer.js +5 -2
- package/dist/coordinator/dag/llm-finalizer.js.map +1 -1
- package/dist/coordinator/dialogue/dialogue-session.d.ts +2 -3
- package/dist/coordinator/dialogue/dialogue-session.d.ts.map +1 -1
- package/dist/coordinator/dialogue/dialogue-session.js +103 -64
- package/dist/coordinator/dialogue/dialogue-session.js.map +1 -1
- package/dist/coordinator/dialogue/index.d.ts +2 -2
- package/dist/coordinator/dialogue/index.d.ts.map +1 -1
- package/dist/coordinator/dialogue/index.js +2 -2
- package/dist/coordinator/dialogue/index.js.map +1 -1
- package/dist/coordinator/dialogue/planner-context-builder.d.ts +2 -3
- package/dist/coordinator/dialogue/planner-context-builder.d.ts.map +1 -1
- package/dist/coordinator/dialogue/planner-context-builder.js +13 -73
- package/dist/coordinator/dialogue/planner-context-builder.js.map +1 -1
- package/dist/coordinator/dialogue/planner-retrieval.d.ts.map +1 -1
- package/dist/coordinator/dialogue/planner-retrieval.js +13 -4
- package/dist/coordinator/dialogue/planner-retrieval.js.map +1 -1
- package/dist/coordinator/dialogue/planner-scope.d.ts +4 -1
- package/dist/coordinator/dialogue/planner-scope.d.ts.map +1 -1
- package/dist/coordinator/dialogue/planner-scope.js.map +1 -1
- package/dist/coordinator/dialogue/planner-tools-client.d.ts.map +1 -1
- package/dist/coordinator/dialogue/planner-tools-client.js +47 -26
- package/dist/coordinator/dialogue/planner-tools-client.js.map +1 -1
- package/dist/coordinator/dialogue/profile-plan-author.d.ts.map +1 -1
- package/dist/coordinator/dialogue/profile-plan-author.js +5 -5
- package/dist/coordinator/dialogue/profile-plan-author.js.map +1 -1
- package/dist/coordinator/dialogue/profile-resolver.d.ts.map +1 -1
- package/dist/coordinator/dialogue/profile-resolver.js +8 -0
- package/dist/coordinator/dialogue/profile-resolver.js.map +1 -1
- package/dist/coordinator/dialogue/structured-plan.d.ts +1 -1
- package/dist/coordinator/dialogue/structured-plan.d.ts.map +1 -1
- package/dist/coordinator/dialogue/structured-plan.js +6 -7
- package/dist/coordinator/dialogue/structured-plan.js.map +1 -1
- package/dist/coordinator/dialogue/submit-report-tool.d.ts +1 -1
- package/dist/coordinator/dialogue/submit-report-tool.d.ts.map +1 -1
- package/dist/coordinator/dialogue/submit-report-tool.js +4 -17
- package/dist/coordinator/dialogue/submit-report-tool.js.map +1 -1
- package/dist/coordinator/dialogue/task-board.d.ts +11 -3
- package/dist/coordinator/dialogue/task-board.d.ts.map +1 -1
- package/dist/coordinator/dialogue/task-board.js +42 -12
- package/dist/coordinator/dialogue/task-board.js.map +1 -1
- package/dist/coordinator/dialogue/task-reference.d.ts +1 -3
- package/dist/coordinator/dialogue/task-reference.d.ts.map +1 -1
- package/dist/coordinator/dialogue/task-reference.js +3 -10
- package/dist/coordinator/dialogue/task-reference.js.map +1 -1
- package/dist/coordinator/dialogue/tool-trace-render.d.ts.map +1 -1
- package/dist/coordinator/dialogue/tool-trace-render.js +9 -29
- package/dist/coordinator/dialogue/tool-trace-render.js.map +1 -1
- package/dist/coordinator/dispatch/self.d.ts.map +1 -1
- package/dist/coordinator/dispatch/self.js +41 -26
- package/dist/coordinator/dispatch/self.js.map +1 -1
- package/dist/coordinator/dispatch/subagent.d.ts.map +1 -1
- package/dist/coordinator/dispatch/subagent.js +3 -0
- package/dist/coordinator/dispatch/subagent.js.map +1 -1
- package/dist/coordinator/llm-output-truncation.d.ts +3 -0
- package/dist/coordinator/llm-output-truncation.d.ts.map +1 -0
- package/dist/coordinator/llm-output-truncation.js +6 -0
- package/dist/coordinator/llm-output-truncation.js.map +1 -0
- package/dist/coordinator/planning/one-shot.d.ts.map +1 -1
- package/dist/coordinator/planning/one-shot.js +4 -0
- package/dist/coordinator/planning/one-shot.js.map +1 -1
- package/dist/coordinator/planning/replan-on-error.d.ts.map +1 -1
- package/dist/coordinator/planning/replan-on-error.js +5 -1
- package/dist/coordinator/planning/replan-on-error.js.map +1 -1
- package/dist/coordinator/stepper/cyclic-react-executor.d.ts.map +1 -1
- package/dist/coordinator/stepper/cyclic-react-executor.js +51 -37
- package/dist/coordinator/stepper/cyclic-react-executor.js.map +1 -1
- package/dist/coordinator/stepper/llm-evaluator.d.ts.map +1 -1
- package/dist/coordinator/stepper/llm-evaluator.js +12 -4
- package/dist/coordinator/stepper/llm-evaluator.js.map +1 -1
- package/dist/coordinator/stepper/llm-stepper-planner.d.ts.map +1 -1
- package/dist/coordinator/stepper/llm-stepper-planner.js +16 -5
- package/dist/coordinator/stepper/llm-stepper-planner.js.map +1 -1
- package/dist/coordinator/stepper/llm-task-formalizer.d.ts +2 -3
- package/dist/coordinator/stepper/llm-task-formalizer.d.ts.map +1 -1
- package/dist/coordinator/stepper/llm-task-formalizer.js +14 -8
- package/dist/coordinator/stepper/llm-task-formalizer.js.map +1 -1
- package/dist/coordinator/stepper/need-resolver.d.ts.map +1 -1
- package/dist/coordinator/stepper/need-resolver.js +10 -1
- package/dist/coordinator/stepper/need-resolver.js.map +1 -1
- package/dist/coordinator/stepper/root-finalizer.d.ts.map +1 -1
- package/dist/coordinator/stepper/root-finalizer.js +8 -3
- package/dist/coordinator/stepper/root-finalizer.js.map +1 -1
- package/dist/coordinator/stepper/stepper-interpreter.d.ts.map +1 -1
- package/dist/coordinator/stepper/stepper-interpreter.js +8 -19
- package/dist/coordinator/stepper/stepper-interpreter.js.map +1 -1
- package/dist/history/history-memory.d.ts +1 -0
- package/dist/history/history-memory.d.ts.map +1 -1
- package/dist/history/history-memory.js +5 -1
- package/dist/history/history-memory.js.map +1 -1
- package/dist/history/history-summarizer.js +1 -1
- package/dist/history/history-summarizer.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces/pipeline.d.ts +1 -1
- package/dist/interfaces/pipeline.d.ts.map +1 -1
- package/dist/pipeline/context/tool-loop-context/window-context-strategy.d.ts +1 -1
- package/dist/pipeline/context/tool-loop-context/window-context-strategy.d.ts.map +1 -1
- package/dist/pipeline/context/tool-loop-context/window-context-strategy.js +6 -3
- package/dist/pipeline/context/tool-loop-context/window-context-strategy.js.map +1 -1
- package/dist/pipeline/context/tool-loop-control-history.d.ts +15 -0
- package/dist/pipeline/context/tool-loop-control-history.d.ts.map +1 -0
- package/dist/pipeline/context/tool-loop-control-history.js +72 -0
- package/dist/pipeline/context/tool-loop-control-history.js.map +1 -0
- package/dist/pipeline/context.d.ts +5 -2
- package/dist/pipeline/context.d.ts.map +1 -1
- package/dist/pipeline/default-pipeline.d.ts +2 -2
- package/dist/pipeline/default-pipeline.d.ts.map +1 -1
- package/dist/pipeline/default-pipeline.js +7 -7
- package/dist/pipeline/default-pipeline.js.map +1 -1
- package/dist/pipeline/executor.d.ts.map +1 -1
- package/dist/pipeline/executor.js +6 -0
- package/dist/pipeline/executor.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 +42 -46
- package/dist/pipeline/handlers/adaptive-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/assemble.d.ts +0 -9
- package/dist/pipeline/handlers/assemble.d.ts.map +1 -1
- package/dist/pipeline/handlers/assemble.js +7 -11
- package/dist/pipeline/handlers/assemble.js.map +1 -1
- package/dist/pipeline/handlers/coordinator.d.ts +1 -0
- package/dist/pipeline/handlers/coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/coordinator.js +39 -7
- package/dist/pipeline/handlers/coordinator.js.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.js +17 -13
- package/dist/pipeline/handlers/dag-coordinator.js.map +1 -1
- package/dist/pipeline/handlers/history-upsert.d.ts +2 -0
- package/dist/pipeline/handlers/history-upsert.d.ts.map +1 -1
- package/dist/pipeline/handlers/history-upsert.js +6 -1
- package/dist/pipeline/handlers/history-upsert.js.map +1 -1
- package/dist/pipeline/handlers/pass-through.d.ts +5 -3
- package/dist/pipeline/handlers/pass-through.d.ts.map +1 -1
- package/dist/pipeline/handlers/pass-through.js +165 -91
- package/dist/pipeline/handlers/pass-through.js.map +1 -1
- package/dist/pipeline/handlers/subagent.d.ts.map +1 -1
- package/dist/pipeline/handlers/subagent.js +4 -1
- package/dist/pipeline/handlers/subagent.js.map +1 -1
- package/dist/pipeline/handlers/summarize.d.ts +2 -12
- package/dist/pipeline/handlers/summarize.d.ts.map +1 -1
- package/dist/pipeline/handlers/summarize.js +2 -54
- package/dist/pipeline/handlers/summarize.js.map +1 -1
- package/dist/pipeline/handlers/tool-loop-core.d.ts +15 -9
- package/dist/pipeline/handlers/tool-loop-core.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-loop-core.js +128 -59
- package/dist/pipeline/handlers/tool-loop-core.js.map +1 -1
- package/dist/pipeline/handlers/tool-loop.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-loop.js +120 -298
- package/dist/pipeline/handlers/tool-loop.js.map +1 -1
- package/dist/pipeline/handlers/tool-response-round.d.ts +48 -0
- package/dist/pipeline/handlers/tool-response-round.d.ts.map +1 -0
- package/dist/pipeline/handlers/tool-response-round.js +104 -0
- package/dist/pipeline/handlers/tool-response-round.js.map +1 -0
- package/dist/pipeline/handlers/tool-select.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-select.js +5 -1
- package/dist/pipeline/handlers/tool-select.js.map +1 -1
- package/dist/pipeline/pipeline-to-stream.d.ts.map +1 -1
- package/dist/pipeline/pipeline-to-stream.js +13 -6
- package/dist/pipeline/pipeline-to-stream.js.map +1 -1
- package/dist/policy/caller-identity.d.ts +29 -0
- package/dist/policy/caller-identity.d.ts.map +1 -0
- package/dist/policy/caller-identity.js +79 -0
- package/dist/policy/caller-identity.js.map +1 -0
- package/dist/policy/mixed-tool-call-handler.d.ts +9 -3
- package/dist/policy/mixed-tool-call-handler.d.ts.map +1 -1
- package/dist/policy/mixed-tool-call-handler.js +29 -7
- package/dist/policy/mixed-tool-call-handler.js.map +1 -1
- package/dist/policy/pending-tool-results-registry.d.ts +46 -4
- package/dist/policy/pending-tool-results-registry.d.ts.map +1 -1
- package/dist/policy/pending-tool-results-registry.js +203 -18
- package/dist/policy/pending-tool-results-registry.js.map +1 -1
- package/dist/policy/tool-availability-registry.d.ts +6 -5
- package/dist/policy/tool-availability-registry.d.ts.map +1 -1
- package/dist/policy/tool-availability-registry.js +13 -2
- package/dist/policy/tool-availability-registry.js.map +1 -1
- package/dist/resilience/retry-llm.d.ts +7 -5
- package/dist/resilience/retry-llm.d.ts.map +1 -1
- package/dist/resilience/retry-llm.js +93 -58
- package/dist/resilience/retry-llm.js.map +1 -1
- package/dist/subagent/default-context-builder.d.ts.map +1 -1
- package/dist/subagent/default-context-builder.js +9 -2
- package/dist/subagent/default-context-builder.js.map +1 -1
- package/dist/subagent/direct-llm-subagent.d.ts +1 -1
- package/dist/subagent/direct-llm-subagent.d.ts.map +1 -1
- package/dist/subagent/direct-llm-subagent.js +12 -3
- package/dist/subagent/direct-llm-subagent.js.map +1 -1
- package/dist/subagent/smart-agent-subagent.d.ts.map +1 -1
- package/dist/subagent/smart-agent-subagent.js +8 -5
- package/dist/subagent/smart-agent-subagent.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,100 +1,174 @@
|
|
|
1
|
-
import { addCacheTokenUsage, scopedUsage, toModelToolMessages, } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import { addCacheTokenUsage, OrchestratorError, scopedUsage, toModelToolMessages, toToolCallDelta, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { summaryToUsage } from '../../logger/session-request-logger.js';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
let cache = {};
|
|
14
|
-
let accPrompt = 0;
|
|
15
|
-
let accCompletion = 0;
|
|
16
|
-
let accTotal = 0;
|
|
17
|
-
let hasUsage = false;
|
|
18
|
-
const logPassUsage = () => {
|
|
19
|
-
// Log only if a usage chunk was actually seen (mirrors
|
|
20
|
-
// LoggingLlm.streamChat) — avoids creating a zero tool-loop bucket.
|
|
21
|
-
if (!hasUsage)
|
|
22
|
-
return;
|
|
23
|
-
requestLogger.logLlmCall({
|
|
24
|
-
component: 'tool-loop',
|
|
25
|
-
model: llm.model ?? 'unknown',
|
|
26
|
-
...cache,
|
|
27
|
-
promptTokens: accPrompt,
|
|
28
|
-
completionTokens: accCompletion,
|
|
29
|
-
totalTokens: accTotal,
|
|
30
|
-
durationMs: Date.now() - passStart,
|
|
31
|
-
requestId: traceId2,
|
|
3
|
+
import { createPendingToolCallsEntry, PendingToolResultsRegistry, } from '../../policy/pending-tool-results-registry.js';
|
|
4
|
+
import { ToolResponseRound } from './tool-response-round.js';
|
|
5
|
+
export async function* runPassThrough(llm, requestLogger, messages, externalTools, opts, toolTrust, pendingToolResults = new PendingToolResultsRegistry(), identity = { kind: 'anonymous' }) {
|
|
6
|
+
for (;;) {
|
|
7
|
+
const passStart = Date.now();
|
|
8
|
+
const traceId2 = opts?.trace?.traceId;
|
|
9
|
+
opts?.sessionLogger?.logStep('llm_request_pass', { messages, tools: externalTools ?? [] }, 'llm');
|
|
10
|
+
const stream = llm.streamChat(toModelToolMessages(messages, toolTrust), externalTools, {
|
|
11
|
+
...opts,
|
|
12
|
+
usage: scopedUsage(opts?.usage, { component: 'tool-loop' }),
|
|
32
13
|
});
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
14
|
+
let passContent = '';
|
|
15
|
+
const calls = new Map();
|
|
16
|
+
let finishReason;
|
|
17
|
+
let cache = {};
|
|
18
|
+
let accPrompt = 0;
|
|
19
|
+
let accCompletion = 0;
|
|
20
|
+
let accTotal = 0;
|
|
21
|
+
let hasUsage = false;
|
|
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
|
+
});
|
|
37
|
+
};
|
|
38
|
+
let chunksSeen = 0;
|
|
39
|
+
for await (const chunk of stream) {
|
|
40
|
+
if (!chunk.ok) {
|
|
41
|
+
// process() returns on the first error chunk → post-loop code never
|
|
42
|
+
// runs. Log accumulated (partial) spend BEFORE yielding the error, and
|
|
43
|
+
// write the response trace here for the same reason (#290): the trace
|
|
44
|
+
// that matters most is the one for the call that failed, and leaving on
|
|
45
|
+
// this path recorded the question and nothing else.
|
|
46
|
+
opts?.sessionLogger?.logStep('llm_response_pass', {
|
|
47
|
+
error: {
|
|
48
|
+
message: chunk.error.message,
|
|
49
|
+
code: chunk.error.code,
|
|
50
|
+
cause: describeCause(chunk.error),
|
|
51
|
+
},
|
|
52
|
+
partialContent: passContent,
|
|
53
|
+
chunksSeen,
|
|
54
|
+
}, 'llm');
|
|
55
|
+
logPassUsage();
|
|
56
|
+
yield chunk;
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
chunksSeen += 1;
|
|
60
|
+
if (chunk.value.reset) {
|
|
61
|
+
passContent = '';
|
|
62
|
+
calls.clear();
|
|
63
|
+
finishReason = undefined;
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
if (chunk.value.content)
|
|
67
|
+
passContent += chunk.value.content;
|
|
68
|
+
if (chunk.value.finishReason)
|
|
69
|
+
finishReason = chunk.value.finishReason;
|
|
70
|
+
if (chunk.value.toolCalls) {
|
|
71
|
+
for (const [index, raw] of chunk.value.toolCalls.entries()) {
|
|
72
|
+
const call = toToolCallDelta(raw, index);
|
|
73
|
+
const previous = calls.get(call.index);
|
|
74
|
+
calls.set(call.index, {
|
|
75
|
+
id: call.id || previous?.id || '',
|
|
76
|
+
name: call.name || previous?.name || '',
|
|
77
|
+
arguments: (previous?.arguments ?? '') + (call.arguments ?? ''),
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
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
|
+
// Strip usage from the forwarded chunk: the single usage-bearing chunk
|
|
89
|
+
// is the terminal getSummary chunk below (one usage chunk per request).
|
|
90
|
+
// Buffer tool-call fragments until the suspension has its own returned IDs.
|
|
91
|
+
const { usage: _omitUsage, toolCalls: _omitCalls, finishReason: _omitFinish, ...rest } = chunk.value;
|
|
92
|
+
yield { ok: true, value: rest };
|
|
54
93
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
94
|
+
logPassUsage();
|
|
95
|
+
const hasToolCalls = finishReason === 'tool_calls' && calls.size > 0;
|
|
96
|
+
const round = new ToolResponseRound(passContent, calls.values(), () => true);
|
|
97
|
+
const executable = hasToolCalls ? round.executableCalls() : [];
|
|
98
|
+
opts?.sessionLogger?.logStep('llm_response_pass', { content: passContent, ...round.diagnostics(executable), finishReason }, 'llm');
|
|
99
|
+
if (finishReason === 'length') {
|
|
100
|
+
yield {
|
|
101
|
+
ok: false,
|
|
102
|
+
error: new OrchestratorError('LLM response was truncated at a token limit.', 'LLM_OUTPUT_TRUNCATED'),
|
|
103
|
+
};
|
|
104
|
+
return;
|
|
60
105
|
}
|
|
61
|
-
if (
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
106
|
+
if (hasToolCalls) {
|
|
107
|
+
if (executable.length === 0) {
|
|
108
|
+
const complete = round.finish();
|
|
109
|
+
yield { ok: true, value: { content: '', iterationEnd: 'retry' } };
|
|
110
|
+
messages = [...messages, complete.assistant, ...complete.results];
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
const entry = {
|
|
114
|
+
assistantMessage: round.assistant,
|
|
115
|
+
precedingMessages: structuredClone(messages),
|
|
116
|
+
sourceMessages: { input: structuredClone(messages), continuation: [] },
|
|
117
|
+
externalCalls: executable.map((call) => ({
|
|
118
|
+
toolCallId: call.id,
|
|
119
|
+
})),
|
|
120
|
+
promise: Promise.resolve(round.calls.flatMap((call) => {
|
|
121
|
+
const message = round
|
|
122
|
+
.resolved()
|
|
123
|
+
.find((item) => item.tool_call_id === call.id);
|
|
124
|
+
return message
|
|
125
|
+
? [
|
|
126
|
+
{
|
|
127
|
+
toolCallId: call.id,
|
|
128
|
+
toolName: call.name,
|
|
129
|
+
text: String(message.content ?? ''),
|
|
130
|
+
},
|
|
131
|
+
]
|
|
132
|
+
: [];
|
|
133
|
+
})),
|
|
134
|
+
createdAt: Date.now(),
|
|
135
|
+
};
|
|
136
|
+
const pending = identity.kind === 'caller'
|
|
137
|
+
? pendingToolResults.set(identity.caller, entry)
|
|
138
|
+
: createPendingToolCallsEntry(entry);
|
|
139
|
+
yield {
|
|
140
|
+
ok: true,
|
|
141
|
+
value: {
|
|
142
|
+
content: '',
|
|
143
|
+
toolCalls: executable.map((call, index) => ({
|
|
144
|
+
...call,
|
|
145
|
+
arguments: JSON.stringify(call.arguments),
|
|
146
|
+
index,
|
|
147
|
+
id: pending.externalCalls[index].returnedId,
|
|
148
|
+
})),
|
|
149
|
+
},
|
|
150
|
+
};
|
|
71
151
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
yield {
|
|
152
|
+
const passSummary = traceId2
|
|
153
|
+
? requestLogger.getSummary(traceId2)
|
|
154
|
+
: undefined;
|
|
155
|
+
yield {
|
|
156
|
+
ok: true,
|
|
157
|
+
value: {
|
|
158
|
+
content: '',
|
|
159
|
+
finishReason: hasToolCalls ? 'tool_calls' : (finishReason ?? 'stop'),
|
|
160
|
+
...(passSummary
|
|
161
|
+
? {
|
|
162
|
+
usage: {
|
|
163
|
+
...summaryToUsage(passSummary),
|
|
164
|
+
models: passSummary.byModel,
|
|
165
|
+
},
|
|
166
|
+
}
|
|
167
|
+
: {}),
|
|
168
|
+
},
|
|
169
|
+
};
|
|
170
|
+
return;
|
|
76
171
|
}
|
|
77
|
-
opts?.sessionLogger?.logStep('llm_response_pass', {
|
|
78
|
-
content: passContent,
|
|
79
|
-
toolCalls: passToolCalls.length > 0 ? passToolCalls : undefined,
|
|
80
|
-
}, 'llm');
|
|
81
|
-
logPassUsage();
|
|
82
|
-
const passSummary = traceId2 ? requestLogger.getSummary(traceId2) : undefined;
|
|
83
|
-
yield {
|
|
84
|
-
ok: true,
|
|
85
|
-
value: {
|
|
86
|
-
content: '',
|
|
87
|
-
finishReason: 'stop',
|
|
88
|
-
...(passSummary
|
|
89
|
-
? {
|
|
90
|
-
usage: {
|
|
91
|
-
...summaryToUsage(passSummary),
|
|
92
|
-
models: passSummary.byModel,
|
|
93
|
-
},
|
|
94
|
-
}
|
|
95
|
-
: {}),
|
|
96
|
-
},
|
|
97
|
-
};
|
|
98
172
|
}
|
|
99
173
|
/**
|
|
100
174
|
* The cause chain as plain text, bounded. See the twin in `tool-loop.ts`: a
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,qBAAa,eAAgB,YAAW,aAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,gBAAgB;IAEjD,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;CAoEpB"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* task: string — Handlebars-style template for the task; defaults to '{{inputText}}'
|
|
10
10
|
* outputTo: string — dot-path to write result output; defaults to `subResults.<agent>`
|
|
11
11
|
*/
|
|
12
|
+
import { terminalRunError } from '@mcp-abap-adt/llm-agent';
|
|
12
13
|
import { OrchestratorError } from '../../agent.js';
|
|
13
14
|
import { resolveTemplate, setPath } from '../../util/template.js';
|
|
14
15
|
export class SubAgentHandler {
|
|
@@ -45,7 +46,9 @@ export class SubAgentHandler {
|
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
48
|
catch (err) {
|
|
48
|
-
ctx.error =
|
|
49
|
+
ctx.error =
|
|
50
|
+
terminalRunError(err) ??
|
|
51
|
+
new OrchestratorError(err instanceof Error ? err.message : String(err), 'SUBAGENT_RUNTIME_ERROR');
|
|
49
52
|
return false;
|
|
50
53
|
}
|
|
51
54
|
const outputPath = config.outputTo ?? `subResults.${config.agent}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAUlE,MAAM,OAAO,eAAe;IACG;IAA7B,YAA6B,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;IAAG,CAAC;IAE3D,KAAK,CAAC,OAAO,CACX,GAAoB,EACpB,SAAkC,EAClC,KAAY;QAEZ,MAAM,MAAM,GAAG,SAA2C,CAAC;QAE3D,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtD,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,qCAAqC,EACrC,uBAAuB,CACxB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,GAAG,GAA0B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,aAAa,MAAM,CAAC,KAAK,4BACvB,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAC1C,EAAE,EACF,oBAAoB,CACrB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,IAAI,eAAe,CAAC;QACpD,MAAM,IAAI,GAAG,eAAe,CAC1B,YAAY,EACZ,GAAyC,CAC1C,CAAC;QAEF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YACzB,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,oBAAoB,EACpB,mBAAmB,CACpB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,MAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACrB,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;gBAC1B,IAAI;gBACJ,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK;gBACzB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,
|
|
1
|
+
{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,8 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* SummarizeHandler — condenses conversation history using helper LLM.
|
|
3
|
-
*
|
|
4
|
-
* Reads: `ctx.history`, `ctx.helperLlm`
|
|
5
|
-
* Writes: `ctx.history` (replaces with summarized version)
|
|
6
|
-
*
|
|
7
|
-
* Keeps at least the last 5 messages, preserving whole tool exchanges,
|
|
8
|
-
* and summarizes the rest into a
|
|
9
|
-
* single system message. Skips silently if no helper LLM is available
|
|
10
|
-
* or history is too short.
|
|
11
|
-
*/
|
|
12
1
|
import type { ISpan } from '../../tracer/types.js';
|
|
13
2
|
import type { PipelineContext } from '../context.js';
|
|
14
3
|
import type { IStageHandler } from '../stage-handler.js';
|
|
4
|
+
/** @deprecated history is no longer summarized; full history is kept */
|
|
15
5
|
export declare class SummarizeHandler implements IStageHandler {
|
|
16
|
-
execute(
|
|
6
|
+
execute(_ctx: PipelineContext, _config: Parameters<IStageHandler['execute']>[1], _span: ISpan): Promise<boolean>;
|
|
17
7
|
}
|
|
18
8
|
//# sourceMappingURL=summarize.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summarize.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"summarize.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,wEAAwE;AACxE,qBAAa,gBAAiB,YAAW,aAAa;IAC9C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAChD,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;CAGpB"}
|
|
@@ -1,58 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
/** @deprecated history is no longer summarized; full history is kept */
|
|
2
2
|
export class SummarizeHandler {
|
|
3
|
-
async execute(
|
|
4
|
-
if (!ctx.helperLlm) {
|
|
5
|
-
span.setAttribute('skipped', true);
|
|
6
|
-
span.setAttribute('reason', 'no_helper_llm');
|
|
7
|
-
return true;
|
|
8
|
-
}
|
|
9
|
-
const limit = config.limit ?? ctx.config.historyAutoSummarizeLimit ?? 10;
|
|
10
|
-
if (ctx.history.length <= limit) {
|
|
11
|
-
span.setAttribute('skipped', true);
|
|
12
|
-
span.setAttribute('reason', 'history_under_limit');
|
|
13
|
-
return true;
|
|
14
|
-
}
|
|
15
|
-
// Keep the entire tool exchange when the recent-message boundary lands
|
|
16
|
-
// among its results. Both the helper request and retained history stay valid.
|
|
17
|
-
let boundary = Math.max(0, ctx.history.length - 5);
|
|
18
|
-
while (boundary > 0 && ctx.history[boundary]?.role === 'tool') {
|
|
19
|
-
boundary--;
|
|
20
|
-
}
|
|
21
|
-
const toSummarize = ctx.history.slice(0, boundary);
|
|
22
|
-
const recent = ctx.history.slice(boundary);
|
|
23
|
-
if (toSummarize.length === 0)
|
|
24
|
-
return true;
|
|
25
|
-
const prompt = ctx.config.historySummaryPrompt ??
|
|
26
|
-
'Summarize the conversation so far in 2-3 sentences. Focus on the user goals and the current status of the task. Keep technical SAP terms as is.';
|
|
27
|
-
const chatStart = Date.now();
|
|
28
|
-
const res = await ctx.helperLlm.chat([...toSummarize, { role: 'system', content: prompt }], [], { ...ctx.options, usage: ctx.options?.usage?.with({ role: 'helper' }) });
|
|
29
|
-
ctx.requestLogger.logLlmCall({
|
|
30
|
-
// Stamp requestId so this helper-LLM call is attributed to the active
|
|
31
|
-
// request's per-traceId delta — without it, history-summarization tokens
|
|
32
|
-
// only show up in the session-cumulative aggregate and are missing from
|
|
33
|
-
// `response.usage` (which is computed from the delta).
|
|
34
|
-
requestId: ctx.options?.trace?.traceId,
|
|
35
|
-
component: 'helper',
|
|
36
|
-
model: ctx.helperLlm.model ?? 'unknown',
|
|
37
|
-
...addCacheTokenUsage(undefined, res.ok ? res.value.usage : undefined),
|
|
38
|
-
promptTokens: res.ok ? (res.value.usage?.promptTokens ?? 0) : 0,
|
|
39
|
-
completionTokens: res.ok ? (res.value.usage?.completionTokens ?? 0) : 0,
|
|
40
|
-
totalTokens: res.ok ? (res.value.usage?.totalTokens ?? 0) : 0,
|
|
41
|
-
durationMs: Date.now() - chatStart,
|
|
42
|
-
});
|
|
43
|
-
if (!res.ok) {
|
|
44
|
-
// Non-fatal — keep original history
|
|
45
|
-
span.setAttribute('fallback', true);
|
|
46
|
-
return true;
|
|
47
|
-
}
|
|
48
|
-
ctx.history = [
|
|
49
|
-
{
|
|
50
|
-
role: 'system',
|
|
51
|
-
content: `Summary of previous conversation: ${res.value.content}`,
|
|
52
|
-
},
|
|
53
|
-
...recent,
|
|
54
|
-
];
|
|
55
|
-
span.setAttribute('summarized_count', toSummarize.length);
|
|
3
|
+
async execute(_ctx, _config, _span) {
|
|
56
4
|
return true;
|
|
57
5
|
}
|
|
58
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summarize.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"summarize.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"AAIA,wEAAwE;AACxE,MAAM,OAAO,gBAAgB;IAC3B,KAAK,CAAC,OAAO,CACX,IAAqB,EACrB,OAAgD,EAChD,KAAY;QAEZ,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -8,7 +8,8 @@
|
|
|
8
8
|
import type { CallOptions, IMcpClient, IMcpFailureClassifier, IToolCache, LlmStreamChunk, LlmTool, McpToolResult, Message, Result, TimingEntry } from '@mcp-abap-adt/llm-agent';
|
|
9
9
|
import { OrchestratorError, type ToolTrust } from '@mcp-abap-adt/llm-agent';
|
|
10
10
|
import type { IMetrics } from '../../metrics/types.js';
|
|
11
|
-
import type
|
|
11
|
+
import { type CallerResolution } from '../../policy/caller-identity.js';
|
|
12
|
+
import { type PendingSourceMessages, type PendingToolResultsRegistry } from '../../policy/pending-tool-results-registry.js';
|
|
12
13
|
import { type ToolAvailabilityRegistry } from '../../policy/tool-availability-registry.js';
|
|
13
14
|
import type { ISpan, ITracer } from '../../tracer/types.js';
|
|
14
15
|
import type { IOutputValidator } from '../../validator/types.js';
|
|
@@ -34,15 +35,20 @@ export interface IClassifiedToolCalls {
|
|
|
34
35
|
hallucinations: ParsedToolCall[];
|
|
35
36
|
}
|
|
36
37
|
/** Partition tool calls into internal / valid-external / blocked / hallucinated. */
|
|
37
|
-
export declare function classifyToolCalls(toolCalls: ParsedToolCall[], toolClientMap: Map<string, IMcpClient>, externalToolNames: Set<string>, toolAvailabilityRegistry: ToolAvailabilityRegistry,
|
|
38
|
+
export declare function classifyToolCalls(toolCalls: ParsedToolCall[], toolClientMap: Map<string, IMcpClient>, externalToolNames: Set<string>, toolAvailabilityRegistry: ToolAvailabilityRegistry, identity: CallerResolution, localBlocks?: ReadonlySet<string>): IClassifiedToolCalls;
|
|
38
39
|
/** Append the client-tool priority instruction to the system message when
|
|
39
40
|
* external tools are present. Returns messages unchanged otherwise. */
|
|
40
41
|
export declare function injectToolPriority(messages: Message[], externalTools: LlmTool[]): Message[];
|
|
41
42
|
/** Filter out session-blocked tools; log the blocked set when non-empty.
|
|
42
43
|
* Returns the allowed subset. */
|
|
43
|
-
export declare function filterAvailableTools(registry: ToolAvailabilityRegistry,
|
|
44
|
-
/**
|
|
45
|
-
|
|
44
|
+
export declare function filterAvailableTools(registry: ToolAvailabilityRegistry, identity: CallerResolution, currentTools: LlmTool[], iteration: number, options: CallOptions | undefined, localBlocks?: ReadonlySet<string>): LlmTool[];
|
|
45
|
+
/**
|
|
46
|
+
* Restore the complete suspended round in assembled context. Keep the round
|
|
47
|
+
* intact even when an explicit history window excluded part or all of it.
|
|
48
|
+
*/
|
|
49
|
+
export declare function injectPendingResults(messages: Message[], pendingToolResults: PendingToolResultsRegistry, identity: CallerResolution, options: CallOptions | undefined, externalResults?: ReadonlyMap<string, string>, sourceInput?: string | Message[]): Promise<Message[]>;
|
|
50
|
+
/** Retain logical history for a later delta, without recycling assembled RAG. */
|
|
51
|
+
export declare function pendingSourceMessages(source: string | Message[], prefix: readonly Message[], messages: readonly Message[]): PendingSourceMessages;
|
|
46
52
|
export type SyntheticToolGroup = {
|
|
47
53
|
assistant: Message;
|
|
48
54
|
results: Message[];
|
|
@@ -69,10 +75,7 @@ export type ToolResultMeta = {
|
|
|
69
75
|
isError: boolean;
|
|
70
76
|
};
|
|
71
77
|
export type BatchOutcome = {
|
|
72
|
-
escalated:
|
|
73
|
-
toolCallCount: number;
|
|
74
|
-
} | {
|
|
75
|
-
escalated: false;
|
|
78
|
+
escalated: boolean;
|
|
76
79
|
currentTools: LlmTool[];
|
|
77
80
|
toolCallCount: number;
|
|
78
81
|
toolMessages: Message[];
|
|
@@ -89,6 +92,8 @@ export interface IExecuteToolBatchArgs {
|
|
|
89
92
|
parentSpan: ISpan;
|
|
90
93
|
toolAvailabilityRegistry: ToolAvailabilityRegistry;
|
|
91
94
|
sessionId: string;
|
|
95
|
+
callerResolution?: CallerResolution;
|
|
96
|
+
localBlocks?: Set<string>;
|
|
92
97
|
externalToolNames: Set<string>;
|
|
93
98
|
currentTools: LlmTool[];
|
|
94
99
|
toolCallCount: number;
|
|
@@ -96,6 +101,7 @@ export interface IExecuteToolBatchArgs {
|
|
|
96
101
|
maxToolCalls?: number;
|
|
97
102
|
heartbeatMs: number | null;
|
|
98
103
|
options: CallOptions | undefined;
|
|
104
|
+
onBatchComplete?: (outcome: BatchOutcome) => Promise<void>;
|
|
99
105
|
onToolExecuted?: (r: ToolExecResult) => void;
|
|
100
106
|
mcpFailureClassifier?: IMcpFailureClassifier;
|
|
101
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop-core.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-loop-core.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,qBAAqB,EACrB,UAAU,EACV,cAAc,EACd,OAAO,EACP,aAAa,EACb,OAAO,EACP,MAAM,EACN,WAAW,EACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"tool-loop-core.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-loop-core.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,qBAAqB,EACrB,UAAU,EACV,cAAc,EACd,OAAO,EACP,aAAa,EACb,OAAO,EACP,MAAM,EACN,WAAW,EACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,iBAAiB,EAGjB,KAAK,SAAS,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAChC,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF,sEAAsE;AACtE,wBAAgB,cAAc,CAC5B,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,UAAU,EAAE,MAAM;;;;;;eAGnB;AAED,sFAAsF;AACtF,wBAAgB,cAAc,CAC5B,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,CAAC,EAAE,WAAW,GACpB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAOzC;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,cAAc,EAAE,CAAC;IAChC,kBAAkB,EAAE,cAAc,EAAE,CAAC;IACrC,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,cAAc,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,cAAc,EAAE,EAC3B,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC9B,wBAAwB,EAAE,wBAAwB,EAClD,QAAQ,EAAE,gBAAgB,EAC1B,WAAW,GAAE,WAAW,CAAC,MAAM,CAAa,GAC3C,oBAAoB,CAyBtB;AAED;wEACwE;AACxE,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,OAAO,EAAE,GACvB,OAAO,EAAE,CAcX;AAED;kCACkC;AAClC,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,wBAAwB,EAClC,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,OAAO,EAAE,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,WAAW,GAAE,WAAW,CAAC,MAAM,CAAa,GAC3C,OAAO,EAAE,CAYX;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,0BAA0B,EAC9C,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7C,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,GAC/B,OAAO,CAAC,OAAO,EAAE,CAAC,CAgFpB;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE,EAC1B,MAAM,EAAE,SAAS,OAAO,EAAE,EAC1B,QAAQ,EAAE,SAAS,OAAO,EAAE,GAC3B,qBAAqB,CAMvB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC;AAE5E;;8EAE8E;AAC9E,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,CAAC,EAAE,WAAW,GAAG,SAAS,GAChC,kBAAkB,CAmBpB;AAED;;uEAEuE;AACvE,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,EAC5B,cAAc,EAAE,cAAc,EAAE,GAC/B,kBAAkB,CAgBpB;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC,aAAa,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,EAAE,CAAC;IACxB,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACvC,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,QAAQ,CAAC;IAClB,UAAU,EAAE,KAAK,CAAC;IAClB,wBAAwB,EAAE,wBAAwB,CAAC;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,YAAY,EAAE,OAAO,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IACjC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAC9C;AAED;;;oDAGoD;AACpD,wBAAuB,6BAA6B,CAClD,IAAI,EAAE,qBAAqB,GAC1B,cAAc,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAyQzE;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED;+EAC+E;AAC/E,wBAAsB,2BAA2B,CAC/C,eAAe,EAAE,gBAAgB,EACjC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,OAAO,EAAE,EACvB,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,SAAS,CAAC,CAsBpB"}
|