@zhixuan92/multi-model-agent-core 4.3.1 → 4.5.0

package/dist/lifecycle/handlers/review-handler.js

@@ -1,40 +1,35 @@
-import { delegateWithEscalation } from '../../escalation/delegate-with-escalation.js';
+// v4.4.x — Review stage.
+//
+// One complex session, two sequential turns: spec review, then quality
+// review. Same session = same cached prefix on the 2nd turn. Combined
+// verdict is `approved` only if BOTH reviewers approve; otherwise
+// `changes_required`. Combined `reviewConcerns` is the concat of both
+// reviewers' concerns.
 import { specLintTemplate } from '../../review/templates/spec-review.js';
 import { qualityLintTemplate } from '../../review/templates/quality-review.js';
 import { parseReviewReport } from '../../review/parse-review-report.js';
 import { mergeStageStats } from '../merge-stage-stats.js';
-async function runOneReviewer(state, ctx, task, source, diff, workerOutput) {
+import { HUMAN_LABEL } from '../stage-labels.js';
+import { buildWarmFollowupMessage } from '../warm-followup.js';
+async function runOneReviewer(session, task, source, diff, workerOutput, isWarmFollowup) {
     const template = source === 'spec' ? specLintTemplate : qualityLintTemplate;
-    const reviewerTier = ctx.assignedTier === 'standard' ? 'complex' : 'standard';
-    const provider = ctx.providers[reviewerTier];
-    if (!provider) {
-        return { transportError: `no provider available for tier ${reviewerTier}` };
-    }
     const promptCtx = {
         brief: task.prompt ?? '',
         workerOutput,
         diff,
         planContext: task.planContext,
     };
-    const fullPrompt = template.systemPrompt + '\n\n' + template.buildUserPrompt(promptCtx);
+    // Warm follow-up: the same reviewer session already loaded brief +
+    // diff + planContext on turn 1. Send only the new instruction via
+    // the standard preamble. systemPrompt is intentionally not
+    // re-prepended — it lives in the resumed session's history.
+    // Cold open: full system prompt + brief + diff + planContext.
+    const fullPrompt = isWarmFollowup && template.buildWarmFollowup
+        ? buildWarmFollowupMessage(template.buildWarmFollowup(promptCtx))
+        : template.systemPrompt + '\n\n' + template.buildUserPrompt(promptCtx);
     try {
-        return await delegateWithEscalation({
-            prompt: fullPrompt,
-            cwd: ctx.cwd,
-            agentType: reviewerTier,
-            briefQualityPolicy: 'off',
-            timeoutMs: ctx.timing.timeoutMs,
-            tools: 'readonly',
-        }, [provider], {
-            explicitlyPinned: true,
-            taskDeadlineMs: ctx.timing.deadlineMs,
-            abortSignal: ctx.stall.controller.signal,
-            assignedTier: reviewerTier,
-            ...(ctx.bus && { bus: ctx.bus }),
-            ...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
-            ...(ctx.taskIndex !== undefined && { taskIndex: ctx.taskIndex }),
-            stageLabel: 'Review',
-        });
+        const turn = await session.send(fullPrompt, { stageLabel: HUMAN_LABEL.review });
+        return { turn };
     }
     catch (err) {
         return { transportError: err instanceof Error ? err.message : String(err) };
@@ -50,120 +45,119 @@ export async function reviewHandler(state) {
     const last = state.lastRunResult;
     if (!ctx || !task || !last)
         return;
+    if (state.reviewPolicy === 'none') {
+        state.reviewVerdict = 'approved';
+        state.reviewFindings = [];
+        return;
+    }
     let cumulativeDiff = '';
     if (state.diffTracker) {
         try {
             cumulativeDiff = await state.diffTracker.cumulativeDiff();
         }
-        catch {
-            cumulativeDiff = '';
-        }
+        catch { /* tolerated */ }
     }
     const workerOutput = last.output ?? '';
+    // v4.4.x: spec and quality run sequentially on the SAME complex
+    // session so the second call benefits from the cached prefix.
+    const reviewerTier = ctx.assignedTier === 'standard' ? 'complex' : 'standard';
+    if (!ctx.providers[reviewerTier]) {
+        state.reviewVerdict = 'changes_required';
+        state.reviewError = `no provider available for tier ${reviewerTier}`;
+        state.reviewFindings = [];
+        return;
+    }
+    // Which sub-reviews to run, per reviewPolicy.
     const runSpec = state.reviewPolicy === 'full';
     const runQuality = state.reviewPolicy === 'full'
         || state.reviewPolicy === 'quality_only'
         || state.reviewPolicy === 'diff_only';
-    if (!runSpec && !runQuality) {
-        state.reviewVerdict = 'approved';
-        state.reviewFindings = [];
-        return;
-    }
     const sources = [];
     if (runSpec)
         sources.push('spec');
     if (runQuality)
         sources.push('quality');
-    const isOk = (r) => !('transportError' in r) && r.status === 'ok';
-    const settled = await Promise.all(sources.map(async (source) => ({
-        source,
-        result: await runOneReviewer(state, ctx, task, source, cumulativeDiff, workerOutput),
-    })));
-    const retryNeeded = settled
-        .map((o, i) => ({ o, i }))
-        .filter(({ o }) => !isOk(o.result))
-        .map(({ i }) => i);
-    if (retryNeeded.length > 0) {
-        const retried = await Promise.all(retryNeeded.map(async (i) => ({
-            source: settled[i].source,
-            result: await runOneReviewer(state, ctx, task, settled[i].source, cumulativeDiff, workerOutput),
-        })));
-        retried.forEach((o, k) => { settled[retryNeeded[k]] = o; });
+    if (sources.length === 0) {
+        state.reviewVerdict = 'approved';
+        state.reviewFindings = [];
+        return;
     }
     const findings = [];
     const errors = [];
     let anyChangesRequired = false;
     let anySuccess = false;
-    for (const { source, result } of settled) {
-        if ('transportError' in result) {
-            if (source === 'spec')
-                state.specReviewError = result.transportError;
-            else
-                state.qualityReviewError = result.transportError;
-            errors.push(`${source}: ${result.transportError}`);
-            process.stderr.write(`[review-handler] ${source} transportError: ${result.transportError}\n`);
-            continue;
-        }
-        if (result.status !== 'ok') {
-            const errDetail = result.error ?? '(no error field)';
-            const msg = `reviewer status=${result.status}; error=${errDetail}`;
+    // Sequential — second turn hits the cached prefix on the same session.
+    // The warm-follow-up form is valid ONLY when iteration > 0 AND the
+    // session reference is the same as iteration 0. Today ctx.getSession
+    // is idempotent on tier so both iterations see the same session; the
+    // identity guard exists so a future change that rotates the reviewer
+    // session mid-stage (escalation rotation, retry-after-failure) falls
+    // back to cold-open automatically rather than sending a warm follow-up
+    // into a fresh thread that lacks the prior history.
+    const settled = [];
+    let firstSession = null;
+    for (let iteration = 0; iteration < sources.length; iteration++) {
+        const source = sources[iteration];
+        const currentSession = ctx.getSession(reviewerTier);
+        if (iteration === 0)
+            firstSession = currentSession;
+        const isWarmFollowup = iteration > 0 && currentSession === firstSession;
+        const outcome = await runOneReviewer(currentSession, task, source, cumulativeDiff, workerOutput, isWarmFollowup);
+        settled.push({ source, outcome });
+    }
+    let combinedInput = 0, combinedOutput = 0, combinedCached = 0, combinedNonRead = 0;
+    let combinedTurns = 0;
+    let combinedCost = null;
+    let combinedDuration = 0;
+    for (const { source, outcome } of settled) {
+        if ('transportError' in outcome) {
             if (source === 'spec')
-                state.specReviewError = msg;
+                state.specReviewError = outcome.transportError;
             else
-                state.qualityReviewError = msg;
-            errors.push(`${source}: ${msg}`);
-            process.stderr.write(`[review-handler] ${source} ${msg}\n`);
+                state.qualityReviewError = outcome.transportError;
+            errors.push(`${source}: ${outcome.transportError}`);
+            process.stderr.write(`[review-handler] ${source} transportError: ${outcome.transportError}\n`);
             continue;
         }
         anySuccess = true;
-        const parsed = parseReviewReport(result.output ?? '');
+        const parsed = parseReviewReport(outcome.turn.output ?? '');
         if (source === 'spec') {
-            state.specReviewerNotes = result.output;
+            state.specReviewerNotes = outcome.turn.output;
             state.specReviewVerdict = parsed.verdict;
         }
         else {
-            state.qualityReviewerNotes = result.output;
+            state.qualityReviewerNotes = outcome.turn.output;
             state.qualityReviewVerdict = parsed.verdict;
         }
         if (parsed.verdict === 'changes_required')
             anyChangesRequired = true;
-        for (const dev of parsed.deviations) {
+        for (const dev of parsed.deviations)
             findings.push({ source, text: dev });
-        }
+        combinedInput += outcome.turn.usage?.inputTokens ?? 0;
+        combinedOutput += outcome.turn.usage?.outputTokens ?? 0;
+        combinedCached += outcome.turn.usage?.cachedReadTokens ?? 0;
+        combinedNonRead += outcome.turn.usage?.cachedNonReadTokens ?? 0;
+        combinedTurns += outcome.turn.turns ?? 1;
+        combinedDuration += outcome.turn.durationMs ?? 0;
+        const c = outcome.turn.costUSD;
+        if (c !== null && c !== undefined)
+            combinedCost = (combinedCost ?? 0) + c;
     }
     state.reviewFindings = findings;
+    state.reviewConcerns = findings.map((f) => f.text);
     if (!anySuccess) {
         state.reviewVerdict = 'changes_required';
         state.reviewError = errors.join(' | ');
         return;
     }
     state.reviewVerdict = anyChangesRequired ? 'changes_required' : 'approved';
-    let combinedInput = 0, combinedOutput = 0, combinedCached = 0, combinedNonRead = 0;
-    let combinedTurns = 0, combinedTools = 0;
-    let combinedCost = null;
-    let combinedDuration = 0;
-    for (const { result } of settled) {
-        if ('transportError' in result || result.status !== 'ok')
-            continue;
-        combinedInput += result.usage?.inputTokens ?? 0;
-        combinedOutput += result.usage?.outputTokens ?? 0;
-        combinedCached += result.usage?.cachedReadTokens ?? 0;
-        combinedNonRead += result.usage?.cachedNonReadTokens ?? 0;
-        combinedTurns += result.turns ?? 1;
-        combinedTools += Array.isArray(result.toolCalls) ? result.toolCalls.length : 0;
-        combinedDuration = Math.max(combinedDuration, result.durationMs ?? 0);
-        const c = result.costUSD;
-        if (c !== null && c !== undefined)
-            combinedCost = (combinedCost ?? 0) + c;
-    }
-    const reviewerTier = ctx.assignedTier === 'standard' ? 'complex' : 'standard';
     mergeStageStats(state, 'review', {
         inputTokens: combinedInput,
         outputTokens: combinedOutput,
         cachedReadTokens: combinedCached,
         cachedNonReadTokens: combinedNonRead,
         turnCount: combinedTurns,
-        toolCallCount: combinedTools,
+        toolCallCount: 0,
         costUSD: combinedCost,
         durationMs: combinedDuration || null,
     }, {

package/dist/lifecycle/handlers/review-handler.js.map

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

package/dist/lifecycle/handlers/rework-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rework-handler.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/rework-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAO7D,wBAAsB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0FxE"}
+{"version":3,"file":"rework-handler.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/rework-handler.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAa7D,wBAAsB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAuIxE"}

package/dist/lifecycle/handlers/rework-handler.js

@@ -1,6 +1,21 @@
-import { delegateWithEscalation } from '../../escalation/delegate-with-escalation.js';
+// v4.4.x — Rework stage.
+//
+// Fires only when reviewVerdict === 'changes_required'. Runs on the
+// same standard session that did Implementing (full conversation
+// continuity). Worker is asked to address the reviewer's concerns AND
+// re-run any verifyCommand. Rework's WorkerOutput merges onto
+// Implementing's per the spec's "Rework → Implementing field merge
+// rules": summary/workerStatus/unresolved/commitMessage take Rework's
+// values; filesChanged is the union of both phases; validationsRun is
+// REPLACED by Rework's value (empty list signals validation_stale to
+// Committing).
 import { replaceLastRunResultPreservingTrackers, mergeStageStats } from '../merge-stage-stats.js';
 import { reworkTemplate } from '../../review/templates/rework.js';
+import { buildWarmFollowupMessage } from '../warm-followup.js';
+import { assembleRunResult } from '../../providers/assemble-run-result.js';
+import { parseWorkerOutput } from '../worker-output-contract.js';
+import { HUMAN_LABEL } from '../stage-labels.js';
+import { startProgressWatchdog, recordPostHocSignals } from '../../bounded-execution/progress-watchdog.js';
 export async function reworkHandler(state) {
     if (state.terminal)
         return;
@@ -23,17 +38,15 @@ export async function reworkHandler(state) {
         try {
             cumulativeDiff = await state.diffTracker.cumulativeDiff();
         }
-        catch {
-            cumulativeDiff = '';
-        }
+        catch { /* tolerated */ }
     }
-    const reworkTier = 'complex';
+    const reworkTier = 'standard';
     const provider = ctx.providers[reworkTier];
     if (!provider) {
         state.reworkError = `no provider available for tier ${reworkTier}`;
         return;
     }
-    const concerns = findings.map(f => `[${f.source}] ${f.text}`);
+    const concerns = findings.map((f) => `[${f.source}] ${f.text}`);
     const promptCtx = {
         brief: task.prompt ?? '',
         workerOutput: last.output ?? '',
@@ -41,38 +54,74 @@ export async function reworkHandler(state) {
         planContext: task.planContext,
         priorConcerns: concerns,
     };
-    const fullPrompt = reworkTemplate.systemPrompt + '\n\n' + reworkTemplate.buildUserPrompt(promptCtx);
+    // Rework always resumes the implementer's thread — the systemPrompt,
+    // brief, prior output, and cumulative diff are already in conversation
+    // history. We send only the new instruction (reviewer deviations +
+    // fix action) wrapped in the standard warm-followup preamble.
+    const fullPrompt = buildWarmFollowupMessage(reworkTemplate.buildUserPrompt(promptCtx))
+        + '\n\nAfter your edits, re-run any verifyCommand the brief specifies and include the fresh validationsRun results in your structured output. Do NOT run git history-mutating commands (commit / add / push / reset / rebase / etc.) — the Committing stage will handle persistence at the end.';
     let result;
-    try {
-        result = await delegateWithEscalation({
-            prompt: fullPrompt,
-            cwd: ctx.cwd,
-            agentType: reworkTier,
-            briefQualityPolicy: 'off',
-            timeoutMs: ctx.timing.timeoutMs,
-            tools: 'full',
-        }, [provider], {
-            explicitlyPinned: true,
-            taskDeadlineMs: ctx.timing.deadlineMs,
-            abortSignal: ctx.stall.controller.signal,
-            assignedTier: reworkTier,
-            ...(ctx.bus && { bus: ctx.bus }),
-            ...(ctx.batchId !== undefined && { batchId: ctx.batchId }),
-            ...(ctx.taskIndex !== undefined && { taskIndex: ctx.taskIndex }),
-            stageLabel: 'Rework',
+    // Wire progress watchdog around the rework session.send.
+    const wdConfig = {
+        enabled: ctx.config?.defaults?.progressWatchdogEnabled ?? true,
+        thrashTurns: ctx.config?.defaults?.thrashTurns ?? 25,
+        thrashWallClockMs: ctx.config?.defaults?.thrashWallClockMs ?? 1_200_000,
+        thrashSoftWallClockMs: 600_000,
+    };
+    const wdState2 = { fired: false };
+    const wdController = ctx.stall.controller;
+    let disposeWd;
+    if (wdConfig.enabled) {
+        disposeWd = startProgressWatchdog({
+            state,
+            controller: wdController,
+            emit: (event) => { ctx.bus?.emit(event); },
+            config: wdConfig,
+            taskIndex: ctx.taskIndex,
+            batchId: ctx.batchId,
+            state2: wdState2,
         });
     }
+    let turn;
+    try {
+        const session = ctx.getSession(reworkTier);
+        turn = await session.send(fullPrompt, { stageLabel: HUMAN_LABEL.rework });
+        result = assembleRunResult(turn);
+    }
     catch (err) {
         state.reworkError = err instanceof Error ? err.message : String(err);
+        disposeWd?.();
         return;
     }
+    finally {
+        disposeWd?.();
+    }
+    if (wdConfig.enabled && turn !== undefined) {
+        await recordPostHocSignals(state, turn.turns ?? 0, wdConfig, (event) => { ctx.bus?.emit(event); }, ctx.taskIndex, ctx.batchId);
+    }
     if (result.status !== 'ok') {
         state.reworkError = `rework returned status: ${result.status}`;
         return;
     }
+    // Parse the Rework worker's WorkerOutput JSON block.
+    const reworked = parseWorkerOutput(result.output ?? '');
     state.reworkApplied = true;
     state.reworkOutput = result.output;
     replaceLastRunResultPreservingTrackers(state, result);
+    // Apply merge rules: Rework owns summary/workerStatus/unresolved/commitMessage;
+    // filesChanged is the union of Implementing's + Rework's; validationsRun is
+    // REPLACED by Rework's value (so an empty list signals validation_stale).
+    const merged = state.lastRunResult;
+    if (merged) {
+        const priorFilesChanged = (last.filesChanged) ?? [];
+        merged.summary = reworked.summary;
+        merged.workerStatus = reworked.workerStatus;
+        merged.filesChanged = Array.from(new Set([...priorFilesChanged, ...reworked.filesChanged]));
+        merged.validationsRun = reworked.validationsRun;
+        merged.unresolved = reworked.unresolved;
+        if (reworked.commitMessage)
+            merged.commitMessage = reworked.commitMessage;
+    }
     mergeStageStats(state, 'rework', {
         inputTokens: result.usage?.inputTokens ?? 0,
         outputTokens: result.usage?.outputTokens ?? 0,
@@ -80,7 +129,12 @@ export async function reworkHandler(state) {
         cachedNonReadTokens: result.usage?.cachedNonReadTokens ?? 0,
         turnCount: result.turns ?? 1,
         toolCallCount: Array.isArray(result.toolCalls) ? result.toolCalls.length : 0,
-        costUSD: result.costUSD ?? null,
+        // `result` comes from assembleRunResult which writes the turn cost to
+        // top-level `actualCostUSD` (not a `costUSD` field). Reading the wrong
+        // field name was the historical cause of rework stages recording
+        // cost=null/0 in telemetry; canonical lookup is `actualCostUSD` with
+        // legacy `costUSD` as a safety fallback.
+        costUSD: result.actualCostUSD ?? result.costUSD ?? null,
         durationMs: result.durationMs ?? null,
         filesReadCount: Array.isArray(result.filesRead) ? result.filesRead.length : 0,
         filesWrittenCount: Array.isArray(result.filesWritten) ? result.filesWritten.length : 0,

package/dist/lifecycle/handlers/rework-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"rework-handler.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/rework-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rework-handler.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/rework-handler.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,EAAE;AACF,oEAAoE;AACpE,iEAAiE;AACjE,sEAAsE;AACtE,8DAA8D;AAC9D,mEAAmE;AACnE,sEAAsE;AACtE,sEAAsE;AACtE,qEAAqE;AACrE,eAAe;AAMf,OAAO,EAAE,sCAAsC,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AAG3G,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAqB;IACvD,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO;IAC3B,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;QAAE,OAAO;IACjF,IAAI,KAAK,CAAC,aAAa,KAAK,kBAAkB;QAAE,OAAO;IAEvD,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgD,CAAC;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,IAA4B,CAAC;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,aAAsC,CAAC;IAC1D,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO;IAEnC,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC;IAC5C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,IAAI,CAAC;YAAC,cAAc,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,UAAU,GAAc,UAAU,CAAC;IACzC,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAyB,CAAC;IACnE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,KAAK,CAAC,WAAW,GAAG,kCAAkC,UAAU,EAAE,CAAC;QACnE,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;QACxB,YAAY,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;QAC/B,IAAI,EAAE,cAAc;QACpB,WAAW,EAAG,IAAiC,CAAC,WAAW;QAC3D,aAAa,EAAE,QAAQ;KACxB,CAAC;IACF,qEAAqE;IACrE,uEAAuE;IACvE,mEAAmE;IACnE,8DAA8D;IAC9D,MAAM,UAAU,GACd,wBAAwB,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;UACjE,8RAA8R,CAAC;IAEnS,IAAI,MAAiB,CAAC;IACtB,yDAAyD;IACzD,MAAM,QAAQ,GAA2B;QACvC,OAAO,EAAG,GAAG,CAAC,MAAM,EAAE,QAAkD,EAAE,uBAAuB,IAAI,IAAI;QACzG,WAAW,EAAG,GAAG,CAAC,MAAM,EAAE,QAAqC,EAAE,WAAW,IAAI,EAAE;QAClF,iBAAiB,EAAG,GAAG,CAAC,MAAM,EAAE,QAA2C,EAAE,iBAAiB,IAAI,SAAS;QAC3G,qBAAqB,EAAE,OAAO;KAC/B,CAAC;IACF,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAClC,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;IAC1C,IAAI,SAAmC,CAAC;IACxC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,SAAS,GAAG,qBAAqB,CAAC;YAChC,KAAK;YACL,UAAU,EAAE,YAAY;YACxB,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAA2C,CAAC,CAAC,CAAC,CAAC;YAChF,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,QAAQ;SACjB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAsD,CAAC;IAC3D,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1E,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,KAAK,CAAC,WAAW,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrE,SAAS,EAAE,EAAE,CAAC;QACd,OAAO;IACT,CAAC;YAAS,CAAC;QACT,SAAS,EAAE,EAAE,CAAC;IAChB,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,oBAAoB,CACxB,KAAK,EACJ,IAA2B,CAAC,KAAK,IAAI,CAAC,EACvC,QAAQ,EACR,CAAC,KAAK,EAAE,EAAE,GAAG,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAA2C,CAAC,CAAC,CAAC,CAAC,EAC1E,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,OAAO,CACZ,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,2BAA2B,MAAM,CAAC,MAAM,EAAE,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,qDAAqD;IACrD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAExD,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,sCAAsC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEtD,gFAAgF;IAChF,4EAA4E;IAC5E,0EAA0E;IAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,aAAoD,CAAC;IAC1E,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,iBAAiB,GAAG,CAAE,IAAoC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACrF,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAClC,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5C,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5F,MAAM,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAChD,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACxC,IAAI,QAAQ,CAAC,aAAa;YAAE,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;IAC5E,CAAC;IAED,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE;QAC/B,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,WAAW,IAAI,CAAC;QAC3C,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,IAAI,CAAC;QAC7C,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC;QACrD,mBAAmB,EAAE,MAAM,CAAC,KAAK,EAAE,mBAAmB,IAAI,CAAC;QAC3D,SAAS,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;QAC5B,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5E,sEAAsE;QACtE,uEAAuE;QACvE,iEAAiE;QACjE,qEAAqE;QACrE,yCAAyC;QACzC,OAAO,EAAG,MAA4C,CAAC,aAAa,IAAK,MAAsC,CAAC,OAAO,IAAI,IAAI;QAC/H,UAAU,EAAG,MAAkC,CAAC,UAAU,IAAI,IAAI;QAClE,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7E,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;KACvF,EAAE;QACD,IAAI,EAAE,UAAU;QAChB,KAAK,EAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,MAAyC,EAAE,KAAK,IAAI,IAAI;KAC5F,CAAC,CAAC;AACL,CAAC"}

package/dist/lifecycle/handlers/task-executor.d.ts

@@ -1,10 +1,9 @@
 import type { LifecycleState } from '../stage-plan-types.js';
-import type { RunnerShell } from '../../providers/runner-shell.js';
 import type { EventEmitter } from '../../events/event-emitter.js';
+export declare function capturePreTaskState(state: LifecycleState): Promise<void>;
 export declare class TaskExecutor {
-    private shell;
     private emitter;
-    constructor(shell: RunnerShell, emitter: EventEmitter);
+    constructor(emitter: EventEmitter);
     handler: (state: LifecycleState) => Promise<void>;
 }
 //# sourceMappingURL=task-executor.d.ts.map

package/dist/lifecycle/handlers/task-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/task-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,qBAAa,YAAY;IACX,OAAO,CAAC,KAAK;IAAe,OAAO,CAAC,OAAO;gBAAnC,KAAK,EAAE,WAAW,EAAU,OAAO,EAAE,YAAY;IAErE,OAAO,GAAU,OAAO,cAAc,KAAG,OAAO,CAAC,IAAI,CAAC,CAMpD;CACH"}
+{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/handlers/task-executor.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AA2BlE,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB9E;AAED,qBAAa,YAAY;IACX,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,YAAY;IAEzC,OAAO,GAAU,OAAO,cAAc,KAAG,OAAO,CAAC,IAAI,CAAC,CA8CpD;CACH"}

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

@@ -1,16 +1,98 @@
+// v4.4.x — write-route Implementing stage handler.
+//
+// Sends the brief to the route's implementer tier via session.send,
+// captures the pre-task HEAD SHA (for the Committing stage's
+// worker-committed-out-of-band detection), and parses the worker's
+// WorkerOutput JSON block onto state.lastRunResult so downstream
+// stages (Review / Rework / Committing / Annotating) consume a
+// uniform structured shape.
+import { assembleRunResult } from '../../providers/assemble-run-result.js';
+import { parseWorkerOutput } from '../worker-output-contract.js';
+import { HUMAN_LABEL } from '../stage-labels.js';
+import { spawnSync } from 'node:child_process';
+import { join } from 'node:path';
+const GIT_FORBIDDEN_INSTRUCTION = [
+    '\n\nIMPORTANT — Persistence:',
+    'Do NOT run any git subcommand that mutates history',
+    '(commit, add, push, reset, rebase, merge, cherry-pick, etc.).',
+    'The Committing stage handles persistence at the end.',
+    '',
+    'IMPORTANT — Structured output:',
+    'End your response with a JSON-fenced block describing what you did:',
+    '```json',
+    '{',
+    '  "summary": "one-line description",',
+    '  "workerStatus": "done" | "done_with_concerns" | "blocked" | "failed",',
+    '  "filesChanged": ["path/to/file.ts", ...],',
+    '  "validationsRun": [{ "name": "npm test", "passed": true, "output": "..." }],',
+    '  "unresolved": ["any items you could not finish"],',
+    '  "commitMessage": "feat: optional Conventional Commits message"',
+    '}',
+    '```',
+].join('\n');
+export async function capturePreTaskState(state) {
+    const cwd = state.cwd;
+    if (!cwd)
+        return;
+    const headResult = spawnSync('git', ['rev-parse', 'HEAD'], { cwd, encoding: 'utf8' });
+    if (headResult.status !== 0)
+        return; // not a git work-tree, or no commits — leave both undefined
+    state.preTaskHeadSha = headResult.stdout.trim();
+    const lsResult = spawnSync('git', ['ls-files', '--others', '--exclude-standard'], { cwd, encoding: 'utf8' });
+    if (lsResult.status !== 0) {
+        // Defensive: head succeeded but ls-files failed (unusual). Treat as no untracked files.
+        state.preTaskUntrackedFiles = new Set();
+        return;
+    }
+    const relativeFiles = lsResult.stdout.split('\n').filter(line => line.length > 0);
+    state.preTaskUntrackedFiles = new Set(relativeFiles.map(rel => join(cwd, rel)) // absolute paths
+    );
+}
 export class TaskExecutor {
-    shell;
     emitter;
-    constructor(shell, emitter) {
-        this.shell = shell;
+    constructor(emitter) {
         this.emitter = emitter;
     }
     handler = async (state) => {
-        this.emitter.emit({ type: 'run_started', taskIndex: state.taskIndex, attempt: state.attemptIndex });
-        const result = await this.shell.run(state.runInput);
-        state.workerStatus = result.workerStatus;
-        state.lastRunResult = result;
-        this.emitter.emit({ type: 'run_completed', taskIndex: state.taskIndex, attempt: state.attemptIndex, usage: result.usage });
+        const ctx = state.executionContext;
+        if (!ctx)
+            throw new Error('task-executor: state.executionContext not set');
+        const systemPrompt = state.systemPrompt ?? '';
+        const userMessage = state.userMessage ?? '';
+        const base = systemPrompt.length > 0
+            ? `${systemPrompt}\n\n${userMessage}`
+            : userMessage;
+        const instruction = base + GIT_FORBIDDEN_INSTRUCTION;
+        // Snapshot HEAD + untracked files before the worker runs — Committing reads
+        // this to detect a worker-authored commit (HEAD moved between snapshots).
+        await capturePreTaskState(state);
+        this.emitter.emit({
+            type: 'run_started',
+            taskIndex: state.taskIndex,
+            attempt: state.attemptIndex,
+        });
+        const session = ctx.getSession(ctx.assignedTier);
+        const turn = await session.send(instruction, { stageLabel: HUMAN_LABEL.implementing });
+        const result = assembleRunResult(turn);
+        // Parse the worker's structured output and merge onto lastRunResult.
+        const parsed = parseWorkerOutput(turn.output);
+        const merged = {
+            ...result,
+            summary: parsed.summary,
+            workerStatus: parsed.workerStatus,
+            filesChanged: parsed.filesChanged,
+            validationsRun: parsed.validationsRun,
+            unresolved: parsed.unresolved,
+            ...(parsed.commitMessage && { commitMessage: parsed.commitMessage }),
+        };
+        state.workerStatus = parsed.workerStatus;
+        state.lastRunResult = merged;
+        this.emitter.emit({
+            type: 'run_completed',
+            taskIndex: state.taskIndex,
+            attempt: state.attemptIndex,
+            usage: result.usage,
+        });
     };
 }
 //# sourceMappingURL=task-executor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/task-executor.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,YAAY;IACH;IAA4B;IAAhD,YAAoB,KAAkB,EAAU,OAAqB;QAAjD,UAAK,GAAL,KAAK,CAAa;QAAU,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAEzE,OAAO,GAAG,KAAK,EAAE,KAAqB,EAAiB,EAAE;QACvD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QACpG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,QAAe,CAAC,CAAC;QAC3D,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACzC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7H,CAAC,CAAC;CACH"}
+{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../../../src/lifecycle/handlers/task-executor.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/handlers/terminal-handlers.d.ts

@@ -9,6 +9,6 @@ export declare function persistToBatchRegistryHandler(state: LifecycleState): vo
  * recorder. Idempotent on state.taskCompletedRecorded. No-op when the
  * server hasn't supplied a recorder (CLI/test paths).
  */
-export declare function recordTaskCompletedHandler(state: LifecycleState): void;
+export declare function recordTaskCompletedHandler(state: LifecycleState): Promise<void>;
 export declare function flushTelemetryHandler(state: LifecycleState): Promise<void>;
 //# sourceMappingURL=terminal-handlers.d.ts.map