@zhixuan92/multi-model-agent-core 5.0.3 → 5.1.0

package/dist/tools/execute-plan/brief-slot.js

@@ -1,11 +1,51 @@
 import { readFileSync } from 'node:fs';
 import { resolve as pathResolve } from 'node:path';
 import { extractPlanSection, SLICE_CAP_BYTES } from './plan-extractor.js';
+const ATX = /^(#{1,6})\s+(.+?)\s*$/;
+/**
+ * Derive a 1-based plan-phase per descriptor from the plan's heading structure.
+ * Tasks (the descriptors) live at some heading level L; their parent sections
+ * (level L-1) are the plan-phase boundaries. A new phase starts at each
+ * level-(L-1) heading. Plans with no grouping above the tasks → all phase 1.
+ */
+export function derivePhases(planText, descriptors) {
+    const want = new Set(descriptors.map((d) => d.trim()));
+    const headings = [];
+    for (const line of planText.split(/\r?\n/)) {
+        const m = ATX.exec(line);
+        if (m)
+            headings.push({ level: m[1].length, text: m[2].trim() });
+    }
+    const descLevels = headings.filter((h) => want.has(h.text)).map((h) => h.level);
+    if (descLevels.length === 0)
+        return descriptors.map(() => 1);
+    const taskLevel = Math.min(...descLevels);
+    const phaseLevel = taskLevel - 1;
+    const phaseOf = new Map();
+    let phase = 0;
+    for (const h of headings) {
+        if (h.level === phaseLevel)
+            phase += 1;
+        if (want.has(h.text) && !phaseOf.has(h.text))
+            phaseOf.set(h.text, Math.max(phase, 1));
+    }
+    return descriptors.map((d) => phaseOf.get(d.trim()) ?? 1);
+}
+function readPlanText(planPath, cwd) {
+    try {
+        const resolved = planPath.startsWith('/') ? planPath : pathResolve(cwd, planPath);
+        return readFileSync(resolved, 'utf8');
+    }
+    catch {
+        return '';
+    }
+}
 export function executePlanBriefSlot(input) {
     const planPath = input.filePaths[0];
     const cwd = input.cwd ?? process.cwd();
     const rp = input.perTaskReviewPolicy ?? {};
-    return input.taskDescriptors.map((descriptor, i) => {
+    const phases = derivePhases(readPlanText(planPath, cwd), input.taskDescriptors);
+    const tasks = input.taskDescriptors.map((descriptor, i) => {
         let sectionBody = '';
         let sectionTruncated = false;
         try {
@@ -14,33 +54,37 @@ export function executePlanBriefSlot(input) {
             sectionTruncated = section.truncated;
         }
         catch {
-            // extractPlanSection enforces sandbox — if that fails (e.g. macOS
-            // temp-dir symlinks), fall back to reading the file without sandbox.
             const raw = readPlanSectionRaw(planPath, descriptor, cwd);
             sectionBody = raw.body;
             sectionTruncated = raw.truncated;
         }
-        return {
-            taskDescriptor: descriptor,
+        const body = sectionBody.trim().length > 0
+            ? (sectionTruncated
+                ? `${sectionBody}\n\n⚠ Section truncated at the size cap — read the full plan file (${planPath}) for the tail if needed.`
+                : sectionBody)
+            : `No unique plan section matched "${descriptor}". Read the plan file ${planPath}, find this task, and implement it. If still no unique match, report and skip this task.`;
+        return { heading: descriptor, body, phase: phases[i] ?? 1 };
+    });
+    // Collapse per-task review policy to the goal axis: review unless every task opted out.
+    const allNone = input.taskDescriptors.every((_, i) => (rp[String(i)] ?? rp[i] ?? 'full') === 'none');
+    const reviewPolicy = allNone ? 'none' : 'review-fix';
+    return [{
+            tasks,
+            reviewPolicy,
             filePaths: input.filePaths,
-            sectionBody,
-            sectionTruncated,
             contextBlockIds: input.contextBlockIds ?? [],
-            reviewPolicy: (rp[String(i)] ?? rp[i] ?? 'full'),
             cwd,
-        };
-    });
+        }];
 }
 /**
  * Read a plan file and extract a heading section without sandbox enforcement.
- * Used as a fallback when extractPlanSection's realpath check rejects the path
- * (e.g. macOS temp directories that are symlinks).
+ * Fallback when extractPlanSection's realpath check rejects the path (e.g.
+ * macOS temp directories that are symlinks).
  */
 function readPlanSectionRaw(planFilePath, descriptor, cwd) {
     const resolved = planFilePath.startsWith('/') ? planFilePath : pathResolve(cwd, planFilePath);
     const text = readFileSync(resolved, 'utf8');
     const lines = text.split(/\r?\n/);
-    const ATX = /^(#{1,6})\s+(.+?)\s*$/;
     const wantTrim = descriptor.trim();
     let startIdx = -1;
     let level = 0;

package/dist/tools/execute-plan/brief-slot.js.map

@@ -1 +1 @@
-{"version":3,"file":"brief-slot.js","sourceRoot":"","sources":["../../../src/tools/execute-plan/brief-slot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"brief-slot.js","sourceRoot":"","sources":["../../../src/tools/execute-plan/brief-slot.ts"],"names":[],"mappings":"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"}

package/dist/tools/execute-plan/tool-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-config.d.ts","sourceRoot":"","sources":["../../../src/tools/execute-plan/tool-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAa9E,eAAO,MAAM,sBAAsB;;;;;;;;;;;kBAMxB,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE1E;mFACmF;AACnF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8B,CAAC;AAExD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAYvE;AAgFD,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,oBAAoB,EAAE,gBAAgB,CA4BzE,CAAC"}
+{"version":3,"file":"tool-config.d.ts","sourceRoot":"","sources":["../../../src/tools/execute-plan/tool-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAO9E,eAAO,MAAM,sBAAsB;;;;;;;;;;;kBAMxB,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE1E;mFACmF;AACnF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8B,CAAC;AAExD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAYvE;AAED,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,oBAAoB,EAAE,gBAAgB,CAyBzE,CAAC"}

package/dist/tools/execute-plan/tool-config.js

@@ -1,11 +1,11 @@
 import { z } from 'zod';
-import { basename } from 'node:path';
 import { buildOutputEnvelopeSchema } from '../shared-output.js';
 import { executePlanBriefSlot } from './brief-slot.js';
 import { executePlanHeadlineTemplate } from '../../reporting/headline-templates/execute-plan.js';
 import { executePlanReportSchema } from '../../reporting/report-parser-slots/execute-plan-report.js';
 import { DEFAULT_TASK_TIMEOUT_MS } from '../../config/schema.js';
-import { EXECUTE_PLAN_PURPOSE_ORIENTATION, EXECUTE_PLAN_SCOPE_RULE, EXECUTE_PLAN_FAILURE_MODES, PLAN_VS_SOURCE_RECONCILIATION, SELF_VERIFICATION, TURN_BUDGET, } from './implementer-criteria.js';
+import { assembleGoal, goalToTaskSpec } from '../../lifecycle/goal-builder.js';
+import { implementGoalPrompt } from '../../lifecycle/goal-prompts.js';
 export const executePlanInputSchema = z.object({
     filePaths: z.array(z.string()).length(1, { message: "execute_plan requires exactly one plan filePath" }),
     taskDescriptors: z.array(z.string()).min(1),
@@ -29,52 +29,6 @@ export function registerExecutePlan(registry) {
         responseShapeName: 'BatchResponse',
     });
 }
-/**
- * Build a compact worker prompt for one plan task. Extracted from the legacy
- * executor — just the section matched by the slot, not the full plan file.
- *
- * The prompt is structured top-down: orientation (why this exists) →
- * task descriptor → matched plan section → file paths → fidelity rules
- * (RESTORED in 4.1.0; the older `compileExecutePlan` had them, the
- * slot-style refactor that became the canonical path dropped them) →
- * failure-mode taxonomy → reviewer awareness. Without the orientation
- * + fidelity blocks, workers default to "implement the goal" and treat
- * the plan as a starting suggestion rather than the contract.
- */
-function buildExecutePlanPrompt(filePaths, task, taskSection, sectionTruncated) {
-    const parts = [
-        // Orientation goes FIRST — fidelity-first framing before the
-        // task descriptor, so the worker reads the section through the
-        // execution lens instead of the "improve it" lens.
-        EXECUTE_PLAN_PURPOSE_ORIENTATION,
-        '',
-        `Execute this task from the plan: "${task}"`,
-        '',
-    ];
-    if (taskSection) {
-        const sectionBytes = Buffer.byteLength(taskSection, 'utf8');
-        parts.push('Relevant plan section:', '', '---', taskSection.trim(), '---', '');
-        if (sectionTruncated) {
-            parts.push(`⚠ Section TRUNCATED — visible above is the first ~${sectionBytes} bytes; the tail was cut at the size cap. The visible portion is correct up to the cut. If you need the missing tail, read the full plan file (path below). If the visible portion is sufficient to execute the task, proceed.`, '');
-        }
-        else {
-            parts.push(`✓ Section is COMPLETE (${sectionBytes} bytes, heading-to-heading). No truncation. If you find yourself thinking "this section looks truncated" or "this seems to end mid-step", you are misreading the boundary — re-read carefully before bailing. The most common misread: a closing \`\`\` code-fence near the section boundary looks like a mid-stream cut. It is not.`, '');
-        }
-    }
-    else {
-        parts.push('No unique plan section matched that task heading. The full plan file is at:', ...filePaths.map((p) => `  - ${p}`), 'Read the plan file(s) yourself to find the task. If still no unique match, report that and stop — do not implement anything.', '');
-    }
-    // Only mention "plan files for reference" when section is missing or
-    // truncated — when the section is complete, the worker should rely on
-    // it as authoritative. Telling the worker to "re-read for adjacent
-    // context" when not needed encourages second-guessing and fails when
-    // the plan path is outside cwd (sandbox blocks the read).
-    if (!taskSection || sectionTruncated) {
-        parts.push('Plan files for reference (read on demand if you need adjacent context — but do not enlarge scope into other tasks):', ...filePaths.map((p) => `  - ${p}`), '');
-    }
-    parts.push('Implement the task fully. Follow acceptance criteria, file paths, and', 'constraints in the plan section above.', '', EXECUTE_PLAN_SCOPE_RULE, '', EXECUTE_PLAN_FAILURE_MODES, '', PLAN_VS_SOURCE_RECONCILIATION, '', SELF_VERIFICATION, '', TURN_BUDGET);
-    return parts.join('\n');
-}
 export const toolConfig = {
     name: 'execute_plan',
     category: 'artifact_producing',
@@ -82,25 +36,22 @@ export const toolConfig = {
     dispatchModeOverridable: false,
     agentType: 'standard',
     briefSlot: executePlanBriefSlot,
-    buildTaskSpec: (brief, ctx) => ({
-        prompt: buildExecutePlanPrompt(brief.filePaths, brief.taskDescriptor, brief.sectionBody, brief.sectionTruncated),
-        agentType: 'standard',
-        reviewPolicy: brief.reviewPolicy,
-        done: 'Implement the task fully. Report: which task heading you matched, what files were created or modified, and any issues encountered. If no unique matching task was found, report that explicitly and do not implement anything.',
-        tools: ctx.config.defaults?.tools ?? 'full',
-        timeoutMs: ctx.config.defaults?.timeoutMs ?? DEFAULT_TASK_TIMEOUT_MS,
-        sandboxPolicy: ctx.config.defaults?.sandboxPolicy ?? 'cwd-only',
-        // ctx.cwd is the HTTP `?cwd=` query param (set in execution-context.ts
-        // from projectContext.cwd). Always prefer it over brief.cwd because the
-        // brief slot's `input.cwd` is undefined unless the caller put it in the
-        // body — most callers (codex-cli, claude-code) put it in the URL.
-        cwd: ctx.cwd ?? brief.cwd,
-        filePaths: brief.filePaths,
-        contextBlockIds: brief.contextBlockIds,
-        taskDescriptor: brief.taskDescriptor,
-        planBasename: basename(brief.filePaths[0]),
-        ...(brief.sectionBody ? { planContext: brief.sectionBody } : {}),
-    }),
+    buildTaskSpec: (brief, ctx) => {
+        const goal = assembleGoal({
+            source: 'execute-plan',
+            // ctx.cwd is the HTTP `?cwd=` query param; prefer it over the brief's
+            // (which is only set when the caller put cwd in the body).
+            cwd: ctx.cwd ?? brief.cwd,
+            tasks: brief.tasks,
+            phases: [{ tier: 'standard', mode: 'implement' }, { tier: 'complex', mode: 'review-fix' }],
+            reviewPolicy: brief.reviewPolicy,
+            tools: ctx.config.defaults?.tools ?? 'full',
+            sandboxPolicy: ctx.config.defaults?.sandboxPolicy ?? 'cwd-only',
+            ...(ctx.config.defaults?.timeoutMs !== undefined && { perTaskTimeoutMs: ctx.config.defaults.timeoutMs }),
+            ...(brief.contextBlockIds.length > 0 && { contextBlockIds: brief.contextBlockIds }),
+        });
+        return goalToTaskSpec(goal, implementGoalPrompt(goal), DEFAULT_TASK_TIMEOUT_MS);
+    },
     reportSchema: executePlanReportSchema,
     headlineTemplate: executePlanHeadlineTemplate,
 };

package/dist/tools/execute-plan/tool-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-config.js","sourceRoot":"","sources":["../../../src/tools/execute-plan/tool-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-config.js","sourceRoot":"","sources":["../../../src/tools/execute-plan/tool-config.ts"],"names":[],"mappings":"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"}

package/dist/tools/journal/record/brief-slot.d.ts

@@ -1,11 +1,14 @@
 import type { Input } from './schema.js';
-import type { ReviewPolicy } from '../../../types/review-policy.js';
+import type { TaskInput } from '../../../lifecycle/goal-builder.js';
+/**
+ * One goal-set per /journal-record call. Each learning becomes one GoalTask;
+ * the journal integration procedure rides as the goal preamble (prepended to
+ * both phase prompts). Both phases run on the complex tier — journal dedup /
+ * refine / supersede is nuanced enough to warrant it on the write phase too.
+ */
 export interface JournalRecordBrief {
-    prompt: string;
-    /** Clean subject source for the deterministic commit (compose-commit-message). */
-    taskDescriptor: string;
-    agentType: 'standard' | 'complex';
-    reviewPolicy: ReviewPolicy;
+    tasks: TaskInput[];
+    preamble: string;
     contextBlockIds?: string[];
 }
 export declare const journalRecordBriefSlot: (input: Input) => JournalRecordBrief[];

package/dist/tools/journal/record/brief-slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brief-slot.d.ts","sourceRoot":"","sources":["../../../../src/tools/journal/record/brief-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAMpE,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,kFAAkF;IAClF,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,UAAU,GAAG,SAAS,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAgBD,eAAO,MAAM,sBAAsB,GAAI,OAAO,KAAK,KAAG,kBAAkB,EAQtE,CAAC"}
+{"version":3,"file":"brief-slot.d.ts","sourceRoot":"","sources":["../../../../src/tools/journal/record/brief-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAOpE;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAgBD,eAAO,MAAM,sBAAsB,GAAI,OAAO,KAAK,KAAG,kBAAkB,EAWvE,CAAC"}

package/dist/tools/journal/record/brief-slot.js

@@ -1,24 +1,28 @@
+import { firstLine } from '../../../lifecycle/goal-prompts.js';
 import { JOURNAL_RECORD_ORIENTATION, JOURNAL_RECORD_PROCEDURE, JOURNAL_RECORD_EDGE_VOCAB, JOURNAL_RECORD_REPORT, JOURNAL_RECORD_UNTRUSTED, } from './implementer-criteria.js';
-function compile(learnings, tagHints) {
+/** The shared journal procedure, carried as the goal preamble. */
+function journalPreamble(tagHints) {
     const hints = tagHints && tagHints.length
         ? `\n\nTag hints (batch-scoped — apply across all learnings; revise/normalize per node): ${tagHints.join(', ')}.`
         : '';
-    const numbered = learnings.map((l, i) => `LEARNING ${i + 1} (learningIndex ${i}):\n${l}`).join('\n\n');
     return [
-        JOURNAL_RECORD_ORIENTATION, '',
-        'The learnings to record (the contract) — integrate EACH one IN ORDER:', '',
-        numbered, hints, '',
+        JOURNAL_RECORD_ORIENTATION,
+        hints,
+        '',
         JOURNAL_RECORD_PROCEDURE, '', JOURNAL_RECORD_EDGE_VOCAB, '',
         JOURNAL_RECORD_UNTRUSTED, '', JOURNAL_RECORD_REPORT,
     ].join('\n');
 }
-export const journalRecordBriefSlot = (input) => [{
-        prompt: compile(input.learnings, input.tagHints),
-        taskDescriptor: input.learnings.length === 1
-            ? `record learning: ${input.learnings[0]}`
-            : `record ${input.learnings.length} learnings`,
-        agentType: 'complex',
-        reviewPolicy: 'full',
-        contextBlockIds: input.contextBlockIds,
-    }];
+export const journalRecordBriefSlot = (input) => {
+    const tasks = input.learnings.map((l, i) => ({
+        heading: `learning ${i + 1}: ${firstLine(l)}`,
+        body: l,
+        phase: 1,
+    }));
+    return [{
+            tasks,
+            preamble: journalPreamble(input.tagHints),
+            contextBlockIds: input.contextBlockIds,
+        }];
+};
 //# sourceMappingURL=brief-slot.js.map

package/dist/tools/journal/record/brief-slot.js.map

@@ -1 +1 @@
-{"version":3,"file":"brief-slot.js","sourceRoot":"","sources":["../../../../src/tools/journal/record/brief-slot.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,0BAA0B,EAAE,wBAAwB,EAAE,yBAAyB,EAC/E,qBAAqB,EAAE,wBAAwB,GAChD,MAAM,2BAA2B,CAAC;AAWnC,SAAS,OAAO,CAAC,SAAmB,EAAE,QAAmB;IACvD,MAAM,KAAK,GAAG,QAAQ,IAAI,QAAQ,CAAC,MAAM;QACvC,CAAC,CAAC,yFAAyF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACjH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvG,OAAO;QACL,0BAA0B,EAAE,EAAE;QAC9B,uEAAuE,EAAE,EAAE;QAC3E,QAAQ,EAAE,KAAK,EAAE,EAAE;QACnB,wBAAwB,EAAE,EAAE,EAAE,yBAAyB,EAAE,EAAE;QAC3D,wBAAwB,EAAE,EAAE,EAAE,qBAAqB;KACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAwB,EAAE,CAAC,CAAC;QAC7E,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;QAChD,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAC1C,CAAC,CAAC,oBAAoB,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;YAC1C,CAAC,CAAC,UAAU,KAAK,CAAC,SAAS,CAAC,MAAM,YAAY;QAChD,SAAS,EAAE,SAAS;QACpB,YAAY,EAAE,MAAM;QACpB,eAAe,EAAE,KAAK,CAAC,eAAe;KACvC,CAAC,CAAC"}
+{"version":3,"file":"brief-slot.js","sourceRoot":"","sources":["../../../../src/tools/journal/record/brief-slot.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EACL,0BAA0B,EAAE,wBAAwB,EAAE,yBAAyB,EAC/E,qBAAqB,EAAE,wBAAwB,GAChD,MAAM,2BAA2B,CAAC;AAcnC,kEAAkE;AAClE,SAAS,eAAe,CAAC,QAAmB;IAC1C,MAAM,KAAK,GAAG,QAAQ,IAAI,QAAQ,CAAC,MAAM;QACvC,CAAC,CAAC,yFAAyF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACjH,CAAC,CAAC,EAAE,CAAC;IACP,OAAO;QACL,0BAA0B;QAC1B,KAAK;QACL,EAAE;QACF,wBAAwB,EAAE,EAAE,EAAE,yBAAyB,EAAE,EAAE;QAC3D,wBAAwB,EAAE,EAAE,EAAE,qBAAqB;KACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAwB,EAAE;IAC3E,MAAM,KAAK,GAAgB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACxD,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE;QAC7C,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;KACT,CAAC,CAAC,CAAC;IACJ,OAAO,CAAC;YACN,KAAK;YACL,QAAQ,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC;YACzC,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/tools/journal/record/tool-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-config.d.ts","sourceRoot":"","sources":["../../../../src/tools/journal/record/tool-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGlF,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAYzE;AAED,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAoBrE,CAAC"}
+{"version":3,"file":"tool-config.d.ts","sourceRoot":"","sources":["../../../../src/tools/journal/record/tool-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAKlF,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAYzE;AAED,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAyBrE,CAAC"}

package/dist/tools/journal/record/tool-config.js

@@ -3,6 +3,8 @@ import { journalHeadlineTemplate } from '../../../reporting/headline-templates/j
 import { journalReportSchema } from '../../../reporting/report-parser-slots/journal-report.js';
 import { journalRecordBriefSlot } from './brief-slot.js';
 import { DEFAULT_TASK_TIMEOUT_MS } from '../../../config/schema.js';
+import { assembleGoal, goalToTaskSpec } from '../../../lifecycle/goal-builder.js';
+import { implementGoalPrompt } from '../../../lifecycle/goal-prompts.js';
 export function registerJournalRecord(registry) {
     registry.register({
         routeName: 'journal-record',
@@ -23,17 +25,22 @@ export const toolConfig = {
     dispatchModeOverridable: false,
     agentType: 'complex',
     briefSlot: journalRecordBriefSlot,
-    buildTaskSpec: (brief, ctx) => ({
-        prompt: brief.prompt,
-        taskDescriptor: brief.taskDescriptor,
-        agentType: brief.agentType,
-        reviewPolicy: brief.reviewPolicy,
-        contextBlockIds: brief.contextBlockIds,
-        cwd: ctx.projectContext?.cwd ?? ctx.cwd,
-        tools: ctx.config.defaults?.tools ?? 'full',
-        timeoutMs: ctx.config.defaults?.timeoutMs ?? DEFAULT_TASK_TIMEOUT_MS,
-        sandboxPolicy: ctx.config.defaults?.sandboxPolicy ?? 'cwd-only',
-    }),
+    buildTaskSpec: (brief, ctx) => {
+        const goal = assembleGoal({
+            source: 'journal-record',
+            cwd: ctx.projectContext?.cwd ?? ctx.cwd,
+            tasks: brief.tasks,
+            // Journal integration is nuanced — complex on both phases.
+            phases: [{ tier: 'complex', mode: 'implement' }, { tier: 'complex', mode: 'review-fix' }],
+            reviewPolicy: 'review-fix',
+            tools: ctx.config.defaults?.tools ?? 'full',
+            sandboxPolicy: ctx.config.defaults?.sandboxPolicy ?? 'cwd-only',
+            ...(ctx.config.defaults?.timeoutMs !== undefined && { perTaskTimeoutMs: ctx.config.defaults.timeoutMs }),
+            preamble: brief.preamble,
+            ...(brief.contextBlockIds && brief.contextBlockIds.length > 0 && { contextBlockIds: brief.contextBlockIds }),
+        });
+        return goalToTaskSpec(goal, implementGoalPrompt(goal), DEFAULT_TASK_TIMEOUT_MS);
+    },
     reportSchema: journalReportSchema,
     headlineTemplate: journalHeadlineTemplate,
 };

package/dist/tools/journal/record/tool-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-config.js","sourceRoot":"","sources":["../../../../src/tools/journal/record/tool-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAA2B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,UAAU,qBAAqB,CAAC,QAA6B;IACjE,QAAQ,CAAC,QAAQ,CAAC;QAChB,SAAS,EAAE,gBAAgB;QAC3B,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,WAAW;QACnB,YAAY,EAAE,oBAAoB;QAClC,gBAAgB,EAAE,SAAS;QAC3B,oBAAoB,EAAE,KAAK;QAC3B,iBAAiB,EAAE,eAAe;KACnC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAmD;IACxE,IAAI,EAAE,gBAAgB;IACtB,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,QAAQ;IACtB,uBAAuB,EAAE,KAAK;IAC9B,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,sBAAsB;IACjC,aAAa,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,GAAG,EAAE,GAAG,CAAC,cAAc,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG;QACvC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,IAAI,MAAM;QAC3C,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,IAAI,uBAAuB;QACpE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,aAAa,IAAI,UAAU;KAChE,CAAC;IACF,YAAY,EAAE,mBAAmB;IACjC,gBAAgB,EAAE,uBAAuB;CAC1C,CAAC"}
+{"version":3,"file":"tool-config.js","sourceRoot":"","sources":["../../../../src/tools/journal/record/tool-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAA2B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,UAAU,qBAAqB,CAAC,QAA6B;IACjE,QAAQ,CAAC,QAAQ,CAAC;QAChB,SAAS,EAAE,gBAAgB;QAC3B,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,WAAW;QACnB,YAAY,EAAE,oBAAoB;QAClC,gBAAgB,EAAE,SAAS;QAC3B,oBAAoB,EAAE,KAAK;QAC3B,iBAAiB,EAAE,eAAe;KACnC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAmD;IACxE,IAAI,EAAE,gBAAgB;IACtB,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,QAAQ;IACtB,uBAAuB,EAAE,KAAK;IAC9B,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,sBAAsB;IACjC,aAAa,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,YAAY,CAAC;YACxB,MAAM,EAAE,gBAAgB;YACxB,GAAG,EAAE,GAAG,CAAC,cAAc,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG;YACvC,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,2DAA2D;YAC3D,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;YACzF,YAAY,EAAE,YAAY;YAC1B,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,IAAI,MAAM;YAC3C,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,aAAa,IAAI,UAAU;YAC/D,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,KAAK,SAAS,IAAI,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxG,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC;SAC7G,CAAC,CAAC;QACH,OAAO,cAAc,CAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAClF,CAAC;IACD,YAAY,EAAE,mBAAmB;IACjC,gBAAgB,EAAE,uBAAuB;CAC1C,CAAC"}

package/dist/tools/retry/brief-slot.d.ts

@@ -1,7 +1,7 @@
 import type { Input } from './schema.js';
 export interface RetryBrief {
     batchId: string;
-    taskIndex: number;
 }
+/** One brief: re-fire the stored goal-set for `batchId`. */
 export declare const retryBriefSlot: (input: Input) => RetryBrief[];
 //# sourceMappingURL=brief-slot.d.ts.map

package/dist/tools/retry/brief-slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brief-slot.d.ts","sourceRoot":"","sources":["../../../src/tools/retry/brief-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,KAAG,UAAU,EACsB,CAAC"}
+{"version":3,"file":"brief-slot.d.ts","sourceRoot":"","sources":["../../../src/tools/retry/brief-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,4DAA4D;AAC5D,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,KAAG,UAAU,EAAkC,CAAC"}

package/dist/tools/retry/brief-slot.js

@@ -1,2 +1,3 @@
-export const retryBriefSlot = (input) => input.taskIndices.map((idx) => ({ batchId: input.batchId, taskIndex: idx }));
+/** One brief: re-fire the stored goal-set for `batchId`. */
+export const retryBriefSlot = (input) => [{ batchId: input.batchId }];
 //# sourceMappingURL=brief-slot.js.map

package/dist/tools/retry/brief-slot.js.map

@@ -1 +1 @@
-{"version":3,"file":"brief-slot.js","sourceRoot":"","sources":["../../../src/tools/retry/brief-slot.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAY,EAAgB,EAAE,CAC3D,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"brief-slot.js","sourceRoot":"","sources":["../../../src/tools/retry/brief-slot.ts"],"names":[],"mappings":"AAMA,4DAA4D;AAC5D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAY,EAAgB,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC"}

package/dist/tools/retry/schema.d.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 export declare const inputSchema: z.ZodObject<{
     batchId: z.ZodString;
-    taskIndices: z.ZodArray<z.ZodNumber>;
 }, z.core.$strip>;
 export type Input = z.infer<typeof inputSchema>;
 export declare const outputSchema: z.ZodObject<{

package/dist/tools/retry/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/tools/retry/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,WAAW;;;iBAKtB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEhD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8B,CAAC;AAExD,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/tools/retry/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,eAAO,MAAM,WAAW;;iBAEtB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEhD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8B,CAAC;AAExD,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC"}

package/dist/tools/retry/schema.js

@@ -1,12 +1,12 @@
-// packages/core/src/tool-schemas/retry.ts
+// packages/core/src/tools/retry/schema.ts
 import { z } from 'zod';
 import { buildOutputEnvelopeSchema } from '../shared-output.js';
-// Ported verbatim from the inline retry_tasks registration in packages/mcp/src/cli.ts.
+// Goal mode: retry re-fires a prior write goal-set against the CURRENT git
+// HEAD (the new baseSha). Because git holds all committed progress, the re-run
+// continues/repairs rather than redoing finished work. There is no task-index
+// subset — a single autonomous run has no MMA-controlled task boundary.
 export const inputSchema = z.object({
-    batchId: z.string().describe('Batch id returned from a previous delegate_tasks call'),
-    taskIndices: z
-        .array(z.number().int().nonnegative())
-        .describe('Zero-based indices (into the original batch) of the tasks to re-run'),
+    batchId: z.string().describe('Batch id returned from a previous delegate / execute-plan / journal-record call'),
 });
 export const outputSchema = buildOutputEnvelopeSchema();
 //# sourceMappingURL=schema.js.map

package/dist/tools/retry/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/tools/retry/schema.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,uFAAuF;AACvF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uDAAuD,CAAC;IACrF,WAAW,EAAE,CAAC;SACX,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;SACrC,QAAQ,CAAC,qEAAqE,CAAC;CACnF,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,YAAY,GAAG,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/tools/retry/schema.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,2EAA2E;AAC3E,+EAA+E;AAC/E,8EAA8E;AAC9E,wEAAwE;AACxE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iFAAiF,CAAC;CAChH,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,YAAY,GAAG,yBAAyB,EAAE,CAAC"}

package/dist/tools/retry/tool-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-config.d.ts","sourceRoot":"","sources":["../../../src/tools/retry/tool-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAMvE,wBAAgB,aAAa,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAYjE;AAED,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CA4D7D,CAAC"}
+{"version":3,"file":"tool-config.d.ts","sourceRoot":"","sources":["../../../src/tools/retry/tool-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAoBvE,wBAAgB,aAAa,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAYjE;AAED,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CA0C7D,CAAC"}

package/dist/tools/retry/tool-config.js

@@ -3,6 +3,18 @@ import { retryBriefSlot } from './brief-slot.js';
 import { noStructuredReportSchema } from '../../reporting/report-parser-slots/no-structured-report.js';
 import { makeFindingsHeadlineTemplate } from '../../reporting/findings-headline.js';
 import { notApplicable } from '../../reporting/not-applicable.js';
+import { implementGoalPrompt } from '../../lifecycle/goal-prompts.js';
+const RETRY_PREAMBLE = [
+    'RETRY: the plan below was partially executed in a prior run. The commits since the run',
+    'start (see `git log`) show what is already done. Do NOT redo committed, correct work —',
+    'complete what is missing and fix what is wrong, committing with the same `[task N]` convention.',
+    '',
+].join('\n');
+/** Thrown when the prior batch's goal has been evicted from the cache. */
+class GoalNotFoundError extends Error {
+    code = 'goal_not_found';
+    constructor(batchId) { super(`no stored goal for batch ${batchId}`); this.name = 'GoalNotFoundError'; }
+}
 export function registerRetry(registry) {
     registry.register({
         routeName: 'retry_tasks',
@@ -12,34 +24,27 @@ export function registerRetry(registry) {
         schema: inputSchema,
         toolCategory: 'assist',
         agentTypeDefault: 'standard',
-        agentTypeOverridable: true,
+        agentTypeOverridable: false,
         responseShapeName: 'BatchResponse',
     });
 }
 export const toolConfig = {
     name: 'retry',
     category: 'assist',
-    dispatchMode: 'parallel',
+    dispatchMode: 'serial',
     dispatchModeOverridable: false,
     agentType: 'standard',
     briefSlot: retryBriefSlot,
     buildTaskSpec: (brief, ctx) => {
-        const batchCache = ctx.projectContext?.batchCache;
-        const batch = batchCache?.get(brief.batchId);
-        const origTask = batch?.tasks[brief.taskIndex];
-        const defaults = ctx.config.defaults;
+        const batch = ctx.projectContext?.batchCache?.get(brief.batchId);
+        const origTask = batch?.tasks[0];
+        if (!origTask?.goal)
+            throw new GoalNotFoundError(brief.batchId);
+        // Re-fire the same goal-set; the prepare stage captures a fresh baseSha
+        // (current HEAD) so the re-run continues from where the prior run left off.
         return {
-            prompt: origTask?.prompt ?? `Retry task ${brief.taskIndex} from batch ${brief.batchId}`,
-            agentType: origTask?.agentType ?? 'standard',
-            reviewPolicy: origTask?.reviewPolicy ?? 'none',
-            briefQualityPolicy: origTask?.briefQualityPolicy ?? 'off',
-            tools: origTask?.tools ?? defaults?.tools ?? 'full',
-            timeoutMs: origTask?.timeoutMs ?? defaults?.timeoutMs ?? 1_800_000,
-            sandboxPolicy: origTask?.sandboxPolicy ?? defaults?.sandboxPolicy ?? 'cwd-only',
-            cwd: origTask?.cwd ?? ctx.projectContext?.cwd ?? ctx.cwd,
-            contextBlockIds: origTask?.contextBlockIds ?? [],
-            mainModel: origTask?.mainModel,
-            done: origTask?.done,
+            ...origTask,
+            prompt: RETRY_PREAMBLE + implementGoalPrompt(origTask.goal),
         };
     },
     reportSchema: noStructuredReportSchema,
@@ -47,12 +52,6 @@ export const toolConfig = {
     postProcessEnvelope: (envelope, ctx) => {
         const results = (Array.isArray(envelope.results) ? envelope.results : []);
         const total = results.length;
-        // Tool sweep #8 fix: pre-fix this hard-coded `retry: N/N tasks complete`
-        // regardless of actual outcomes — operator could not tell if any
-        // retried task had failed. Now compute the true ok/incomplete/error
-        // breakdown from per-task `status` and emit a headline that mirrors
-        // delegate / execute-plan: '[<aggregate-status>] retry: ok/total tasks complete'
-        // with detail when not all ok.
         let ok = 0, incomplete = 0, error = 0;
         for (const r of results) {
             const s = r?.status;
@@ -61,7 +60,7 @@ export const toolConfig = {
             else if (s === 'error')
                 error++;
             else
-                incomplete++; // 'incomplete' or any unknown bucket
+                incomplete++;
         }
         const aggregate = error > 0 ? 'error' : incomplete > 0 ? 'incomplete' : 'ok';
         let detail = `${ok}/${total} tasks complete`;
@@ -71,10 +70,6 @@ export const toolConfig = {
             detail += `, ${error} error`;
         envelope.headline = `[${aggregate}] retry: ${detail}`;
         envelope.structuredReport = notApplicable('no structured report emitted by this executor');
-        // Tool sweep #8: keep the underlying review verdicts on the envelope
-        // (do NOT delete) so downstream telemetry + UI can show whether the
-        // retried tasks' lifecycles passed their spec/quality chains. Pre-fix
-        // these were stripped, hiding important failure signal.
         if (ctx?.batchId) {
             envelope.retryBatchId = ctx.batchId;
         }

package/dist/tools/retry/tool-config.js.map

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