@zhixuan92/multi-model-agent-core 4.0.2 → 4.0.4

package/dist/lifecycle/task-executor.js

@@ -6,6 +6,8 @@ import { autoRegisterContextBlock } from './auto-register-context-block.js';
 import { mapReviewVerdicts } from '../review/review-verdict-mapping.js';
 import { notApplicable } from '../reporting/not-applicable.js';
 import { createDefaultReviewerEngine, createDefaultAnnotatorEngine } from '../review/default-engines.js';
+import { parseStructuredReport } from '../reporting/structured-report.js';
+import { expandContextBlocks } from '../stores/expand-context-blocks.js';
 /**
  * Generic per-task orchestrator. Takes a ToolConfig (which encodes all
  * tool-specific behavior: brief compilation, TaskSpec building, headline
@@ -34,15 +36,27 @@ export async function executeTask(config, ctx, input) {
     }
     // ── Step 2: Resolve agent ──
     const resolved = resolveAgent(config.agentType, ctx.config);
-    // ── Step 3: Build TaskSpecs from briefs ──
-    const tasks = briefs.map((brief) => config.buildTaskSpec(brief, ctx));
+    // ── Step 3: Build TaskSpecs from briefs, then expand contextBlockIds ──
+    // Gap 1 cache-invariant fix (4.0.3+): batch cache MUST store the EXPANDED,
+    // contextBlockIds-stripped task. If we cache the original (with
+    // contextBlockIds) and the contextBlockStore loses entries before retry,
+    // retry resolves stale IDs and fails. expandContextBlocks strips
+    // contextBlockIds from the returned task, so subsequent expansion calls
+    // are a no-op (idempotent).
+    const tasks = briefs.map((brief) => {
+        const built = config.buildTaskSpec(brief, ctx);
+        return ctx.contextBlockStore
+            ? expandContextBlocks(built, ctx.contextBlockStore)
+            : built;
+    });
     // Store TaskSpecs in the per-project batch cache so retry can
     // reconstruct original tasks without re-invoking the brief slot.
+    // (Tasks here are already expanded — see comment above.)
     if (ctx.batchId && ctx.projectContext?.batchCache) {
         ctx.projectContext.batchCache.remember(ctx.batchId, tasks);
     }
     // ── Step 4: Dispatch ──
-    const mainModel = ctx.mainModel ?? ctx.config.defaults?.mainModel ?? undefined;
+    const mainModel = ctx.mainModel;
     const startMs = Date.now();
     let results;
     if (tasks.length === 1) {
@@ -61,8 +75,9 @@ export async function executeTask(config, ctx, input) {
                 recorder: ctx.recorder,
                 route: ctx.route ?? config.name,
                 client: ctx.client,
-                triggeringSkill: ctx.triggeringSkill,
+                mainModel: ctx.mainModel,
                 bus: ctx.bus,
+                ...(ctx.contextBlockStore && { contextBlockStore: ctx.contextBlockStore }),
                 reviewerEngine: ctx.reviewerEngine ?? createDefaultReviewerEngine(),
                 annotatorEngine: ctx.annotatorEngine ?? createDefaultAnnotatorEngine(),
             });
@@ -70,6 +85,10 @@ export async function executeTask(config, ctx, input) {
         }
         catch (e) {
             const msg = e instanceof Error ? e.message : String(e);
+            // Gap 3 fix (round-2 F5): durationMs MUST be set on EVERY return,
+            // including failure envelopes. Pre-fix, error envelopes carried
+            // durationMs:0 — failed runs were invisible in cost-per-time
+            // analysis, retry budgeting, and operator debugging.
             results = [
                 {
                     output: '',
@@ -85,7 +104,7 @@ export async function executeTask(config, ctx, input) {
                     error: msg,
                     errorCode: 'runner_crash',
                     retryable: false,
-                    durationMs: 0,
+                    durationMs: Date.now() - startMs,
                     structuredError: { code: 'runner_crash', message: msg, where: `executor:${config.name}` },
                     workerStatus: 'failed',
                 },
@@ -107,12 +126,15 @@ export async function executeTask(config, ctx, input) {
             recorder: ctx.recorder,
             route: ctx.route ?? config.name,
             client: ctx.client,
-            triggeringSkill: ctx.triggeringSkill,
+            mainModel: ctx.mainModel,
             bus: ctx.bus,
+            ...(ctx.contextBlockStore && { contextBlockStore: ctx.contextBlockStore }),
             reviewerEngine: ctx.reviewerEngine ?? createDefaultReviewerEngine(),
             annotatorEngine: ctx.annotatorEngine ?? createDefaultAnnotatorEngine(),
         }).catch((e) => {
             const msg = e instanceof Error ? e.message : String(e);
+            // Gap 3 fix (round-2 F5): set durationMs on failure envelopes
+            // so cost-per-time + retry budgeting see real wall-clock.
             return {
                 output: '',
                 status: 'error',
@@ -127,19 +149,37 @@ export async function executeTask(config, ctx, input) {
                 error: msg,
                 errorCode: 'runner_crash',
                 retryable: false,
-                durationMs: 0,
+                durationMs: Date.now() - startMs,
                 structuredError: { code: 'runner_crash', message: msg, where: `executor:${config.name}` },
                 workerStatus: 'failed',
             };
         })));
     }
     const wallClockMs = Date.now() - startMs;
+    // Gap 3 fix (4.0.3+): surface the executor's wall-clock as
+    // result.durationMs on each task. The dispatcher's runResult.durationMs
+    // only covers the implementer's shell.run wall-clock, missing
+    // reviewer/annotator stages. Setting it here means retry callers + the
+    // wire builder's Math.max see the real total. Skip if the result already
+    // has a larger durationMs (e.g., dispatcher tracked something we didn't).
+    for (const r of results) {
+        if (!r.durationMs || r.durationMs < wallClockMs) {
+            r.durationMs = wallClockMs;
+        }
+    }
     // ── Step 5: Auto-register context block ──
     const contextBlockId = autoRegisterContextBlock(results, ctx.contextBlockStore);
     // ── Step 6: Compute timings + cost ──
     const batchTimings = computeTimings(wallClockMs, results);
     const costSummary = computeAggregateCost(results);
     // ── Step 7: Parse structured report ──
+    // First try the per-tool schema. Five of the ten tools (audit, review,
+    // verify, debug, investigate) instruct workers to emit narrative
+    // `## Finding N: ...` rather than JSON; for those, the per-tool schema
+    // always throws. Fall back to the generic narrative parser so the
+    // envelope's structuredReport carries the parsed sections instead of a
+    // "parse failed" sentinel. The narrative parser never throws — empty
+    // input yields an empty ParsedStructuredReport.
     let structuredReport;
     const primaryOutput = results[0]?.output;
     if (primaryOutput && primaryOutput.trim().length > 0) {
@@ -147,13 +187,16 @@ export async function executeTask(config, ctx, input) {
             structuredReport = config.reportSchema.parse(primaryOutput);
         }
         catch {
-            structuredReport = notApplicable(`reportSchema.parse failed for ${config.name}`);
+            structuredReport = parseStructuredReport(primaryOutput);
         }
     }
     else {
         structuredReport = notApplicable('no task output to parse');
     }
     // ── Step 8: Compose headline ──
+    // 4.0.3+ Gap 2 fix: pass runResult + task so audit/review composers
+    // can read annotatedFindings and filePaths fallbacks when the
+    // structured report doesn't carry them (narrative-emitting tools).
     const headline = config.headlineTemplate.compose({
         taskBrief: typeof briefs[0] === 'object' && briefs[0] !== null
             ? briefs[0].prompt
@@ -163,6 +206,8 @@ export async function executeTask(config, ctx, input) {
             : config.name,
         report: structuredReport,
         status: results[0]?.status ?? 'error',
+        ...(results[0] && { runResult: results[0] }),
+        ...(tasks[0] && { task: tasks[0] }),
     });
     // ── Step 9: Map review verdicts ──
     const verdicts = mapReviewVerdicts(results[0] ?? {}, false);
@@ -193,12 +238,12 @@ function emptyEnvelope(toolName, ctx) {
         headline: `${toolName}: no tasks executed`,
         results: [],
         batchTimings: { wallClockMs: 0, sumOfTaskMs: 0, estimatedParallelSavingsMs: 0 },
-        costSummary: { totalActualCostUSD: 0, totalCostDeltaVsParentUSD: 0 },
+        costSummary: { totalActualCostUSD: 0, totalCostDeltaVsMainUSD: 0 },
         structuredReport: notApplicable('no briefs produced'),
         error: notApplicable('batch succeeded'),
         batchId: ctx.batchId ?? randomUUID(),
         wallClockMs: 0,
-        mainModel: ctx.mainModel ?? ctx.config.defaults?.mainModel,
+        mainModel: ctx.mainModel,
         specReviewVerdict: 'not_applicable',
         qualityReviewVerdict: 'not_applicable',
         roundsUsed: 0,

package/dist/lifecycle/task-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../../src/lifecycle/task-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../../src/lifecycle/task-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAsB,MAAM,gCAAgC,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACzG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAwC,EACxC,GAAqB,EACrB,KAAY;IAEZ,+BAA+B;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,iDAAiD;QACjD,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,8BAA8B;IAC9B,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAE5D,yEAAyE;IACzE,2EAA2E;IAC3E,gEAAgE;IAChE,yEAAyE;IACzE,iEAAiE;IACjE,wEAAwE;IACxE,4BAA4B;IAC5B,MAAM,KAAK,GAAe,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/C,OAAO,GAAG,CAAC,iBAAiB;YAC1B,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC,iBAAiB,CAAC;YACnD,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,8DAA8D;IAC9D,iEAAiE;IACjE,yDAAyD;IACzD,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,cAAc,EAAE,UAAU,EAAE,CAAC;QAClD,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,yBAAyB;IACzB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE3B,IAAI,OAAoB,CAAC;IACzB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,kCAAkC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;gBACxC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAE;gBACf,QAAQ;gBACR,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,eAAe,EAAE,GAAG,CAAC,eAAe;gBACpC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,aAAa,EAAE,GAAG,CAAC,aAAa;gBAChC,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI;gBAC/B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,GAAG,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,CAAC;gBAC1E,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,2BAA2B,EAAE;gBACnE,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,4BAA4B,EAAE;aACvE,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvD,kEAAkE;YAClE,gEAAgE;YAChE,6DAA6D;YAC7D,qDAAqD;YACrD,OAAO,GAAG;gBACR;oBACE,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE,OAAgB;oBACxB,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE;oBACvF,KAAK,EAAE,CAAC;oBACR,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,kBAAkB,EAAE,KAAK;oBACzB,aAAa,EAAE,EAAE;oBACjB,cAAc,EAAE,IAAI;oBACpB,KAAK,EAAE,GAAG;oBACV,SAAS,EAAE,cAAc;oBACzB,SAAS,EAAE,KAAK;oBAChB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;oBAChC,eAAe,EAAE,EAAE,IAAI,EAAE,cAAuB,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,MAAM,CAAC,IAAI,EAAE,EAAE;oBAClG,YAAY,EAAE,QAAiB;iBAChC;aACF,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,2CAA2C;QAC3C,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CACzB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACpB,oBAAoB,CAAC;YACnB,IAAI;YACJ,QAAQ;YACR,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI;YAC/B,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC1E,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,2BAA2B,EAAE;YACnE,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,4BAA4B,EAAE;SACvE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAU,EAAa,EAAE;YACjC,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvD,8DAA8D;YAC9D,0DAA0D;YAC1D,OAAO;gBACL,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,OAAgB;gBACxB,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE;gBACvF,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,kBAAkB,EAAE,KAAK;gBACzB,aAAa,EAAE,EAAE;gBACjB,cAAc,EAAE,IAAI;gBACpB,KAAK,EAAE,GAAG;gBACV,SAAS,EAAE,cAAc;gBACzB,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;gBAChC,eAAe,EAAE,EAAE,IAAI,EAAE,cAAuB,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,MAAM,CAAC,IAAI,EAAE,EAAE;gBAClG,YAAY,EAAE,QAAiB;aAChC,CAAC;QACJ,CAAC,CAAC,CACH,CACF,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IAEzC,2DAA2D;IAC3D,wEAAwE;IACxE,8DAA8D;IAC9D,uEAAuE;IACvE,yEAAyE;IACzE,0EAA0E;IAC1E,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,GAAG,WAAW,EAAE,CAAC;YAC/C,CAA4B,CAAC,UAAU,GAAG,WAAW,CAAC;QACzD,CAAC;IACH,CAAC;IAED,4CAA4C;IAC5C,MAAM,cAAc,GAAG,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAEhF,uCAAuC;IACvC,MAAM,YAAY,GAAG,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAElD,wCAAwC;IACxC,uEAAuE;IACvE,iEAAiE;IACjE,uEAAuE;IACvE,kEAAkE;IAClE,uEAAuE;IACvE,qEAAqE;IACrE,gDAAgD;IAChD,IAAI,gBAAyD,CAAC;IAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IACzC,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC;YACH,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,aAAa,CAA4B,CAAC;QACzF,CAAC;QAAC,MAAM,CAAC;YACP,gBAAgB,GAAG,qBAAqB,CAAC,aAAa,CAAuC,CAAC;QAChG,CAAC;IACH,CAAC;SAAM,CAAC;QACN,gBAAgB,GAAG,aAAa,CAAC,yBAAyB,CAAC,CAAC;IAC9D,CAAC;IAED,iCAAiC;IACjC,oEAAoE;IACpE,8DAA8D;IAC9D,mEAAmE;IACnE,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;QAC/C,SAAS,EAAE,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI;YAC5D,CAAC,CAAG,MAAM,CAAC,CAAC,CAA6B,CAAC,MAAiB;mBACpD,MAAM,CAAC,CAAC,CAA6B,CAAC,KAAgB;mBACvD,MAAM,CAAC,CAAC,CAA6B,CAAC,QAAkB;mBACzD,MAAM,CAAC,IAAI;YAChB,CAAC,CAAC,MAAM,CAAC,IAAI;QACf,MAAM,EAAE,gBAAgB;QACxB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,OAAO;QACrC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAC,CAAC;IAEH,oCAAoC;IACpC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAE5D,+CAA+C;IAC/C,IAAI,QAAQ,GAAmB;QAC7B,QAAQ;QACR,OAAO;QACP,YAAY;QACZ,WAAW;QACX,gBAAgB,EAAE,gBAAsD;QACxE,KAAK,EAAE,aAAa,CAAC,iBAAiB,CAAC;QACvC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,UAAU,EAAE;QACpC,WAAW;QACX,SAAS;QACT,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;QACnD,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,cAAc,EAAE,CAAC;KACxD,CAAC;IAEF,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC/B,QAAQ,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,qEAAqE;AACrE,SAAS,aAAa,CAAC,QAAgB,EAAE,GAAqB;IAC5D,OAAO;QACL,QAAQ,EAAE,GAAG,QAAQ,qBAAqB;QAC1C,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,0BAA0B,EAAE,CAAC,EAAE;QAC/E,WAAW,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE,uBAAuB,EAAE,CAAC,EAAE;QAClE,gBAAgB,EAAE,aAAa,CAAC,oBAAoB,CAAC;QACrD,KAAK,EAAE,aAAa,CAAC,iBAAiB,CAAC;QACvC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,UAAU,EAAE;QACpC,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,iBAAiB,EAAE,gBAAgB;QACnC,oBAAoB,EAAE,gBAAgB;QACtC,UAAU,EAAE,CAAC;KACd,CAAC;AACJ,CAAC"}

package/dist/lifecycle/task-runner.d.ts

@@ -33,7 +33,6 @@ export interface RunTasksOptions {
             taskSpec: TaskSpec;
             runResult: RunResult;
             client: string;
-            triggeringSkill: string;
             mainModel: string | null;
             reviewPolicy?: 'full' | 'quality_only' | 'diff_only' | 'none';
             verifyCommandPresent?: boolean;
@@ -41,7 +40,6 @@ export interface RunTasksOptions {
     };
     route?: string;
     client?: string;
-    triggeringSkill?: string;
     bus?: EventEmitter;
     qualityReviewPromptBuilder?: (ctx: {
         workerOutput: string;
@@ -66,8 +64,14 @@ export interface DispatchTaskInput {
     recorder?: ExecutionContext['recorder'];
     route?: string;
     client?: string;
-    triggeringSkill?: string;
+    /** Calling agent's model (e.g., claude-opus-4-7), threaded into telemetry as mainModel.
+     *  Sourced from X-MMA-Main-Model header → execution-context → here. */
+    mainModel?: string | null;
     bus?: EventEmitter;
+    /** Context block store for expanding contextBlockIds into the task's prompt
+     *  before dispatch. Without this, the worker LLM never sees the prior-round
+     *  audit/review report referenced by contextBlockIds. */
+    contextBlockStore?: import('../stores/context-block-tool.js').ContextBlockStore;
     qualityReviewPromptBuilder?: (ctx: {
         workerOutput: string;
         brief: string;

package/dist/lifecycle/task-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../../src/lifecycle/task-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../../src/lifecycle/task-runner.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/task-runner.js

@@ -6,6 +6,7 @@ import { resolveAgent } from '../escalation/agent-resolver.js';
 import { expandContextBlocks } from '../stores/expand-context-blocks.js';
 import { delegateWithEscalation } from '../escalation/delegate-with-escalation.js';
 import { parseStructuredReport } from '../reporting/structured-report.js';
+import { mergeStageStats } from './merge-stage-stats.js';
 export function errorResult(error) {
     return {
         output: `Sub-agent error: ${error}`,
@@ -82,7 +83,6 @@ export async function runTasks(tasks, config, options = {}) {
             ...(options.recorder && { recorder: options.recorder }),
             ...(options.route !== undefined && { route: options.route }),
             ...(options.client !== undefined && { client: options.client }),
-            ...(options.triggeringSkill !== undefined && { triggeringSkill: options.triggeringSkill }),
             ...(options.bus && { bus: options.bus }),
             ...(options.qualityReviewPromptBuilder && { qualityReviewPromptBuilder: options.qualityReviewPromptBuilder }),
             ...(options.reviewerEngine && { reviewerEngine: options.reviewerEngine }),
@@ -101,7 +101,14 @@ function toolCategoryForRoute(route) {
     return 'artifact_producing';
 }
 function buildExecutionContext(input) {
-    const { task, resolved, config } = input;
+    const { resolved, config } = input;
+    // Expand contextBlockIds into the task's prompt up-front so every downstream
+    // dispatch path (legacy executor + new lifecycle) sees the materialized
+    // context. Throwing here surfaces missing-block errors at the dispatcher
+    // boundary rather than silently dropping them on the floor.
+    const task = input.contextBlockStore
+        ? expandContextBlocks(input.task, input.contextBlockStore)
+        : input.task;
     const cwd = task.cwd ?? process.cwd();
     const timeoutMs = task.timeoutMs ?? config.defaults?.timeoutMs ?? 1_800_000;
     const stallTimeoutMs = config.defaults?.stallTimeoutMs ?? 300_000;
@@ -124,8 +131,8 @@ function buildExecutionContext(input) {
         ...(input.batchId !== undefined && { batchId: input.batchId }),
         route: input.route ?? '',
         client: input.client ?? '',
-        triggeringSkill: input.triggeringSkill ?? '',
-        mainModel: input.recorder ? null : null,
+        mainModel: input.mainModel ?? null,
+        ...(input.contextBlockStore && { contextBlockStore: input.contextBlockStore }),
         assignedTier: resolved.slot,
         implementerProvider: resolved.provider,
         escalationProvider: providers[resolved.slot === 'standard' ? 'complex' : 'standard'],
@@ -149,15 +156,23 @@ function buildExecutionContext(input) {
     };
 }
 export async function runTaskViaDispatcher(input, dispatcher = new LifecycleDispatcher()) {
-    const executionContext = buildExecutionContext(input);
+    // Gap 1 fix: expand contextBlockIds into the task's prompt once, up-front,
+    // so the SAME expanded task object reaches BOTH state.task AND
+    // executionContext.task (single source of truth — no two references).
+    // buildExecutionContext also expands internally, but that becomes a no-op
+    // because expandContextBlocks strips contextBlockIds on first pass.
+    const expandedTask = input.contextBlockStore
+        ? expandContextBlocks(input.task, input.contextBlockStore)
+        : input.task;
+    const executionContext = buildExecutionContext({ ...input, task: expandedTask });
     const route = input.route ?? '';
     const toolCategory = toolCategoryForRoute(route);
     void ATTEMPT_BUDGETS[toolCategory];
     const out = await dispatcher.dispatch({
         route,
         toolCategory,
-        rawRequest: { tasks: [input.task] },
-        context: { task: input.task, executionContext },
+        rawRequest: { tasks: [expandedTask] },
+        context: { task: expandedTask, executionContext },
         executor: async (_rawRequest, state) => {
             const task = state.task;
             const ctx = state.executionContext;
@@ -199,12 +214,33 @@ export async function runTaskViaDispatcher(input, dispatcher = new LifecycleDisp
                     taskDeadlineMs: ctx.timing.deadlineMs,
                     abortSignal: ctx.stall.controller.signal,
                     assignedTier: decision.impl,
+                    stageLabel: 'Implementing',
+                    ...(ctx.bus && { bus: ctx.bus }),
+                    ...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
+                    taskIndex: ctx.taskIndex,
                 });
                 const enrichedResult = {
                     ...result,
                     ...(result.implementationReport === undefined && result.output && { implementationReport: parseStructuredReport(result.output) }),
                 };
                 state.lastRunResult = enrichedResult;
+                // Record the implementer's per-stage cost so emit_task_terminal +
+                // wire task.completed include it in the totals + per-stage breakdown.
+                mergeStageStats(state, 'implementing', {
+                    inputTokens: result.usage.inputTokens ?? 0,
+                    outputTokens: result.usage.outputTokens ?? 0,
+                    cachedReadTokens: result.usage.cachedReadTokens ?? 0,
+                    cachedNonReadTokens: result.usage.cachedNonReadTokens ?? 0,
+                    turnCount: result.turns ?? 0,
+                    toolCallCount: Array.isArray(result.toolCalls) ? result.toolCalls.length : 0,
+                    costUSD: result.cost?.costUSD ?? null,
+                    durationMs: result.durationMs ?? null,
+                    filesReadCount: Array.isArray(result.filesRead) ? result.filesRead.length : 0,
+                    filesWrittenCount: Array.isArray(result.filesWritten) ? result.filesWritten.length : 0,
+                }, {
+                    tier: ctx.assignedTier,
+                    model: ctx.implementerProvider?.config?.model ?? null,
+                });
                 if (result.status !== 'ok') {
                     state.terminal = true;
                 }

package/dist/lifecycle/task-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/lifecycle/task-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/lifecycle/task-runner.ts"],"names":[],"mappings":"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"}

package/dist/providers/anthropic-messages-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-messages-adapter.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic-messages-adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE9F,qBAAa,wBAAyB,YAAW,aAAa;IAC5D,QAAQ,CAAC,YAAY,EAAE,QAAQ,GAAG,mBAAmB,CAAC;IACtD,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,eAAe,CAAS;gBAEpB,IAAI,EAAE;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,CAAC,EAAE,QAAQ,GAAG,mBAAmB,CAAC;KAC/C;IAOK,IAAI,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8B/D,OAAO,CAAC,aAAa;IAqCrB,OAAO,CAAC,QAAQ;CAOjB"}
+{"version":3,"file":"anthropic-messages-adapter.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic-messages-adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE9F,qBAAa,wBAAyB,YAAW,aAAa;IAC5D,QAAQ,CAAC,YAAY,EAAE,QAAQ,GAAG,mBAAmB,CAAC;IACtD,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,eAAe,CAAS;gBAEpB,IAAI,EAAE;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,CAAC,EAAE,QAAQ,GAAG,mBAAmB,CAAC;KAC/C;IAOK,IAAI,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAuD/D,OAAO,CAAC,aAAa;IAqCrB,OAAO,CAAC,QAAQ;CAOjB"}

package/dist/providers/anthropic-messages-adapter.js

@@ -12,13 +12,23 @@ export class AnthropicMessagesAdapter {
     }
     async turn(input) {
         const messages = this.buildMessages(input);
-        const response = await this.client.messages.create({
+        // Use the streaming endpoint and reduce to a final Message. The
+        // Anthropic SDK rejects non-streaming requests when max_tokens is
+        // high enough that the call could exceed 10 minutes
+        // ("Streaming is required for operations that may take longer than
+        // 10 minutes"). Streaming sidesteps that preflight rejection and
+        // also keeps the connection alive for the actual long calls
+        // reasoning-heavy models like deepseek-v4-pro do. `finalMessage()`
+        // resolves to the same `Message` shape `messages.create()` returned,
+        // so the rest of the adapter is unchanged.
+        const stream = this.client.messages.stream({
             model: this.model,
             system: input.systemPrompt,
             messages,
             tools: this.mapTools(input.toolDefinitions),
             max_tokens: this.maxOutputTokens,
         });
+        const response = await stream.finalMessage();
         const usage = {
             inputTokens: response.usage.input_tokens,
             outputTokens: response.usage.output_tokens,
@@ -29,11 +39,25 @@ export class AnthropicMessagesAdapter {
         const toolCalls = response.content
             .filter(b => b.type === 'tool_use')
             .map((b) => ({ id: b.id, name: b.name, input: b.input }));
+        // Tally every content-block type the provider returned so the runner
+        // can emit a `runner_response_received` event that surfaces e.g.
+        // `{ text: 0, thinking: 1 }` when deepseek emitted reasoning-only.
+        // That diagnostic was missing in 4.0.x — the adapter silently dropped
+        // non-text blocks and the runner-shell terminated with empty output.
+        const contentBlocks = {};
+        for (const b of response.content) {
+            const t = b.type ?? 'unknown';
+            contentBlocks[t] = (contentBlocks[t] ?? 0) + 1;
+        }
         return {
             assistantText: text,
             toolCalls,
             usage,
             finishReason: toolCalls.length > 0 ? 'tool_use' : (response.stop_reason === 'end_turn' ? 'stop' : 'max_tokens'),
+            responseShape: {
+                ...(response.stop_reason && { stopReason: response.stop_reason }),
+                contentBlocks,
+            },
         };
     }
     buildMessages(input) {

package/dist/providers/anthropic-messages-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-messages-adapter.js","sourceRoot":"","sources":["../../src/providers/anthropic-messages-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"anthropic-messages-adapter.js","sourceRoot":"","sources":["../../src/providers/anthropic-messages-adapter.ts"],"names":[],"mappings":"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"}

package/dist/providers/base/result-builders.d.ts

@@ -9,7 +9,7 @@ export interface SharedResultUsage {
     cachedReadTokens: number;
     cachedNonReadTokens: number;
     costUSD: number | null;
-    costDeltaVsParentUSD: number | null;
+    costDeltaVsMainUSD: number | null;
 }
 export interface ReviewedRunResultFields {
     workerStatus: 'done' | 'done_with_concerns' | 'review_loop_capped' | 'failed';

package/dist/providers/base/result-builders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result-builders.d.ts","sourceRoot":"","sources":["../../../src/providers/base/result-builders.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAqB,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAEpG,YAAY,EAAE,MAAM,EAAE,CAAC;AAIvB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,MAAM,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,QAAQ,CAAC;IAC9E,iBAAiB,CAAC,EAAE,WAAW,GAAG,cAAc,GAAG,cAAc,GAAG,uBAAuB,CAAC;IAC5F,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/E,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,aAAa,GAAG,gBAAgB,GAAG,aAAa,GAAG,cAAc,GAAG,gBAAgB,CAAC;QAAC,QAAQ,EAAE,UAAU,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtL,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,iCAAiC,GAAG,mCAAmC,GAAG,iDAAiD,GAAG,0BAA0B,GAAG,sBAAsB,GAAG,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACtU;AAWD,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,SAAS,CAkBZ;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,cAAc,CAAC;IAC3B;;yEAEqE;IACrE,eAAe,EAAE,CAAC,GAAG,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAC;QAAC,YAAY,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,MAAM,CAAC;IAC5I,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,SAAS,CAgCZ;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,SAAS,CAyBZ;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,cAAc,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,SAAS,CAuBZ"}
+{"version":3,"file":"result-builders.d.ts","sourceRoot":"","sources":["../../../src/providers/base/result-builders.ts"],"names":[],"mappings":"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"}

package/dist/providers/base/result-builders.js

@@ -13,7 +13,7 @@ export function buildOkResult(args) {
         output,
         status: 'ok',
         usage: usageShape(usage),
-        cost: { costUSD: usage.costUSD, costDeltaVsParentUSD: usage.costDeltaVsParentUSD },
+        cost: { costUSD: usage.costUSD, costDeltaVsMainUSD: usage.costDeltaVsMainUSD },
         turns,
         filesRead: tracker.getReads(),
         directoriesListed: tracker.getDirectoriesListed(),
@@ -45,7 +45,7 @@ export function buildIncompleteResult(args) {
         status: 'incomplete',
         ...(stampExhausted && { errorCode: 'degenerate_exhausted' }),
         usage: usageShape(usage),
-        cost: { costUSD: usage.costUSD, costDeltaVsParentUSD: usage.costDeltaVsParentUSD },
+        cost: { costUSD: usage.costUSD, costDeltaVsMainUSD: usage.costDeltaVsMainUSD },
         turns,
         filesRead,
         directoriesListed: tracker.getDirectoriesListed(),
@@ -71,7 +71,7 @@ export function buildMaxTurnsExitResult(args) {
         status: 'incomplete',
         errorCode: 'degenerate_exhausted',
         usage: usageShape(usage),
-        cost: { costUSD: usage.costUSD, costDeltaVsParentUSD: usage.costDeltaVsParentUSD },
+        cost: { costUSD: usage.costUSD, costDeltaVsMainUSD: usage.costDeltaVsMainUSD },
         turns,
         filesRead: tracker.getReads(),
         directoriesListed: tracker.getDirectoriesListed(),
@@ -93,7 +93,7 @@ export function buildTimeCeilingResult(args) {
         output: hasSalvage ? scratchpad.latest() : diagnostic,
         status: 'incomplete',
         usage: usageShape(usage),
-        cost: { costUSD: usage.costUSD, costDeltaVsParentUSD: usage.costDeltaVsParentUSD },
+        cost: { costUSD: usage.costUSD, costDeltaVsMainUSD: usage.costDeltaVsMainUSD },
         turns,
         filesRead: tracker.getReads(),
         directoriesListed: tracker.getDirectoriesListed(),

package/dist/providers/base/result-builders.js.map

@@ -1 +1 @@
-{"version":3,"file":"result-builders.js","sourceRoot":"","sources":["../../../src/providers/base/result-builders.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"result-builders.js","sourceRoot":"","sources":["../../../src/providers/base/result-builders.ts"],"names":[],"mappings":"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"}

package/dist/providers/make-runner-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-runner-shell.d.ts","sourceRoot":"","sources":["../../src/providers/make-runner-shell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAyE/D"}
+{"version":3,"file":"make-runner-shell.d.ts","sourceRoot":"","sources":["../../src/providers/make-runner-shell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CA0E/D"}

package/dist/providers/make-runner-shell.js

@@ -4,14 +4,15 @@ export function makeRunnerShell(provider) {
     // Test/mock providers expose `__mockAdapter` so the engine path can run
     // without making real HTTP calls. Production providers carry a real config
     // and use `buildAdapter` to produce a real runner adapter.
+    const cfgModel = provider.config?.model;
     const maybeMock = provider.__mockAdapter;
     if (maybeMock)
-        return new RunnerShell(maybeMock);
+        return new RunnerShell(maybeMock, cfgModel);
     // If the provider looks like a test mock (named 'mock' OR config.model === 'mock'),
     // synthesize a bridge adapter from `provider.run(prompt)` so the engine path
     // works in tests without each test wiring `__mockAdapter` explicitly.
     const cfg = provider.config;
-    const isMock = provider.name === 'mock' || cfg?.model === 'mock' || cfg?.model === 'mock-model';
+    const isMock = provider.name === 'mock' || cfgModel === 'mock' || cfgModel === 'mock-model';
     if (isMock && typeof provider.run === 'function') {
         const adapter = {
             providerType: 'mock',
@@ -31,7 +32,7 @@ export function makeRunnerShell(provider) {
                 };
             },
         };
-        return new RunnerShell(adapter);
+        return new RunnerShell(adapter, cfgModel);
     }
     let adapter;
     try {
@@ -62,8 +63,8 @@ export function makeRunnerShell(provider) {
                 };
             },
         };
-        return new RunnerShell(bridgeAdapter);
+        return new RunnerShell(bridgeAdapter, cfgModel);
     }
-    return new RunnerShell(adapter);
+    return new RunnerShell(adapter, cfgModel);
 }
 //# sourceMappingURL=make-runner-shell.js.map