@themoltnet/agent-daemon 0.10.4 → 0.10.6

package/dist/main.js

@@ -3060,7 +3060,7 @@ function validateRubricWeights(rubric) {
 * attaches to any task type. It has four orthogonal sections — pick
 * whichever apply per task type:
 *
-*   - `gates`        Deterministic structural checks (CID/schema match)
+*   - `gates`        Promise-level structural/process checks
 *   - `assertions`   Declarative claims about output JSON
 *   - `rubric`       Weighted-criteria scoring instrument, reused
 *                    verbatim from `./rubric.ts`.
@@ -3105,17 +3105,27 @@ var CidEqualsSpec = Type$2.Object({
 	path: Type$2.String({ minLength: 1 }),
 	expected: Type$2.String({ minLength: 1 })
 }, { additionalProperties: false });
-var Gate = Type$2.Union([Type$2.Object({
+var SubmitToolCallGate = Type$2.Object({
 	id: Type$2.String({ minLength: 1 }),
-	kind: Type$2.Literal("schema-check"),
-	spec: SchemaCheckSpec,
-	required: Type$2.Boolean()
-}, { additionalProperties: false }), Type$2.Object({
-	id: Type$2.String({ minLength: 1 }),
-	kind: Type$2.Literal("cid-equals"),
-	spec: CidEqualsSpec,
+	kind: Type$2.Literal("submit-tool-call"),
+	description: Type$2.String({ minLength: 1 }),
 	required: Type$2.Boolean()
-}, { additionalProperties: false })], { $id: "Gate" });
+}, { additionalProperties: false });
+var Gate = Type$2.Union([
+	SubmitToolCallGate,
+	Type$2.Object({
+		id: Type$2.String({ minLength: 1 }),
+		kind: Type$2.Literal("schema-check"),
+		spec: SchemaCheckSpec,
+		required: Type$2.Boolean()
+	}, { additionalProperties: false }),
+	Type$2.Object({
+		id: Type$2.String({ minLength: 1 }),
+		kind: Type$2.Literal("cid-equals"),
+		spec: CidEqualsSpec,
+		required: Type$2.Boolean()
+	}, { additionalProperties: false })
+], { $id: "Gate" });
 var AssertionOp = Type$2.Union([
 	Type$2.Literal("exists"),
 	Type$2.Literal("equals"),
@@ -6305,6 +6315,32 @@ function submitOutputToolName(taskType) {
 	return `submit_${taskType}_output`;
 }
 //#endregion
+//#region ../../libs/agent-runtime/src/prompts/assemble.ts
+/**
+* Render a `PromptSection[]` into final text + structured trace.
+* Single source of truth for inter-section spacing and header
+* rendering across all task types.
+*/
+function assembleTaskPrompt(taskType, sections) {
+	const trace = [];
+	const rendered = [];
+	for (const section of sections) {
+		trace.push({
+			id: section.id,
+			source: section.source,
+			header: section.header,
+			char_count: section.body.length
+		});
+		if (section.body === "") continue;
+		rendered.push(section.header ? `## ${section.header}\n\n${section.body}` : section.body);
+	}
+	return {
+		text: rendered.join("\n\n"),
+		trace,
+		taskType
+	};
+}
+//#endregion
 //#region ../../libs/agent-runtime/src/prompts/final-output.ts
 function buildFinalOutputBlock(opts) {
 	const { taskType, outputSchemaName, shapeSketch, extraNotes } = opts;
@@ -6319,7 +6355,8 @@ function buildFinalOutputBlock(opts) {
 		`The runtime captures the validated arguments and ends the session.`,
 		`Do NOT emit the output as plain assistant text. Do NOT rely on a`,
 		`JSON-in-message fallback. If you do not call \`${submitTool}\`, the`,
-		`attempt fails even if the underlying work succeeded.`,
+		`attempt is recorded as failing the promised submit-output criterion`,
+		`even if the underlying work succeeded.`,
 		"",
 		`Your final assistant text before that tool call may explain your work,`,
 		`but the submit-tool call itself must be your VERY LAST action.`,
@@ -6357,37 +6394,17 @@ function renderRubricPreambleSection(rubric) {
 *
 * Design note — no pre-resolved `target` projection
 * --------------------------------------------------
-* Earlier drafts hand-wired a `target` bundle (branch, PR url,
-* commits, summary, diary entry ids) into the prompt before the
-* judge started. That coupled the daemon to one specific producer
-* shape (`FulfillBriefOutput`), forced every executor to know how
-* to project it, and went stale every time a producer task type
-* grew a field. Trade-off was wrong: the runtime is meant to be
-* task-type-agnostic, and judges are perfectly capable of
-* fetching their own data.
-*
-* Now: the prompt tells the judge the `targetTaskId` and instructs
-* it to call `moltnet_get_task` + `moltnet_list_task_attempts`
-* itself. The judge sees whatever the producer's accepted attempt
-* actually wrote — no projection, no lossiness, no daemon-side
-* type knowledge required. Different producers (fulfill_brief,
-* future task types whose products are docs / configs / changes /
-* anything) work without any code path here.
+* Earlier drafts hand-wired a `target` bundle (branch, PR url, commits,
+* summary, diary entry ids) into the prompt before the judge started.
+* That coupled the daemon to one specific producer shape, forced every
+* executor to know how to project it, and went stale every time a
+* producer task type grew a field. Now: the prompt tells the judge
+* the `targetTaskId` and instructs it to call `moltnet_get_task` +
+* `moltnet_list_task_attempts` itself.
 */
 function buildAssessBriefUserPrompt(input, ctx) {
 	const rubric = input.successCriteria.rubric;
-	const criteriaList = renderRubricCriteriaList(rubric);
-	const preambleSection = renderRubricPreambleSection(rubric) ?? "";
-	const workspaceSection = ctx.workspace?.mode === "dedicated_worktree" ? [
-		"### Workspace",
-		"",
-		"This review attempt is running inside a dedicated disposable git",
-		"worktree created for this task. If you need to check out the target",
-		"branch or inspect refs locally, do it only inside this worktree.",
-		ctx.workspace.branch ? `The current review branch is \`${ctx.workspace.branch}\`. You may replace it with the target branch locally if that helps your inspection.` : "The current checkout is disposable and will be cleaned up when the task ends.",
-		""
-	].join("\n") : "";
-	return [
+	const header = [
 		"# Assess Brief Judge",
 		"",
 		"You are an independent judge. You did NOT produce the work under review.",
@@ -6395,10 +6412,9 @@ function buildAssessBriefUserPrompt(input, ctx) {
 		"You may read code, commits, and diary entries — but do NOT modify anything.",
 		"",
 		`Your diary ID is: ${ctx.diaryId}`,
-		`This task's id is: ${ctx.taskId}`,
-		"",
-		"## Target of assessment",
-		"",
+		`This task's id is: ${ctx.taskId}`
+	].join("\n");
+	const target = [
 		`**Producer task id:** \`${input.targetTaskId}\``,
 		"",
 		"Investigate the producer task before scoring:",
@@ -6411,10 +6427,9 @@ function buildAssessBriefUserPrompt(input, ctx) {
 		"   - `commits[].sha` listed → use `git show <sha>` for individual commits.",
 		"   - `diaryEntryIds[]` listed → fetch each via `moltnet_get_entry` to read the producer's reasoning.",
 		"   - `summary` set → use as orientation, not as ground truth.",
-		"Adapt your investigation to whatever the output actually contains. Score conservatively when the producer's output is opaque or thin.",
-		"",
-		"### Querying the producer's diary entries",
-		"",
+		"Adapt your investigation to whatever the output actually contains. Score conservatively when the producer's output is opaque or thin."
+	].join("\n");
+	const diaryQuery = [
 		`Beyond the explicit \`diaryEntryIds[]\` from step 3, the producer's`,
 		"attempts auto-tag every entry with the `task:*` provenance namespace.",
 		"You can pull the full set without enumerating ids by passing the",
@@ -6425,38 +6440,84 @@ function buildAssessBriefUserPrompt(input, ctx) {
 		"- Just the accepted attempt: add `attemptN: <acceptedAttemptN>`.",
 		"- The producer plus any prior chain (when a correlationId was set):",
 		"  read it from the task you fetched in step 1 and pass",
-		"  `taskFilter: { correlationId: \"<id>\" }`.",
-		"",
-		workspaceSection,
-		preambleSection,
-		"## Criteria",
-		"",
-		criteriaList,
-		"",
-		"### Scoring rules",
-		"",
+		"  `taskFilter: { correlationId: \"<id>\" }`."
+	].join("\n");
+	const workspace = ctx.workspace?.mode === "dedicated_worktree" ? [
+		"This review attempt is running inside a dedicated disposable git",
+		"worktree created for this task. If you need to check out the target",
+		"branch or inspect refs locally, do it only inside this worktree.",
+		ctx.workspace.branch ? `The current review branch is \`${ctx.workspace.branch}\`. You may replace it with the target branch locally if that helps your inspection.` : "The current checkout is disposable and will be cleaned up when the task ends."
+	].join("\n") : "";
+	const preamble = renderRubricPreambleSection(rubric) ?? "";
+	const criteria = renderRubricCriteriaList(rubric);
+	const scoring = [
 		"- `llm_score`: score 0..1 continuous. `rationale` REQUIRED (2–4 sentences).",
 		"- `boolean`: score exactly 0 or 1. `rationale` optional.",
 		"- `deterministic_signature_check`: run `moltnet entry verify` on every diary entry returned by step 3 above AND `git verify-commit` on every commit. Score 1 iff ALL signatures are valid; otherwise 0. Populate `evidence.commitsVerified`, `evidence.commitsTotal`, `evidence.signatureFailures`.",
 		"",
-		"Write a signed diary entry (tags: \"judgment\", \"assess_brief\") capturing the rationale before reporting structured output.",
-		"",
-		buildFinalOutputBlock({
-			taskType: "assess_brief",
-			outputSchemaName: "AssessBriefOutput",
-			shapeSketch: [
-				"{",
-				"  \"scores\": [",
-				"    { \"criterionId\": \"...\", \"score\": 0.0, \"rationale\": \"...\", \"evidence\": {} }",
-				"  ],",
-				"  \"composite\": <sum>,",
-				"  \"verdict\": \"<1-3 sentence overall>\",",
-				"  \"judgeModel\": \"<provider:model>\"",
-				"}"
-			].join("\n"),
-			extraNotes: ["`composite` = Σ(weight_i × score_i) recomputed. The runtime rejects a mismatch."]
-		})
-	].filter(Boolean).join("\n");
+		"Write a signed diary entry (tags: \"judgment\", \"assess_brief\") capturing the rationale before reporting structured output."
+	].join("\n");
+	return assembleTaskPrompt("assess_brief", [
+		{
+			id: "assess_brief.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "assess_brief.target",
+			source: "task_input",
+			header: "Target of assessment",
+			body: target
+		},
+		{
+			id: "assess_brief.diary_query",
+			source: "static",
+			header: "Querying the producer's diary entries",
+			body: diaryQuery
+		},
+		{
+			id: "assess_brief.workspace",
+			source: "workspace",
+			header: "Workspace",
+			body: workspace
+		},
+		{
+			id: "assess_brief.preamble",
+			source: "rubric_judge",
+			body: preamble
+		},
+		{
+			id: "assess_brief.criteria",
+			source: "rubric_judge",
+			header: "Criteria",
+			body: criteria
+		},
+		{
+			id: "assess_brief.scoring",
+			source: "rubric_judge",
+			header: "Scoring rules",
+			body: scoring
+		},
+		{
+			id: "assess_brief.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "assess_brief",
+				outputSchemaName: "AssessBriefOutput",
+				shapeSketch: [
+					"{",
+					"  \"scores\": [",
+					"    { \"criterionId\": \"...\", \"score\": 0.0, \"rationale\": \"...\", \"evidence\": {} }",
+					"  ],",
+					"  \"composite\": <sum>,",
+					"  \"verdict\": \"<1-3 sentence overall>\",",
+					"  \"judgeModel\": \"<provider:model>\"",
+					"}"
+				].join("\n"),
+				extraNotes: ["`composite` = Σ(weight_i × score_i) recomputed. The runtime rejects a mismatch."]
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/self-verification.ts
@@ -6465,11 +6526,11 @@ function buildSelfVerificationBlock(taskId, criteriaField = "successCriteria") {
 		"## Self-verification",
 		"",
 		`If \`input.${criteriaField}\` is set on this task, your final output MUST`,
-		"include a `verification` block. **The runtime/server rejects task",
-		`submission without \`verification\` when \`${criteriaField}\` is present**`,
-		"— the request fails validation and the attempt is discarded, even if the",
-		"underlying work succeeded. Do not call the submit tool until you have",
-		"computed the verification payload.",
+		"include a `verification` block. Treat every item in those criteria as",
+		"part of the promise you made when you claimed the task. That includes",
+		"the built-in submit-output gate when present. Do not call the submit",
+		"tool until you have computed the verification payload you can honestly",
+		"stand behind.",
 		"",
 		`Call \`moltnet_get_task\` with task id \`${taskId}\` and read \`input.${criteriaField}\`.`,
 		"",
@@ -6533,22 +6594,13 @@ function buildSelfVerificationBlock(taskId, criteriaField = "successCriteria") {
 * TODO(#885): add a `moltnet_parallel_explore` custom tool that spawns
 * N isolated `createAgentSession` children (one per tag cluster or
 * entry_type axis the curator picks after recon), each with a narrow
-* tool subset and a turn cap, and returns compressed summaries. Parent
-* curator keeps a warm context and only sees {candidateIds, notes}
-* per probe — mirrors the fan-out pattern pi-mono SDK example #13
-* (session runtime) + #05 (custom tools) makes possible. Until that
-* lands, the `checkpoints[]` output field is the fallback: curator
-* emits pruned state at phase boundaries so a follow-up session can
-* resume without replaying the tool history.
+* tool subset and a turn cap, and returns compressed summaries.
 */
 function buildCuratePackUserPrompt(input, ctx) {
 	const { diaryId, taskPrompt, entryTypes, tagFilters, tokenBudget, recipe } = input;
 	const entryTypesPinned = Boolean(entryTypes);
 	const resolvedRecipe = recipe ?? "topic-focused-v1";
-	const includeLine = tagFilters?.include?.length ? `- Hard include (ALL must be present on an entry): ${tagFilters.include.map((t) => `\`${t}\``).join(", ")}` : null;
-	const excludeLine = tagFilters?.exclude?.length ? `- Hard exclude (drop if ANY present): ${tagFilters.exclude.map((t) => `\`${t}\``).join(", ")}` : null;
-	const prefixLine = tagFilters?.prefix ? `- Tag prefix hint when inventorying: \`${tagFilters.prefix}\`` : null;
-	return [
+	const header = [
 		"# Curate Pack Agent",
 		"",
 		"You are the curator. Step 1 of the three-session attribution loop:",
@@ -6556,40 +6608,29 @@ function buildCuratePackUserPrompt(input, ctx) {
 		"will judge. Your output IS the pack — nobody downstream will re-rank.",
 		"",
 		`Your agent-session diary ID is: ${ctx.diaryId}`,
-		`This task's id is: ${ctx.taskId}`,
-		"",
-		"## Goal",
-		"",
+		`This task's id is: ${ctx.taskId}`
+	].join("\n");
+	const goal = [
 		`Build a pack from diary \`${diaryId}\` that faithfully serves this`,
-		`prompt:`,
+		"prompt:",
 		"",
 		`> ${taskPrompt}`,
 		"",
 		"What \"faithfully\" means is your call. A broad prompt may warrant 20",
 		"entries spanning clusters; a sharp one may resolve to 4 high-signal",
 		"entries. Trust your own judgment on breadth vs. depth — but be able",
-		"to defend it in the summary.",
-		"",
-		"## Constraints",
-		"",
-		entryTypesPinned ? `- Entry types pinned by imposer (do not widen): ${entryTypes.map((t) => `\`${t}\``).join(", ")}` : "- Entry types: **you choose**. The diary contains three kinds:",
-		entryTypesPinned ? null : "  - `episodic` — incident reports, \"what happened and how we fixed it\" narratives.",
-		entryTypesPinned ? null : "  - `semantic` — durable decisions, patterns, design rationale.",
-		entryTypesPinned ? null : "  - `procedural` — commit audit trails / changelog-style provenance.",
-		entryTypesPinned ? null : "  Pick the subset that fits the prompt. For \"failures and workarounds\"",
-		entryTypesPinned ? null : "  or \"decisions we made\" you generally do NOT want `procedural` — those",
-		entryTypesPinned ? null : "  entries are append-only commit logs and produce changelog-shaped packs.",
-		entryTypesPinned ? null : "  Include `procedural` only when the prompt explicitly asks for changelog-",
-		entryTypesPinned ? null : "  style content (e.g., \"what shipped this week\"). State your choice",
-		entryTypesPinned ? null : "  briefly in the final `summary`.",
-		`- Recipe tag: \`${resolvedRecipe}\` (recorded on pack params)`,
-		tokenBudget ? `- Token budget (soft cap on final pack): ${tokenBudget}. Pick entry count so the pack fits — estimate ~300 tok/entry as a starting heuristic, tighten after inspecting actual content lengths.` : "- No token budget — size the pack to match the prompt, not an arbitrary target.",
-		includeLine,
-		excludeLine,
-		prefixLine,
-		"",
-		"## Tools available (not a recipe — use what the situation calls for)",
-		"",
+		"to defend it in the summary."
+	].join("\n");
+	const constraintsLines = [];
+	if (entryTypesPinned) constraintsLines.push(`- Entry types pinned by imposer (do not widen): ${entryTypes.map((t) => `\`${t}\``).join(", ")}`);
+	else constraintsLines.push("- Entry types: **you choose**. The diary contains three kinds:", "  - `episodic` — incident reports, \"what happened and how we fixed it\" narratives.", "  - `semantic` — durable decisions, patterns, design rationale.", "  - `procedural` — commit audit trails / changelog-style provenance.", "  Pick the subset that fits the prompt. For \"failures and workarounds\"", "  or \"decisions we made\" you generally do NOT want `procedural` — those", "  entries are append-only commit logs and produce changelog-shaped packs.", "  Include `procedural` only when the prompt explicitly asks for changelog-", "  style content (e.g., \"what shipped this week\"). State your choice", "  briefly in the final `summary`.");
+	constraintsLines.push(`- Recipe tag: \`${resolvedRecipe}\` (recorded on pack params)`);
+	constraintsLines.push(tokenBudget ? `- Token budget (soft cap on final pack): ${tokenBudget}. Pick entry count so the pack fits — estimate ~300 tok/entry as a starting heuristic, tighten after inspecting actual content lengths.` : "- No token budget — size the pack to match the prompt, not an arbitrary target.");
+	if (tagFilters?.include?.length) constraintsLines.push(`- Hard include (ALL must be present on an entry): ${tagFilters.include.map((t) => `\`${t}\``).join(", ")}`);
+	if (tagFilters?.exclude?.length) constraintsLines.push(`- Hard exclude (drop if ANY present): ${tagFilters.exclude.map((t) => `\`${t}\``).join(", ")}`);
+	if (tagFilters?.prefix) constraintsLines.push(`- Tag prefix hint when inventorying: \`${tagFilters.prefix}\``);
+	const constraints = constraintsLines.join("\n");
+	const tools = [
 		"- `moltnet_diary_tags` — tag inventory with counts. Cheap reconnaissance",
 		"  when the prompt implies a scope but not a tag. Pass",
 		"  `prefix: \"task:\"` to enumerate task-provenance tags only",
@@ -6602,10 +6643,9 @@ function buildCuratePackUserPrompt(input, ctx) {
 		"- `moltnet_list_entries` — multi-tag (AND) listing with optional",
 		"  `excludeTags`, `entryType`, and the same `taskFilter` shorthand.",
 		"- `moltnet_get_entry` — full entry read, for disambiguation.",
-		"- `moltnet_pack_create` — terminal call that persists the pack.",
-		"",
-		"## Exploration discipline",
-		"",
+		"- `moltnet_pack_create` — terminal call that persists the pack."
+	].join("\n");
+	const exploration = [
 		"Context is finite. Treat every tool call as buying information against",
 		"a budget. Some heuristics that tend to work:",
 		"",
@@ -6622,57 +6662,110 @@ function buildCuratePackUserPrompt(input, ctx) {
 		"- **Emit a checkpoint if your working set exceeds ~30 candidates.**",
 		"  Write one to the `checkpoints` array (see Output) listing the ids",
 		"  you're keeping and dropping, plus a note explaining the cut. This",
-		"  lets a follow-up session resume without replaying your tool history.",
-		"",
-		"## Ranking",
-		"",
+		"  lets a follow-up session resume without replaying your tool history."
+	].join("\n");
+	const ranking = [
 		"Assign integer ranks 1..N, lower = more prominent. Rank reflects",
 		"relevance to the prompt, NOT recency or entry popularity. Each entry",
 		"in the output must carry a short `rationale` — one sentence pointing",
-		"at what in its content earned the rank.",
-		"",
-		"## Persisting the pack",
-		"",
+		"at what in its content earned the rank."
+	].join("\n");
+	const persisting = [
 		"Call `moltnet_pack_create` with:",
 		"- `entries`: `[{ entryId, rank }]` for each selected entry.",
-		"- `params`: `{ recipe: \"" + resolvedRecipe + "\", prompt: <the task prompt>, selection_rationale: \"<2-sentence summary>\" }`.",
+		`- \`params\`: \`{ recipe: "${resolvedRecipe}", prompt: <the task prompt>, selection_rationale: "<2-sentence summary>" }\`.`,
 		tokenBudget ? `- \`tokenBudget\`: ${tokenBudget}.` : "- `tokenBudget`: omit.",
 		"- `pinned: false` (packs in this pipeline are ephemeral by design).",
 		"",
 		"The tool returns a JSON payload whose top-level fields are `packId` and",
 		"`packCid` (NOT `id`). Copy those exact UUID/CID strings verbatim into",
 		"`packId` and `packCid` in your final output — do not substitute an",
-		"entry id, do not reformat, do not fabricate a UUID.",
-		"",
-		"## Hard constraints",
-		"",
+		"entry id, do not reformat, do not fabricate a UUID."
+	].join("\n");
+	const hardConstraints = [
 		"- Do NOT call `moltnet_pack_render` — that belongs to the next session.",
 		"- Do NOT write diary entries unless curation surfaces a genuine",
 		"  incident worth recording. The curation reasoning lives in the task",
 		"  output, not in the diary.",
-		"- Respect hard include/exclude filters literally.",
-		"",
-		buildSelfVerificationBlock(ctx.taskId),
-		buildFinalOutputBlock({
-			taskType: "curate_pack",
-			outputSchemaName: "CuratePackOutput",
-			shapeSketch: [
-				"{",
-				"  \"packId\": \"<uuid>\",",
-				"  \"packCid\": \"<cid>\",",
-				"  \"entries\": [",
-				"    { \"entryId\": \"<uuid>\", \"rank\": 1, \"rationale\": \"<why>\" }",
-				"  ],",
-				"  \"recipeParams\": { \"recipe\": \"...\", \"prompt\": \"...\", ... },",
-				"  \"checkpoints\": [",
-				"    { \"phase\": \"recon\", \"candidateIds\": [...], \"droppedIds\": [...], \"notes\": \"...\" }",
-				"  ],",
-				"  \"summary\": \"<2-4 sentences: what you looked for, how you narrowed, what defines the final set>\",",
-				"  \"verification\": <required iff input.successCriteria; see Self-verification>",
-				"}"
-			].join("\n")
-		})
-	].filter((l) => l !== null).join("\n");
+		"- Respect hard include/exclude filters literally."
+	].join("\n");
+	return assembleTaskPrompt("curate_pack", [
+		{
+			id: "curate_pack.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "curate_pack.goal",
+			source: "task_input",
+			header: "Goal",
+			body: goal
+		},
+		{
+			id: "curate_pack.constraints",
+			source: "task_input",
+			header: "Constraints",
+			body: constraints
+		},
+		{
+			id: "curate_pack.tools",
+			source: "static",
+			header: "Tools available (not a recipe — use what the situation calls for)",
+			body: tools
+		},
+		{
+			id: "curate_pack.exploration",
+			source: "static",
+			header: "Exploration discipline",
+			body: exploration
+		},
+		{
+			id: "curate_pack.ranking",
+			source: "static",
+			header: "Ranking",
+			body: ranking
+		},
+		{
+			id: "curate_pack.persisting",
+			source: "static",
+			header: "Persisting the pack",
+			body: persisting
+		},
+		{
+			id: "curate_pack.hard_constraints",
+			source: "static",
+			header: "Hard constraints",
+			body: hardConstraints
+		},
+		{
+			id: "curate_pack.verification",
+			source: "verification",
+			body: buildSelfVerificationBlock(ctx.taskId)
+		},
+		{
+			id: "curate_pack.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "curate_pack",
+				outputSchemaName: "CuratePackOutput",
+				shapeSketch: [
+					"{",
+					"  \"packId\": \"<uuid>\",",
+					"  \"packCid\": \"<cid>\",",
+					"  \"entries\": [",
+					"    { \"entryId\": \"<uuid>\", \"rank\": 1, \"rationale\": \"<why>\" }",
+					"  ],",
+					"  \"recipeParams\": { \"recipe\": \"...\", \"prompt\": \"...\", ... },",
+					"  \"checkpoints\": [",
+					"    { \"phase\": \"recon\", \"candidateIds\": [...], \"droppedIds\": [...], \"notes\": \"...\" }",
+					"  ],",
+					"  \"summary\": \"<2-4 sentences: what you looked for, how you narrowed, what defines the final set>\",",
+					"  \"verification\": <required iff input.successCriteria; see Self-verification>",
+					"}"
+				].join("\n")
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/fulfill-brief.ts
@@ -6685,17 +6778,22 @@ function buildCuratePackUserPrompt(input, ctx) {
 */
 function buildFulfillBriefUserPrompt(input, ctx) {
 	const { brief, title, seedFiles, scopeHint } = input;
-	const seedSection = seedFiles?.length ? [
-		"### Seed files",
+	const header = [
+		"# Fulfill Brief Agent",
 		"",
-		"Start by reading these files to ground yourself:",
-		...seedFiles.map((f) => `- \`${f}\``),
-		""
-	].join("\n") : "";
-	const branchSlug = ctx.correlationId ? `moltnet/${ctx.correlationId}/` : scopeHint ? `feat/${scopeHint}-` : "feat/";
-	const correlationSection = ctx.correlationId ? [
-		"### Correlation",
+		"You are a software engineering agent working in a sandboxed environment.",
+		"Your workspace is at /workspace (mounted from the host repository).",
+		"The MoltNet runtime instructor (above, in this system prompt) defines the",
+		"invariants for this task: identity, gh authentication, diary discipline,",
+		"and the accountable-commit shape. Follow it for every commit.",
+		"",
+		`## Task: ${title ?? "Fulfill brief"}`,
 		"",
+		`Task id: \`${ctx.taskId}\``
+	].join("\n");
+	const seedFilesBody = seedFiles?.length ? ["Start by reading these files to ground yourself:", ...seedFiles.map((f) => `- \`${f}\``)].join("\n") : "";
+	const branchSlug = ctx.correlationId ? `moltnet/${ctx.correlationId}/` : scopeHint ? `feat/${scopeHint}-` : "feat/";
+	const correlation = ctx.correlationId ? [
 		`This task carries correlationId \`${ctx.correlationId}\`. You MUST:`,
 		"",
 		`1. Name your branch \`moltnet/${ctx.correlationId}/<short-slug>\` — use a`,
@@ -6704,39 +6802,14 @@ function buildFulfillBriefUserPrompt(input, ctx) {
 		"   your **first** commit on that branch (subsequent commits do not need it).",
 		"",
 		"These are recovery anchors for the MoltNet mention-bot. Do not deviate",
-		"from this branch naming scheme when correlationId is set.",
-		""
+		"from this branch naming scheme when correlationId is set."
 	].join("\n") : "";
-	const workspaceSection = ctx.workspace?.mode === "dedicated_worktree" ? [
-		"### Workspace",
-		"",
+	const workspace = ctx.workspace?.mode === "dedicated_worktree" ? [
 		"This attempt is running inside a dedicated git worktree created",
 		"for this task. Do not repurpose or switch the primary checkout.",
-		ctx.workspace.branch ? `The current branch is \`${ctx.workspace.branch}\`. Stay on this branch unless the runtime instructor explicitly tells you otherwise.` : "Stay on the branch that was pre-provisioned for this task.",
-		""
+		ctx.workspace.branch ? `The current branch is \`${ctx.workspace.branch}\`. Stay on this branch unless the runtime instructor explicitly tells you otherwise.` : "Stay on the branch that was pre-provisioned for this task."
 	].join("\n") : "";
-	return [
-		"# Fulfill Brief Agent",
-		"",
-		"You are a software engineering agent working in a sandboxed environment.",
-		"Your workspace is at /workspace (mounted from the host repository).",
-		"The MoltNet runtime instructor (above, in this system prompt) defines the",
-		"invariants for this task: identity, gh authentication, diary discipline,",
-		"and the accountable-commit shape. Follow it for every commit.",
-		"",
-		`## Task: ${title ?? "Fulfill brief"}`,
-		"",
-		`Task id: \`${ctx.taskId}\``,
-		"",
-		"### Brief",
-		"",
-		brief,
-		"",
-		seedSection,
-		correlationSection,
-		workspaceSection,
-		"### Workflow",
-		"",
+	const workflow = [
 		ctx.workspace?.mode === "dedicated_worktree" ? `1. Use the already-provisioned dedicated worktree branch${ctx.workspace.branch ? ` (\`${ctx.workspace.branch}\`)` : ""}; do not create or switch the primary checkout.` : `1. Create a feature branch (starting prefix suggestion: \`${branchSlug}<short-slug>\`).`,
 		"2. Understand the problem — read relevant code; do not speculate.",
 		"3. Implement the change. Keep commits small and coherent.",
@@ -6744,24 +6817,68 @@ function buildFulfillBriefUserPrompt(input, ctx) {
 		"5. For every commit, create a signed diary entry first via",
 		"   `moltnet_create_entry` and embed its id in the commit trailer",
 		"   `MoltNet-Diary: <id>` (per the runtime instructor).",
-		"6. Push the branch and open a PR.",
-		"",
-		buildSelfVerificationBlock(ctx.taskId),
-		buildFinalOutputBlock({
-			taskType: "fulfill_brief",
-			outputSchemaName: "FulfillBriefOutput",
-			shapeSketch: [
-				"{",
-				"  \"branch\": \"<branch-name>\",",
-				"  \"commits\": [{ \"sha\": \"...\", \"message\": \"...\", \"diaryEntryId\": \"...\" }],",
-				"  \"pullRequestUrl\": \"<url-or-null>\",",
-				"  \"diaryEntryIds\": [\"...\"],",
-				"  \"summary\": \"<1-3 sentence recap>\",",
-				"  \"verification\": <required iff input.successCriteria; see Self-verification>",
-				"}"
-			].join("\n")
-		})
-	].filter(Boolean).join("\n");
+		"6. Push the branch and open a PR."
+	].join("\n");
+	return assembleTaskPrompt("fulfill_brief", [
+		{
+			id: "fulfill_brief.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "fulfill_brief.brief",
+			source: "task_input",
+			header: "Brief",
+			body: brief
+		},
+		{
+			id: "fulfill_brief.seed_files",
+			source: "task_input",
+			header: "Seed files",
+			body: seedFilesBody
+		},
+		{
+			id: "fulfill_brief.correlation",
+			source: "task_input",
+			header: "Correlation",
+			body: correlation
+		},
+		{
+			id: "fulfill_brief.workspace",
+			source: "workspace",
+			header: "Workspace",
+			body: workspace
+		},
+		{
+			id: "fulfill_brief.workflow",
+			source: "static",
+			header: "Workflow",
+			body: workflow
+		},
+		{
+			id: "fulfill_brief.verification",
+			source: "verification",
+			body: buildSelfVerificationBlock(ctx.taskId)
+		},
+		{
+			id: "fulfill_brief.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "fulfill_brief",
+				outputSchemaName: "FulfillBriefOutput",
+				shapeSketch: [
+					"{",
+					"  \"branch\": \"<branch-name>\",",
+					"  \"commits\": [{ \"sha\": \"...\", \"message\": \"...\", \"diaryEntryId\": \"...\" }],",
+					"  \"pullRequestUrl\": \"<url-or-null>\",",
+					"  \"diaryEntryIds\": [\"...\"],",
+					"  \"summary\": \"<1-3 sentence recap>\",",
+					"  \"verification\": <required iff input.successCriteria; see Self-verification>",
+					"}"
+				].join("\n")
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/judge-eval-attempt.ts
@@ -6770,46 +6887,18 @@ function buildJudgeEvalAttemptUserPrompt(input, ctx) {
 	if (!rubric) throw new Error("judge_eval_attempt requires successCriteria.rubric — none present");
 	const escapeCell = (s) => s.replace(/\\/g, "\\\\").replace(/\|/g, "\\|").replace(/\r?\n/g, " ");
 	const criteriaTable = rubric.criteria.map((c) => `| \`${c.id}\` | ${c.weight.toFixed(3)} | ${c.scoring} | ${escapeCell(c.description)} |`).join("\n");
-	const finalOutputBlock = buildFinalOutputBlock({
-		taskType: "judge_eval_attempt",
-		outputSchemaName: "JudgeEvalAttemptOutput",
-		shapeSketch: [
-			"{",
-			`  "targetTaskId": "${input.targetTaskId}",`,
-			`  "targetAttemptN": ${input.targetAttemptN},`,
-			"  \"variantLabel\": \"<from producer input>\",",
-			"  \"scores\": [ { \"criterionId\": \"...\", \"score\": 0..1, \"rationale\": \"...\", \"assertions\": [...]? } ],",
-			"  \"composite\": <Σ(weight × score), 0..1>,",
-			"  \"verdict\": \"<1-3 sentences>\",",
-			"  \"judgeModel\": \"<id>\",  // optional",
-			"  \"traceparent\": \"<from claim>\"",
-			"}"
-		].join("\n")
-	});
-	const workspaceSection = ctx.workspace?.attached === true ? [
-		"### Workspace",
+	const header = [
+		"# Judge Eval Attempt",
 		"",
-		"Your current workspace is already attached to the producer attempt",
-		"you are judging. Inspect files directly from the current workspace",
-		"root instead of inventing synthetic `artifact_<taskId>` paths.",
-		"If the accepted attempt output lists `artifacts[].path`, treat those",
-		"paths as relative to the current workspace root unless the output",
-		"explicitly says otherwise.",
-		ctx.workspace.mode === "dedicated_worktree" ? `This attachment is a dedicated producer worktree${ctx.workspace.branch ? ` on branch \`${ctx.workspace.branch}\`` : ""}.` : ctx.workspace.mode === "scratch_mount" ? "This workspace is a fresh judge-owned scratch copy of the producer workspace." : "This attachment is the producer shared workspace mounted with shadow writes for safe inspection.",
-		""
-	].join("\n") : "";
-	return [
-		"# Judge Eval Attempt\n",
 		"You are grading one accepted `run_eval` producer attempt against a hidden",
 		"judge rubric. Do not delegate to subagents. Grade in this session only.",
 		"",
 		`Task id: \`${ctx.taskId}\``,
 		`Diary: \`${ctx.diaryId}\``,
 		`Producer task: \`${input.targetTaskId}\``,
-		`Producer attempt: \`${input.targetAttemptN}\``,
-		"",
-		"### Evidence gathering",
-		"",
+		`Producer attempt: \`${input.targetAttemptN}\``
+	].join("\n");
+	const evidence = [
 		`1. Call \`moltnet_get_task\` with taskId=\`${input.targetTaskId}\`.`,
 		`2. Call \`moltnet_list_task_attempts\` with taskId=\`${input.targetTaskId}\` and inspect the accepted attempt matching \`${input.targetAttemptN}\`.`,
 		`3. Call \`moltnet_list_task_messages\` with taskId=\`${input.targetTaskId}\`, attemptN=\`${input.targetAttemptN}\` to inspect the producer's turn-by-turn behavior.`,
@@ -6817,32 +6906,82 @@ function buildJudgeEvalAttemptUserPrompt(input, ctx) {
 		"   artifacts or workspace evidence available in your environment.",
 		"   Read artifact files from the mounted producer workspace when present;",
 		"   do not assume detached `artifact_<taskId>` directories exist.",
-		"5. Score strictly against the rubric below.",
-		"",
-		workspaceSection,
-		"### Rubric",
-		"",
-		rubric.preamble ? `${rubric.preamble}\n` : "",
+		"5. Score strictly against the rubric below."
+	].join("\n");
+	const workspace = ctx.workspace?.attached === true ? [
+		"Your current workspace is already attached to the producer attempt",
+		"you are judging. Inspect files directly from the current workspace",
+		"root instead of inventing synthetic `artifact_<taskId>` paths.",
+		"If the accepted attempt output lists `artifacts[].path`, treat those",
+		"paths as relative to the current workspace root unless the output",
+		"explicitly says otherwise.",
+		ctx.workspace.mode === "dedicated_worktree" ? `This attachment is a dedicated producer worktree${ctx.workspace.branch ? ` on branch \`${ctx.workspace.branch}\`` : ""}.` : ctx.workspace.mode === "scratch_mount" ? "This workspace is a fresh judge-owned scratch copy of the producer workspace." : "This attachment is the producer shared workspace mounted with shadow writes for safe inspection."
+	].join("\n") : "";
+	const rubricBody = [
+		rubric.preamble ?? "",
 		"| Criterion | Weight | Scoring | Description |",
 		"| --- | --- | --- | --- |",
-		criteriaTable,
-		"",
-		"### Composite arithmetic",
-		"",
-		"Your `composite` MUST equal `Σ(criterion.weight × score)` over the rubric",
-		"criteria. Drift > 0.001 is rejected.",
-		"",
-		finalOutputBlock
+		criteriaTable
 	].filter((s) => s !== "").join("\n");
+	const composite = ["Your `composite` MUST equal `Σ(criterion.weight × score)` over the rubric", "criteria. Drift > 0.001 is rejected."].join("\n");
+	return assembleTaskPrompt("judge_eval_attempt", [
+		{
+			id: "judge_eval_attempt.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "judge_eval_attempt.evidence",
+			source: "evidence",
+			header: "Evidence gathering",
+			body: evidence
+		},
+		{
+			id: "judge_eval_attempt.workspace",
+			source: "workspace",
+			header: "Workspace",
+			body: workspace
+		},
+		{
+			id: "judge_eval_attempt.rubric",
+			source: "rubric_judge",
+			header: "Rubric",
+			body: rubricBody
+		},
+		{
+			id: "judge_eval_attempt.composite",
+			source: "rubric_judge",
+			header: "Composite arithmetic",
+			body: composite
+		},
+		{
+			id: "judge_eval_attempt.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "judge_eval_attempt",
+				outputSchemaName: "JudgeEvalAttemptOutput",
+				shapeSketch: [
+					"{",
+					`  "targetTaskId": "${input.targetTaskId}",`,
+					`  "targetAttemptN": ${input.targetAttemptN},`,
+					"  \"variantLabel\": \"<from producer input>\",",
+					"  \"scores\": [ { \"criterionId\": \"...\", \"score\": 0..1, \"rationale\": \"...\", \"assertions\": [...]? } ],",
+					"  \"composite\": <Σ(weight × score), 0..1>,",
+					"  \"verdict\": \"<1-3 sentences>\",",
+					"  \"judgeModel\": \"<id>\",  // optional",
+					"  \"traceparent\": \"<from claim>\"",
+					"}"
+				].join("\n")
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/judge-pack.ts
 function buildJudgePackUserPrompt(input, ctx) {
 	const { renderedPackId, sourcePackId, successCriteria } = input;
 	const rubric = successCriteria.rubric;
-	const criteriaList = renderRubricCriteriaList(rubric);
-	const preambleSection = renderRubricPreambleSection(rubric);
-	return [
+	const header = [
 		"# Judge Pack Agent",
 		"",
 		"You are an independent judge. You did NOT curate or render the pack",
@@ -6851,17 +6990,15 @@ function buildJudgePackUserPrompt(input, ctx) {
 		"referenced entries — but do NOT modify anything.",
 		"",
 		`Your diary ID is: ${ctx.diaryId}`,
-		`This task's id is: ${ctx.taskId}`,
-		"",
-		"## Target",
-		"",
+		`This task's id is: ${ctx.taskId}`
+	].join("\n");
+	const target = [
 		`- **Rendered pack**: \`${renderedPackId}\``,
 		`- **Source pack**: \`${sourcePackId}\``,
-		`- **Rubric**: \`${rubric.rubricId}\` v${rubric.version}`,
-		"",
-		preambleSection,
-		"## Workflow",
-		"",
+		`- **Rubric**: \`${rubric.rubricId}\` v${rubric.version}`
+	].join("\n");
+	const preamble = renderRubricPreambleSection(rubric) ?? "";
+	const workflow = [
 		"1. Call `moltnet_rendered_pack_get` for the rendered pack. Keep the",
 		"   `content` string — you will score it.",
 		"2. Call `moltnet_pack_get` with `expandEntries: true` for the source",
@@ -6869,14 +7006,10 @@ function buildJudgePackUserPrompt(input, ctx) {
 		"3. For each criterion, score according to its `scoring` mode (see",
 		"   Scoring rules below). Produce rationales where required.",
 		"4. Compute `composite = Σ(weight_i × score_i)` and sanity-check it",
-		"   equals the sum you will emit — the runtime rejects mismatches.",
-		"",
-		"## Criteria",
-		"",
-		criteriaList,
-		"",
-		"### Scoring rules",
-		"",
+		"   equals the sum you will emit — the runtime rejects mismatches."
+	].join("\n");
+	const criteria = renderRubricCriteriaList(rubric);
+	const scoring = [
 		"- `llm_score`: score 0..1 continuous. `rationale` REQUIRED (2–4",
 		"  sentences pointing at specific evidence in the rendered content or",
 		"  the source entries). NOTE: this mode smooths individual failures",
@@ -6915,80 +7048,95 @@ function buildJudgePackUserPrompt(input, ctx) {
 		"- `deterministic_coverage_check`: for every source entry, check",
 		"  whether its `entryId` (or a stable reference like title + CID",
 		"  prefix) appears in the rendered `content`. Score 1 iff coverage is",
-		"  complete; otherwise 0. Populate `evidence` with `{ covered, total, missing: [entryIds] }`.",
-		"",
-		"## Constraints",
-		"",
+		"  complete; otherwise 0. Populate `evidence` with `{ covered, total, missing: [entryIds] }`."
+	].join("\n");
+	const constraints = [
 		"- Do NOT call `moltnet_pack_create` or `moltnet_pack_render`.",
 		"- Do NOT fetch the curator's or renderer's task output directly — they",
 		"  may leak guidance that biases judgment.",
 		"- Keep the session focused on scoring; no speculative exploration.",
 		"",
-		`Write a signed diary entry (tags: \`judgment\`, \`judge_pack\`, \`rubric:${rubric.rubricId}\`) capturing the rationale before`,
-		"reporting structured output.",
-		"",
-		buildFinalOutputBlock({
-			taskType: "judge_pack",
-			outputSchemaName: "JudgePackOutput",
-			shapeSketch: [
-				"{",
-				"  \"scores\": [",
-				"    { \"criterionId\": \"...\", \"score\": 0.0, \"rationale\": \"...\", \"evidence\": {} },",
-				"    {",
-				"      \"criterionId\": \"<llm_checklist criterion>\",",
-				"      \"score\": 0,                          // 1 iff every assertion passed",
-				"      \"assertions\": [",
-				"        { \"id\": \"claim-1\", \"text\": \"...\", \"passed\": false, \"evidence\": \"...\" }",
-				"      ]",
-				"    }",
-				"  ],",
-				"  \"composite\": <sum-of-weighted-scores>,",
-				"  \"verdict\": \"<1-3 sentence overall>\",",
-				"  \"judgeModel\": \"<provider:model>\",",
-				"  \"rendererBinaryCid\": \"<cid-string-only-if-available>\"",
-				"}"
-			].join("\n"),
-			extraNotes: [
-				"Omit `rendererBinaryCid` entirely when no binary CID is exposed by",
-				"`moltnet_rendered_pack_get`. Do NOT emit `null` — the field is",
-				"optional and absence is the correct representation when unavailable."
-			]
-		})
-	].filter((l) => l !== null).join("\n");
+		`Write a signed diary entry (tags: \`judgment\`, \`judge_pack\`, \`rubric:${rubric.rubricId}\`) capturing the rationale before reporting structured output.`
+	].join("\n");
+	return assembleTaskPrompt("judge_pack", [
+		{
+			id: "judge_pack.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "judge_pack.target",
+			source: "task_input",
+			header: "Target",
+			body: target
+		},
+		{
+			id: "judge_pack.preamble",
+			source: "rubric_judge",
+			body: preamble
+		},
+		{
+			id: "judge_pack.workflow",
+			source: "static",
+			header: "Workflow",
+			body: workflow
+		},
+		{
+			id: "judge_pack.criteria",
+			source: "rubric_judge",
+			header: "Criteria",
+			body: criteria
+		},
+		{
+			id: "judge_pack.scoring",
+			source: "rubric_judge",
+			header: "Scoring rules",
+			body: scoring
+		},
+		{
+			id: "judge_pack.constraints",
+			source: "static",
+			header: "Constraints",
+			body: constraints
+		},
+		{
+			id: "judge_pack.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "judge_pack",
+				outputSchemaName: "JudgePackOutput",
+				shapeSketch: [
+					"{",
+					"  \"scores\": [",
+					"    { \"criterionId\": \"...\", \"score\": 0.0, \"rationale\": \"...\", \"evidence\": {} },",
+					"    {",
+					"      \"criterionId\": \"<llm_checklist criterion>\",",
+					"      \"score\": 0,                          // 1 iff every assertion passed",
+					"      \"assertions\": [",
+					"        { \"id\": \"claim-1\", \"text\": \"...\", \"passed\": false, \"evidence\": \"...\" }",
+					"      ]",
+					"    }",
+					"  ],",
+					"  \"composite\": <sum-of-weighted-scores>,",
+					"  \"verdict\": \"<1-3 sentence overall>\",",
+					"  \"judgeModel\": \"<provider:model>\",",
+					"  \"rendererBinaryCid\": \"<cid-string-only-if-available>\"",
+					"}"
+				].join("\n"),
+				extraNotes: [
+					"Omit `rendererBinaryCid` entirely when no binary CID is exposed by",
+					"`moltnet_rendered_pack_get`. Do NOT emit `null` — the field is",
+					"optional and absence is the correct representation when unavailable."
+				]
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/pr-review.ts
 function buildPrReviewUserPrompt(input, ctx) {
 	const rubric = input.successCriteria.rubric;
-	const criteriaList = renderRubricCriteriaList(rubric);
-	const preambleSection = renderRubricPreambleSection(rubric);
-	const taskPromptSection = input.taskPrompt ? [
-		"## Task-specific instructions",
-		"",
-		input.taskPrompt,
-		""
-	].join("\n") : "";
-	const resourceSection = input.subject.resourceUrls && input.subject.resourceUrls.length > 0 ? [
-		"### Resources",
-		"",
-		...input.subject.resourceUrls.map((url) => `- ${url}`),
-		""
-	].join("\n") : "";
-	const hintsSection = input.subject.inspectionHints && input.subject.inspectionHints.length > 0 ? [
-		"### Inspection hints",
-		"",
-		...input.subject.inspectionHints.map((hint) => `- ${hint}`),
-		""
-	].join("\n") : "";
-	const workspaceSection = ctx.workspace?.mode === "dedicated_worktree" ? [
-		"### Workspace",
-		"",
-		"This review attempt is running inside a dedicated disposable git",
-		"worktree. Inspect and reason inside this workspace only.",
-		ctx.workspace.branch ? `The current review branch is \`${ctx.workspace.branch}\`.` : "The current checkout is disposable and will be cleaned up when the task ends.",
-		""
-	].join("\n") : "";
-	return [
+	const header = [
 		"# Review Agent",
 		"",
 		"You are an independent judge. You did NOT produce the subject under review.",
@@ -6996,29 +7144,30 @@ function buildPrReviewUserPrompt(input, ctx) {
 		"You may inspect the local workspace and the referenced resources, but do NOT modify anything.",
 		"",
 		`Your diary ID is: ${ctx.diaryId}`,
-		`This task's id is: ${ctx.taskId}`,
-		"",
-		"## Subject",
-		"",
+		`This task's id is: ${ctx.taskId}`
+	].join("\n");
+	const subject = [
 		`**Title:** ${input.subject.title}`,
 		"",
-		input.subject.summary,
-		"",
-		resourceSection,
-		hintsSection,
-		workspaceSection,
-		"### Execution contract",
-		"",
+		input.subject.summary
+	].join("\n");
+	const resources = input.subject.resourceUrls && input.subject.resourceUrls.length > 0 ? input.subject.resourceUrls.map((url) => `- ${url}`).join("\n") : "";
+	const hints = input.subject.inspectionHints && input.subject.inspectionHints.length > 0 ? input.subject.inspectionHints.map((hint) => `- ${hint}`).join("\n") : "";
+	const workspace = ctx.workspace?.mode === "dedicated_worktree" ? [
+		"This review attempt is running inside a dedicated disposable git",
+		"worktree. Inspect and reason inside this workspace only.",
+		ctx.workspace.branch ? `The current review branch is \`${ctx.workspace.branch}\`.` : "The current checkout is disposable and will be cleaned up when the task ends."
+	].join("\n") : "";
+	const executionContract = [
 		"Treat the provided subject, resources, inspection hints, and any",
 		"task-specific instructions as the full",
 		"review contract for this task.",
 		"",
 		"If the task-specific instructions or inspection hints require an outward action tied to the review",
 		"(for example publishing the judgment somewhere), perform that action as",
-		"part of the task before reporting structured output.",
-		"",
-		"## Review workflow",
-		"",
+		"part of the task before reporting structured output."
+	].join("\n");
+	const workflow = [
 		"1. Read the subject summary, resources, inspection hints, and any",
 		"   task-specific instructions before scoring.",
 		"2. Inspect the target artefact directly using the tools and resources the",
@@ -7028,39 +7177,104 @@ function buildPrReviewUserPrompt(input, ctx) {
 		"4. Apply the rubric strictly. This task is about complexity and",
 		"   reviewability, not correctness or feature desirability.",
 		"5. Perform any required outward action before emitting the final",
-		"   structured output.",
-		"",
-		taskPromptSection,
-		preambleSection,
-		"## Criteria",
-		"",
-		criteriaList,
-		"",
-		"### Scoring rules",
-		"",
+		"   structured output."
+	].join("\n");
+	const taskPromptSection = input.taskPrompt ?? "";
+	const preamble = renderRubricPreambleSection(rubric) ?? "";
+	const criteria = renderRubricCriteriaList(rubric);
+	const scoring = [
 		"- Every criterion uses binary scoring only.",
 		"- Score `1` when the subject clearly clears the criterion.",
 		"- Score `0` when it does not, or when the evidence is ambiguous.",
 		"- `rationale` is REQUIRED for every score. Keep it concrete and audit-friendly.",
 		"- Compute `composite = Σ(weight_i × score_i)` exactly; the runtime rejects mismatches.",
 		"",
-		"Write a signed diary entry (tags: `judgment`, `pr_review`) capturing the rationale before reporting structured output.",
-		"",
-		buildFinalOutputBlock({
-			taskType: "pr_review",
-			outputSchemaName: "PrReviewOutput",
-			shapeSketch: [
-				"{",
-				"  \"scores\": [",
-				"    { \"criterionId\": \"...\", \"score\": 0, \"rationale\": \"...\" }",
-				"  ],",
-				"  \"composite\": <sum-of-weighted-binary-scores>,",
-				"  \"verdict\": \"<1-3 sentence overall>\"",
-				"}"
-			].join("\n"),
-			extraNotes: ["`scores` MUST stay in the same order as the rubric criteria.", "`score` MUST be exactly `0` or `1` for every criterion."]
-		})
-	].filter(Boolean).join("\n");
+		"Write a signed diary entry (tags: `judgment`, `pr_review`) capturing the rationale before reporting structured output."
+	].join("\n");
+	return assembleTaskPrompt("pr_review", [
+		{
+			id: "pr_review.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "pr_review.subject",
+			source: "task_input",
+			header: "Subject",
+			body: subject
+		},
+		{
+			id: "pr_review.resources",
+			source: "task_input",
+			header: "Resources",
+			body: resources
+		},
+		{
+			id: "pr_review.hints",
+			source: "task_input",
+			header: "Inspection hints",
+			body: hints
+		},
+		{
+			id: "pr_review.workspace",
+			source: "workspace",
+			header: "Workspace",
+			body: workspace
+		},
+		{
+			id: "pr_review.execution_contract",
+			source: "static",
+			header: "Execution contract",
+			body: executionContract
+		},
+		{
+			id: "pr_review.workflow",
+			source: "static",
+			header: "Review workflow",
+			body: workflow
+		},
+		{
+			id: "pr_review.task_prompt",
+			source: "task_input",
+			header: "Task-specific instructions",
+			body: taskPromptSection
+		},
+		{
+			id: "pr_review.preamble",
+			source: "rubric_judge",
+			body: preamble
+		},
+		{
+			id: "pr_review.criteria",
+			source: "rubric_judge",
+			header: "Criteria",
+			body: criteria
+		},
+		{
+			id: "pr_review.scoring",
+			source: "rubric_judge",
+			header: "Scoring rules",
+			body: scoring
+		},
+		{
+			id: "pr_review.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "pr_review",
+				outputSchemaName: "PrReviewOutput",
+				shapeSketch: [
+					"{",
+					"  \"scores\": [",
+					"    { \"criterionId\": \"...\", \"score\": 0, \"rationale\": \"...\" }",
+					"  ],",
+					"  \"composite\": <sum-of-weighted-binary-scores>,",
+					"  \"verdict\": \"<1-3 sentence overall>\"",
+					"}"
+				].join("\n"),
+				extraNotes: ["`scores` MUST stay in the same order as the rubric criteria.", "`score` MUST be exactly `0` or `1` for every criterion."]
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/render-pack.ts
@@ -7070,7 +7284,7 @@ function buildPrReviewUserPrompt(input, ctx) {
 */
 function buildRenderPackUserPrompt(input, ctx) {
 	const { packId, persist = true, pinned = false } = input;
-	return [
+	const header = [
 		"# Render Pack Agent",
 		"",
 		"You are rendering a context pack to markdown. Step 2 of the",
@@ -7078,16 +7292,14 @@ function buildRenderPackUserPrompt(input, ctx) {
 		"a third will judge the rendering. You must NOT judge it here.",
 		"",
 		`Your agent-session diary ID is: ${ctx.diaryId}`,
-		`This task's id is: ${ctx.taskId}`,
-		"",
-		"## Input",
-		"",
+		`This task's id is: ${ctx.taskId}`
+	].join("\n");
+	const inputBlock = [
 		`- **Pack**: \`${packId}\``,
 		`- **Persist**: \`${persist}\``,
-		`- **Pinned**: \`${pinned}\``,
-		"",
-		"## Workflow",
-		"",
+		`- **Pinned**: \`${pinned}\``
+	].join("\n");
+	const workflow = [
 		"1. Call `moltnet_pack_get` with `expandEntries: true` to inspect the",
 		"   source entries. Read it — you need the entry count for your output.",
 		"2. Call `moltnet_pack_render` with:",
@@ -7095,16 +7307,14 @@ function buildRenderPackUserPrompt(input, ctx) {
 		`   - \`persist\`: \`${persist}\``,
 		`   - \`pinned\`: \`${pinned}\``,
 		"   Record the returned `renderedPackId`, `cid`, `renderMethod`, and",
-		"   `content` byte length.",
-		"",
-		"## Constraints",
-		"",
+		"   `content` byte length."
+	].join("\n");
+	const constraints = [
 		"- Do NOT modify the source pack or its entries.",
 		"- Do NOT write diary entries unless a genuine incident occurs",
-		"  (rendering failure, invariant violation).",
-		"",
-		"## Fidelity Discipline",
-		"",
+		"  (rendering failure, invariant violation)."
+	].join("\n");
+	const fidelity = [
 		"These rules apply when you are producing the markdown yourself rather",
 		"than relying on a deterministic `server:*` renderer.",
 		"",
@@ -7124,25 +7334,63 @@ function buildRenderPackUserPrompt(input, ctx) {
 		"   completeness. Optimize for \"no detectable drift across a",
 		"   claim-by-claim audit\", not \"shorter at any cost\". When compressing, prefer",
 		"   tightening prose around a quote rather than altering the quote,",
-		"   and prefer summarising a list over silently truncating it.",
-		"",
-		buildSelfVerificationBlock(ctx.taskId),
-		buildFinalOutputBlock({
-			taskType: "render_pack",
-			outputSchemaName: "RenderPackOutput",
-			shapeSketch: [
-				"{",
-				"  \"renderedPackId\": \"<uuid-or-null>\",",
-				"  \"renderedCid\": \"<cid>\",",
-				"  \"renderMethod\": \"<label>\",",
-				"  \"byteSize\": <int>,",
-				"  \"entriesRendered\": <int>,",
-				"  \"summary\": \"<1-3 sentence recap>\",",
-				"  \"verification\": <required iff input.successCriteria; see Self-verification>",
-				"}"
-			].join("\n")
-		})
+		"   and prefer summarising a list over silently truncating it."
 	].join("\n");
+	return assembleTaskPrompt("render_pack", [
+		{
+			id: "render_pack.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "render_pack.input",
+			source: "task_input",
+			header: "Input",
+			body: inputBlock
+		},
+		{
+			id: "render_pack.workflow",
+			source: "static",
+			header: "Workflow",
+			body: workflow
+		},
+		{
+			id: "render_pack.constraints",
+			source: "static",
+			header: "Constraints",
+			body: constraints
+		},
+		{
+			id: "render_pack.fidelity",
+			source: "static",
+			header: "Fidelity Discipline",
+			body: fidelity
+		},
+		{
+			id: "render_pack.verification",
+			source: "verification",
+			body: buildSelfVerificationBlock(ctx.taskId)
+		},
+		{
+			id: "render_pack.final_output",
+			source: "final_output",
+			body: buildFinalOutputBlock({
+				taskType: "render_pack",
+				outputSchemaName: "RenderPackOutput",
+				shapeSketch: [
+					"{",
+					"  \"renderedPackId\": \"<uuid-or-null>\",",
+					"  \"renderedCid\": \"<cid>\",",
+					"  \"renderMethod\": \"<label>\",",
+					"  \"byteSize\": <int>,",
+					"  \"entriesRendered\": <int>,",
+					"  \"summary\": \"<1-3 sentence recap>\",",
+					"  \"verification\": <required iff input.successCriteria; see Self-verification>",
+					"}"
+				].join("\n")
+			})
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/run-eval.ts
@@ -7151,8 +7399,7 @@ function buildRenderPackUserPrompt(input, ctx) {
 *
 * Free-form: no git workflow, no commit ceremony. The executor produces
 * a textual response (and optional file artifacts) that later
-* `judge_eval_attempt` task(s) grade against their own hidden
-* rubric.
+* `judge_eval_attempt` task(s) grade against their own hidden rubric.
 *
 * Context delivery is handled by `resolveTaskContext` (see
 * libs/agent-runtime/src/context-bindings.ts) and runs BEFORE this
@@ -7160,50 +7407,44 @@ function buildRenderPackUserPrompt(input, ctx) {
 * the body, `skill` items are persisted at the runtime's skill path,
 * and `user_inline` items are appended to the first user message. This
 * builder does NOT inline `input.context[]` itself.
+*
+* Prompt-shape notes (issue #1175, area 1):
+* - No `Correlation` section: the agent never acts on it. The id is
+*   still carried on attempt event metadata for cross-variant queries.
+* - No `Execution mode` section: the workspace already reflects the
+*   chosen mode by its shape (scratch/shared mount/dedicated worktree).
+*   Restating it as text adds noise without changing model behavior.
+* - The "Injected Task Context" phrase is used identically in this
+*   prompt's discipline section and in the materialized context block
+*   header (see context-bindings.ts) so weaker models see one repeated
+*   anchor.
+* - The discipline copy demands the model encode injected constraints
+*   into the code path itself, not into comments or the verification
+*   field. Quoting the constraint back is not following the task.
 */
 function buildRunEvalUserPrompt(input, ctx) {
-	const { scenario, variantLabel, execution, successCriteria } = input;
+	const { scenario, variantLabel, successCriteria } = input;
 	const hasContext = input.context.length > 0;
 	const hasInlineContext = input.context.some((entry) => entry.binding === "context_inline");
-	const inputFilesSection = scenario.inputFiles?.length ? [
-		"### Input files",
-		"",
-		...scenario.inputFiles.map((f) => `- \`${f}\``),
-		""
-	].join("\n") : "";
-	const verificationSection = successCriteria ? buildSelfVerificationBlock(ctx.taskId) : "";
-	const correlationSection = ctx.correlationId ? [
-		"### Correlation",
-		"",
-		`This task carries correlationId \`${ctx.correlationId}\`. It joins`,
-		"this variant to its sibling `run_eval` tasks (other variants of the",
-		"same scenario and to any later `judge_eval_attempt` tasks created",
-		"against those variants. You do not need to act on it directly — it",
-		"is recorded for cross-variant aggregation at query time.",
-		""
-	].join("\n") : "";
-	const executionSection = [
-		"### Execution mode",
-		"",
-		`Mode: \`${execution.mode}\``,
-		`Workspace: \`${execution.workspace}\``,
-		execution.workspace === "none" ? "You are running in a scratch workspace with no repository checkout mounted. Do not assume git history or repo files are present unless the scenario provided them explicitly." : execution.workspace === "shared_mount" ? "You are running against the daemon shared mount. Treat any repository mutations as affecting the mounted checkout directly." : "You are running in a dedicated disposable git worktree isolated from the daemon shared checkout.",
-		""
-	].join("\n");
-	const contextDisciplineSection = hasContext ? [
-		"### Injected context discipline",
+	const header = `# Run Eval Agent\n\nYou are running an evaluation scenario as variant \`${variantLabel}\`.\nTask id: \`${ctx.taskId}\``;
+	const contextDiscipline = hasContext ? [
+		"This task includes Injected Task Context supplied by the task",
+		"creator. You MUST inspect it BEFORE you write solution files or",
+		"draft your final answer — not after.",
 		"",
-		"This task includes extra injected context from the task creator.",
-		"You MUST inspect and use that context BEFORE you write solution",
-		"files or draft your final answer.",
-		"Do not solve first and only review the context afterward.",
-		hasInlineContext ? "For `context_inline`, your FIRST content-inspection step should be a `read` of `/workspace/context-pack.md` before your first `write` call. The same content is also mirrored in `/workspace/AGENTS.md` and may be referenced from `/workspace/.claude/CLAUDE.md`." : "If injected context was provided as a skill, inspect that task-injected context before solving.",
-		hasInlineContext ? "If `/workspace/context-pack.md` exists and you skip reading it before writing solution files, you are not following the task instructions." : "Do not rely on memory alone when task-injected context is available; inspect it first.",
-		"If the injected context contains repo- or workflow-specific rules,",
-		"those rules override your generic instincts.",
-		""
+		"Reconcile every constraint from that context **into the code path",
+		"itself**: function bodies, control flow, transaction boundaries,",
+		"guard clauses. Quoting a constraint back in a comment, a",
+		"`// note:` line, the task summary, or the `verification` field is",
+		"NOT following the task. If the constraint affects behavior, it",
+		"must affect behavior.",
+		hasInlineContext ? "For `context_inline`, your FIRST content-inspection step is a `read` of `/workspace/context-pack.md` before your first `write` call. The same content is also mirrored in `/workspace/AGENTS.md` and may be referenced from `/workspace/.claude/CLAUDE.md`." : "When the context is delivered as a skill, inspect it before solving.",
+		"If the Injected Task Context contains repo- or workflow-specific",
+		"rules, those rules override your generic instincts."
 	].join("\n") : "";
-	const finalOutputBlock = buildFinalOutputBlock({
+	const inputFiles = scenario.inputFiles?.length ? scenario.inputFiles.map((f) => `- \`${f}\``).join("\n") : "";
+	const verification = successCriteria ? buildSelfVerificationBlock(ctx.taskId) : "";
+	const finalOutput = buildFinalOutputBlock({
 		taskType: "run_eval",
 		outputSchemaName: "RunEvalOutput",
 		shapeSketch: [
@@ -7223,17 +7464,41 @@ function buildRunEvalUserPrompt(input, ctx) {
 			"}"
 		].join("\n")
 	});
-	return [
-		"# Run Eval Agent\n",
-		`You are running an evaluation scenario as variant \`${variantLabel}\`.\nTask id: \`${ctx.taskId}\`\n`,
-		correlationSection,
-		executionSection,
-		contextDisciplineSection,
-		`### Scenario\n\n${scenario.prompt}\n`,
-		inputFilesSection,
-		verificationSection,
-		finalOutputBlock
-	].filter((s) => s !== "").join("\n");
+	return assembleTaskPrompt("run_eval", [
+		{
+			id: "run_eval.header",
+			source: "header",
+			body: header
+		},
+		{
+			id: "run_eval.context_discipline",
+			source: "discipline",
+			header: "Injected Task Context",
+			body: contextDiscipline
+		},
+		{
+			id: "run_eval.scenario",
+			source: "task_input",
+			header: "Scenario",
+			body: scenario.prompt
+		},
+		{
+			id: "run_eval.input_files",
+			source: "task_input",
+			header: "Input files",
+			body: inputFiles
+		},
+		{
+			id: "run_eval.verification",
+			source: "verification",
+			body: verification
+		},
+		{
+			id: "run_eval.final_output",
+			source: "final_output",
+			body: finalOutput
+		}
+	]);
 }
 //#endregion
 //#region ../../libs/agent-runtime/src/prompts/index.ts
@@ -16843,7 +17108,7 @@ async function executePiTask(claimedTask, reporter, opts) {
 		});
 		let taskPrompt;
 		try {
-			taskPrompt = buildTaskUserPrompt(task, {
+			const assembled = buildTaskUserPrompt(task, {
 				diaryId,
 				taskId: task.id,
 				workspace: {
@@ -16854,6 +17119,12 @@ async function executePiTask(claimedTask, reporter, opts) {
 				},
 				extras: opts.promptExtras
 			});
+			taskPrompt = assembled.text;
+			await emit("info", {
+				event: "prompt_assembled",
+				taskType: assembled.taskType,
+				sections: assembled.trace
+			});
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			await emit("error", {
@@ -17116,8 +17387,8 @@ async function executePiTask(claimedTask, reporter, opts) {
 			}
 			else if (submitToolHandle) {
 				parseError = {
-					code: "output_missing",
-					message: "Agent did not submit output through the task submit tool. A valid submit tool call is required to complete this task type."
+					code: "submit_output_missing",
+					message: "Agent did not satisfy the promised submit-output criterion: no valid task submit tool call was captured before the session ended."
 				};
 				await emit("error", {
 					message: parseError.message,