patchwork-os 1.2.0-beta.2.canary.836 → 1.2.0-beta.2.canary.838

package/dist/recipes/yamlRunner.js

@@ -67,7 +67,7 @@ import { resolveLocalEndpoint, resolveLocalModel } from "./localSettings.js";
 import { defaultDeprecationWarn, normalizeRecipeForRuntime, } from "./migrations/index.js";
 import { costRouter } from "./pricing/costRouter.js";
 import { loadPriceTable, costUsd as priceCostUsd, } from "./pricing/priceTable.js";
-import { ReplayIncompleteError } from "./replayBoundary.js";
+import { ReplayIncompleteError, } from "./replayBoundary.js";
 import { resolveRecipePath } from "./resolveRecipePath.js";
 import { RunBudget } from "./runBudget.js";
 import { recordAttemptRun } from "./runLedgers.js";
@@ -961,6 +961,9 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
     // agent step would. It returns `{ value, ok }`; `ok: false` signals a
     // failed / silent-fail / empty agent response — the caller stops the loop
     // and treats it as exhausted (we don't re-judge a non-result).
+    // The agent step currently executing, for replay refusals raised from the
+    // refine-loop / nested-agent helpers below (they do not take a step id).
+    let currentAgentStepId;
     const runAgentText = async (prompt, driver, model, mcpAccess, downshift, providerOptions, 
     // P0-5: carry the reviewed/judge step's opt-in tool sandbox into refine-loop
     // re-runs so a sandboxed step STAYS sandboxed across revisions/re-judges.
@@ -995,7 +998,7 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
             ...(deps.agentDisallowedTools?.length && { enforceSandbox: true }),
             ...(providerOptions && { providerOptions }),
             ...(dataPolicy !== undefined && { boundary: { dataPolicy } }),
-        }, buildAgentExecutorDeps(stepDeps, deps, undefined, runTaskId));
+        }, buildAgentExecutorDeps(stepDeps, deps, undefined, runTaskId, currentAgentStepId));
         runBudget.reconcile(
         // Prefer the driver executeAgent actually resolved+ran; fall back to
         // the routed value only when servedBy is absent (non-executeAgent
@@ -1076,7 +1079,7 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
             ...(input.dataPolicy !== undefined && {
                 boundary: { dataPolicy: input.dataPolicy },
             }),
-        }, buildAgentExecutorDeps(stepDeps, deps, undefined, runTaskId));
+        }, buildAgentExecutorDeps(stepDeps, deps, undefined, runTaskId, currentAgentStepId));
         runBudget.reconcile(agentReturn.servedBy?.driver ?? input.driver ?? "auto", agentReturn.usage, agentReturn.servedBy?.model, {
             inputChars: input.prompt.length,
             outputChars: agentReturn.text.length,
@@ -1317,6 +1320,7 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
             // cap is set; never disturbs injected (unit-test) price tables.
             runBudget.refreshPrices();
             const stepIdForEmit = step.into ?? step.agent?.into ?? `step_${stepsRun}`;
+            currentAgentStepId = stepIdForEmit;
             const stepTs = Date.now();
             stepStartTs.set(stepIdForEmit, stepTs);
             emit("recipe_step_start", {
@@ -1714,6 +1718,12 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
                     // capture no `output`, so under replay there is never a mock for
                     // one — refuse here rather than let the catch below be the first
                     // to hear about it from the seam.
+                    // A recorded agent failure replays as that failure (thrown so the
+                    // catch below records it exactly as the original halt did).
+                    const replayedAgentFailure = deps.mockedFailures?.get(stepId);
+                    if (replayedAgentFailure !== undefined) {
+                        throw new Error(replayedAgentFailure.error);
+                    }
                     if (deps.replayOnly === true) {
                         throw new ReplayIncompleteError([stepId], "agent step");
                     }
@@ -1764,7 +1774,7 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
                         ...(agentCfg.data_policy !== undefined && {
                             boundary: { dataPolicy: agentCfg.data_policy },
                         }),
-                    }, buildAgentExecutorDeps(stepDeps, deps, undefined, runTaskId));
+                    }, buildAgentExecutorDeps(stepDeps, deps, undefined, runTaskId, stepId));
                     agentResult = agentReturn.text;
                     runBudget.reconcile(
                     // Prefer the driver executeAgent actually resolved+ran; the routed
@@ -2007,7 +2017,16 @@ export async function runYamlRecipe(recipe, deps = {}, seedContext = {}) {
             // below (driven by `result`), so a replay shows how the recipe's
             // wiring behaves against captured evidence — only the tool call
             // itself is skipped. See RunnerDeps.mockedOutputs's doc comment.
-            if (deps.mockedOutputs?.has(stepId)) {
+            const replayedFailure = deps.mockedFailures?.get(stepId);
+            if (replayedFailure !== undefined) {
+                // The original run recorded this step as FAILED with no output. That
+                // record is the evidence: fail the same way, dispatch nothing, and do
+                // not retry — there is nothing to retry against.
+                thrownError = replayedFailure.error;
+                thrownErrorCode = replayedFailure.errorCode;
+                result = null;
+            }
+            else if (deps.mockedOutputs?.has(stepId)) {
                 result = deps.mockedOutputs.get(stepId) ?? null;
                 // A replayed http.post response is interpreted exactly as a live one,
                 // including a response captured before httpOutcome existed: it reads
@@ -3121,12 +3140,17 @@ function buildAgentExecutorDeps(stepDeps, runnerDeps, claudeCodeFnOverride,
  * the `runTaskIdRef` cell on its own deps at dispatch time, by which point
  * the run has started; the flat caller passes its local const directly.
  */
-runTaskId) {
+runTaskId, 
+/**
+ * The step this dispatch belongs to, so a replay refusal names it. Falls
+ * back to "agent" only when a caller genuinely does not know.
+ */
+stepId) {
     // Replay boundary (replayBoundary.ts, layer 3) — the single place agent
     // executor deps are built for every dispatch site in this runner, so a
     // replay's StepDeps can never hand a driver to an agent step.
     if (stepDeps.replayOnly === true) {
-        throw new ReplayIncompleteError(["agent"], "agent step");
+        throw new ReplayIncompleteError([stepId ?? "agent"], "agent step");
     }
     const claudeCliFn = claudeCodeFnOverride ?? stepDeps.claudeCodeFn;
     return {
@@ -3820,7 +3844,7 @@ recipeName) {
         }, buildAgentExecutorDeps(stepDeps, runnerDeps, claudeCodeFnOverride, 
         // Read at DISPATCH time, not build time — by now `runChainedRecipe` has
         // computed and published the run's `taskId`.
-        runTaskIdRef.current));
+        runTaskIdRef.current, opts?.stepId));
     };
     // ---------------------------------------------------------------------
     // BEGIN A-PR2 EDIT BLOCK — `loadNestedRecipe` jail (dogfood F-04).
@@ -4004,6 +4028,7 @@ export async function dispatchRecipe(recipe, deps, seedContext = {}) {
             runLog: deps.chainedOptions?.runLog,
             activityLog: deps.chainedOptions?.activityLog,
             mockedOutputs: deps.chainedOptions?.mockedOutputs,
+            mockedFailures: deps.chainedOptions?.mockedFailures,
             ...((deps.replayOnly === true ||
                 deps.chainedOptions?.replayOnly === true) && { replayOnly: true }),
             taskIdPrefix: deps.chainedOptions?.taskIdPrefix,