@mcp-abap-adt/llm-agent-libs 16.2.0 → 17.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/llm-provider-bridge.js +2 -2
- package/dist/adapters/llm-provider-bridge.js.map +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +48 -37
- package/dist/agent.js.map +1 -1
- package/dist/builder.d.ts +10 -0
- package/dist/builder.d.ts.map +1 -1
- package/dist/builder.js +17 -3
- package/dist/builder.js.map +1 -1
- package/dist/classifier/llm-classifier.d.ts.map +1 -1
- package/dist/classifier/llm-classifier.js +1 -0
- package/dist/classifier/llm-classifier.js.map +1 -1
- package/dist/coordinator/dag/abort-error-strategy.d.ts +7 -0
- package/dist/coordinator/dag/abort-error-strategy.d.ts.map +1 -0
- package/dist/coordinator/dag/abort-error-strategy.js +8 -0
- package/dist/coordinator/dag/abort-error-strategy.js.map +1 -0
- package/dist/coordinator/dag/compose-node-task.d.ts +8 -0
- package/dist/coordinator/dag/compose-node-task.d.ts.map +1 -0
- package/dist/coordinator/dag/compose-node-task.js +41 -0
- package/dist/coordinator/dag/compose-node-task.js.map +1 -0
- package/dist/coordinator/dag/dag-plan-interpreter.d.ts +9 -0
- package/dist/coordinator/dag/dag-plan-interpreter.d.ts.map +1 -0
- package/dist/coordinator/dag/dag-plan-interpreter.js +220 -0
- package/dist/coordinator/dag/dag-plan-interpreter.js.map +1 -0
- package/dist/coordinator/dag/index.d.ts +5 -0
- package/dist/coordinator/dag/index.d.ts.map +1 -0
- package/dist/coordinator/dag/index.js +5 -0
- package/dist/coordinator/dag/index.js.map +1 -0
- package/dist/coordinator/dag/llm-dag-planner.d.ts +17 -0
- package/dist/coordinator/dag/llm-dag-planner.d.ts.map +1 -0
- package/dist/coordinator/dag/llm-dag-planner.js +152 -0
- package/dist/coordinator/dag/llm-dag-planner.js.map +1 -0
- package/dist/coordinator/dag/llm-finalizer.d.ts +21 -0
- package/dist/coordinator/dag/llm-finalizer.d.ts.map +1 -0
- package/dist/coordinator/dag/llm-finalizer.js +77 -0
- package/dist/coordinator/dag/llm-finalizer.js.map +1 -0
- package/dist/coordinator/dag/llm-review-strategy.d.ts +17 -0
- package/dist/coordinator/dag/llm-review-strategy.d.ts.map +1 -0
- package/dist/coordinator/dag/llm-review-strategy.js +149 -0
- package/dist/coordinator/dag/llm-review-strategy.js.map +1 -0
- package/dist/coordinator/dag/noop-review-strategy.d.ts +8 -0
- package/dist/coordinator/dag/noop-review-strategy.d.ts.map +1 -0
- package/dist/coordinator/dag/noop-review-strategy.js +11 -0
- package/dist/coordinator/dag/noop-review-strategy.js.map +1 -0
- package/dist/coordinator/dag/passthrough-finalizer.d.ts +11 -0
- package/dist/coordinator/dag/passthrough-finalizer.d.ts.map +1 -0
- package/dist/coordinator/dag/passthrough-finalizer.js +13 -0
- package/dist/coordinator/dag/passthrough-finalizer.js.map +1 -0
- package/dist/coordinator/dag/render-ancestor-context.d.ts +8 -0
- package/dist/coordinator/dag/render-ancestor-context.d.ts.map +1 -0
- package/dist/coordinator/dag/render-ancestor-context.js +27 -0
- package/dist/coordinator/dag/render-ancestor-context.js.map +1 -0
- package/dist/coordinator/dag/replan-error-strategy.d.ts +15 -0
- package/dist/coordinator/dag/replan-error-strategy.d.ts.map +1 -0
- package/dist/coordinator/dag/replan-error-strategy.js +32 -0
- package/dist/coordinator/dag/replan-error-strategy.js.map +1 -0
- package/dist/coordinator/dag/reviewer-error-strategy.d.ts +15 -0
- package/dist/coordinator/dag/reviewer-error-strategy.d.ts.map +1 -0
- package/dist/coordinator/dag/reviewer-error-strategy.js +38 -0
- package/dist/coordinator/dag/reviewer-error-strategy.js.map +1 -0
- package/dist/coordinator/dag/splice-sub-plan.d.ts +12 -0
- package/dist/coordinator/dag/splice-sub-plan.d.ts.map +1 -0
- package/dist/coordinator/dag/splice-sub-plan.js +41 -0
- package/dist/coordinator/dag/splice-sub-plan.js.map +1 -0
- package/dist/coordinator/dag/subagent-state-oracle.d.ts +19 -0
- package/dist/coordinator/dag/subagent-state-oracle.d.ts.map +1 -0
- package/dist/coordinator/dag/subagent-state-oracle.js +31 -0
- package/dist/coordinator/dag/subagent-state-oracle.js.map +1 -0
- package/dist/coordinator/dag/template-finalizer.d.ts +11 -0
- package/dist/coordinator/dag/template-finalizer.d.ts.map +1 -0
- package/dist/coordinator/dag/template-finalizer.js +17 -0
- package/dist/coordinator/dag/template-finalizer.js.map +1 -0
- package/dist/coordinator/dispatch/subagent.d.ts.map +1 -1
- package/dist/coordinator/dispatch/subagent.js +6 -12
- package/dist/coordinator/dispatch/subagent.js.map +1 -1
- package/dist/coordinator/index.d.ts +6 -0
- package/dist/coordinator/index.d.ts.map +1 -1
- package/dist/coordinator/index.js +6 -0
- package/dist/coordinator/index.js.map +1 -1
- package/dist/coordinator/planning/one-shot.d.ts.map +1 -1
- package/dist/coordinator/planning/one-shot.js +14 -7
- package/dist/coordinator/planning/one-shot.js.map +1 -1
- package/dist/index.d.ts +8 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/logger/default-request-logger.d.ts +18 -6
- package/dist/logger/default-request-logger.d.ts.map +1 -1
- package/dist/logger/default-request-logger.js +15 -4
- package/dist/logger/default-request-logger.js.map +1 -1
- package/dist/logger/noop-request-logger.d.ts +10 -5
- package/dist/logger/noop-request-logger.d.ts.map +1 -1
- package/dist/logger/noop-request-logger.js +4 -3
- package/dist/logger/noop-request-logger.js.map +1 -1
- package/dist/logger/session-request-logger.d.ts +50 -0
- package/dist/logger/session-request-logger.d.ts.map +1 -0
- package/dist/logger/session-request-logger.js +151 -0
- package/dist/logger/session-request-logger.js.map +1 -0
- package/dist/pipeline/context.d.ts +8 -3
- package/dist/pipeline/context.d.ts.map +1 -1
- package/dist/pipeline/default-pipeline.d.ts +27 -4
- package/dist/pipeline/default-pipeline.d.ts.map +1 -1
- package/dist/pipeline/default-pipeline.js +42 -7
- package/dist/pipeline/default-pipeline.js.map +1 -1
- package/dist/pipeline/handlers/coordinator.d.ts +0 -3
- package/dist/pipeline/handlers/coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/coordinator.js +33 -22
- package/dist/pipeline/handlers/coordinator.js.map +1 -1
- package/dist/pipeline/handlers/dag-coordinator.d.ts +47 -0
- package/dist/pipeline/handlers/dag-coordinator.d.ts.map +1 -0
- package/dist/pipeline/handlers/dag-coordinator.js +369 -0
- package/dist/pipeline/handlers/dag-coordinator.js.map +1 -0
- package/dist/pipeline/handlers/index.d.ts +7 -0
- package/dist/pipeline/handlers/index.d.ts.map +1 -1
- package/dist/pipeline/handlers/index.js +5 -1
- package/dist/pipeline/handlers/index.js.map +1 -1
- package/dist/pipeline/handlers/rag-query.d.ts.map +1 -1
- package/dist/pipeline/handlers/rag-query.js +1 -0
- package/dist/pipeline/handlers/rag-query.js.map +1 -1
- package/dist/pipeline/handlers/subagent.d.ts.map +1 -1
- package/dist/pipeline/handlers/subagent.js +0 -2
- package/dist/pipeline/handlers/subagent.js.map +1 -1
- package/dist/pipeline/handlers/summarize.d.ts.map +1 -1
- package/dist/pipeline/handlers/summarize.js +5 -0
- package/dist/pipeline/handlers/summarize.js.map +1 -1
- package/dist/pipeline/handlers/tool-loop.d.ts.map +1 -1
- package/dist/pipeline/handlers/tool-loop.js +16 -0
- 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 +1 -0
- package/dist/pipeline/handlers/translate.js.map +1 -1
- package/dist/pipeline/index.d.ts +2 -1
- package/dist/pipeline/index.d.ts.map +1 -1
- package/dist/pipeline/index.js +1 -1
- package/dist/pipeline/index.js.map +1 -1
- package/dist/session/session-graph-factory.d.ts +66 -0
- package/dist/session/session-graph-factory.d.ts.map +1 -0
- package/dist/session/session-graph-factory.js +63 -0
- package/dist/session/session-graph-factory.js.map +1 -0
- package/dist/session/session-graph.d.ts +54 -0
- package/dist/session/session-graph.d.ts.map +1 -0
- package/dist/session/session-graph.js +76 -0
- package/dist/session/session-graph.js.map +1 -0
- package/dist/session/session-registry.d.ts +89 -0
- package/dist/session/session-registry.d.ts.map +1 -0
- package/dist/session/session-registry.js +279 -0
- package/dist/session/session-registry.js.map +1 -0
- package/dist/subagent/direct-llm-subagent.d.ts.map +1 -1
- package/dist/subagent/direct-llm-subagent.js +0 -2
- 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 +3 -3
- package/dist/subagent/smart-agent-subagent.js.map +1 -1
- package/package.json +14 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-request-logger.js","sourceRoot":"","sources":["../../src/logger/default-request-logger.ts"],"names":[],"mappings":"AAWA,MAAM,YAAY,GAAwC;
|
|
1
|
+
{"version":3,"file":"default-request-logger.js","sourceRoot":"","sources":["../../src/logger/default-request-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import type { IRequestLogger, LlmCallEntry, RagQueryEntry, RequestSummary, ToolCallEntry } from '@mcp-abap-adt/llm-agent';
|
|
2
2
|
export declare class NoopRequestLogger implements IRequestLogger {
|
|
3
3
|
logLlmCall(_entry: LlmCallEntry): void;
|
|
4
|
-
logRagQuery(_entry: RagQueryEntry
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
logRagQuery(_entry: RagQueryEntry & {
|
|
5
|
+
requestId?: string;
|
|
6
|
+
}): void;
|
|
7
|
+
logToolCall(_entry: ToolCallEntry & {
|
|
8
|
+
requestId?: string;
|
|
9
|
+
}): void;
|
|
10
|
+
startRequest(_requestId?: string): void;
|
|
11
|
+
endRequest(_requestId?: string): void;
|
|
12
|
+
dropRequest(_requestId?: string): void;
|
|
13
|
+
getSummary(_requestId?: string): RequestSummary;
|
|
9
14
|
reset(): void;
|
|
10
15
|
}
|
|
11
16
|
//# sourceMappingURL=noop-request-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noop-request-logger.d.ts","sourceRoot":"","sources":["../../src/logger/noop-request-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAC;AAWjC,qBAAa,iBAAkB,YAAW,cAAc;IACtD,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IACtC,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"noop-request-logger.d.ts","sourceRoot":"","sources":["../../src/logger/noop-request-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAC;AAWjC,qBAAa,iBAAkB,YAAW,cAAc;IACtD,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IACtC,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IACjE,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IACjE,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IACvC,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IACrC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IACtC,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,cAAc;IAG/C,KAAK,IAAI,IAAI;CACd"}
|
|
@@ -10,9 +10,10 @@ export class NoopRequestLogger {
|
|
|
10
10
|
logLlmCall(_entry) { }
|
|
11
11
|
logRagQuery(_entry) { }
|
|
12
12
|
logToolCall(_entry) { }
|
|
13
|
-
startRequest() { }
|
|
14
|
-
endRequest() { }
|
|
15
|
-
|
|
13
|
+
startRequest(_requestId) { }
|
|
14
|
+
endRequest(_requestId) { }
|
|
15
|
+
dropRequest(_requestId) { }
|
|
16
|
+
getSummary(_requestId) {
|
|
16
17
|
return { ...EMPTY_SUMMARY, byModel: {}, byComponent: {}, byCategory: {} };
|
|
17
18
|
}
|
|
18
19
|
reset() { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noop-request-logger.js","sourceRoot":"","sources":["../../src/logger/noop-request-logger.ts"],"names":[],"mappings":"AAQA,MAAM,aAAa,GAAmB;IACpC,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,EAAE;IACf,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,eAAe,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,OAAO,iBAAiB;IAC5B,UAAU,CAAC,MAAoB,IAAS,CAAC;IACzC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"noop-request-logger.js","sourceRoot":"","sources":["../../src/logger/noop-request-logger.ts"],"names":[],"mappings":"AAQA,MAAM,aAAa,GAAmB;IACpC,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,EAAE;IACf,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,eAAe,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,OAAO,iBAAiB;IAC5B,UAAU,CAAC,MAAoB,IAAS,CAAC;IACzC,WAAW,CAAC,MAA8C,IAAS,CAAC;IACpE,WAAW,CAAC,MAA8C,IAAS,CAAC;IACpE,YAAY,CAAC,UAAmB,IAAS,CAAC;IAC1C,UAAU,CAAC,UAAmB,IAAS,CAAC;IACxC,WAAW,CAAC,UAAmB,IAAS,CAAC;IACzC,UAAU,CAAC,UAAmB;QAC5B,OAAO,EAAE,GAAG,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAC5E,CAAC;IACD,KAAK,KAAU,CAAC;CACjB"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { IRequestLogger, LlmCallEntry, LlmUsage, RagQueryEntry, RequestSummary, ToolCallEntry } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
interface Bucket {
|
|
3
|
+
llm: LlmCallEntry[];
|
|
4
|
+
rag: number;
|
|
5
|
+
tool: number;
|
|
6
|
+
}
|
|
7
|
+
/** Shared aggregation (DRY with DefaultRequestLogger.getSummary). */
|
|
8
|
+
export declare function aggregate(b: Bucket): RequestSummary;
|
|
9
|
+
/** Sum a summary's components into a flat usage triple for response.usage. */
|
|
10
|
+
export declare function summaryToUsage(s: RequestSummary): LlmUsage;
|
|
11
|
+
/**
|
|
12
|
+
* One logger per SessionGraph, shared by the coordinator AND its workers. Two
|
|
13
|
+
* accounting axes (spec C.2):
|
|
14
|
+
* - session-cumulative (survives across requests, for /v1/usage),
|
|
15
|
+
* - per-traceId delta (for response.usage; keyed so concurrent requests never
|
|
16
|
+
* stomp each other).
|
|
17
|
+
*
|
|
18
|
+
* NESTED-SAFE: a worker's SmartAgent.process() runs startRequest(traceId) /
|
|
19
|
+
* endRequest(traceId) under the SAME traceId as the coordinator. Therefore:
|
|
20
|
+
* - startRequest is depth-counted and creates the bucket ONLY if absent
|
|
21
|
+
* (never clears an existing one — a worker start must not wipe coordinator
|
|
22
|
+
* tokens already logged under that traceId),
|
|
23
|
+
* - endRequest is depth-counted and NEVER deletes the bucket (a worker end
|
|
24
|
+
* must not drop the delta before the server emits response.usage),
|
|
25
|
+
* - dropRequest is the explicit free, called by the top-level owner (the
|
|
26
|
+
* server) AFTER it has read getSummary(traceId).
|
|
27
|
+
*/
|
|
28
|
+
export declare class SessionRequestLogger implements IRequestLogger {
|
|
29
|
+
private readonly cumulative;
|
|
30
|
+
private readonly deltas;
|
|
31
|
+
private readonly depth;
|
|
32
|
+
startRequest(requestId?: string): void;
|
|
33
|
+
endRequest(requestId?: string): void;
|
|
34
|
+
/** Explicit free of a request delta. Called once by the top-level owner. */
|
|
35
|
+
dropRequest(requestId?: string): void;
|
|
36
|
+
logLlmCall(entry: LlmCallEntry): void;
|
|
37
|
+
logRagQuery(entry: RagQueryEntry & {
|
|
38
|
+
requestId?: string;
|
|
39
|
+
}): void;
|
|
40
|
+
logToolCall(entry: ToolCallEntry & {
|
|
41
|
+
requestId?: string;
|
|
42
|
+
}): void;
|
|
43
|
+
getSummary(requestId?: string): RequestSummary;
|
|
44
|
+
reset(): void;
|
|
45
|
+
/** Get-or-create the delta bucket for a requestId (used by log* when a call
|
|
46
|
+
* arrives before startRequest, e.g. a deeply nested worker). */
|
|
47
|
+
private deltaFor;
|
|
48
|
+
}
|
|
49
|
+
export {};
|
|
50
|
+
//# sourceMappingURL=session-request-logger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-request-logger.d.ts","sourceRoot":"","sources":["../../src/logger/session-request-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,cAAc,EACd,aAAa,EACd,MAAM,yBAAyB,CAAC;AAGjC,UAAU,MAAM;IACd,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAMD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,cAAc,CA8CnD;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,CAAC,EAAE,cAAc,GAAG,QAAQ,CAU1D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IACpD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IAEnD,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAMtC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAUpC,4EAA4E;IAC5E,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAMrC,UAAU,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAKrC,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKhE,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKhE,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,cAAc;IAM9C,KAAK,IAAI,IAAI;IAQb;qEACiE;IACjE,OAAO,CAAC,QAAQ;CAQjB"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { CATEGORY_MAP } from './default-request-logger.js';
|
|
2
|
+
function emptyBucket() {
|
|
3
|
+
return { llm: [], rag: 0, tool: 0 };
|
|
4
|
+
}
|
|
5
|
+
/** Shared aggregation (DRY with DefaultRequestLogger.getSummary). */
|
|
6
|
+
export function aggregate(b) {
|
|
7
|
+
const byModel = {};
|
|
8
|
+
const byComponent = {};
|
|
9
|
+
const byCategory = {};
|
|
10
|
+
let totalDurationMs = 0;
|
|
11
|
+
const zeroBucket = () => ({
|
|
12
|
+
promptTokens: 0,
|
|
13
|
+
completionTokens: 0,
|
|
14
|
+
totalTokens: 0,
|
|
15
|
+
requests: 0,
|
|
16
|
+
});
|
|
17
|
+
for (const c of b.llm) {
|
|
18
|
+
totalDurationMs += c.durationMs;
|
|
19
|
+
byModel[c.model] ??= zeroBucket();
|
|
20
|
+
const m = byModel[c.model];
|
|
21
|
+
m.promptTokens += c.promptTokens;
|
|
22
|
+
m.completionTokens += c.completionTokens;
|
|
23
|
+
m.totalTokens += c.totalTokens;
|
|
24
|
+
m.requests++;
|
|
25
|
+
byComponent[c.component] ??= zeroBucket();
|
|
26
|
+
const comp = byComponent[c.component];
|
|
27
|
+
comp.promptTokens += c.promptTokens;
|
|
28
|
+
comp.completionTokens += c.completionTokens;
|
|
29
|
+
comp.totalTokens += c.totalTokens;
|
|
30
|
+
comp.requests++;
|
|
31
|
+
// Use the component-keyed CATEGORY_MAP — same semantics as
|
|
32
|
+
// DefaultRequestLogger.getSummary (review MEDIUM #4). Previously this
|
|
33
|
+
// categorized via `c.scope ?? 'request'`, which dropped most aux calls
|
|
34
|
+
// (classifier/translate/query-expander/helper have no `scope`) into
|
|
35
|
+
// `request`, misreporting /v1/usage.byCategory.
|
|
36
|
+
const catKey = CATEGORY_MAP[c.component] ?? 'request';
|
|
37
|
+
byCategory[catKey] ??= zeroBucket();
|
|
38
|
+
const cat = byCategory[catKey];
|
|
39
|
+
cat.promptTokens += c.promptTokens;
|
|
40
|
+
cat.completionTokens += c.completionTokens;
|
|
41
|
+
cat.totalTokens += c.totalTokens;
|
|
42
|
+
cat.requests++;
|
|
43
|
+
}
|
|
44
|
+
return {
|
|
45
|
+
byModel,
|
|
46
|
+
byComponent,
|
|
47
|
+
byCategory,
|
|
48
|
+
ragQueries: b.rag,
|
|
49
|
+
toolCalls: b.tool,
|
|
50
|
+
totalDurationMs,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
/** Sum a summary's components into a flat usage triple for response.usage. */
|
|
54
|
+
export function summaryToUsage(s) {
|
|
55
|
+
let promptTokens = 0;
|
|
56
|
+
let completionTokens = 0;
|
|
57
|
+
let totalTokens = 0;
|
|
58
|
+
for (const v of Object.values(s.byComponent)) {
|
|
59
|
+
promptTokens += v.promptTokens;
|
|
60
|
+
completionTokens += v.completionTokens;
|
|
61
|
+
totalTokens += v.totalTokens;
|
|
62
|
+
}
|
|
63
|
+
return { promptTokens, completionTokens, totalTokens };
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* One logger per SessionGraph, shared by the coordinator AND its workers. Two
|
|
67
|
+
* accounting axes (spec C.2):
|
|
68
|
+
* - session-cumulative (survives across requests, for /v1/usage),
|
|
69
|
+
* - per-traceId delta (for response.usage; keyed so concurrent requests never
|
|
70
|
+
* stomp each other).
|
|
71
|
+
*
|
|
72
|
+
* NESTED-SAFE: a worker's SmartAgent.process() runs startRequest(traceId) /
|
|
73
|
+
* endRequest(traceId) under the SAME traceId as the coordinator. Therefore:
|
|
74
|
+
* - startRequest is depth-counted and creates the bucket ONLY if absent
|
|
75
|
+
* (never clears an existing one — a worker start must not wipe coordinator
|
|
76
|
+
* tokens already logged under that traceId),
|
|
77
|
+
* - endRequest is depth-counted and NEVER deletes the bucket (a worker end
|
|
78
|
+
* must not drop the delta before the server emits response.usage),
|
|
79
|
+
* - dropRequest is the explicit free, called by the top-level owner (the
|
|
80
|
+
* server) AFTER it has read getSummary(traceId).
|
|
81
|
+
*/
|
|
82
|
+
export class SessionRequestLogger {
|
|
83
|
+
cumulative = emptyBucket();
|
|
84
|
+
deltas = new Map();
|
|
85
|
+
depth = new Map();
|
|
86
|
+
startRequest(requestId) {
|
|
87
|
+
if (!requestId)
|
|
88
|
+
return;
|
|
89
|
+
this.depth.set(requestId, (this.depth.get(requestId) ?? 0) + 1);
|
|
90
|
+
if (!this.deltas.has(requestId))
|
|
91
|
+
this.deltas.set(requestId, emptyBucket());
|
|
92
|
+
}
|
|
93
|
+
endRequest(requestId) {
|
|
94
|
+
if (!requestId)
|
|
95
|
+
return;
|
|
96
|
+
const d = this.depth.get(requestId);
|
|
97
|
+
if (d === undefined)
|
|
98
|
+
return;
|
|
99
|
+
if (d <= 1)
|
|
100
|
+
this.depth.delete(requestId);
|
|
101
|
+
else
|
|
102
|
+
this.depth.set(requestId, d - 1);
|
|
103
|
+
// Intentionally does NOT delete the delta bucket: the server frees it via
|
|
104
|
+
// dropRequest() after reading response.usage.
|
|
105
|
+
}
|
|
106
|
+
/** Explicit free of a request delta. Called once by the top-level owner. */
|
|
107
|
+
dropRequest(requestId) {
|
|
108
|
+
if (!requestId)
|
|
109
|
+
return;
|
|
110
|
+
this.deltas.delete(requestId);
|
|
111
|
+
this.depth.delete(requestId);
|
|
112
|
+
}
|
|
113
|
+
logLlmCall(entry) {
|
|
114
|
+
this.cumulative.llm.push(entry);
|
|
115
|
+
if (entry.requestId)
|
|
116
|
+
this.deltaFor(entry.requestId).llm.push(entry);
|
|
117
|
+
}
|
|
118
|
+
logRagQuery(entry) {
|
|
119
|
+
this.cumulative.rag++;
|
|
120
|
+
if (entry.requestId)
|
|
121
|
+
this.deltaFor(entry.requestId).rag++;
|
|
122
|
+
}
|
|
123
|
+
logToolCall(entry) {
|
|
124
|
+
this.cumulative.tool++;
|
|
125
|
+
if (entry.requestId)
|
|
126
|
+
this.deltaFor(entry.requestId).tool++;
|
|
127
|
+
}
|
|
128
|
+
getSummary(requestId) {
|
|
129
|
+
if (requestId)
|
|
130
|
+
return aggregate(this.deltas.get(requestId) ?? emptyBucket());
|
|
131
|
+
return aggregate(this.cumulative);
|
|
132
|
+
}
|
|
133
|
+
reset() {
|
|
134
|
+
this.cumulative.llm.length = 0;
|
|
135
|
+
this.cumulative.rag = 0;
|
|
136
|
+
this.cumulative.tool = 0;
|
|
137
|
+
this.deltas.clear();
|
|
138
|
+
this.depth.clear();
|
|
139
|
+
}
|
|
140
|
+
/** Get-or-create the delta bucket for a requestId (used by log* when a call
|
|
141
|
+
* arrives before startRequest, e.g. a deeply nested worker). */
|
|
142
|
+
deltaFor(requestId) {
|
|
143
|
+
let b = this.deltas.get(requestId);
|
|
144
|
+
if (!b) {
|
|
145
|
+
b = emptyBucket();
|
|
146
|
+
this.deltas.set(requestId, b);
|
|
147
|
+
}
|
|
148
|
+
return b;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=session-request-logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-request-logger.js","sourceRoot":"","sources":["../../src/logger/session-request-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* The `tool-loop` stage streams. It uses `ctx.yield()` to push
|
|
16
16
|
* SSE chunks back to the caller. All other stages are batch operations.
|
|
17
17
|
*/
|
|
18
|
-
import type { CallOptions, IContextAssembler, IEmbedder, IHistoryMemory, IHistorySummarizer, ILlm, ILlmCallStrategy, ILogger, IMcpClient, IQueryEmbedding, IQueryExpander, IRagProviderRegistry, IRagRegistry, IRequestLogger, ISkill, ISkillManager, ISubpromptClassifier, IToolCache, IToolSelectionStrategy, LlmStreamChunk, LlmTool, McpTool, Message, Plan, RagResult, Result, StepResult, SubAgentRegistry, Subprompt, TimingEntry } from '@mcp-abap-adt/llm-agent';
|
|
18
|
+
import type { CallOptions, IContextAssembler, IEmbedder, IHistoryMemory, IHistorySummarizer, ILlm, ILlmCallStrategy, ILogger, IMcpClient, IQueryEmbedding, IQueryExpander, IRagProviderRegistry, IRagRegistry, IRequestLogger, ISkill, ISkillManager, ISubpromptClassifier, IToolCache, IToolSelectionStrategy, LlmStreamChunk, LlmTool, McpTool, Message, OnPartial, Plan, RagResult, Result, StepResult, SubAgentRegistry, Subprompt, TimingEntry } from '@mcp-abap-adt/llm-agent';
|
|
19
19
|
import type { OrchestratorError, SmartAgentConfig, SmartAgentRagStores } from '../agent.js';
|
|
20
20
|
import type { IMetrics } from '../metrics/types.js';
|
|
21
21
|
import type { PendingToolResultsRegistry } from '../policy/pending-tool-results-registry.js';
|
|
@@ -116,8 +116,13 @@ export interface PipelineContext {
|
|
|
116
116
|
* streaming content and heartbeats back through the SSE connection.
|
|
117
117
|
*/
|
|
118
118
|
yield(chunk: Result<LlmStreamChunk, OrchestratorError>): void;
|
|
119
|
-
/**
|
|
120
|
-
|
|
119
|
+
/**
|
|
120
|
+
* Optional partial-output callback threaded from `ISubAgentInput.onPartial`.
|
|
121
|
+
* When present, the tool-loop stage forwards every content delta and
|
|
122
|
+
* tool-call event as a `StreamChunk` so the calling coordinator can
|
|
123
|
+
* render live progress without polling.
|
|
124
|
+
*/
|
|
125
|
+
onPartial?: OnPartial;
|
|
121
126
|
/** Subagent stage outputs written by SubAgentHandler. Keyed by output path. */
|
|
122
127
|
subResults?: Record<string, unknown>;
|
|
123
128
|
/** Subagent registry exposed to runtime stages (coordinator, subagent). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/pipeline/context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/pipeline/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,22 @@
|
|
|
26
26
|
import type { CallOptions, ICoordinatorConfig, LlmStreamChunk, LlmTool, Message, Result, SubAgentRegistry } from '@mcp-abap-adt/llm-agent';
|
|
27
27
|
import type { OrchestratorError } from '../agent.js';
|
|
28
28
|
import type { IPipeline, PipelineDeps, PipelineResult } from '../interfaces/pipeline.js';
|
|
29
|
+
import { PendingToolResultsRegistry } from '../policy/pending-tool-results-registry.js';
|
|
30
|
+
import { ToolAvailabilityRegistry } from '../policy/tool-availability-registry.js';
|
|
31
|
+
import type { DagCoordinatorHandlerDeps } from './handlers/dag-coordinator.js';
|
|
32
|
+
/**
|
|
33
|
+
* Resolves the per-session tool-availability / pending-tool-results registries
|
|
34
|
+
* for a pipeline request. When the SessionGraph injects them via `CallOptions`,
|
|
35
|
+
* the same instances are reused across requests sharing the sessionId; otherwise
|
|
36
|
+
* fresh per-request instances are created (preserves embed-as-library behavior).
|
|
37
|
+
*/
|
|
38
|
+
export declare function resolveSessionRegistries(src: {
|
|
39
|
+
toolAvailability?: ToolAvailabilityRegistry;
|
|
40
|
+
pendingToolResults?: PendingToolResultsRegistry;
|
|
41
|
+
}): {
|
|
42
|
+
toolAvailability: ToolAvailabilityRegistry;
|
|
43
|
+
pendingToolResults: PendingToolResultsRegistry;
|
|
44
|
+
};
|
|
29
45
|
/**
|
|
30
46
|
* Standard IPipeline implementation that orchestrates the default SmartAgent
|
|
31
47
|
* request lifecycle via PipelineExecutor and built-in stage handlers.
|
|
@@ -47,12 +63,18 @@ export interface DefaultPipelineOptions {
|
|
|
47
63
|
*/
|
|
48
64
|
subAgents?: SubAgentRegistry;
|
|
49
65
|
/**
|
|
50
|
-
* Optional coordinator configuration. When
|
|
51
|
-
*
|
|
52
|
-
*
|
|
53
|
-
* `
|
|
66
|
+
* Optional coordinator configuration. When a coordinator (`planning`+`dispatch`,
|
|
67
|
+
* or a `dagCoordinator`) is configured, a `coordinator-activate` runtime stage
|
|
68
|
+
* decides per-request (via the activation strategy) whether the `coordinator`
|
|
69
|
+
* stage runs in place of `tool-loop`.
|
|
54
70
|
*/
|
|
55
71
|
coordinator?: ICoordinatorConfig;
|
|
72
|
+
/**
|
|
73
|
+
* DAG coordinator deps. When set, registers `DagCoordinatorHandler` under
|
|
74
|
+
* the `coordinator` stage slot and wires `coordinator-activate`.
|
|
75
|
+
* Mutually exclusive with `coordinator` — `dagCoordinator` takes precedence.
|
|
76
|
+
*/
|
|
77
|
+
dagCoordinator?: DagCoordinatorHandlerDeps;
|
|
56
78
|
}
|
|
57
79
|
export declare class DefaultPipeline implements IPipeline {
|
|
58
80
|
private deps;
|
|
@@ -60,6 +82,7 @@ export declare class DefaultPipeline implements IPipeline {
|
|
|
60
82
|
private stages;
|
|
61
83
|
private readonly subAgents?;
|
|
62
84
|
private readonly coordinator?;
|
|
85
|
+
private readonly dagCoordinator?;
|
|
63
86
|
constructor(options?: DefaultPipelineOptions);
|
|
64
87
|
private resolvedTracer;
|
|
65
88
|
private resolvedClassifier;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-pipeline.d.ts","sourceRoot":"","sources":["../../src/pipeline/default-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,OAAO,EACP,OAAO,EACP,MAAM,EACN,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,aAAa,CAAC;AAIrB,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,cAAc,EACf,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"default-pipeline.d.ts","sourceRoot":"","sources":["../../src/pipeline/default-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,OAAO,EACP,OAAO,EACP,MAAM,EACN,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,aAAa,CAAC;AAIrB,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,cAAc,EACf,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAOnF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAQ/E;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE;IAC5C,gBAAgB,CAAC,EAAE,wBAAwB,CAAC;IAC5C,kBAAkB,CAAC,EAAE,0BAA0B,CAAC;CACjD,GAAG;IACF,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,kBAAkB,EAAE,0BAA0B,CAAC;CAChD,CAMA;AAkBD;;;;;;;;;;GAUG;AACH;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC;;;;OAIG;IACH,cAAc,CAAC,EAAE,yBAAyB,CAAC;CAC5C;AAED,qBAAa,eAAgB,YAAW,SAAS;IAC/C,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA4B;gBAEhD,OAAO,GAAE,sBAA2B;IAOhD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,kBAAkB,CAAiC;IAC3D,OAAO,CAAC,iBAAiB,CAAgC;IACzD,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,qBAAqB,CAAoC;IACjE,OAAO,CAAC,iBAAiB,CAAgC;IACzD,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,sBAAsB,CAAqC;IACnE,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,qBAAqB,CAAoC;IACjE,OAAO,CAAC,uBAAuB,CAAsC;IAMrE,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IA0D9B,OAAO,CACX,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,EACzB,OAAO,EAAE,OAAO,EAAE,EAClB,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,KAAK,IAAI,EACtE,aAAa,CAAC,EAAE,OAAO,EAAE,GACxB,OAAO,CAAC,cAAc,CAAC;IAyB1B,aAAa,IAAI,IAAI;IAQrB;;;OAGG;IACH,OAAO,CAAC,YAAY;IA6GpB;;;OAGG;IACH,OAAO,CAAC,aAAa;CA0GtB"}
|
|
@@ -38,6 +38,21 @@ import { NoopValidator } from '../validator/noop-validator.js';
|
|
|
38
38
|
import { PipelineExecutor } from './executor.js';
|
|
39
39
|
import { buildDefaultHandlerRegistry } from './handlers/index.js';
|
|
40
40
|
// ---------------------------------------------------------------------------
|
|
41
|
+
// Session-scoped registry resolution
|
|
42
|
+
// ---------------------------------------------------------------------------
|
|
43
|
+
/**
|
|
44
|
+
* Resolves the per-session tool-availability / pending-tool-results registries
|
|
45
|
+
* for a pipeline request. When the SessionGraph injects them via `CallOptions`,
|
|
46
|
+
* the same instances are reused across requests sharing the sessionId; otherwise
|
|
47
|
+
* fresh per-request instances are created (preserves embed-as-library behavior).
|
|
48
|
+
*/
|
|
49
|
+
export function resolveSessionRegistries(src) {
|
|
50
|
+
return {
|
|
51
|
+
toolAvailability: src.toolAvailability ?? new ToolAvailabilityRegistry(),
|
|
52
|
+
pendingToolResults: src.pendingToolResults ?? new PendingToolResultsRegistry(),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
// ---------------------------------------------------------------------------
|
|
41
56
|
// Default SmartAgentConfig for standalone use
|
|
42
57
|
// ---------------------------------------------------------------------------
|
|
43
58
|
const DEFAULT_CONFIG = {
|
|
@@ -53,9 +68,11 @@ export class DefaultPipeline {
|
|
|
53
68
|
stages;
|
|
54
69
|
subAgents;
|
|
55
70
|
coordinator;
|
|
71
|
+
dagCoordinator;
|
|
56
72
|
constructor(options = {}) {
|
|
57
73
|
this.subAgents = options.subAgents;
|
|
58
74
|
this.coordinator = options.coordinator;
|
|
75
|
+
this.dagCoordinator = options.dagCoordinator;
|
|
59
76
|
}
|
|
60
77
|
// Cached defaults (created once in initialize, reused per request)
|
|
61
78
|
resolvedTracer;
|
|
@@ -92,6 +109,7 @@ export class DefaultPipeline {
|
|
|
92
109
|
const coordPlanning = this.coordinator?.planning;
|
|
93
110
|
const coordDispatch = this.coordinator?.dispatch;
|
|
94
111
|
const coordinatorConfigured = coordPlanning != null && coordDispatch != null;
|
|
112
|
+
const anyCoordinator = coordinatorConfigured || this.dagCoordinator != null;
|
|
95
113
|
const registry = buildDefaultHandlerRegistry({
|
|
96
114
|
subAgents: this.subAgents,
|
|
97
115
|
coordinator: coordinatorConfigured && coordPlanning && coordDispatch
|
|
@@ -101,16 +119,22 @@ export class DefaultPipeline {
|
|
|
101
119
|
maxSteps: this.coordinator?.maxSteps ?? 12,
|
|
102
120
|
maxRetriesPerStep: this.coordinator?.maxRetriesPerStep ?? 1,
|
|
103
121
|
failPolicy: this.coordinator?.failPolicy ?? 'abort',
|
|
104
|
-
maxLayer: this.coordinator?.maxLayer ?? 1,
|
|
105
122
|
}
|
|
106
123
|
: undefined,
|
|
124
|
+
dagCoordinator: this.dagCoordinator,
|
|
107
125
|
// Default to ExplicitActivation when caller passes a coordinator config
|
|
108
126
|
// without an activation strategy. Matches SmartAgentBuilder.withCoordinator
|
|
109
127
|
// semantics: presence of coordinator config IS the opt-in signal.
|
|
110
128
|
// Without this default, `_buildStages()` would emit a `coordinator-activate`
|
|
111
129
|
// stage whose handler is unregistered → unknown-stage runtime error.
|
|
112
|
-
|
|
113
|
-
|
|
130
|
+
// DAG wins the handler slot when both are configured, so its activation
|
|
131
|
+
// strategy takes precedence too — otherwise the DAG handler could be gated
|
|
132
|
+
// by the linear coordinator's activation. (Matches handler precedence in
|
|
133
|
+
// handlers/index.ts and SmartAgentBuilder.withDagCoordinator.)
|
|
134
|
+
coordinatorActivation: anyCoordinator
|
|
135
|
+
? (this.dagCoordinator?.activation ??
|
|
136
|
+
this.coordinator?.activation ??
|
|
137
|
+
new ExplicitActivation())
|
|
114
138
|
: undefined,
|
|
115
139
|
});
|
|
116
140
|
this.executor = new PipelineExecutor(registry, this.resolvedTracer);
|
|
@@ -210,8 +234,9 @@ export class DefaultPipeline {
|
|
|
210
234
|
});
|
|
211
235
|
}
|
|
212
236
|
const coordinatorConfigured = this.coordinator?.planning != null && this.coordinator?.dispatch != null;
|
|
237
|
+
const anyCoordinatorStage = coordinatorConfigured || this.dagCoordinator != null;
|
|
213
238
|
stages.push({ id: 'tool-select', type: 'tool-select' }, { id: 'assemble', type: 'assemble' });
|
|
214
|
-
if (
|
|
239
|
+
if (anyCoordinatorStage) {
|
|
215
240
|
// Runtime activation: `coordinator-activate` evaluates the configured
|
|
216
241
|
// IActivationStrategy AFTER skill-select has run, so it can see the
|
|
217
242
|
// real `ctx.selectedSkills` state (which build-time stage selection
|
|
@@ -276,8 +301,16 @@ export class DefaultPipeline {
|
|
|
276
301
|
requestLogger: this.resolvedRequestLogger,
|
|
277
302
|
toolPolicy: this.deps.toolPolicy,
|
|
278
303
|
injectionDetector: this.deps.injectionDetector,
|
|
279
|
-
|
|
280
|
-
|
|
304
|
+
...(() => {
|
|
305
|
+
const r = resolveSessionRegistries({
|
|
306
|
+
toolAvailability: options?.toolAvailability,
|
|
307
|
+
pendingToolResults: options?.pendingToolResults,
|
|
308
|
+
});
|
|
309
|
+
return {
|
|
310
|
+
toolAvailabilityRegistry: r.toolAvailability,
|
|
311
|
+
pendingToolResults: r.pendingToolResults,
|
|
312
|
+
};
|
|
313
|
+
})(),
|
|
281
314
|
skillManager: this.deps.skillManager,
|
|
282
315
|
embedder: this.deps.embedder,
|
|
283
316
|
toolSelectionStrategy: this.deps.toolSelectionStrategy,
|
|
@@ -308,9 +341,11 @@ export class DefaultPipeline {
|
|
|
308
341
|
timing: [],
|
|
309
342
|
// Streaming callback
|
|
310
343
|
yield: yieldChunk,
|
|
344
|
+
// Partial-output callback (forwarded from ISubAgentInput.onPartial via
|
|
345
|
+
// CallOptions.onPartial so the tool-loop can emit live deltas).
|
|
346
|
+
onPartial: options?.onPartial,
|
|
311
347
|
// Subagent registry for coordinator/subagent stages (read by handlers).
|
|
312
348
|
subAgents: this.subAgents,
|
|
313
|
-
layer: options?.layer ?? 0,
|
|
314
349
|
};
|
|
315
350
|
}
|
|
316
351
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-pipeline.js","sourceRoot":"","sources":["../../src/pipeline/default-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAWH,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAM3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"default-pipeline.js","sourceRoot":"","sources":["../../src/pipeline/default-pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,13 +23,10 @@ export interface CoordinatorHandlerDeps {
|
|
|
23
23
|
maxSteps: number;
|
|
24
24
|
maxRetriesPerStep: number;
|
|
25
25
|
failPolicy: 'abort' | 'continue';
|
|
26
|
-
/** Maximum dispatch depth. Default 1. */
|
|
27
|
-
maxLayer: number;
|
|
28
26
|
}
|
|
29
27
|
export declare class CoordinatorHandler implements IStageHandler {
|
|
30
28
|
private readonly deps;
|
|
31
29
|
constructor(deps: CoordinatorHandlerDeps);
|
|
32
|
-
private validatePlan;
|
|
33
30
|
execute(ctx: PipelineContext, _rawConfig: Record<string, unknown>, _span: ISpan): Promise<boolean>;
|
|
34
31
|
}
|
|
35
32
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/coordinator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAEV,iBAAiB,EACjB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"coordinator.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/coordinator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAEV,iBAAiB,EACjB,iBAAiB,EAKlB,MAAM,yBAAyB,CAAC;AAEjC,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,sBAAsB;IACrC,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,GAAG,UAAU,CAAC;CAClC;AAED,qBAAa,kBAAmB,YAAW,aAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,sBAAsB;IAEnD,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;CAmNpB;AAkCD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAEjE"}
|