@mcp-abap-adt/llm-agent-libs 18.0.1 → 18.0.2
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/coordinator/dispatch/self.d.ts +5 -0
- package/dist/coordinator/dispatch/self.d.ts.map +1 -1
- package/dist/coordinator/dispatch/self.js +80 -0
- package/dist/coordinator/dispatch/self.js.map +1 -1
- package/dist/coordinator/stepper/llm-evaluator.d.ts +29 -0
- package/dist/coordinator/stepper/llm-evaluator.d.ts.map +1 -0
- package/dist/coordinator/stepper/llm-evaluator.js +94 -0
- package/dist/coordinator/stepper/llm-evaluator.js.map +1 -0
- package/dist/pipeline/handlers/coordinator.d.ts.map +1 -1
- package/dist/pipeline/handlers/coordinator.js +26 -0
- 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 +13 -4
- package/dist/pipeline/handlers/dag-coordinator.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,5 +5,10 @@ export declare class SelfDispatch implements IDispatchStrategy {
|
|
|
5
5
|
readonly name = "self";
|
|
6
6
|
constructor(llm: ILlm, systemPrompt?: string | undefined);
|
|
7
7
|
dispatch(step: PlanStep, ctx: ICoordinatorContext): Promise<StepResult>;
|
|
8
|
+
/** Bounded ReAct loop: chat with tools → execute any tool calls via
|
|
9
|
+
* `ctx.callTool` → feed results back → repeat until the model answers with no
|
|
10
|
+
* tool call (or the cap is hit). Mirrors the wire shape providers expect
|
|
11
|
+
* (assistant `tool_calls` followed by matching `tool` messages). */
|
|
12
|
+
private runToolLoop;
|
|
8
13
|
}
|
|
9
14
|
//# sourceMappingURL=self.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dispatch/self.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,
|
|
1
|
+
{"version":3,"file":"self.d.ts","sourceRoot":"","sources":["../../../src/coordinator/dispatch/self.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,EAIJ,QAAQ,EACR,UAAU,EACX,MAAM,yBAAyB,CAAC;AAOjC,qBAAa,YAAa,YAAW,iBAAiB;IAIlD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAJhC,QAAQ,CAAC,IAAI,UAAU;gBAGJ,GAAG,EAAE,IAAI,EACT,YAAY,CAAC,EAAE,MAAM,YAAA;IAGlC,QAAQ,CACZ,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,mBAAmB,GACvB,OAAO,CAAC,UAAU,CAAC;IAyDtB;;;yEAGqE;YACvD,WAAW;CA+D1B"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { composeTask } from './compose-task.js';
|
|
2
|
+
/** Bound on the self-dispatch tool-loop — enough for a read→observe→answer
|
|
3
|
+
* cycle without runaway. */
|
|
4
|
+
const MAX_TOOL_ITERATIONS = 6;
|
|
2
5
|
export class SelfDispatch {
|
|
3
6
|
llm;
|
|
4
7
|
systemPrompt;
|
|
@@ -17,6 +20,22 @@ export class SelfDispatch {
|
|
|
17
20
|
const userMsg = `${composeTask(step, ctx)}\n\nResults so far:\n${priorBlock}`;
|
|
18
21
|
const started = Date.now();
|
|
19
22
|
try {
|
|
23
|
+
// #157: when the coordinator threaded the per-request RAG-selected tools
|
|
24
|
+
// and a tool executor, run a bounded tool-loop so a self-dispatched step
|
|
25
|
+
// can actually CALL MCP (read a table, list a package, …) instead of a
|
|
26
|
+
// single toolless chat that hallucinates the result. No tools / no
|
|
27
|
+
// executor → the legacy single-chat behaviour (below).
|
|
28
|
+
const tools = (ctx.selectedTools ?? []);
|
|
29
|
+
if (tools.length > 0 && typeof ctx.callTool === 'function') {
|
|
30
|
+
const r = await this.runToolLoop(sys, userMsg, tools, ctx);
|
|
31
|
+
return {
|
|
32
|
+
stepId: step.id,
|
|
33
|
+
output: r.content,
|
|
34
|
+
usage: r.usage,
|
|
35
|
+
durationMs: Date.now() - started,
|
|
36
|
+
ok: true,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
20
39
|
const res = await this.llm.chat([
|
|
21
40
|
{ role: 'system', content: sys },
|
|
22
41
|
{ role: 'user', content: userMsg },
|
|
@@ -41,5 +60,66 @@ export class SelfDispatch {
|
|
|
41
60
|
};
|
|
42
61
|
}
|
|
43
62
|
}
|
|
63
|
+
/** Bounded ReAct loop: chat with tools → execute any tool calls via
|
|
64
|
+
* `ctx.callTool` → feed results back → repeat until the model answers with no
|
|
65
|
+
* tool call (or the cap is hit). Mirrors the wire shape providers expect
|
|
66
|
+
* (assistant `tool_calls` followed by matching `tool` messages). */
|
|
67
|
+
async runToolLoop(sys, userMsg, tools, ctx) {
|
|
68
|
+
const callTool = ctx.callTool;
|
|
69
|
+
const messages = [
|
|
70
|
+
{ role: 'system', content: sys },
|
|
71
|
+
{ role: 'user', content: userMsg },
|
|
72
|
+
];
|
|
73
|
+
let usage;
|
|
74
|
+
const add = (u) => {
|
|
75
|
+
if (!u)
|
|
76
|
+
return;
|
|
77
|
+
usage = usage
|
|
78
|
+
? {
|
|
79
|
+
promptTokens: usage.promptTokens + u.promptTokens,
|
|
80
|
+
completionTokens: usage.completionTokens + u.completionTokens,
|
|
81
|
+
totalTokens: usage.totalTokens + u.totalTokens,
|
|
82
|
+
}
|
|
83
|
+
: { ...u };
|
|
84
|
+
};
|
|
85
|
+
for (let iter = 0; iter < MAX_TOOL_ITERATIONS; iter++) {
|
|
86
|
+
const res = await this.llm.chat(messages, tools, {
|
|
87
|
+
signal: ctx.signal,
|
|
88
|
+
sessionId: ctx.sessionId,
|
|
89
|
+
});
|
|
90
|
+
if (!res.ok)
|
|
91
|
+
throw res.error;
|
|
92
|
+
add(res.value.usage);
|
|
93
|
+
const toolCalls = res.value.toolCalls ?? [];
|
|
94
|
+
if (toolCalls.length === 0)
|
|
95
|
+
return { content: res.value.content, usage };
|
|
96
|
+
messages.push({
|
|
97
|
+
role: 'assistant',
|
|
98
|
+
content: res.value.content || null,
|
|
99
|
+
tool_calls: toolCalls.map((tc) => ({
|
|
100
|
+
id: tc.id,
|
|
101
|
+
type: 'function',
|
|
102
|
+
function: {
|
|
103
|
+
name: tc.name,
|
|
104
|
+
arguments: JSON.stringify(tc.arguments ?? {}),
|
|
105
|
+
},
|
|
106
|
+
})),
|
|
107
|
+
});
|
|
108
|
+
for (const tc of toolCalls) {
|
|
109
|
+
const out = await callTool(tc.name, tc.arguments ?? {}, ctx.signal);
|
|
110
|
+
messages.push({ role: 'tool', content: out, tool_call_id: tc.id });
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
// Iteration cap hit: one final tool-free turn so we answer from what was
|
|
114
|
+
// gathered instead of returning empty.
|
|
115
|
+
const final = await this.llm.chat(messages, [], {
|
|
116
|
+
signal: ctx.signal,
|
|
117
|
+
sessionId: ctx.sessionId,
|
|
118
|
+
});
|
|
119
|
+
if (!final.ok)
|
|
120
|
+
throw final.error;
|
|
121
|
+
add(final.value.usage);
|
|
122
|
+
return { content: final.value.content, usage };
|
|
123
|
+
}
|
|
44
124
|
}
|
|
45
125
|
//# sourceMappingURL=self.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self.js","sourceRoot":"","sources":["../../../src/coordinator/dispatch/self.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"self.js","sourceRoot":"","sources":["../../../src/coordinator/dispatch/self.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { EvaluatorVerdict, IEvaluator, IKnowledgeRagHandle, ILlm, IToolsRagHandle, ITaskSpec, RunIdentity } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
/**
|
|
3
|
+
* Task-agnostic Evaluator prompt. It judges the INPUT (the sub-prompt) against
|
|
4
|
+
* the RAG context — NOT how to do the task. "What completeness means" comes from
|
|
5
|
+
* the Known facts (the consumer's RAG skills); the prompt names no tools or
|
|
6
|
+
* domain rules. The three routes ARE the recursion control: executable =
|
|
7
|
+
* terminal, needs-work = recurse with gaps, needs-consumer = ask the human.
|
|
8
|
+
*/
|
|
9
|
+
export declare const EVALUATOR_SYSTEM = "You assess whether a TASK can be executed as stated, using ONLY the provided context. Do NOT perform the task. Decide ONE route:\n- \"executable\": the task can be carried out unambiguously with what is already known (see \"Known facts\") or with a single available tool call. Nothing essential is missing.\n- \"needs-work\": something essential is missing BUT it can be obtained by the agent \u2014 fetched via an available tool, or produced by decomposing/gathering first. List each missing item.\n- \"needs-consumer\": something essential is missing that ONLY the human/consumer can resolve (a decision, or knowledge external to the system that no available tool can obtain). List the question(s).\nUse \"Known facts\" to decide what \"complete\" means for this domain \u2014 e.g. if a review needs the COMPLETE artifact (all parts/sub-parts) and the facts show only a part is present, that is \"needs-work\" (fetch the rest). If an available tool could obtain the missing data, the route is \"needs-work\", NEVER \"needs-consumer\".\nRespond with ONLY JSON: {\"route\":\"executable|needs-work|needs-consumer\",\"missing\":[\"...\"],\"reason\":\"<one line>\"}";
|
|
10
|
+
export declare class LlmEvaluator implements IEvaluator {
|
|
11
|
+
private readonly llm;
|
|
12
|
+
readonly name = "llm-evaluator";
|
|
13
|
+
readonly model?: string;
|
|
14
|
+
private readonly systemPrompt;
|
|
15
|
+
constructor(llm: ILlm, systemPrompt?: string);
|
|
16
|
+
evaluate(input: {
|
|
17
|
+
prompt: string;
|
|
18
|
+
knowledgeRag: IKnowledgeRagHandle;
|
|
19
|
+
toolsRag: IToolsRagHandle;
|
|
20
|
+
taskSpec?: ITaskSpec;
|
|
21
|
+
identity: RunIdentity;
|
|
22
|
+
signal?: AbortSignal;
|
|
23
|
+
}): Promise<EvaluatorVerdict>;
|
|
24
|
+
}
|
|
25
|
+
/** Parse the JSON verdict; tolerate code fences and stray prose around it.
|
|
26
|
+
* Defaults to a safe `needs-work` if the route is missing/unknown (never
|
|
27
|
+
* silently treat an unparseable answer as executable). */
|
|
28
|
+
export declare function parseVerdict(raw: string): EvaluatorVerdict;
|
|
29
|
+
//# sourceMappingURL=llm-evaluator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-evaluator.d.ts","sourceRoot":"","sources":["../../../src/coordinator/stepper/llm-evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,UAAU,EACV,mBAAmB,EACnB,IAAI,EACJ,eAAe,EACf,SAAS,EACT,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAGjC;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,+oCAKoF,CAAC;AAQlH,qBAAa,YAAa,YAAW,UAAU;IAM3C,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,QAAQ,CAAC,IAAI,mBAAmB;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAGnB,GAAG,EAAE,IAAI,EAC1B,YAAY,GAAE,MAAyB;IAMnC,QAAQ,CAAC,KAAK,EAAE;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,mBAAmB,CAAC;QAClC,QAAQ,EAAE,eAAe,CAAC;QAC1B,QAAQ,CAAC,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,WAAW,CAAC;QACtB,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA6C9B;AAED;;2DAE2D;AAC3D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAc1D"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { renderTaskSpec } from '@mcp-abap-adt/llm-agent';
|
|
2
|
+
/**
|
|
3
|
+
* Task-agnostic Evaluator prompt. It judges the INPUT (the sub-prompt) against
|
|
4
|
+
* the RAG context — NOT how to do the task. "What completeness means" comes from
|
|
5
|
+
* the Known facts (the consumer's RAG skills); the prompt names no tools or
|
|
6
|
+
* domain rules. The three routes ARE the recursion control: executable =
|
|
7
|
+
* terminal, needs-work = recurse with gaps, needs-consumer = ask the human.
|
|
8
|
+
*/
|
|
9
|
+
export const EVALUATOR_SYSTEM = `You assess whether a TASK can be executed as stated, using ONLY the provided context. Do NOT perform the task. Decide ONE route:
|
|
10
|
+
- "executable": the task can be carried out unambiguously with what is already known (see "Known facts") or with a single available tool call. Nothing essential is missing.
|
|
11
|
+
- "needs-work": something essential is missing BUT it can be obtained by the agent — fetched via an available tool, or produced by decomposing/gathering first. List each missing item.
|
|
12
|
+
- "needs-consumer": something essential is missing that ONLY the human/consumer can resolve (a decision, or knowledge external to the system that no available tool can obtain). List the question(s).
|
|
13
|
+
Use "Known facts" to decide what "complete" means for this domain — e.g. if a review needs the COMPLETE artifact (all parts/sub-parts) and the facts show only a part is present, that is "needs-work" (fetch the rest). If an available tool could obtain the missing data, the route is "needs-work", NEVER "needs-consumer".
|
|
14
|
+
Respond with ONLY JSON: {"route":"executable|needs-work|needs-consumer","missing":["..."],"reason":"<one line>"}`;
|
|
15
|
+
const ROUTES = new Set([
|
|
16
|
+
'executable',
|
|
17
|
+
'needs-work',
|
|
18
|
+
'needs-consumer',
|
|
19
|
+
]);
|
|
20
|
+
export class LlmEvaluator {
|
|
21
|
+
llm;
|
|
22
|
+
name = 'llm-evaluator';
|
|
23
|
+
model;
|
|
24
|
+
systemPrompt;
|
|
25
|
+
constructor(llm, systemPrompt = EVALUATOR_SYSTEM) {
|
|
26
|
+
this.llm = llm;
|
|
27
|
+
this.model = llm.model;
|
|
28
|
+
this.systemPrompt = systemPrompt;
|
|
29
|
+
}
|
|
30
|
+
async evaluate(input) {
|
|
31
|
+
const facts = await input.knowledgeRag.query(input.prompt, { k: 8 });
|
|
32
|
+
const factBlock = facts.length
|
|
33
|
+
? `Known facts (already in the knowledge store):\n${facts
|
|
34
|
+
.map((f) => `- [${f.metadata.artifactType}] ${truncate(f.content, 400)}`)
|
|
35
|
+
.join('\n')}\n\n`
|
|
36
|
+
: 'Known facts: (none yet)\n\n';
|
|
37
|
+
let toolsBlock = '';
|
|
38
|
+
try {
|
|
39
|
+
const tools = await input.toolsRag.query(input.prompt, 15);
|
|
40
|
+
if (tools.length > 0) {
|
|
41
|
+
toolsBlock =
|
|
42
|
+
`Available tools (the agent can call these to obtain data):\n` +
|
|
43
|
+
tools
|
|
44
|
+
.map((t) => `- ${t.name}: ${truncate(t.description ?? '', 200)}`)
|
|
45
|
+
.join('\n') +
|
|
46
|
+
'\n\n';
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
// toolsRag unavailable — omit gracefully (fewer obtainable options known)
|
|
51
|
+
}
|
|
52
|
+
const taskBlock = input.taskSpec
|
|
53
|
+
? `${renderTaskSpec(input.taskSpec)}\n\n`
|
|
54
|
+
: '';
|
|
55
|
+
const user = `${taskBlock}${factBlock}${toolsBlock}Task: ${input.prompt}`;
|
|
56
|
+
const res = await this.llm.chat([
|
|
57
|
+
{ role: 'system', content: this.systemPrompt },
|
|
58
|
+
{ role: 'user', content: user },
|
|
59
|
+
], [], { signal: input.signal });
|
|
60
|
+
if (res.ok === false)
|
|
61
|
+
throw new Error(`evaluator: ${res.error?.message ?? 'llm error'}`);
|
|
62
|
+
return parseVerdict(res.value.content);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/** Parse the JSON verdict; tolerate code fences and stray prose around it.
|
|
66
|
+
* Defaults to a safe `needs-work` if the route is missing/unknown (never
|
|
67
|
+
* silently treat an unparseable answer as executable). */
|
|
68
|
+
export function parseVerdict(raw) {
|
|
69
|
+
const json = extractJson(raw);
|
|
70
|
+
const route = json && typeof json.route === 'string' && ROUTES.has(json.route)
|
|
71
|
+
? json.route
|
|
72
|
+
: 'needs-work';
|
|
73
|
+
const missing = Array.isArray(json?.missing)
|
|
74
|
+
? (json?.missing).filter((m) => typeof m === 'string')
|
|
75
|
+
: [];
|
|
76
|
+
const reason = json && typeof json.reason === 'string' ? json.reason : undefined;
|
|
77
|
+
return { route, missing, ...(reason ? { reason } : {}) };
|
|
78
|
+
}
|
|
79
|
+
function extractJson(s) {
|
|
80
|
+
const start = s.indexOf('{');
|
|
81
|
+
const end = s.lastIndexOf('}');
|
|
82
|
+
if (start === -1 || end === -1 || end < start)
|
|
83
|
+
return undefined;
|
|
84
|
+
try {
|
|
85
|
+
return JSON.parse(s.slice(start, end + 1));
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
function truncate(s, n) {
|
|
92
|
+
return s.length > n ? `${s.slice(0, n)}…` : s;
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=llm-evaluator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-evaluator.js","sourceRoot":"","sources":["../../../src/coordinator/stepper/llm-evaluator.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,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;
|
|
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;CAuNpB;AA4DD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAEjE"}
|
|
@@ -34,6 +34,10 @@ export class CoordinatorHandler {
|
|
|
34
34
|
stepResults: {},
|
|
35
35
|
signal: ctx.options?.signal,
|
|
36
36
|
sessionId: ctx.sessionId,
|
|
37
|
+
// #157: thread the per-request RAG-selected tools + an MCP executor so a
|
|
38
|
+
// self-dispatched step runs a real tool-loop instead of a toolless chat.
|
|
39
|
+
selectedTools: ctx.activeTools ?? ctx.selectedTools,
|
|
40
|
+
callTool: buildCallTool(ctx),
|
|
37
41
|
};
|
|
38
42
|
let plan;
|
|
39
43
|
try {
|
|
@@ -229,6 +233,28 @@ function wrapError(err, code) {
|
|
|
229
233
|
return err;
|
|
230
234
|
return new OrchestratorError(err instanceof Error ? err.message : String(err), code);
|
|
231
235
|
}
|
|
236
|
+
/**
|
|
237
|
+
* Build a tool executor for self-dispatched coordinator steps (#157): resolve
|
|
238
|
+
* the owning MCP client from `toolClientMap` and call it, returning the textual
|
|
239
|
+
* result (mirrors the default tool-loop's extraction). Returns undefined when no
|
|
240
|
+
* MCP clients are connected, so SelfDispatch keeps its toolless behaviour.
|
|
241
|
+
*/
|
|
242
|
+
function buildCallTool(ctx) {
|
|
243
|
+
const map = ctx.toolClientMap;
|
|
244
|
+
if (!map || map.size === 0)
|
|
245
|
+
return undefined;
|
|
246
|
+
return async (name, args) => {
|
|
247
|
+
const client = map.get(name);
|
|
248
|
+
if (!client)
|
|
249
|
+
return `Tool not found: ${name}`;
|
|
250
|
+
const r = await client.callTool(name, (args ?? {}), ctx.options);
|
|
251
|
+
if (!r.ok)
|
|
252
|
+
return r.error.message;
|
|
253
|
+
return typeof r.value.content === 'string'
|
|
254
|
+
? r.value.content
|
|
255
|
+
: JSON.stringify(r.value.content);
|
|
256
|
+
};
|
|
257
|
+
}
|
|
232
258
|
/**
|
|
233
259
|
* Helper used by DefaultPipeline / activation strategies to detect whether
|
|
234
260
|
* the active skill carries a structured `steps` block — a strong signal for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/coordinator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAanD,MAAM,OAAO,kBAAkB;IACA;IAA7B,YAA6B,IAA4B;QAA5B,SAAI,GAAJ,IAAI,CAAwB;IAAG,CAAC;IAE7D,KAAK,CAAC,OAAO,CACX,GAAoB,EACpB,UAAmC,EACnC,KAAY;QAEZ,uEAAuE;QACvE,sEAAsE;QACtE,sEAAsE;QACtE,mEAAmE;QACnE,MAAM,QAAQ,GAAqB,GAAG,CAAC,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC;QAE9D,MAAM,QAAQ,GAAwB;YACpC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,mBAAmB,CAAC,GAAG,CAAC;YACtC,YAAY,EAAE,mBAAmB,CAAC,GAAG,CAAC;YACtC,eAAe,EAAE,sBAAsB,CAAC,GAAG,CAAC;YAC5C,QAAQ;YACR,WAAW,EAAE,EAAE;YACf,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM;YAC3B,SAAS,EAAE,GAAG,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/coordinator.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;AAMjC,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;;;;;;;;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;
|
|
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;AAMjC,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;;;;;;;;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;CA2WpB;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,GAAG,WAAW,CA+BtE"}
|
|
@@ -212,11 +212,20 @@ export class DagCoordinatorHandler {
|
|
|
212
212
|
continue;
|
|
213
213
|
}
|
|
214
214
|
}
|
|
215
|
-
|
|
215
|
+
// #166 fix: the FINALIZER is the single source of client-facing content.
|
|
216
|
+
// Previously ONE onPartial was passed to BOTH the interpreter and the
|
|
217
|
+
// finalizer, so a non-streaming client received the answer TWICE — once
|
|
218
|
+
// as streamed node content (A) and again as the finalizer's re-emission
|
|
219
|
+
// of the joined output (B). Now the interpreter's progress (node content,
|
|
220
|
+
// node-start/end, tool-call) goes to the session log ONLY; the finalizer's
|
|
221
|
+
// onPartial is the one that yields content to the client.
|
|
222
|
+
const interpreterOnPartial = (chunk) => {
|
|
223
|
+
ctx.options?.sessionLogger?.logStep('dag_stream', chunk);
|
|
224
|
+
};
|
|
225
|
+
const finalizerOnPartial = (chunk) => {
|
|
216
226
|
if (chunk.kind === 'content') {
|
|
217
227
|
ctx.yield({ ok: true, value: { content: chunk.delta } });
|
|
218
228
|
}
|
|
219
|
-
// node-start / node-end / tool-call → session log only (NOT yielded to client)
|
|
220
229
|
ctx.options?.sessionLogger?.logStep('dag_stream', chunk);
|
|
221
230
|
};
|
|
222
231
|
let result;
|
|
@@ -230,7 +239,7 @@ export class DagCoordinatorHandler {
|
|
|
230
239
|
ancestorContext,
|
|
231
240
|
trace: ctx.options?.trace,
|
|
232
241
|
sessionLogger: ctx.options?.sessionLogger,
|
|
233
|
-
onPartial,
|
|
242
|
+
onPartial: interpreterOnPartial,
|
|
234
243
|
// Issue #167: thread the client's external tools into worker dispatch.
|
|
235
244
|
externalTools: ctx.externalTools,
|
|
236
245
|
});
|
|
@@ -263,7 +272,7 @@ export class DagCoordinatorHandler {
|
|
|
263
272
|
sessionId: ctx.sessionId,
|
|
264
273
|
signal: ctx.options?.signal,
|
|
265
274
|
trace: ctx.options?.trace,
|
|
266
|
-
onPartial,
|
|
275
|
+
onPartial: finalizerOnPartial,
|
|
267
276
|
}));
|
|
268
277
|
if ('ended' in finalRes)
|
|
269
278
|
return true;
|
|
@@ -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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"}
|