@mcp-abap-adt/llm-agent-libs 16.2.0 → 18.0.0

package/dist/pipeline/handlers/dag-coordinator.js

@@ -0,0 +1,369 @@
+import { ClarifySignal, NeedInfoSignal } from '@mcp-abap-adt/llm-agent';
+import { OrchestratorError } from '../../agent.js';
+import { PassthroughFinalizer } from '../../coordinator/dag/passthrough-finalizer.js';
+import { AbortErrorStrategy } from '../../coordinator/index.js';
+import { summaryToUsage } from '../../logger/session-request-logger.js';
+/**
+ * Marker prefixed onto a coordinator-emitted clarification question. `Message`
+ * has no metadata field, so the marker lives in the assistant content — but it is
+ * zero-width (invisible): the user/API sees only the question. On the next turn
+ * `buildAncestorContext` reconstructs the clarification Q/A ONLY from the marked
+ * tail turn. This is a coordinator-internal protocol detail (emit + reconstruct
+ * are both here), NOT a public contract — hence it lives in llm-agent-libs, not in
+ * the contracts package. Zero-width: U+2063 INVISIBLE SEPARATOR x3.
+ */
+export const CLARIFY_MARKER = '⁣⁣⁣';
+export class DagCoordinatorHandler {
+    deps;
+    finalizer;
+    constructor(deps) {
+        this.deps = deps;
+        this.finalizer = deps.finalizer ?? new PassthroughFinalizer();
+        // The DAG interpreter passes data-flow (dependency outputs + user input)
+        // through the composed task text, never through the ISubAgentInput.context
+        // field. A worker with contextPolicy='required' (the DirectLlmSubAgent
+        // default) would therefore always fail at dispatch. Reject it at startup
+        // with a clear message instead of failing per-request.
+        for (const [name, w] of deps.workers) {
+            if (w.capabilities?.contextPolicy === 'required') {
+                throw new Error(`DagCoordinatorHandler: worker '${name}' has contextPolicy='required', ` +
+                    'but the DAG interpreter supplies node data via the composed task text, ' +
+                    "not the context field. Use a worker with contextPolicy 'optional' or 'forbidden'.");
+            }
+        }
+    }
+    async execute(ctx, _rawConfig, _span) {
+        const maxRoundTrips = Math.max(1, this.deps.maxRoundTrips ?? 6);
+        const ancestorContext = buildAncestorContext(ctx);
+        const agents = [...this.deps.workers.values()].map((w) => ({
+            name: w.name,
+            description: w.description,
+        }));
+        let roundTrips = 0;
+        // HIGH finding: planner+reviewer LLM spend was escaping both
+        // /v1/usage and response.usage. The role return types now carry an
+        // optional `usage` field; we forward it into the session requestLogger
+        // here, keyed by the current traceId so it lands in the per-request
+        // delta AND in the session-cumulative buckets (categorized as
+        // 'auxiliary' via CATEGORY_MAP). Non-LLM strategies omit `usage`, so
+        // this is a no-op for them.
+        const logRoleUsage = (component, model, usage, durationMs) => {
+            if (!usage)
+                return;
+            ctx.requestLogger.logLlmCall({
+                component,
+                model: model ?? 'unknown',
+                promptTokens: usage.promptTokens,
+                completionTokens: usage.completionTokens,
+                totalTokens: usage.totalTokens,
+                durationMs,
+                requestId: ctx.options?.trace?.traceId,
+            });
+        };
+        // Generic role runner. Owns logging for BOTH happy path AND signal paths
+        // (HIGH finding: a role that throws ClarifySignal/NeedInfoSignal still
+        // consumed LLM tokens — discarding them was invisible spend). Per-role
+        // adapters set `signal.usage` on the signal before throwing; `runRole`
+        // reads it here and routes it through the same `logRoleUsage`.
+        const runRole = async (component, model, thunk) => {
+            for (;;) {
+                const start = Date.now();
+                try {
+                    const value = await thunk();
+                    logRoleUsage(component, model, value.usage, Date.now() - start);
+                    return { value };
+                }
+                catch (err) {
+                    if (err instanceof ClarifySignal) {
+                        logRoleUsage(component, model, err.usage, Date.now() - start);
+                        ctx.options?.sessionLogger?.logStep('coordinator_clarify', {
+                            question: err.question,
+                        });
+                        ctx.yield({
+                            ok: true,
+                            value: {
+                                content: CLARIFY_MARKER + err.question,
+                            },
+                        });
+                        // Attach per-request usage to the TERMINAL yield only — mirrors the
+                        // success-path pattern below (around the result.ok branch). The
+                        // response-assembler in agent.process sums chunk-level usage, so
+                        // putting usage on the content yield as well would double-count.
+                        // Without this, response.usage was zero on clarify paths even though
+                        // /v1/usage saw the spend (Fix #10 logged it into requestLogger).
+                        const traceIdClarify = ctx.options?.trace?.traceId;
+                        const usageClarify = traceIdClarify
+                            ? summaryToUsage(ctx.requestLogger.getSummary(traceIdClarify))
+                            : undefined;
+                        ctx.yield({
+                            ok: true,
+                            value: {
+                                content: '',
+                                finishReason: 'stop',
+                                ...(usageClarify ? { usage: usageClarify } : {}),
+                            },
+                        });
+                        return { ended: true };
+                    }
+                    if (err instanceof NeedInfoSignal) {
+                        logRoleUsage(component, model, err.usage, Date.now() - start);
+                        if (!this.deps.stateOracle) {
+                            throw new OrchestratorError(`coordinator: role requested info but no stateOracle is configured: ${err.query}`, 'COORDINATOR_NEEDINFO_UNRESOLVED');
+                        }
+                        if (++roundTrips > maxRoundTrips) {
+                            throw new OrchestratorError('coordinator: round-trip budget exhausted', 'COORDINATOR_BUDGET_EXHAUSTED');
+                        }
+                        const oracleStart = Date.now();
+                        const ans = await this.deps.stateOracle.query({
+                            query: err.query,
+                            sessionId: ctx.sessionId,
+                            signal: ctx.options?.signal,
+                            trace: ctx.options?.trace,
+                            sessionLogger: ctx.options?.sessionLogger,
+                        });
+                        logRoleUsage('oracle', this.deps.stateOracle.model, ans.usage, Date.now() - oracleStart);
+                        ancestorContext.oracleObservations.push({
+                            query: err.query,
+                            answer: ans.answer,
+                        });
+                        continue;
+                    }
+                    // MEDIUM finding: a role that throws a plain Error (parse-/shape-error
+                    // from LlmDagPlanner / LlmReviewStrategy) ALSO consumed LLM tokens;
+                    // those adapters now attach `res.usage` onto the Error via withUsage.
+                    // Bill it here before rethrowing so the failed call is still visible
+                    // in /v1/usage and the per-request delta (otherwise: real spend,
+                    // invisible).
+                    const failedUsage = err.usage;
+                    if (failedUsage) {
+                        logRoleUsage(component, model, failedUsage, Date.now() - start);
+                    }
+                    throw err;
+                }
+            }
+        };
+        let planRes;
+        const plannerModel = this.deps.planner.model;
+        try {
+            planRes = await runRole('planner', plannerModel, () => this.deps.planner.plan({
+                prompt: ctx.inputText,
+                agents,
+                ancestorContext,
+                sessionId: ctx.sessionId,
+                signal: ctx.options?.signal,
+            }));
+        }
+        catch (err) {
+            ctx.error =
+                err instanceof OrchestratorError
+                    ? err
+                    : new OrchestratorError(errMsg(err), 'COORDINATOR_PLAN_FAILED');
+            return false;
+        }
+        if ('ended' in planRes)
+            return true;
+        let plan = planRes.value.plan;
+        try {
+            for (;;) {
+                if (++roundTrips > maxRoundTrips) {
+                    ctx.error = new OrchestratorError('coordinator: round-trip budget exhausted', 'COORDINATOR_BUDGET_EXHAUSTED');
+                    return false;
+                }
+                const reviewer = this.deps.reviewer;
+                if (reviewer) {
+                    let gate;
+                    const reviewerModel = reviewer.model;
+                    try {
+                        gate = await runRole('reviewer', reviewerModel, () => reviewer.review({
+                            prompt: ctx.inputText,
+                            plan,
+                            agents,
+                            ancestorContext,
+                            sessionId: ctx.sessionId,
+                            signal: ctx.options?.signal,
+                        }));
+                    }
+                    catch (err) {
+                        // A generic reviewer-gate failure keeps the slice-2 error code
+                        // (COORDINATOR_REVIEW_FAILED), not the loop's default STEP_FAILED.
+                        // OrchestratorError from runRole (needInfo-no-oracle / budget) is
+                        // preserved as-is.
+                        ctx.error =
+                            err instanceof OrchestratorError
+                                ? err
+                                : new OrchestratorError(errMsg(err), 'COORDINATOR_REVIEW_FAILED');
+                        return false;
+                    }
+                    if ('ended' in gate)
+                        return true;
+                    const verdict = gate.value.verdict;
+                    if (!verdict.pass) {
+                        const replanned = await runRole('planner', plannerModel, () => this.deps.planner.plan({
+                            prompt: ctx.inputText,
+                            agents,
+                            ancestorContext,
+                            reviewerFeedback: verdict.feedback,
+                            sessionId: ctx.sessionId,
+                            signal: ctx.options?.signal,
+                        }));
+                        if ('ended' in replanned)
+                            return true;
+                        plan = replanned.value.plan;
+                        continue;
+                    }
+                }
+                const onPartial = (chunk) => {
+                    if (chunk.kind === 'content') {
+                        ctx.yield({ ok: true, value: { content: chunk.delta } });
+                    }
+                    // node-start / node-end / tool-call → session log only (NOT yielded to client)
+                    ctx.options?.sessionLogger?.logStep('dag_stream', chunk);
+                };
+                let result;
+                try {
+                    result = await this.deps.interpreter.interpret(plan, {
+                        inputText: ctx.inputText,
+                        workers: this.deps.workers,
+                        sessionId: ctx.sessionId,
+                        signal: ctx.options?.signal,
+                        errorStrategy: this.deps.errorStrategy ?? new AbortErrorStrategy(),
+                        ancestorContext,
+                        trace: ctx.options?.trace,
+                        sessionLogger: ctx.options?.sessionLogger,
+                        onPartial,
+                    });
+                }
+                catch (err) {
+                    ctx.error =
+                        err instanceof OrchestratorError
+                            ? err
+                            : new OrchestratorError(errMsg(err), codeOf(err) ?? 'COORDINATOR_PLAN_INVALID');
+                    return false;
+                }
+                if (result.ok) {
+                    ctx.options?.sessionLogger?.logStep('dag_coordinator_final', {
+                        nodeCount: plan.nodes.length,
+                        outputLength: result.output.length,
+                    });
+                    const executedPlan = result.executedPlan ?? plan;
+                    const nodeIndex = new Map(executedPlan.nodes?.map((n) => [n.id, n]) ?? []);
+                    const executionTrace = (result.executionOrder ?? []).map((id) => ({
+                        nodeId: id,
+                        goal: nodeIndex.get(id)?.goal ?? '',
+                        output: result.nodeResults[id]?.output ?? '',
+                    }));
+                    const finalRes = await runRole('finalizer', this.finalizer.model, () => this.finalizer.finalize({
+                        prompt: ctx.inputText,
+                        objective: executedPlan.objective ?? ctx.inputText,
+                        ancestorContext,
+                        interpreterOutput: result.output,
+                        executionTrace,
+                        sessionId: ctx.sessionId,
+                        signal: ctx.options?.signal,
+                        trace: ctx.options?.trace,
+                        onPartial,
+                    }));
+                    if ('ended' in finalRes)
+                        return true;
+                    // Attach usage ONLY to the terminal `finishReason:'stop'` chunk.
+                    // The agent's response assembler accumulates usage across yielded
+                    // chunks; including usage on both yields would double-count.
+                    const traceId = ctx.options?.trace?.traceId;
+                    const usage = traceId
+                        ? summaryToUsage(ctx.requestLogger.getSummary(traceId))
+                        : undefined;
+                    ctx.yield({
+                        ok: true,
+                        value: {
+                            content: '',
+                            finishReason: 'stop',
+                            ...(usage ? { usage } : {}),
+                        },
+                    });
+                    return true;
+                }
+                const reviewExecutionFailure = reviewer?.reviewExecutionFailure?.bind(reviewer);
+                if (!reviewExecutionFailure) {
+                    ctx.error = new OrchestratorError(`coordinator: ${result.error ?? 'plan execution failed'}`, 'COORDINATOR_STEP_FAILED');
+                    return false;
+                }
+                const execPlan = result.executedPlan ?? plan;
+                const trace = execPlan.nodes
+                    .map((n) => result.nodeResults[n.id])
+                    .filter((r) => Boolean(r));
+                const failedId = result.failedNodeId ?? execPlan.nodes[0]?.id ?? '';
+                const recovery = await runRole('reviewer', reviewer?.model, () => reviewExecutionFailure({
+                    objective: execPlan.objective,
+                    plan: execPlan,
+                    trace,
+                    failedNodeId: failedId,
+                    error: result.nodeResults[failedId]?.error ??
+                        result.error ??
+                        'unknown',
+                    agents,
+                    ancestorContext,
+                    sessionId: ctx.sessionId,
+                    signal: ctx.options?.signal,
+                }));
+                if ('ended' in recovery)
+                    return true;
+                const decision = recovery.value.decision;
+                if (decision.action === 'revise') {
+                    if (decision.revisedPlan.nodes.length === 0) {
+                        ctx.error = new OrchestratorError('coordinator: reviewer returned an empty revised plan', 'COORDINATOR_PLAN_INVALID');
+                        return false;
+                    }
+                    plan = decision.revisedPlan;
+                    continue;
+                }
+                ctx.error = new OrchestratorError(`coordinator: recovery aborted: ${result.error ?? 'unknown'}`, 'COORDINATOR_STEP_FAILED');
+                return false;
+            }
+        }
+        catch (err) {
+            ctx.error =
+                err instanceof OrchestratorError
+                    ? err
+                    : new OrchestratorError(errMsg(err), 'COORDINATOR_STEP_FAILED');
+            return false;
+        }
+    }
+}
+export function buildAncestorContext(ctx) {
+    const h = ctx.history ?? [];
+    const n = h.length;
+    const isMarked = (m) => m?.role === 'assistant' &&
+        typeof m.content === 'string' &&
+        m.content.startsWith(CLARIFY_MARKER);
+    let mi = -1;
+    if (isMarked(h[n - 1]))
+        mi = n - 1;
+    else if (h[n - 1]?.role === 'user' && isMarked(h[n - 2]))
+        mi = n - 2;
+    if (mi >= 0) {
+        const question = h[mi].content
+            .slice(CLARIFY_MARKER.length)
+            .trim();
+        const parent = h[mi - 1];
+        const objective = parent?.role === 'user' && typeof parent.content === 'string'
+            ? parent.content
+            : ctx.inputText;
+        return {
+            objective,
+            clarifications: [{ question, answer: ctx.inputText }],
+            oracleObservations: [],
+        };
+    }
+    return {
+        objective: ctx.inputText,
+        clarifications: [],
+        oracleObservations: [],
+    };
+}
+function errMsg(err) {
+    return err instanceof Error ? err.message : String(err);
+}
+function codeOf(err) {
+    return err?.code;
+}
+//# sourceMappingURL=dag-coordinator.js.map

package/dist/pipeline/handlers/dag-coordinator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dag-coordinator.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/dag-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/handlers/index.d.ts

@@ -10,6 +10,7 @@ import { AssembleHandler } from './assemble.js';
 import { BuildToolQueryHandler } from './build-tool-query.js';
 import { ClassifyHandler } from './classify.js';
 import { type CoordinatorHandlerDeps } from './coordinator.js';
+import { type DagCoordinatorHandlerDeps } from './dag-coordinator.js';
 import { ExpandHandler } from './expand.js';
 import { HistoryUpsertHandler } from './history-upsert.js';
 import { RagQueryHandler } from './rag-query.js';
@@ -30,6 +31,19 @@ export type StageHandlerRegistry = Map<string, IStageHandler>;
 export interface BuildHandlerRegistryOptions {
     subAgents?: SubAgentRegistry;
     coordinator?: CoordinatorHandlerDeps;
+    /**
+     * DAG coordinator deps. When set, registers `DagCoordinatorHandler` under
+     * the `coordinator` stage slot. Mutually exclusive with `coordinator` —
+     * `dagCoordinator` takes precedence when both are supplied.
+     */
+    dagCoordinator?: DagCoordinatorHandlerDeps;
+    /**
+     * Pre-built stage handler to register under the `coordinator` slot.
+     * Takes precedence over `dagCoordinator` and `coordinator` when all three
+     * are supplied. Used by the 18.0 Stepper runtime: caller builds a
+     * `StepperCoordinatorHandler` and passes it in directly.
+     */
+    stepperCoordinator?: IStageHandler;
     /**
      * Activation strategy used by the `coordinator-activate` runtime stage to
      * compute `ctx.coordinatorActive`. Required when `coordinator` is set —

package/dist/pipeline/handlers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAE9D;;;;;;GAMG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,mBAAmB,CAAC;CAC7C;AAED,wBAAgB,2BAA2B,CACzC,IAAI,GAAE,2BAAgC,GACrC,oBAAoB,CA4BtB;AAED,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,GACjB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAE9D;;;;;;GAMG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC;;;;OAIG;IACH,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,aAAa,CAAC;IACnC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,mBAAmB,CAAC;CAC7C;AAED,wBAAgB,2BAA2B,CACzC,IAAI,GAAE,2BAAgC,GACrC,oBAAoB,CAgCtB;AAED,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,GACjB,CAAC"}

package/dist/pipeline/handlers/index.js

@@ -9,6 +9,7 @@ import { BuildToolQueryHandler } from './build-tool-query.js';
 import { ClassifyHandler } from './classify.js';
 import { CoordinatorHandler, } from './coordinator.js';
 import { CoordinatorActivateHandler } from './coordinator-activate.js';
+import { DagCoordinatorHandler, } from './dag-coordinator.js';
 import { ExpandHandler } from './expand.js';
 import { HistoryUpsertHandler } from './history-upsert.js';
 import { RagQueryHandler } from './rag-query.js';
@@ -37,7 +38,13 @@ export function buildDefaultHandlerRegistry(opts = {}) {
     if (opts.subAgents && opts.subAgents.size > 0) {
         registry.set('subagent', new SubAgentHandler(opts.subAgents));
     }
-    if (opts.coordinator) {
+    if (opts.stepperCoordinator) {
+        registry.set('coordinator', opts.stepperCoordinator);
+    }
+    else if (opts.dagCoordinator) {
+        registry.set('coordinator', new DagCoordinatorHandler(opts.dagCoordinator));
+    }
+    else if (opts.coordinator) {
         registry.set('coordinator', new CoordinatorHandler(opts.coordinator));
     }
     if (opts.coordinatorActivation) {

package/dist/pipeline/handlers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EACL,kBAAkB,GAEnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAsBlD,MAAM,UAAU,2BAA2B,CACzC,OAAoC,EAAE;IAEtC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAwB;QAC9C,CAAC,UAAU,EAAE,IAAI,eAAe,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,IAAI,gBAAgB,EAAE,CAAC;QACrC,CAAC,WAAW,EAAE,IAAI,gBAAgB,EAAE,CAAC;QACrC,CAAC,QAAQ,EAAE,IAAI,aAAa,EAAE,CAAC;QAC/B,CAAC,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC;QACpC,CAAC,QAAQ,EAAE,IAAI,aAAa,EAAE,CAAC;QAC/B,CAAC,cAAc,EAAE,IAAI,kBAAkB,EAAE,CAAC;QAC1C,CAAC,kBAAkB,EAAE,IAAI,qBAAqB,EAAE,CAAC;QACjD,CAAC,aAAa,EAAE,IAAI,iBAAiB,EAAE,CAAC;QACxC,CAAC,UAAU,EAAE,IAAI,eAAe,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC;QACpC,CAAC,gBAAgB,EAAE,IAAI,oBAAoB,EAAE,CAAC;KAC/C,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC9C,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,QAAQ,CAAC,GAAG,CACV,sBAAsB,EACtB,IAAI,0BAA0B,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAC3D,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,GACjB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/index.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/handlers/rag-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rag-query.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/rag-query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH,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,qBAAa,eAAgB,YAAW,aAAa;IAC7C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CAyGpB"}
+{"version":3,"file":"rag-query.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/rag-query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH,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,qBAAa,eAAgB,YAAW,aAAa;IAC7C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CA0GpB"}

package/dist/pipeline/handlers/rag-query.js

@@ -75,6 +75,7 @@ export class RagQueryHandler {
             query: queryText.slice(0, 200),
             resultCount: result.ok ? result.value.length : 0,
             durationMs: Date.now() - ragStart,
+            requestId: ctx.options?.trace?.traceId,
         });
         // Log embedding usage once (first rag-query stage that uses the embedding)
         if (!ctx.embeddingUsageLogged && embedding?.getUsage) {

package/dist/pipeline/handlers/rag-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"rag-query.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/rag-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rag-query.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/rag-query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5E,MAAM,OAAO,eAAe;IAC1B,KAAK,CAAC,OAAO,CACX,GAAoB,EACpB,MAA+B,EAC/B,IAAW;QAEX,MAAM,SAAS,GAAG,MAAM,CAAC,KAAe,CAAC;QACzC,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,kBAAkB,SAAS,EAAE,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC,CAAC,kBAAkB;QACjC,CAAC;QAED,MAAM,CAAC,GAAI,MAAM,CAAC,CAAY,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;QAC7D,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEvC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAE1B,sEAAsE;QACtE,uEAAuE;QACvE,oCAAoC;QACpC,MAAM,iBAAiB,GACrB,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;YAClC,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,eAAe;gBACpC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,OAAO,CAAC;gBACpC,CAAC,CAAC,MAAM,CAAC,SAAS;YACpB,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,SAAS,GAAG,iBAAiB,IAAI,GAAG,CAAC,OAAO,CAAC;QAEnD,IAAI,SAAoC,CAAC;QACzC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACpC,SAAS,GAAG,GAAG,CAAC,QAAQ;gBACtB,CAAC,CAAC,IAAI,cAAc,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;gBAC1D,CAAC,CAAC,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,4EAA4E;YAC5E,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;gBACxB,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,QAAQ;oBAC/B,CAAC,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;oBAC5D,CAAC,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;YACD,SAAS,GAAG,GAAG,CAAC,cAAc,CAAC;QACjC,CAAC;QAED,qCAAqC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,KAA6B,CAAC;QACnD,MAAM,WAAW,GAA4B,EAAE,CAAC;QAChD,IAAI,KAAK,KAAK,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YAC5C,WAAW,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;QAC1C,CAAC;QACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,WAAW,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QACxC,CAAC;QAED,MAAM,YAAY,GAAgB;YAChC,GAAG,GAAG,CAAC,OAAO;YACd,SAAS,EAAE,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,WAAW,EAAE;SACzD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QAC7D,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC;YAC5B,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;YAC9B,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAChD,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ;YACjC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO;SACvC,CAAC,CAAC;QAEH,2EAA2E;QAC3E,IAAI,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC;YACrD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,IAAI,KAAK,EAAE,CAAC;gBACV,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC;oBAC3B,SAAS,EAAE,WAAW;oBACtB,KAAK,EAAE,UAAU;oBACjB,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,gBAAgB,EAAE,CAAC;oBACnB,WAAW,EAAE,KAAK,CAAC,WAAW;oBAC9B,UAAU,EAAE,CAAC,EAAE,uEAAuE;oBACtF,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAC;gBACH,GAAG,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAClC,CAAC;QACH,CAAC;QAED,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE;YAC/B,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;SAClD,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACd,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAElD,8CAA8C;YAC9C,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,SAAS,EAAE,EAAE;gBAC5D,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9B,CAAC;gBACD,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;gBAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAChC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE;oBACjB,KAAK,EAAE,CAAC,CAAC,KAAK;oBACd,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;iBAC3B,CAAC,CAAC;aACJ,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/pipeline/handlers/subagent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,qBAAa,eAAgB,YAAW,aAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,gBAAgB;IAEjD,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;CA2DpB"}
+{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,qBAAa,eAAgB,YAAW,aAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,gBAAgB;IAEjD,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;CAyDpB"}

package/dist/pipeline/handlers/subagent.js

@@ -36,8 +36,6 @@ export class SubAgentHandler {
                 task,
                 sessionId: ctx.sessionId,
                 signal,
-                // Increments from current pipeline layer, matching SubAgentDispatch convention.
-                layer: (ctx.layer ?? 0) + 1,
             });
         }
         catch (err) {

package/dist/pipeline/handlers/subagent.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAUlE,MAAM,OAAO,eAAe;IACG;IAA7B,YAA6B,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;IAAG,CAAC;IAE3D,KAAK,CAAC,OAAO,CACX,GAAoB,EACpB,SAAkC,EAClC,KAAY;QAEZ,MAAM,MAAM,GAAG,SAA2C,CAAC;QAE3D,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtD,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,qCAAqC,EACrC,uBAAuB,CACxB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,GAAG,GAA0B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,aAAa,MAAM,CAAC,KAAK,4BACvB,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAC1C,EAAE,EACF,oBAAoB,CACrB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,IAAI,eAAe,CAAC;QACpD,MAAM,IAAI,GAAG,eAAe,CAC1B,YAAY,EACZ,GAAyC,CAC1C,CAAC;QAEF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;QACnC,IAAI,MAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACrB,IAAI;gBACJ,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,MAAM;gBACN,gFAAgF;gBAChF,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC;aAC5B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAChD,wBAAwB,CACzB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,IAAI,cAAc,MAAM,CAAC,KAAK,EAAE,CAAC;QACnE,MAAM,SAAS,GAAG,GAAyC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,UAAU;YAAE,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;QACrD,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,YAAY,MAAM,CAAC,KAAK,EAAE,EAAE;YAC9D,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;YACxB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;YAClC,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/subagent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAUlE,MAAM,OAAO,eAAe;IACG;IAA7B,YAA6B,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;IAAG,CAAC;IAE3D,KAAK,CAAC,OAAO,CACX,GAAoB,EACpB,SAAkC,EAClC,KAAY;QAEZ,MAAM,MAAM,GAAG,SAA2C,CAAC;QAE3D,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtD,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,qCAAqC,EACrC,uBAAuB,CACxB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,GAAG,GAA0B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,aAAa,MAAM,CAAC,KAAK,4BACvB,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAC1C,EAAE,EACF,oBAAoB,CACrB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,IAAI,eAAe,CAAC;QACpD,MAAM,IAAI,GAAG,eAAe,CAC1B,YAAY,EACZ,GAAyC,CAC1C,CAAC;QAEF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;QACnC,IAAI,MAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBACrB,IAAI;gBACJ,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAC/B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAChD,wBAAwB,CACzB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,IAAI,cAAc,MAAM,CAAC,KAAK,EAAE,CAAC;QACnE,MAAM,SAAS,GAAG,GAAyC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,UAAU;YAAE,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;QACrD,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,YAAY,MAAM,CAAC,KAAK,EAAE,EAAE;YAC9D,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;YACxB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;YAClC,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/pipeline/handlers/summarize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summarize.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,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,qBAAa,gBAAiB,YAAW,aAAa;IAC9C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CAwDpB"}
+{"version":3,"file":"summarize.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,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,qBAAa,gBAAiB,YAAW,aAAa;IAC9C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CA6DpB"}

package/dist/pipeline/handlers/summarize.js

@@ -30,6 +30,11 @@ export class SummarizeHandler {
         const chatStart = Date.now();
         const res = await ctx.helperLlm.chat([...toSummarize, { role: 'system', content: prompt }], [], ctx.options);
         ctx.requestLogger.logLlmCall({
+            // Stamp requestId so this helper-LLM call is attributed to the active
+            // request's per-traceId delta — without it, history-summarization tokens
+            // only show up in the session-cumulative aggregate and are missing from
+            // `response.usage` (which is computed from the delta).
+            requestId: ctx.options?.trace?.traceId,
             component: 'helper',
             model: ctx.helperLlm.model ?? 'unknown',
             promptTokens: res.ok ? (res.value.usage?.promptTokens ?? 0) : 0,

package/dist/pipeline/handlers/summarize.js.map

@@ -1 +1 @@
-{"version":3,"file":"summarize.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,MAAM,OAAO,gBAAgB;IAC3B,KAAK,CAAC,OAAO,CACX,GAAoB,EACpB,MAA+B,EAC/B,IAAW;QAEX,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GACR,MAAM,CAAC,KAAgB,IAAI,GAAG,CAAC,MAAM,CAAC,yBAAyB,IAAI,EAAE,CAAC;QAEzE,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1C,MAAM,MAAM,GACV,GAAG,CAAC,MAAM,CAAC,oBAAoB;YAC/B,iJAAiJ,CAAC;QAEpJ,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,IAAI,CAClC,CAAC,GAAG,WAAW,EAAE,EAAE,IAAI,EAAE,QAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAC9D,EAAE,EACF,GAAG,CAAC,OAAO,CACZ,CAAC;QACF,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC;YAC3B,SAAS,EAAE,QAAQ;YACnB,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS;YACvC,YAAY,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,gBAAgB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvE,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;SACnC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,oCAAoC;YACpC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,GAAG,CAAC,OAAO,GAAG;YACZ;gBACE,IAAI,EAAE,QAAiB;gBACvB,OAAO,EAAE,qCAAqC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE;aAClE;YACD,GAAG,MAAM;SACV,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"summarize.js","sourceRoot":"","sources":["../../../src/pipeline/handlers/summarize.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/handlers/tool-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAgBH,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;AAqDzD,qBAAa,eAAgB,YAAW,aAAa;IAC7C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,OAAO,CAAC;CAyxBpB"}
+{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/pipeline/handlers/tool-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAgBH,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;AAqDzD,qBAAa,eAAgB,YAAW,aAAa;IAC7C,OAAO,CACX,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,OAAO,CAAC;CA0yBpB"}

package/dist/pipeline/handlers/tool-loop.js

@@ -349,6 +349,9 @@ export class ToolLoopHandler {
                 if (chunk.content) {
                     content += chunk.content;
                     ctx.yield({ ok: true, value: { content: chunk.content } });
+                    if (ctx.onPartial) {
+                        ctx.onPartial({ kind: 'content', delta: chunk.content });
+                    }
                 }
                 if (chunk.toolCalls) {
                     // Register newly seen external tool indices
@@ -389,6 +392,14 @@ export class ToolLoopHandler {
                                     ex.arguments += tc.arguments;
                             }
                         }
+                        if (tc.name && ctx.onPartial) {
+                            ctx.onPartial({
+                                kind: 'mcp-call',
+                                source: { stepperId: tc.name, name: 'tool' },
+                                tool: tc.name,
+                                args: tc.arguments,
+                            });
+                        }
                     }
                 }
                 if (chunk.finishReason)
@@ -418,6 +429,7 @@ export class ToolLoopHandler {
                 completionTokens: iterCompletionTokens,
                 totalTokens: iterTotalTokens,
                 durationMs: llmCallDuration,
+                requestId: ctx.options?.trace?.traceId,
             });
             const toolCalls = Array.from(toolCallsMap.values()).map((tc) => {
                 let args = {};
@@ -721,6 +733,11 @@ export class ToolLoopHandler {
                     tool_call_id: tc.id,
                 });
                 ctx.requestLogger.logToolCall({
+                    // Stamp requestId so tool executions land in the per-traceId delta
+                    // bucket — without it, `getSummary(traceId).toolCalls` stays 0 even
+                    // when the request actually ran tools (only the session-cumulative
+                    // counter would tick).
+                    requestId: ctx.options?.trace?.traceId,
                     toolName: tc.name,
                     success: !!res?.ok,
                     durationMs: r.duration,