@mcp-abap-adt/llm-agent-libs 33.0.1 → 34.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 +67 -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 +82 -34
- package/dist/adapters/llm-adapter.js.map +1 -1
- package/dist/adapters/llm-provider-bridge.d.ts +1 -4
- package/dist/adapters/llm-provider-bridge.d.ts.map +1 -1
- package/dist/adapters/llm-provider-bridge.js +16 -13
- package/dist/adapters/llm-provider-bridge.js.map +1 -1
- 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 -41
- 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 +11 -2
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +171 -236
- 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 +8 -17
- package/dist/builder.js.map +1 -1
- package/dist/classifier/llm-classifier.d.ts.map +1 -1
- package/dist/classifier/llm-classifier.js +2 -1
- package/dist/classifier/llm-classifier.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/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 +1 -1
- package/dist/coordinator/adaptive/index.d.ts.map +1 -1
- package/dist/coordinator/adaptive/index.js +1 -1
- 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 +3 -9
- package/dist/coordinator/adaptive/llm-adaptive-controller.js.map +1 -1
- package/dist/coordinator/dag/dag-plan-interpreter.js +1 -1
- package/dist/coordinator/dag/dag-plan-interpreter.js.map +1 -1
- package/dist/coordinator/dialogue/dialogue-session.d.ts +0 -3
- package/dist/coordinator/dialogue/dialogue-session.d.ts.map +1 -1
- package/dist/coordinator/dialogue/dialogue-session.js +15 -59
- 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-tools-client.d.ts.map +1 -1
- package/dist/coordinator/dialogue/planner-tools-client.js +7 -19
- package/dist/coordinator/dialogue/planner-tools-client.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 +0 -1
- package/dist/coordinator/dialogue/task-board.d.ts.map +1 -1
- package/dist/coordinator/dialogue/task-board.js +6 -7
- 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 +17 -21
- package/dist/coordinator/dispatch/self.js.map +1 -1
- package/dist/coordinator/planning/replan-on-error.d.ts.map +1 -1
- package/dist/coordinator/planning/replan-on-error.js +1 -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 +35 -34
- package/dist/coordinator/stepper/cyclic-react-executor.js.map +1 -1
- package/dist/coordinator/stepper/logging-llm.d.ts.map +1 -1
- package/dist/coordinator/stepper/logging-llm.js +4 -1
- package/dist/coordinator/stepper/logging-llm.js.map +1 -1
- package/dist/coordinator/stepper/stepper-interpreter.d.ts.map +1 -1
- package/dist/coordinator/stepper/stepper-interpreter.js +5 -17
- 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/logger/default-request-logger.d.ts.map +1 -1
- package/dist/logger/default-request-logger.js +3 -0
- package/dist/logger/default-request-logger.js.map +1 -1
- package/dist/logger/session-request-logger.d.ts.map +1 -1
- package/dist/logger/session-request-logger.js +8 -1
- package/dist/logger/session-request-logger.js.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.map +1 -1
- package/dist/pipeline/handlers/adaptive-coordinator.js +9 -6
- 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/dag-coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.js +2 -1
- 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 +3 -1
- package/dist/pipeline/handlers/pass-through.d.ts.map +1 -1
- package/dist/pipeline/handlers/pass-through.js +75 -5
- package/dist/pipeline/handlers/pass-through.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 -63
- 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 +116 -293
- package/dist/pipeline/handlers/tool-loop.js.map +1 -1
- package/dist/pipeline/handlers/tool-response-round.d.ts +30 -0
- package/dist/pipeline/handlers/tool-response-round.d.ts.map +1 -0
- package/dist/pipeline/handlers/tool-response-round.js +85 -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/handlers/translate.d.ts.map +1 -1
- package/dist/pipeline/handlers/translate.js +2 -10
- package/dist/pipeline/handlers/translate.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/reranker/llm-reranker.d.ts.map +1 -1
- package/dist/reranker/llm-reranker.js +2 -1
- package/dist/reranker/llm-reranker.js.map +1 -1
- package/dist/subagent/direct-llm-subagent.js +1 -1
- 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 +6 -5
- package/dist/subagent/smart-agent-subagent.js.map +1 -1
- package/dist/testing/index.d.ts +3 -1
- package/dist/testing/index.d.ts.map +1 -1
- package/dist/testing/index.js +2 -0
- package/dist/testing/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,15 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
* AssembleHandler — builds the final LLM context from action + retrieved + history.
|
|
3
|
-
*
|
|
4
|
-
* Reads: `ctx.subprompts`, `ctx.ragResults`, `ctx.mcpTools` (selected), `ctx.history`
|
|
5
|
-
* Writes: `ctx.assembledMessages`
|
|
6
|
-
*
|
|
7
|
-
* Merges multiple action subprompts into a single action, then delegates
|
|
8
|
-
* to the injected IContextAssembler.
|
|
9
|
-
*/
|
|
1
|
+
import { callerResolutionKey, resolveCallerIdentity, } from '../../policy/caller-identity.js';
|
|
10
2
|
import { OrchestratorError } from '../../agent.js';
|
|
11
3
|
export class AssembleHandler {
|
|
12
4
|
async execute(ctx, _config, span) {
|
|
5
|
+
const identity = ctx.callerResolution ?? resolveCallerIdentity(ctx.options, ctx.sessionId);
|
|
13
6
|
const actions = ctx.subprompts.filter((sp) => sp.type === 'action');
|
|
14
7
|
// Merge multiple actions into one
|
|
15
8
|
const mainAction = actions.length > 1
|
|
@@ -34,8 +27,11 @@ export class AssembleHandler {
|
|
|
34
27
|
}
|
|
35
28
|
// Build retrieved context — select tools that were chosen
|
|
36
29
|
const selectedMcpTools = ctx.mcpTools.filter((t) => ctx.activeTools.some((at) => at.name === t.name));
|
|
37
|
-
const
|
|
38
|
-
|
|
30
|
+
const memoryKey = callerResolutionKey(identity);
|
|
31
|
+
const recentActions = ctx.historyMemory &&
|
|
32
|
+
ctx.config.semanticHistoryEnabled &&
|
|
33
|
+
memoryKey !== undefined
|
|
34
|
+
? ctx.historyMemory.getRecent(memoryKey, ctx.config.historyRecencyWindow ?? 3)
|
|
39
35
|
: undefined;
|
|
40
36
|
const retrieved = {
|
|
41
37
|
ragResults: ctx.ragResults,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assemble.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/assemble.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"assemble.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/assemble.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dag-coordinator.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACX,OAAO,EAEP,mBAAmB,EACnB,cAAc,EACd,UAAU,EACV,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,SAAS,EAMV,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"dag-coordinator.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACX,OAAO,EAEP,mBAAmB,EACnB,cAAc,EACd,UAAU,EACV,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,SAAS,EAMV,MAAM,yBAAyB,CAAC;AAUjC,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,0EAA0E;AAC1E,wBAAgB,aAAa,CAC3B,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,MAAM,GAAG,SAAS;;;;;;;cAK5B;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,uBAAQ,CAAC;AAEpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,QAAQ,CAAC;IAClB,WAAW,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACpD,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC;;mFAE+E;IAC/E,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC;;4BAEwB;IACxB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,4EAA4E;IAC5E,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B;;yEAEqE;IACrE,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B;;0DAEsD;IACtD,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,sFAAsF;IACtF,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,qBAAsB,YAAW,aAAa;IAG7C,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;gBAEV,IAAI,EAAE,yBAAyB;IAkBtD,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;CAqdpB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,GAAG,WAAW,CA+BtE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ClarifySignal, NeedInfoSignal } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import { addCacheTokenUsage, ClarifySignal, NeedInfoSignal, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { OrchestratorError } from '../../agent.js';
|
|
3
3
|
import { PassthroughFinalizer } from '../../coordinator/dag/passthrough-finalizer.js';
|
|
4
4
|
import { AbortErrorStrategy } from '../../coordinator/index.js';
|
|
@@ -65,6 +65,7 @@ export class DagCoordinatorHandler {
|
|
|
65
65
|
ctx.requestLogger.logLlmCall({
|
|
66
66
|
component,
|
|
67
67
|
model: model ?? 'unknown',
|
|
68
|
+
...addCacheTokenUsage(undefined, usage),
|
|
68
69
|
promptTokens: usage.promptTokens,
|
|
69
70
|
completionTokens: usage.completionTokens,
|
|
70
71
|
totalTokens: usage.totalTokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dag-coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dag-coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type CallerResolution } from '../../policy/caller-identity.js';
|
|
1
2
|
/**
|
|
2
3
|
* HistoryUpsertHandler — post-tool-loop pipeline stage.
|
|
3
4
|
*
|
|
@@ -14,6 +15,7 @@ import type { ISpan } from '../../tracer/types.js';
|
|
|
14
15
|
import type { PipelineContext } from '../context.js';
|
|
15
16
|
import type { IStageHandler } from '../stage-handler.js';
|
|
16
17
|
export interface SummarizeAndStoreArgs {
|
|
18
|
+
identity?: CallerResolution;
|
|
17
19
|
turn: HistoryTurn;
|
|
18
20
|
summarizer: IHistorySummarizer;
|
|
19
21
|
memory: IHistoryMemory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-upsert.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/history-upsert.ts"],"names":[],"mappings":"AACA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,IAAI,EACL,MAAM,yBAAyB,CAAC;AACjC,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,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,GAAG,EAAE,IAAI,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7C;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"history-upsert.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/history-upsert.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,iCAAiC,CAAC;AACzC;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,IAAI,EACL,MAAM,yBAAyB,CAAC;AACjC,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,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,GAAG,EAAE,IAAI,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7C;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED,qBAAa,oBAAqB,YAAW,aAAa;IAClD,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CAiDpB"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { stampRagOwner } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
import { callerResolutionKey, resolveCallerIdentity, } from '../../policy/caller-identity.js';
|
|
2
3
|
export async function summarizeAndStore(args) {
|
|
3
4
|
const { turn, summarizer, memory, rag, sessionId, options, log } = args;
|
|
5
|
+
const identity = args.identity ?? resolveCallerIdentity(options, sessionId);
|
|
4
6
|
const result = await summarizer.summarize(turn, options);
|
|
5
7
|
const summary = result.ok
|
|
6
8
|
? result.value
|
|
@@ -22,7 +24,9 @@ export async function summarizeAndStore(args) {
|
|
|
22
24
|
log?.('history_upsert_failed', { error: upsertResult.error.message });
|
|
23
25
|
}
|
|
24
26
|
}
|
|
25
|
-
|
|
27
|
+
const memoryKey = callerResolutionKey(identity);
|
|
28
|
+
if (memoryKey !== undefined)
|
|
29
|
+
memory.pushRecent(memoryKey, summary);
|
|
26
30
|
}
|
|
27
31
|
export class HistoryUpsertHandler {
|
|
28
32
|
async execute(ctx, _config, span) {
|
|
@@ -50,6 +54,7 @@ export class HistoryUpsertHandler {
|
|
|
50
54
|
timestamp: Date.now(),
|
|
51
55
|
};
|
|
52
56
|
await summarizeAndStore({
|
|
57
|
+
identity: ctx.callerResolution,
|
|
53
58
|
turn,
|
|
54
59
|
summarizer: ctx.historySummarizer,
|
|
55
60
|
memory: ctx.historyMemory,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-upsert.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/history-upsert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"history-upsert.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/history-upsert.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { CallOptions, ILlm, IRequestLogger, LlmStreamChunk, LlmTool, Message, OrchestratorError, Result } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { type ToolTrust } from '@mcp-abap-adt/llm-agent';
|
|
3
|
-
|
|
3
|
+
import type { CallerResolution } from '../../policy/caller-identity.js';
|
|
4
|
+
import { PendingToolResultsRegistry } from '../../policy/pending-tool-results-registry.js';
|
|
5
|
+
export declare function runPassThrough(llm: ILlm, requestLogger: IRequestLogger, messages: Message[], externalTools: LlmTool[], opts: CallOptions | undefined, toolTrust?: ToolTrust, pendingToolResults?: PendingToolResultsRegistry, identity?: CallerResolution): AsyncIterable<Result<LlmStreamChunk, OrchestratorError>>;
|
|
4
6
|
//# sourceMappingURL=pass-through.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pass-through.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,IAAI,EACJ,cAAc,EACd,cAAc,EACd,OAAO,EACP,OAAO,EACP,iBAAiB,EACjB,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"pass-through.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,IAAI,EACJ,cAAc,EACd,cAAc,EACd,OAAO,EACP,OAAO,EACP,iBAAiB,EACjB,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,SAAS,EAGf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAEL,0BAA0B,EAC3B,MAAM,+CAA+C,CAAC;AAGvD,wBAAuB,cAAc,CACnC,GAAG,EAAE,IAAI,EACT,aAAa,EAAE,cAAc,EAC7B,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,OAAO,EAAE,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,SAAS,CAAC,EAAE,SAAS,EACrB,kBAAkB,GAAE,0BAA6D,EACjF,QAAQ,GAAE,gBAAwC,GACjD,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAqM1D"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { scopedUsage, toModelToolMessages, } from '@mcp-abap-adt/llm-agent';
|
|
1
|
+
import { addCacheTokenUsage, scopedUsage, toModelToolMessages, toToolCallDelta, } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
import { summaryToUsage } from '../../logger/session-request-logger.js';
|
|
3
|
-
|
|
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' }) {
|
|
4
6
|
const passStart = Date.now();
|
|
5
7
|
const traceId2 = opts?.trace?.traceId;
|
|
6
8
|
opts?.sessionLogger?.logStep('llm_request_pass', { messages, tools: externalTools ?? [] }, 'llm');
|
|
@@ -10,6 +12,9 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
10
12
|
});
|
|
11
13
|
let passContent = '';
|
|
12
14
|
const passToolCalls = [];
|
|
15
|
+
const calls = new Map();
|
|
16
|
+
let finishReason;
|
|
17
|
+
let cache = {};
|
|
13
18
|
let accPrompt = 0;
|
|
14
19
|
let accCompletion = 0;
|
|
15
20
|
let accTotal = 0;
|
|
@@ -22,6 +27,7 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
22
27
|
requestLogger.logLlmCall({
|
|
23
28
|
component: 'tool-loop',
|
|
24
29
|
model: llm.model ?? 'unknown',
|
|
30
|
+
...cache,
|
|
25
31
|
promptTokens: accPrompt,
|
|
26
32
|
completionTokens: accCompletion,
|
|
27
33
|
totalTokens: accTotal,
|
|
@@ -54,13 +60,28 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
54
60
|
if (chunk.value.reset) {
|
|
55
61
|
passContent = '';
|
|
56
62
|
passToolCalls.length = 0;
|
|
63
|
+
calls.clear();
|
|
64
|
+
finishReason = undefined;
|
|
57
65
|
continue;
|
|
58
66
|
}
|
|
59
67
|
if (chunk.value.content)
|
|
60
68
|
passContent += chunk.value.content;
|
|
61
|
-
if (chunk.value.
|
|
69
|
+
if (chunk.value.finishReason)
|
|
70
|
+
finishReason = chunk.value.finishReason;
|
|
71
|
+
if (chunk.value.toolCalls) {
|
|
62
72
|
passToolCalls.push(...chunk.value.toolCalls);
|
|
73
|
+
for (const [index, raw] of chunk.value.toolCalls.entries()) {
|
|
74
|
+
const call = toToolCallDelta(raw, index);
|
|
75
|
+
const previous = calls.get(call.index);
|
|
76
|
+
calls.set(call.index, {
|
|
77
|
+
id: call.id || previous?.id || '',
|
|
78
|
+
name: call.name || previous?.name || '',
|
|
79
|
+
arguments: (previous?.arguments ?? '') + (call.arguments ?? ''),
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
}
|
|
63
83
|
if (chunk.value.usage) {
|
|
84
|
+
cache = addCacheTokenUsage(cache, chunk.value.usage);
|
|
64
85
|
accPrompt += chunk.value.usage.promptTokens;
|
|
65
86
|
accCompletion += chunk.value.usage.completionTokens;
|
|
66
87
|
accTotal += chunk.value.usage.totalTokens;
|
|
@@ -68,7 +89,8 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
68
89
|
}
|
|
69
90
|
// Strip usage from the forwarded chunk: the single usage-bearing chunk
|
|
70
91
|
// is the terminal getSummary chunk below (one usage chunk per request).
|
|
71
|
-
|
|
92
|
+
// Buffer tool-call fragments until the suspension has its own returned IDs.
|
|
93
|
+
const { usage: _omitUsage, toolCalls: _omitCalls, finishReason: _omitFinish, ...rest } = chunk.value;
|
|
72
94
|
yield { ok: true, value: rest };
|
|
73
95
|
}
|
|
74
96
|
opts?.sessionLogger?.logStep('llm_response_pass', {
|
|
@@ -76,12 +98,60 @@ export async function* runPassThrough(llm, requestLogger, messages, externalTool
|
|
|
76
98
|
toolCalls: passToolCalls.length > 0 ? passToolCalls : undefined,
|
|
77
99
|
}, 'llm');
|
|
78
100
|
logPassUsage();
|
|
101
|
+
const hasToolCalls = finishReason === 'tool_calls' && calls.size > 0;
|
|
102
|
+
if (hasToolCalls) {
|
|
103
|
+
const round = new ToolResponseRound(passContent, calls.values(), () => true);
|
|
104
|
+
const executable = round.executableCalls();
|
|
105
|
+
if (executable.length === 0) {
|
|
106
|
+
const complete = round.finish();
|
|
107
|
+
yield* runPassThrough(llm, requestLogger, [...messages, complete.assistant, ...complete.results], externalTools, opts, toolTrust, pendingToolResults, identity);
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
const entry = {
|
|
111
|
+
assistantMessage: round.assistant,
|
|
112
|
+
precedingMessages: structuredClone(messages),
|
|
113
|
+
sourceMessages: { input: structuredClone(messages), continuation: [] },
|
|
114
|
+
externalCalls: executable.map((call) => ({
|
|
115
|
+
toolCallId: call.id,
|
|
116
|
+
})),
|
|
117
|
+
promise: Promise.resolve(round.calls.flatMap((call) => {
|
|
118
|
+
const message = round
|
|
119
|
+
.resolved()
|
|
120
|
+
.find((item) => item.tool_call_id === call.id);
|
|
121
|
+
return message
|
|
122
|
+
? [
|
|
123
|
+
{
|
|
124
|
+
toolCallId: call.id,
|
|
125
|
+
toolName: call.name,
|
|
126
|
+
text: String(message.content ?? ''),
|
|
127
|
+
},
|
|
128
|
+
]
|
|
129
|
+
: [];
|
|
130
|
+
})),
|
|
131
|
+
createdAt: Date.now(),
|
|
132
|
+
};
|
|
133
|
+
const pending = identity.kind === 'caller'
|
|
134
|
+
? pendingToolResults.set(identity.caller, entry)
|
|
135
|
+
: createPendingToolCallsEntry(entry);
|
|
136
|
+
yield {
|
|
137
|
+
ok: true,
|
|
138
|
+
value: {
|
|
139
|
+
content: '',
|
|
140
|
+
toolCalls: executable.map((call, index) => ({
|
|
141
|
+
...call,
|
|
142
|
+
arguments: JSON.stringify(call.arguments),
|
|
143
|
+
index,
|
|
144
|
+
id: pending.externalCalls[index].returnedId,
|
|
145
|
+
})),
|
|
146
|
+
},
|
|
147
|
+
};
|
|
148
|
+
}
|
|
79
149
|
const passSummary = traceId2 ? requestLogger.getSummary(traceId2) : undefined;
|
|
80
150
|
yield {
|
|
81
151
|
ok: true,
|
|
82
152
|
value: {
|
|
83
153
|
content: '',
|
|
84
|
-
finishReason: 'stop',
|
|
154
|
+
finishReason: hasToolCalls ? 'tool_calls' : (finishReason ?? 'stop'),
|
|
85
155
|
...(passSummary
|
|
86
156
|
? {
|
|
87
157
|
usage: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pass-through.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,WAAW,EAEX,mBAAmB,
|
|
1
|
+
{"version":3,"file":"pass-through.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/pass-through.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":"AAAA
|
|
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,67 +1,6 @@
|
|
|
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
|
-
*/
|
|
1
|
+
/** @deprecated history is no longer summarized; full history is kept */
|
|
12
2
|
export class SummarizeHandler {
|
|
13
|
-
async execute(
|
|
14
|
-
if (!ctx.helperLlm) {
|
|
15
|
-
span.setAttribute('skipped', true);
|
|
16
|
-
span.setAttribute('reason', 'no_helper_llm');
|
|
17
|
-
return true;
|
|
18
|
-
}
|
|
19
|
-
const limit = config.limit ?? ctx.config.historyAutoSummarizeLimit ?? 10;
|
|
20
|
-
if (ctx.history.length <= limit) {
|
|
21
|
-
span.setAttribute('skipped', true);
|
|
22
|
-
span.setAttribute('reason', 'history_under_limit');
|
|
23
|
-
return true;
|
|
24
|
-
}
|
|
25
|
-
// Keep the entire tool exchange when the recent-message boundary lands
|
|
26
|
-
// among its results. Both the helper request and retained history stay valid.
|
|
27
|
-
let boundary = Math.max(0, ctx.history.length - 5);
|
|
28
|
-
while (boundary > 0 && ctx.history[boundary]?.role === 'tool') {
|
|
29
|
-
boundary--;
|
|
30
|
-
}
|
|
31
|
-
const toSummarize = ctx.history.slice(0, boundary);
|
|
32
|
-
const recent = ctx.history.slice(boundary);
|
|
33
|
-
if (toSummarize.length === 0)
|
|
34
|
-
return true;
|
|
35
|
-
const prompt = ctx.config.historySummaryPrompt ??
|
|
36
|
-
'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.';
|
|
37
|
-
const chatStart = Date.now();
|
|
38
|
-
const res = await ctx.helperLlm.chat([...toSummarize, { role: 'system', content: prompt }], [], { ...ctx.options, usage: ctx.options?.usage?.with({ role: 'helper' }) });
|
|
39
|
-
ctx.requestLogger.logLlmCall({
|
|
40
|
-
// Stamp requestId so this helper-LLM call is attributed to the active
|
|
41
|
-
// request's per-traceId delta — without it, history-summarization tokens
|
|
42
|
-
// only show up in the session-cumulative aggregate and are missing from
|
|
43
|
-
// `response.usage` (which is computed from the delta).
|
|
44
|
-
requestId: ctx.options?.trace?.traceId,
|
|
45
|
-
component: 'helper',
|
|
46
|
-
model: ctx.helperLlm.model ?? 'unknown',
|
|
47
|
-
promptTokens: res.ok ? (res.value.usage?.promptTokens ?? 0) : 0,
|
|
48
|
-
completionTokens: res.ok ? (res.value.usage?.completionTokens ?? 0) : 0,
|
|
49
|
-
totalTokens: res.ok ? (res.value.usage?.totalTokens ?? 0) : 0,
|
|
50
|
-
durationMs: Date.now() - chatStart,
|
|
51
|
-
});
|
|
52
|
-
if (!res.ok) {
|
|
53
|
-
// Non-fatal — keep original history
|
|
54
|
-
span.setAttribute('fallback', true);
|
|
55
|
-
return true;
|
|
56
|
-
}
|
|
57
|
-
ctx.history = [
|
|
58
|
-
{
|
|
59
|
-
role: 'system',
|
|
60
|
-
content: `Summary of previous conversation: ${res.value.content}`,
|
|
61
|
-
},
|
|
62
|
-
...recent,
|
|
63
|
-
];
|
|
64
|
-
span.setAttribute('summarized_count', toSummarize.length);
|
|
3
|
+
async execute(_ctx, _config, _span) {
|
|
65
4
|
return true;
|
|
66
5
|
}
|
|
67
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":"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"}
|