@tea-agent/loop-agent 0.38.2 → 0.38.4

package/dist/workflows/dag/node-execution.js

@@ -10,11 +10,13 @@ import { resolveContextPolicy } from "./context-policy.js";
 import { buildDagNodePromptEnvelope, formatConvergenceFeedbackBlock, } from "./prompt.js";
 import { persistLongNodeOutputArtifacts } from "./upstream-artifacts.js";
 import { buildOutputLimitRecoverySection, loadBackendTestWriterProgressForRetry, } from "./backend-test-writer-completeness.js";
-import { computeBackoffDelayMs, isRetryablePiFailureCategory, isSafeReadOnlyPiRetryCandidate, isWriterEmptyDiffRetryCandidate, isWriterTransportRetryCandidate, } from "./retry-policy.js";
+import { computeBackoffDelayMs, isCanonicalFinalVerifyShellRetryCandidate, isRetryablePiFailureCategory, isSafeReadOnlyPiRetryCandidate, isTargetTemplateTransientRetryNode, isWriterEmptyDiffRetryCandidate, isWriterTransportRetryCandidate, VERIFY_SHELL_RETRY_POLICY, } from "./retry-policy.js";
 import { applyNodeActivity, evaluateNodeLiveness, resolveLivenessPolicy, } from "./liveness-policy.js";
 import { buildProtocolRetryInstruction, normalizeReviewVerdictAfterRetries, parseJsonReviewVerdict, validateOutputProtocol, } from "./output-protocol.js";
 import { getStructuredContractValidator } from "./contract-output-registry.js";
 import "./contract-validator-registrations.js";
+import { allowedRepairReadPaths, auditRepairAttemptToolUse, buildStructuredOutputRepairPrompt, freezeStructuredOutputRepairContext, hasNonEmptyStructuredCandidate, isFrontendStructuredRepairSchemaId, isStructuredRepairableFailureCategory, persistStructuredAttemptRaw, sessionEventsByteLength, GOVERNANCE_BLOCKED_CATEGORY, STRUCTURED_REPAIR_EXHAUSTED_CATEGORY, } from "./structured-output-repair.js";
+import { readFrontendCanonicalCandidate } from "./frontend-implementation-contract.js";
 import { writeDagNodeJsonArtifact } from "../../infrastructure/harness/artifact-store.js";
 import { buildProjectGovernanceContext, readCompletedWriterChangeManifests, writeProjectGovernanceContext, } from "./project-governance-context.js";
 import { assertSkillSnapshotCoversSpec, buildNodePromptFromSnapshot, isDagSkillSnapshotIntegrityError, readSkillSnapshot, } from "./skill-snapshot.js";
@@ -135,6 +137,11 @@ function frontendStructuredArtifactRetryGuidance(schemaId) {
             "Return exactly this artifact and nothing else: one short lead-in line, then exactly one fenced json block containing only the editable RFC 7386 plan patch, immediately followed by exactly one fenced openspec-citations block.",
             "The runtime applies your patch to its protected contract skeleton. Do not emit schemaVersion, sourceBinding, riskLevel, targets.files, or mockApi.productionDefaultOff; do not emit the full contract.",
             "Do not emit Markdown headings, bullets, plan prose, explanations, raw JSON, or any other fenced block.",
+            "The openspec-citations fenced block contains one JSON object per line, each with path/section/line — for example:",
+            "```openspec-citations",
+            '{"path":".harness/tasks/<task>/source/需求.md","section":"Objective","line":5}',
+            '{"path":".harness/tasks/<task>/source/references/product-requirement.md","section":"FR-1","line":16}',
+            "```",
         ];
     }
     if (schemaId === "frontend-implementation-contract-revision-patch-v1") {
@@ -142,6 +149,11 @@ function frontendStructuredArtifactRetryGuidance(schemaId) {
             "Return exactly this artifact and nothing else: one short lead-in line, then exactly one fenced json block containing the RFC 7386 merge-patch delta, immediately followed by exactly one fenced openspec-citations block.",
             "The delta contains only the fields you change; null deletes a key, arrays and scalars replace, and plain objects merge recursively. Do not emit a full contract or a schemaVersion/targets section.",
             "Do not emit Markdown headings, bullets, plan prose, explanations, raw JSON, or any other fenced block.",
+            "The openspec-citations fenced block contains one JSON object per line, each with path/section/line — for example:",
+            "```openspec-citations",
+            '{"path":".harness/tasks/<task>/source/需求.md","section":"Objective","line":5}',
+            '{"path":".harness/tasks/<task>/source/references/product-requirement.md","section":"FR-1","line":16}',
+            "```",
         ];
     }
     return [
@@ -248,6 +260,16 @@ function buildAttemptPrompt(task, basePrompt, attemptNumber, previousFailureCate
             "</retry_instruction>",
         ].join("\n");
     }
+    if (previousFailureCategory === "writer-clean-timeout") {
+        return [
+            basePrompt,
+            "",
+            "<retry_instruction>",
+            "Previous attempt ended in a clean provider/transport failure with zero attributed workspace writes and zero write/edit tool calls.",
+            "Do not invent existing implementation progress. Continue from the original task only if the workspace is still unchanged.",
+            "</retry_instruction>",
+        ].join("\n");
+    }
     if (previousFailureCategory !== "output-too-large") {
         return basePrompt;
     }
@@ -684,12 +706,18 @@ export async function executeDagNode(input) {
             // Invalid or missing harness preserves the previous no-override behavior.
         }
     }
-    const retryPolicy = task.retryPolicy &&
+    const specRetryPolicy = task.retryPolicy &&
         (isSafeReadOnlyPiRetryCandidate(task) ||
             isWriterEmptyDiffRetryCandidate(task) ||
             isWriterTransportRetryCandidate(task))
         ? task.retryPolicy
         : undefined;
+    const implicitVerifyRetryPolicy = specRetryPolicy === undefined &&
+        isCanonicalFinalVerifyShellRetryCandidate(task) &&
+        isTargetTemplateTransientRetryNode(task)
+        ? VERIFY_SHELL_RETRY_POLICY
+        : undefined;
+    const retryPolicy = specRetryPolicy ?? implicitVerifyRetryPolicy;
     const maxAttempts = retryPolicy?.maxAttempts ?? 1;
     const attempts = [];
     let totalAttemptWallDurationMs = 0;
@@ -731,10 +759,17 @@ export async function executeDagNode(input) {
     let terminalResult;
     let previousFailureCategory;
     let previousProtocolReason;
+    let pendingStructuredArtifact;
+    let lastRepairAllowlist = [];
     for (let attemptNumber = 1; attemptNumber <= maxAttempts; attemptNumber += 1) {
         const attemptStartedAt = new Date().toISOString();
         node.currentAttempt = attemptNumber;
         node.livenessStatus = "active";
+        // Capture the session-events.jsonl length BEFORE the executor appends this
+        // attempt's events, so the post-attempt repair tool audit can be scoped to
+        // exactly this attempt's segment (B1: earlier attempts legitimately use
+        // ls/find and must not be attributed to the repair attempt).
+        const attemptSessionEventsOffset = await sessionEventsByteLength(runDir, nodeId);
         let result;
         try {
             validateRepairArtifactGateBeforeShell({
@@ -757,12 +792,53 @@ export async function executeDagNode(input) {
                 (acc[i.path] ??= []).push(i.detail);
                 return acc;
             }, {});
+            let attemptPrompt = buildAttemptPrompt(task, prompt, attemptNumber, previousFailureCategory, previousProtocolReason, recoveryTargetPaths, recoveryDiagnostics);
+            if (attemptNumber > 1 &&
+                isFrontendStructuredRepairSchemaId(task.structuredContractOutput?.schemaId) &&
+                isStructuredRepairableFailureCategory(previousFailureCategory) &&
+                (await hasNonEmptyStructuredCandidate({
+                    runDir,
+                    nodeId,
+                    beforeAttempt: attemptNumber,
+                }))) {
+                const originalCanonical = task.structuredContractOutput?.schemaId ===
+                    "frontend-implementation-contract-revision-patch-v1"
+                    ? (await readFrontendCanonicalCandidate(runDir, "frontend-plan-pi"))
+                    : undefined;
+                const frozen = await freezeStructuredOutputRepairContext({
+                    runDir,
+                    runId: state.runId,
+                    taskId: spec.sourceBinding?.taskId ?? task.id,
+                    nodeId,
+                    nodeAttempt: attemptNumber,
+                    targetSchemaId: task.structuredContractOutput.schemaId,
+                    skeleton: task.structuredContractOutput?.skeleton,
+                    originalCanonical,
+                    latestStopReason: previousFailureCategory === "structured-output-truncated"
+                        ? "length"
+                        : previousFailureCategory,
+                });
+                lastRepairAllowlist = allowedRepairReadPaths({
+                    runDir,
+                    context: frozen.context,
+                    contextPath: frozen.relativePath,
+                });
+                attemptPrompt = await buildStructuredOutputRepairPrompt({
+                    runDir,
+                    context: frozen.context,
+                    contextPath: frozen.relativePath,
+                    contextSha256: frozen.sha256,
+                    maxAttempts,
+                    schemaGuidance: frontendStructuredArtifactRetryGuidance(task.structuredContractOutput.schemaId),
+                    previousReason: previousProtocolReason,
+                });
+            }
             result = await executeNode({
                 task,
                 cwd,
                 model,
                 ...(thinking ? { thinking } : {}),
-                prompt: buildAttemptPrompt(task, prompt, attemptNumber, previousFailureCategory, previousProtocolReason, recoveryTargetPaths, recoveryDiagnostics),
+                prompt: attemptPrompt,
                 attempt: attemptNumber,
                 reportActivity,
                 timeoutMs: livenessPolicy.absoluteMaxWallClockMs,
@@ -778,6 +854,35 @@ export async function executeDagNode(input) {
                 durationMs: 0,
             };
         }
+        if (isFrontendStructuredRepairSchemaId(task.structuredContractOutput?.schemaId)) {
+            const rawText = canonicalNodeOutput(result);
+            if (rawText.trim().length > 0) {
+                await persistStructuredAttemptRaw({
+                    runDir,
+                    nodeId,
+                    attempt: attemptNumber,
+                    text: rawText,
+                });
+            }
+            if (attemptNumber > 1 && lastRepairAllowlist.length > 0) {
+                const audit = await auditRepairAttemptToolUse({
+                    runDir,
+                    nodeId,
+                    allowedPaths: lastRepairAllowlist,
+                    fromByteOffset: attemptSessionEventsOffset,
+                });
+                if (!audit.ok) {
+                    result = {
+                        ...result,
+                        ok: false,
+                        failureCategory: GOVERNANCE_BLOCKED_CATEGORY,
+                        stderr: [result.stderr, audit.reason]
+                            .filter(Boolean)
+                            .join("\n"),
+                    };
+                }
+            }
+        }
         // R0: executor ok=true still fails closed when outputProtocol is violated.
         // Valid semantic results (e.g. VERDICT: request-revision) pass validation.
         if (result.ok && task.outputProtocol) {
@@ -814,16 +919,17 @@ export async function executeDagNode(input) {
                     structuredContractOutput: task.structuredContractOutput,
                 });
                 if (!contractCheck.ok) {
-                    // A provider stopReason=length means the response was cut before the
-                    // JSON contract could complete; separate it from an ordinary bad
-                    // contract so the retry switches to a JSON-only output strategy.
                     const attemptStopReason = result.stopReason;
+                    const failureCategory = contractCheck.classification === "governance-blocked"
+                        ? GOVERNANCE_BLOCKED_CATEGORY
+                        : attemptStopReason === "length" ||
+                            contractCheck.classification === "truncated"
+                            ? "structured-output-truncated"
+                            : "invalid-output";
                     result = {
                         ...result,
                         ok: false,
-                        failureCategory: attemptStopReason === "length"
-                            ? "structured-output-truncated"
-                            : "invalid-output",
+                        failureCategory,
                         stderr: [result.stderr, contractCheck.reason]
                             .filter(Boolean)
                             .join("\n"),
@@ -838,6 +944,9 @@ export async function executeDagNode(input) {
                             stdout: contractCheck.normalizedText,
                         };
                     }
+                    if (contractCheck.artifact) {
+                        pendingStructuredArtifact = contractCheck.artifact;
+                    }
                     previousProtocolReason = undefined;
                 }
             }
@@ -850,6 +959,7 @@ export async function executeDagNode(input) {
         const attemptFinishedAt = new Date().toISOString();
         const attemptWallDurationMs = durationBetween(attemptStartedAt, attemptFinishedAt);
         totalAttemptWallDurationMs += attemptWallDurationMs;
+        const rawFailureCategory = result.rawFailureCategory ?? result.failureCategory;
         const attemptRecord = {
             attempt: attemptNumber,
             startedAt: attemptStartedAt,
@@ -861,6 +971,7 @@ export async function executeDagNode(input) {
             stderr: result.stderr,
             assistantText: result.assistantText,
             failureCategory: result.failureCategory,
+            ...(rawFailureCategory ? { rawFailureCategory } : {}),
             backend: result.backend,
             sdkAttempted: result.sdkAttempted,
             tokensUsed: result.tokensUsed,
@@ -908,13 +1019,26 @@ export async function executeDagNode(input) {
             break;
         const canRetry = retryPolicy !== undefined && attemptNumber < maxAttempts;
         const retryable = retryPolicy !== undefined &&
+            result.failureCategory !== GOVERNANCE_BLOCKED_CATEGORY &&
             (isRetryablePiFailureCategory(result.failureCategory, {
                 retryCategories: retryPolicy.retryCategories,
             }) ||
                 (result.failureCategory === "protocol-invalid" &&
                     task.outputProtocol?.retryOnInvalid === true));
-        if (!canRetry || !retryable)
+        if (!canRetry || !retryable) {
+            if (!canRetry &&
+                isFrontendStructuredRepairSchemaId(task.structuredContractOutput?.schemaId) &&
+                isStructuredRepairableFailureCategory(result.failureCategory)) {
+                result = {
+                    ...result,
+                    failureCategory: STRUCTURED_REPAIR_EXHAUSTED_CATEGORY,
+                };
+                terminalResult = result;
+                previousFailureCategory = result.failureCategory;
+                node.failureCategory = result.failureCategory;
+            }
             break;
+        }
         const delayMs = computeBackoffDelayMs(attemptNumber + 1, retryPolicy);
         if (delayMs > 0) {
             const backoffStartedAt = new Date().toISOString();
@@ -1063,6 +1187,11 @@ export async function executeDagNode(input) {
                 node.structuredArtifactSchemaId = "backend-test-result-v1";
             }
         }
+        else if (pendingStructuredArtifact) {
+            node.structuredArtifactPath = pendingStructuredArtifact.path;
+            node.structuredArtifactSha256 = pendingStructuredArtifact.sha256;
+            node.structuredArtifactSchemaId = pendingStructuredArtifact.schemaId;
+        }
     }
     const finishedAt = new Date().toISOString();
     node.finishedAt = finishedAt;

package/dist/workflows/dag/prompt.js

@@ -116,7 +116,21 @@ export function buildUpstreamContext(task, upstream, maxChars = MAX_UPSTREAM_CHA
             ].join("\n"));
             continue;
         }
-        if (!record || record.status !== "FINISHED" || !upstreamText)
+        if (!record || record.status !== "FINISHED")
+            continue;
+        if (record.structuredArtifactPath &&
+            record.structuredArtifactSchemaId ===
+                "frontend-implementation-contract-v1") {
+            sections.push([
+                `## Upstream output: ${depId}`,
+                "Validated structured artifact (read-only runner evidence — use read tool to fetch; do not edit). Do not infer the contract from stdout.",
+                `- path: ${record.structuredArtifactPath}`,
+                `- schema: ${record.structuredArtifactSchemaId}`,
+                `- sha256: ${record.structuredArtifactSha256 ?? "unknown"}`,
+            ].join("\n"));
+            continue;
+        }
+        if (!upstreamText)
             continue;
         const artifactKind = stdout ? "stdout" : "assistant";
         const artifactPath = stdout

package/dist/workflows/dag/rerun-plan.js

@@ -3,6 +3,7 @@ import { readFile } from "node:fs/promises";
 import { assertTaskContractBindingFresh } from "./task-contract-binding.js";
 import { isSafeReadOnlyPiRetryCandidate, isTransportCrashedExclusiveWriter } from "./retry-policy.js";
 import { resolveDagTaskSourcePath } from "../../task/dag-source-paths.js";
+import { composeDagPromptOverridePrompt, MAX_DAG_RERUN_PROMPT_OVERRIDE_CHARS, } from "../../shared/dag-prompt-override.js";
 const REVIEW_VERDICT_RECOVERY_NODE_ID = "review-verdict-recovery-pi";
 const SAFE_SHELL_GATE_KEYS = [
     "verdictGate",
@@ -306,6 +307,9 @@ export function computeResetClosure(spec, effectiveFromNodeId) {
         ...collectReachableDescendants(spec, effectiveFromNodeId),
     ].sort();
 }
+function isNeverStartedNodeStatus(status) {
+    return status === undefined || status === "SKIPPED" || status === "PENDING";
+}
 export function assessResetClosureSafety(spec, resetNodeIds, options = {}) {
     const tasks = taskById(spec);
     const blockingNodes = [];
@@ -314,9 +318,17 @@ export function assessResetClosureSafety(spec, resetNodeIds, options = {}) {
         const task = tasks.get(nodeId);
         if (!task)
             continue;
+        if (options.parentNodes !== undefined &&
+            isNeverStartedNodeStatus(options.parentNodes[nodeId]?.status)) {
+            continue;
+        }
         if (isWriterTask(task, spec)) {
             if (nodeId === options.allowedTransportWriterNodeId)
                 continue;
+            if (nodeId === options.allowedExclusiveShellFromNodeId &&
+                task.executor === "shell") {
+                continue;
+            }
             blockingNodes.push({
                 nodeId,
                 reasonCode: "restart-subgraph-contains-writer",
@@ -370,6 +382,100 @@ export function assessResetClosureSafety(spec, resetNodeIds, options = {}) {
         reasonCodes: [...new Set(reasonCodes)],
     };
 }
+/**
+ * Experimental prompt-override admission (fail-closed):
+ * - requires the internal switch (see shared/dag-prompt-override.ts);
+ * - the target must be a failed (ERROR) node inside the reset closure, so an
+ *   override can only adjust how an already-failed node retries — never a
+ *   finished, skipped, or not-yet-started node;
+ * - only `subtask_prompt` semantics change: "append" keeps the frozen base
+ *   and adds a marked addendum block, "replace" swaps the whole prompt;
+ *   base/final sha256 are recorded for provenance and bound into planHash.
+ */
+function assessPromptOverrides(input) {
+    const blockingNodes = [];
+    const reasonCodes = [];
+    const tasks = taskById(input.spec);
+    const resetSet = new Set(input.resetNodeIds);
+    const seen = new Set();
+    const entries = [];
+    if (!input.enabled) {
+        reasonCodes.push("prompt-override-disabled");
+    }
+    for (const override of input.overrides) {
+        const nodeId = override.nodeId?.trim() ?? "";
+        if (seen.has(nodeId)) {
+            blockingNodes.push({
+                nodeId,
+                reasonCode: "prompt-override-duplicate-node",
+            });
+            reasonCodes.push("prompt-override-duplicate-node");
+            continue;
+        }
+        seen.add(nodeId);
+        const task = tasks.get(nodeId);
+        if (!task) {
+            blockingNodes.push({
+                nodeId,
+                reasonCode: "prompt-override-node-missing",
+            });
+            reasonCodes.push("prompt-override-node-missing");
+            continue;
+        }
+        if (!resetSet.has(nodeId)) {
+            blockingNodes.push({
+                nodeId,
+                reasonCode: "prompt-override-outside-reset-closure",
+            });
+            reasonCodes.push("prompt-override-outside-reset-closure");
+            continue;
+        }
+        if (input.state.nodes[nodeId]?.status !== "ERROR") {
+            blockingNodes.push({
+                nodeId,
+                reasonCode: "prompt-override-node-not-failed",
+            });
+            reasonCodes.push("prompt-override-node-not-failed");
+            continue;
+        }
+        const mode = override.mode === "append" ? "append" : "replace";
+        const prompt = override.prompt ?? "";
+        if (!prompt.trim() ||
+            prompt.length > MAX_DAG_RERUN_PROMPT_OVERRIDE_CHARS) {
+            blockingNodes.push({
+                nodeId,
+                reasonCode: "prompt-override-invalid-prompt",
+            });
+            reasonCodes.push("prompt-override-invalid-prompt");
+            continue;
+        }
+        const basePromptSha256 = createHash("sha256")
+            .update(task.subtask_prompt, "utf8")
+            .digest("hex");
+        const finalPrompt = composeDagPromptOverridePrompt({
+            basePrompt: task.subtask_prompt,
+            text: prompt,
+            mode,
+        });
+        const promptSha256 = createHash("sha256")
+            .update(finalPrompt, "utf8")
+            .digest("hex");
+        if (promptSha256 === basePromptSha256) {
+            blockingNodes.push({
+                nodeId,
+                reasonCode: "prompt-override-unchanged",
+            });
+            reasonCodes.push("prompt-override-unchanged");
+            continue;
+        }
+        entries.push({ nodeId, mode, basePromptSha256, promptSha256 });
+    }
+    return {
+        entries: entries.length > 0 ? entries : undefined,
+        blockingNodes,
+        reasonCodes: [...new Set(reasonCodes)],
+    };
+}
 export function computePlanHash(planWithoutHash) {
     const canonical = JSON.stringify(sortKeysDeep(planWithoutHash));
     return createHash("sha256").update(canonical, "utf8").digest("hex");
@@ -594,9 +700,17 @@ export async function evaluateDagRerunPlan(input) {
             blockedReasons.push("ambiguous-skipped-rewrite");
         }
     }
-    const closureSafety = assessResetClosureSafety(input.parentSpec, resetNodeIds, transportWriterRestart && effectiveFromNodeId
-        ? { allowedTransportWriterNodeId: effectiveFromNodeId }
-        : {});
+    const closureSafety = assessResetClosureSafety(input.parentSpec, resetNodeIds, {
+        ...(transportWriterRestart && effectiveFromNodeId
+            ? { allowedTransportWriterNodeId: effectiveFromNodeId }
+            : {}),
+        parentNodes: input.parentState.nodes,
+        ...(effectiveFromNodeId &&
+            effectiveTask?.executor === "shell" &&
+            effectiveRecord?.status === "ERROR"
+            ? { allowedExclusiveShellFromNodeId: effectiveFromNodeId }
+            : {}),
+    });
     blockingNodes.push(...closureSafety.blockingNodes);
     for (const code of closureSafety.reasonCodes) {
         reasonCodes.push(code);
@@ -629,6 +743,22 @@ export async function evaluateDagRerunPlan(input) {
             blockingNodes.push({ nodeId, reasonCode: "parent-facts-invalid" });
         }
     }
+    let promptOverrideEntries;
+    if (input.promptOverrides !== undefined && input.promptOverrides.length > 0) {
+        const overrideAssessment = assessPromptOverrides({
+            spec: input.parentSpec,
+            state: input.parentState,
+            resetNodeIds,
+            overrides: input.promptOverrides,
+            enabled: input.promptOverrideEnabled === true,
+        });
+        blockingNodes.push(...overrideAssessment.blockingNodes);
+        for (const code of overrideAssessment.reasonCodes) {
+            reasonCodes.push(code);
+            blockedReasons.push(code);
+        }
+        promptOverrideEntries = overrideAssessment.entries;
+    }
     const uniqueReasonCodes = [...new Set(reasonCodes)];
     const uniqueBlockedReasons = [...new Set(blockedReasons)];
     const eligible = uniqueBlockedReasons.length === 0 &&
@@ -672,6 +802,7 @@ export async function evaluateDagRerunPlan(input) {
             parentLifecycle: input.parentLifecycle,
             workerManaged: input.workerManaged,
         }),
+        ...(promptOverrideEntries ? { promptOverrides: promptOverrideEntries } : {}),
     };
     return {
         ...planWithoutHash,

package/dist/workflows/dag/rerun-run.js

@@ -2,6 +2,7 @@ import { createHash } from "node:crypto";
 import { access, copyFile, mkdir, readdir, readFile } from "node:fs/promises";
 import path from "node:path";
 import { writeJsonAtomic } from "../../infrastructure/harness/atomic-write.js";
+import { composeDagPromptOverridePrompt, isDagRerunPromptOverrideEnabled, } from "../../shared/dag-prompt-override.js";
 import { resolveRunningControllerIdentity } from "../../shared/package-metadata.js";
 import { readControllerIdentityArtifact, captureControllerIdentity } from "./controller-identity.js";
 import { DAG_RUNS_DIR, getDagRunDir, isDagNonExecutionLifecycle, locateDagRun, readDagRunSpec, readDagRunState, } from "./lifecycle.js";
@@ -190,6 +191,8 @@ export async function planDagRerun(input) {
             parentSpec: nonCompletedSpec,
             parentState: nonCompletedState,
             parentLifecycle,
+            promptOverrides: input.promptOverrides,
+            promptOverrideEnabled: isDagRerunPromptOverrideEnabled(),
             workerManaged: nonCompletedWorkerHints.workerManaged,
             workerAssociation: nonCompletedWorkerHints.workerManaged
                 ? {
@@ -229,6 +232,8 @@ export async function planDagRerun(input) {
         parentTerminalWorkspace,
         currentWorkspace,
         skillSnapshotOk,
+        promptOverrides: input.promptOverrides,
+        promptOverrideEnabled: isDagRerunPromptOverrideEnabled(),
         workerManaged: workerHints.workerManaged,
         workerAssociation: workerHints.workerManaged
             ? {
@@ -384,15 +389,57 @@ function buildPendingNodeRecord(task) {
         ...(task.outputMode ? { outputMode: task.outputMode } : {}),
     };
 }
+/**
+ * Stage the continuation spec with operator prompt overrides applied. The
+ * parent spec stays frozen; every override must match the plan entry (sha256
+ * of the composed final prompt and of the parent base prompt) so the
+ * two-phase planHash remains the single source of truth for what changed.
+ * "append" entries keep the frozen base and append the operator addendum in a
+ * marked block; "replace" entries swap the whole prompt.
+ */
+function applyPromptOverridesToSpec(input) {
+    const planned = new Map((input.plan.promptOverrides ?? []).map((entry) => [entry.nodeId, entry]));
+    const spec = structuredClone(input.spec);
+    for (const override of input.overrides) {
+        const entry = planned.get(override.nodeId);
+        if (!entry) {
+            throw new Error(`prompt override is not present in the rerun plan: ${override.nodeId}`);
+        }
+        const task = spec.tasks.find((candidate) => candidate.id === override.nodeId);
+        if (!task) {
+            throw new Error(`prompt override node missing from spec: ${override.nodeId}`);
+        }
+        if (sha256Hex(task.subtask_prompt) !== entry.basePromptSha256) {
+            throw new Error(`prompt override base prompt drifted from plan: ${override.nodeId}`);
+        }
+        const finalPrompt = composeDagPromptOverridePrompt({
+            basePrompt: task.subtask_prompt,
+            text: override.prompt,
+            mode: override.mode === "append" ? "append" : "replace",
+        });
+        if (sha256Hex(finalPrompt) !== entry.promptSha256) {
+            throw new Error(`prompt override text does not match the planned sha256: ${override.nodeId}`);
+        }
+        task.subtask_prompt = finalPrompt;
+    }
+    return spec;
+}
 async function stageContinuationRun(input) {
-    const { ranks } = topoSortToRanks(input.parentSpec);
-    const runId = await buildDagRunId(input.parentSpec, { cwd: input.cwd });
+    const specForRun = input.promptOverrides !== undefined && input.promptOverrides.length > 0
+        ? applyPromptOverridesToSpec({
+            spec: input.parentSpec,
+            plan: input.plan,
+            overrides: input.promptOverrides,
+        })
+        : input.parentSpec;
+    const { ranks } = topoSortToRanks(specForRun);
+    const runId = await buildDagRunId(specForRun, { cwd: input.cwd });
     const runDir = getDagRunDir(input.cwd, "active", runId);
     await prepareActiveRunDir(runDir);
-    await writeRunSpec(runDir, input.parentSpec);
+    await writeRunSpec(runDir, specForRun);
     const resetSet = new Set(input.plan.resetNodeIds);
     const importedSet = new Set(input.plan.importedNodeIds);
-    const tasksById = new Map(input.parentSpec.tasks.map((task) => [task.id, task]));
+    const tasksById = new Map(specForRun.tasks.map((task) => [task.id, task]));
     const importManifestNodes = [];
     const nodes = {};
     for (const nodeId of input.plan.importedNodeIds) {
@@ -433,6 +480,9 @@ async function stageContinuationRun(input) {
         reason: input.reason,
         requestId: input.requestId,
         planHash: input.plan.planHash,
+        ...(input.plan.promptOverrides
+            ? { promptOverrides: input.plan.promptOverrides }
+            : {}),
         createdAt,
     };
     const state = {
@@ -482,7 +532,7 @@ async function stageContinuationRun(input) {
     await writeJsonAtomic(path.join(runDir, IMPORT_MANIFEST_REL_PATH), importManifest);
     await writeJsonAtomic(path.join(runDir, RERUN_PLAN_REL_PATH), input.plan);
     await writeRunState(runDir, state);
-    return { runId, runDir, state };
+    return { runId, runDir, state, spec: specForRun };
 }
 export async function executeDagRerun(input) {
     const existing = await readExistingOperatorRequest(input.cwd, input.requestId);
@@ -493,6 +543,7 @@ export async function executeDagRerun(input) {
         cwd: input.cwd,
         parentRunId: input.parentRunId,
         selectedNodeId: input.selectedNodeId,
+        promptOverrides: input.promptOverrides,
     });
     if (plan.planHash !== input.planHash) {
         return {
@@ -530,10 +581,11 @@ export async function executeDagRerun(input) {
         plan,
         reason: input.reason,
         requestId: input.requestId,
+        promptOverrides: input.promptOverrides,
     });
     const continuationOptions = {
         cwd: input.cwd,
-        spec: parentSpec,
+        spec: staged.spec,
         state: staged.state,
         runDir: staged.runDir,
         ...(input.maxConcurrent !== undefined