@blokjs/runner 0.2.1 → 0.4.0

package/dist/ConfigurationResolver.js

@@ -1,4 +1,14 @@
 import LocalStorage from "./LocalStorage";
+import { normalizeWorkflow } from "./workflow/WorkflowNormalizer";
+/**
+ * ConfigurationResolver loads a workflow from any registered storage target
+ * (filesystem, in-memory, etc.) and runs it through the v1→v2 normalizer
+ * before returning it to the caller.
+ *
+ * This is the single pinch point for workflow loading — every trigger
+ * (HTTP, Cron, future) goes through here, so the normalizer applies once
+ * regardless of how the workflow is fetched.
+ */
 export default class ConfigurationResolver {
     targets = {};
     globalOptions = {};
@@ -9,7 +19,13 @@ export default class ConfigurationResolver {
         this.globalOptions = opts;
     }
     async get(target, name) {
-        return await this.targets[target].get(name, this.globalOptions.workflows);
+        const raw = await this.targets[target].get(name, this.globalOptions.workflows);
+        // Normalize v1 → v2 (or pass v2 through). Always returns the
+        // canonical internal shape that Configuration.getSteps consumes.
+        // Cast back to `unknown` so the existing call-site (`Configuration.init`)
+        // continues to use its own untyped projections — no type churn beyond
+        // this one point.
+        return normalizeWorkflow(raw, name);
     }
 }
 //# sourceMappingURL=ConfigurationResolver.js.map

package/dist/ConfigurationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigurationResolver.js","sourceRoot":"","sources":["../src/ConfigurationResolver.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAI1C,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACjC,OAAO,GAAY,EAAE,CAAC;IACtB,aAAa,GAAiC,EAAE,CAAC;IAEzD,YAAY,IAAmB;QAC9B,IAAI,CAAC,OAAO,GAAG;YACd,KAAK,EAAE,IAAI,YAAY,EAAE;SACzB,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,IAAY;QACrC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;CACD"}
+{"version":3,"file":"ConfigurationResolver.js","sourceRoot":"","sources":["../src/ConfigurationResolver.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACjC,OAAO,GAAY,EAAE,CAAC;IACtB,aAAa,GAAiC,EAAE,CAAC;IAEzD,YAAY,IAAmB;QAC9B,IAAI,CAAC,OAAO,GAAG;YACd,KAAK,EAAE,IAAI,YAAY,EAAE;SACzB,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,IAAY;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/E,6DAA6D;QAC7D,iEAAiE;QACjE,0EAA0E;QAC1E,sEAAsE;QACtE,kBAAkB;QAClB,OAAO,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAA0E,CAAC;IAC9G,CAAC;CACD"}

package/dist/PayloadTooLargeError.d.ts

@@ -0,0 +1,19 @@
+/**
+ * PR 2 follow-up · A4 fix.
+ *
+ * Thrown by `HttpTrigger.extractDispatchPayload` when a request body
+ * would push the durable scheduler row past `BLOK_DISPATCH_PAYLOAD_MAX_BYTES`
+ * (default 1MB). Distinct error class so the HTTP transport can translate
+ * to `413 Payload Too Large` with structured info instead of a generic 500.
+ *
+ * Operators tune the cap via `BLOK_DISPATCH_PAYLOAD_MAX_BYTES` (number,
+ * bytes). Authors with large-payload workflows (file uploads, etc.) can
+ * either raise the cap, pre-strip the body before deferring, or skip
+ * durable persistence entirely (don't override `extractDispatchPayload`).
+ */
+export declare class PayloadTooLargeError extends Error {
+    readonly actualBytes: number;
+    readonly maxBytes: number;
+    constructor(actualBytes: number, maxBytes: number, message?: string);
+}
+export declare function isPayloadTooLargeError(err: unknown): err is PayloadTooLargeError;

package/dist/PayloadTooLargeError.js

@@ -0,0 +1,29 @@
+/**
+ * PR 2 follow-up · A4 fix.
+ *
+ * Thrown by `HttpTrigger.extractDispatchPayload` when a request body
+ * would push the durable scheduler row past `BLOK_DISPATCH_PAYLOAD_MAX_BYTES`
+ * (default 1MB). Distinct error class so the HTTP transport can translate
+ * to `413 Payload Too Large` with structured info instead of a generic 500.
+ *
+ * Operators tune the cap via `BLOK_DISPATCH_PAYLOAD_MAX_BYTES` (number,
+ * bytes). Authors with large-payload workflows (file uploads, etc.) can
+ * either raise the cap, pre-strip the body before deferring, or skip
+ * durable persistence entirely (don't override `extractDispatchPayload`).
+ */
+export class PayloadTooLargeError extends Error {
+    actualBytes;
+    maxBytes;
+    constructor(actualBytes, maxBytes, message) {
+        super(message ??
+            `Dispatch payload too large for durable scheduling: ${actualBytes} bytes exceeds cap of ${maxBytes} bytes (configurable via BLOK_DISPATCH_PAYLOAD_MAX_BYTES).`);
+        this.name = "PayloadTooLargeError";
+        this.actualBytes = actualBytes;
+        this.maxBytes = maxBytes;
+        Object.setPrototypeOf(this, PayloadTooLargeError.prototype);
+    }
+}
+export function isPayloadTooLargeError(err) {
+    return err instanceof PayloadTooLargeError;
+}
+//# sourceMappingURL=PayloadTooLargeError.js.map

package/dist/PayloadTooLargeError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PayloadTooLargeError.js","sourceRoot":"","sources":["../src/PayloadTooLargeError.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACrC,WAAW,CAAS;IACpB,QAAQ,CAAS;IAE1B,YAAY,WAAmB,EAAE,QAAgB,EAAE,OAAgB;QAClE,KAAK,CACJ,OAAO;YACN,sDAAsD,WAAW,yBAAyB,QAAQ,4DAA4D,CAC/J,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;CACD;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAY;IAClD,OAAO,GAAG,YAAY,oBAAoB,CAAC;AAC5C,CAAC"}

package/dist/RunCancelledError.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Tier 2 follow-up · thrown by `RunnerSteps` between steps when the
+ * run's `ctx.signal.aborted` flips to true (typically because an
+ * operator called `POST /__blok/runs/:runId/cancel` on a `running`
+ * run).
+ *
+ * Distinct from `Error` so `TriggerBase.run`'s catch block can:
+ * - Skip `failRun` (status is already `"cancelled"` via the
+ *   tracker's `abortRunningRun` flow).
+ * - Re-throw so transport layers can surface the cancellation
+ *   appropriately (HTTP 499 / Worker ACK).
+ */
+export declare class RunCancelledError extends Error {
+    readonly runId?: string;
+    constructor(runId?: string, message?: string);
+}
+export declare function isRunCancelledError(err: unknown): err is RunCancelledError;

package/dist/RunCancelledError.js

@@ -0,0 +1,25 @@
+/**
+ * Tier 2 follow-up · thrown by `RunnerSteps` between steps when the
+ * run's `ctx.signal.aborted` flips to true (typically because an
+ * operator called `POST /__blok/runs/:runId/cancel` on a `running`
+ * run).
+ *
+ * Distinct from `Error` so `TriggerBase.run`'s catch block can:
+ * - Skip `failRun` (status is already `"cancelled"` via the
+ *   tracker's `abortRunningRun` flow).
+ * - Re-throw so transport layers can surface the cancellation
+ *   appropriately (HTTP 499 / Worker ACK).
+ */
+export class RunCancelledError extends Error {
+    runId;
+    constructor(runId, message) {
+        super(message ?? `Run ${runId ?? "(unknown)"} cancelled via AbortSignal`);
+        this.name = "RunCancelledError";
+        this.runId = runId;
+        Object.setPrototypeOf(this, RunCancelledError.prototype);
+    }
+}
+export function isRunCancelledError(err) {
+    return err instanceof RunCancelledError;
+}
+//# sourceMappingURL=RunCancelledError.js.map

package/dist/RunCancelledError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RunCancelledError.js","sourceRoot":"","sources":["../src/RunCancelledError.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAClC,KAAK,CAAU;IAExB,YAAY,KAAc,EAAE,OAAgB;QAC3C,KAAK,CAAC,OAAO,IAAI,OAAO,KAAK,IAAI,WAAW,4BAA4B,CAAC,CAAC;QAC1E,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACD;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC/C,OAAO,GAAG,YAAY,iBAAiB,CAAC;AACzC,CAAC"}

package/dist/RunnerSteps.js

@@ -1,6 +1,58 @@
 import { GlobalError } from "@blokjs/shared";
+import { RunCancelledError } from "./RunCancelledError";
+import { WaitDispatchRequest } from "./WaitDispatchRequest";
+import { resolveIdempotencyKey } from "./idempotency/resolveIdempotencyKey";
+import { StepTimeoutError } from "./timeouts/StepTimeoutError";
 import { RunTracker } from "./tracing/RunTracker";
 import { sanitize } from "./tracing/sanitize";
+import { applyStepOutput } from "./workflow/PersistenceHelper";
+/**
+ * Default TTL for idempotency cache entries when the step author does not
+ * pass `idempotencyKeyTTL` explicitly. 24 hours, matching Trigger.dev's
+ * default and the decision recorded in the Tier 1 ROADMAP session.
+ */
+const DEFAULT_IDEMPOTENCY_TTL_MS = 24 * 60 * 60 * 1000;
+/**
+ * Compute the delay before retry attempt N+1 using capped exponential
+ * backoff. Mirrors Trigger.dev's `retry` semantics — no jitter by default.
+ *
+ * `delay = min(maxTimeoutInMs, minTimeoutInMs * factor^(attempt - 1))`
+ *
+ * Defaults: min=1000, max=30000, factor=2 — same as Trigger.dev.
+ */
+function computeBackoff(config, attempt) {
+    const min = config.minTimeoutInMs ?? 1000;
+    const max = config.maxTimeoutInMs ?? 30000;
+    const factor = config.factor ?? 2;
+    const raw = min * factor ** Math.max(0, attempt - 1);
+    return Math.min(max, Math.floor(raw));
+}
+function sleep(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
+/**
+ * Tier 2 quick-wins — wrap a Promise in a setTimeout-based timeout
+ * race. On timeout, rejects with `StepTimeoutError`. The underlying
+ * `fn()` continues to run (no AbortSignal cancellation in v1) but
+ * the runner has already moved on — orphaned resolution settles
+ * harmlessly into the void.
+ */
+function wrapWithTimeout(fn, ms, stepName) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            reject(new StepTimeoutError(stepName, ms));
+        }, ms);
+        fn().then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        }, (err) => {
+            clearTimeout(timer);
+            reject(err);
+        });
+    });
+}
 export default class RunnerSteps {
     /**
      * Executes a series of steps in the given context.
@@ -23,8 +75,34 @@ export default class RunnerSteps {
             let flow_steps = [];
             let flow_step = 0;
             let stepName = "";
+            // PR 4 — wait.for / wait.until resume cursor.
+            //
+            // On `dispatchDeferred` re-entry from a wait step, the runner
+            // must skip past pre-wait steps that already completed in the
+            // previous pass. `lastCompletedStepIndex` is set on the run
+            // record before each WaitDispatchRequest throw and read here
+            // at runSteps entry. Default `-1` = no resume; runner starts
+            // at i = 0.
+            const persistedRun = !deep && tracker && traceRunId ? tracker.getStore().getRun(traceRunId) : undefined;
+            const resumeFromIndex = persistedRun?.lastCompletedStepIndex !== undefined ? persistedRun.lastCompletedStepIndex + 1 : 0;
             for (let i = 0; i < steps.length; i++) {
                 const step = steps[i];
+                // PR 4 — skip pre-wait steps on resume. State + NodeRuns
+                // from the first pass are still on `ctx.state` / in the
+                // store; the runner just advances past them.
+                if (i < resumeFromIndex) {
+                    ctx.logger.log(`[step ${i + 1}/${steps.length}] ${step.name} → skipped (resumed past wait at lastCompletedStepIndex=${persistedRun?.lastCompletedStepIndex})`);
+                    continue;
+                }
+                // Tier 2 follow-up · cooperative cancellation. Operators can
+                // abort `running` runs via `POST /__blok/runs/:runId/cancel`,
+                // which fires the ctx's AbortController. The check is between
+                // steps so a long-running step's `step.process()` doesn't have
+                // to consult the signal itself (though nodes that want finer
+                // granularity can read `ctx.signal.aborted` themselves).
+                if (ctx.signal?.aborted) {
+                    throw new RunCancelledError(traceRunId);
+                }
                 if (!step.active) {
                     // Track skipped nodes
                     if (tracker && traceRunId) {
@@ -38,47 +116,292 @@ export default class RunnerSteps {
                 if (!step.flow) {
                     // --- Trace: start node ---
                     let nodeRunId;
+                    const stepAny = step;
+                    const stepType = stepAny.type || "unknown";
+                    // Runtime nodes (RuntimeAdapterNode) expose `transport` so
+                    // operators can tell at a glance whether the step ran via
+                    // HTTP, gRPC, or in-process module nodes. Module/local
+                    // nodes don't carry the field — prefix stays one-tag.
+                    const transport = stepAny.transport;
+                    const stepPrefix = transport
+                        ? `[step ${i + 1}/${steps.length}] ${step.name} (${stepType}, ${transport})`
+                        : `[step ${i + 1}/${steps.length}] ${step.name} (${stepType})`;
+                    // --- Step metadata for runtime adapters ---
+                    // Populate `ctx._stepInfo` so adapters (e.g. GrpcRuntimeAdapter)
+                    // can report the step's position in the workflow without each
+                    // adapter having to plumb its own counter. Set unconditionally —
+                    // independent of whether tracing is enabled.
+                    ctx._stepInfo = {
+                        name: step.name,
+                        index: i,
+                        total: steps.length,
+                        depth: depthLevel,
+                    };
                     if (tracker && traceRunId) {
-                        const stepAny = step;
                         const configAny = ctx.config;
+                        // Tier 2 #4 sub-workflow: capture the `wait` mode so
+                        // Studio can render `↳ async` (wait:false) vs `↳ sub`
+                        // (wait:true / default) in StepRail. Only meaningful
+                        // for subworkflow steps; undefined elsewhere.
+                        const subworkflowWait = stepType === "subworkflow" ? stepAny.wait : undefined;
+                        // PR 5 E3 — surface sub-workflow nesting depth.
+                        // `_subworkflowDepth` on ctx is set by SubworkflowNode +
+                        // createChildContext; the parent's invocation of a
+                        // child step has depth = parent.depth + 1. Top-level =
+                        // 1; nested = 2+. Only meaningful for subworkflow steps.
+                        const subworkflowDepth = stepType === "subworkflow"
+                            ? (ctx._subworkflowDepth ?? 0) + 1
+                            : undefined;
                         const nodeRun = tracker.startNode(traceRunId, {
                             nodeName: step.name,
-                            nodeType: stepAny.type || "unknown",
+                            nodeType: stepType,
                             runtimeKind: stepAny.runtime,
                             inputs: sanitize(configAny?.[step.name]?.inputs ?? stepAny.config),
                             depth: depthLevel,
                             stepIndex: i,
+                            wait: subworkflowWait,
+                            subworkflowDepth,
                         });
                         nodeRunId = nodeRun.id;
                         ctx._traceNodeId = nodeRunId;
                     }
-                    try {
-                        const model = await step.process(ctx, step);
-                        ctx.response = model.data;
-                        // --- Trace: complete or fail node ---
-                        if (tracker && nodeRunId) {
-                            if (ctx.response.error) {
-                                const errMsg = typeof ctx.response.error === "string"
-                                    ? ctx.response.error
-                                    : ctx.response.error.message || "Node error";
-                                tracker.failNode(nodeRunId, new Error(errMsg));
+                    // === PR 4: wait.for(duration) / wait.until(date) step ===
+                    // Two paths:
+                    //   1. First pass: compute deadline, mark NodeRun complete
+                    //      (the wait step has no `process()` body), set the
+                    //      run's resume cursor (lastCompletedStepIndex = i - 1),
+                    //      throw WaitDispatchRequest. TriggerBase translates to
+                    //      DeferredDispatchSignal → 202 Accepted.
+                    //   2. Re-entry (dispatchDeferred): the resume cursor logic
+                    //      at the top of runSteps already skipped indices < i.
+                    //      For the wait step itself at i = lastCompletedStepIndex
+                    //      + 1, treat it as satisfied and advance.
+                    //      Detection: existence of run.scheduledAt + wait step =
+                    //      we're on the second pass.
+                    if (stepType === "wait") {
+                        const waitForMs = stepAny.waitForMs;
+                        const waitUntil = stepAny.waitUntil;
+                        // Compute the deadline (resolves $-proxy and ISO strings).
+                        // Review fix-up · BUG-2. A malformed `until` string used to
+                        // silently fall through to `Date.now()` (immediate no-op).
+                        // Authors expecting "wait until tomorrow" with a typo got a
+                        // no-op with no warning — the worst kind of footgun. Throw
+                        // instead so the failure surfaces immediately, both in the
+                        // run trace + Studio's error surface.
+                        const computeDeadline = () => {
+                            if (typeof waitForMs === "number")
+                                return Date.now() + waitForMs;
+                            if (typeof waitUntil === "number")
+                                return waitUntil;
+                            if (typeof waitUntil === "string") {
+                                // Try parsing as a number first (ms-since-epoch as a string).
+                                const asNum = Number(waitUntil);
+                                if (!Number.isNaN(asNum))
+                                    return asNum;
+                                // ISO-date string.
+                                const t = Date.parse(waitUntil);
+                                if (!Number.isNaN(t))
+                                    return t;
+                                // Fail-fast on unparseable strings (the helpful path).
+                                throw new Error(`wait.until: cannot parse '${waitUntil}' as a number or date. Use ms-since-epoch (number or numeric string) or a valid ISO date string.`);
+                            }
+                            // Schema rejects this combination, but defensive: treat
+                            // unsupported input as immediate so the runner doesn't
+                            // hang on a never-firing timer.
+                            return Date.now();
+                        };
+                        // Detect re-entry: on first pass the run has no
+                        // scheduledAt (or it's from trigger-level delay); on
+                        // re-entry from a wait dispatch, the run was marked
+                        // `delayed` with scheduledAt set to the wait deadline.
+                        const isReentry = ctx._blokDispatchReentry === true &&
+                            resumeFromIndex > 0 &&
+                            i === resumeFromIndex;
+                        const deadline = computeDeadline();
+                        const now = Date.now();
+                        if (isReentry || deadline <= now) {
+                            // Wait already satisfied (timer fired AND we're on
+                            // re-entry past the deadline) OR the deadline is
+                            // in the past (e.g., wait.for(0) or wait.until(<past>)).
+                            // Mark NodeRun complete and advance.
+                            if (tracker && nodeRunId) {
+                                tracker.completeNode(nodeRunId, { __waited__: true, deadline });
                             }
-                            else {
-                                tracker.completeNode(nodeRunId, sanitize(ctx.response.data));
+                            ctx.logger.log(`[step ${i + 1}/${steps.length}] ${step.name} (wait) → satisfied`);
+                            // Advance the resume cursor so a subsequent wait at a
+                            // later index can rely on it.
+                            if (tracker && traceRunId) {
+                                tracker.getStore().updateRun(traceRunId, { lastCompletedStepIndex: i });
                             }
+                            continue;
+                        }
+                        // First pass: schedule + throw WaitDispatchRequest.
+                        // Set resume cursor BEFORE throwing so re-entry knows
+                        // where to pick up. Cursor = i - 1 (the last non-wait
+                        // step that completed).
+                        if (tracker && traceRunId) {
+                            tracker.getStore().updateRun(traceRunId, {
+                                lastCompletedStepIndex: i - 1,
+                            });
+                        }
+                        ctx.logger.log(`[step ${i + 1}/${steps.length}] ${step.name} (wait) → scheduled (deadline=${new Date(deadline).toISOString()})`);
+                        throw new WaitDispatchRequest({
+                            scheduledAt: deadline,
+                            stepIndex: i,
+                            stepId: step.name,
+                            lastCompletedStepIndex: i - 1,
+                        });
+                    }
+                    // === Tier 1: idempotency cache lookup ===
+                    // Resolve the step's idempotency key against the live ctx,
+                    // then consult the cache. On hit, short-circuit step.process
+                    // entirely: replay the cached result through the same v2
+                    // persistence rules (ephemeral / spread / as), mark the
+                    // node cached for tracing, log "cached", and skip to the
+                    // next step. Caching layers ABOVE PersistenceHelper —
+                    // applyStepOutput's rules apply identically to cached and
+                    // freshly-computed results.
+                    const workflowName = ctx.workflow_name ?? "";
+                    const cacheStore = tracker && traceRunId ? tracker.getStore() : null;
+                    const resolvedIdemKey = cacheStore && workflowName ? resolveIdempotencyKey(step.idempotencyKey, ctx) : null;
+                    if (cacheStore && resolvedIdemKey && nodeRunId) {
+                        const hit = cacheStore.getIdempotencyCache(workflowName, step.name, resolvedIdemKey);
+                        if (hit) {
+                            applyStepOutput(ctx, step, { data: hit.data });
+                            ctx.response = hit.data;
+                            tracker?.markNodeCached(nodeRunId, {
+                                sourceRunId: hit.sourceRunId,
+                                sourceNodeRunId: hit.sourceNodeRunId,
+                                cachedAt: hit.cachedAt,
+                            }, hit.data);
+                            ctx.logger.log(`${stepPrefix} → cached (from run ${hit.sourceRunId})`);
+                            continue;
                         }
-                        if (ctx.response.error)
-                            throw ctx.response.error;
                     }
-                    catch (nodeErr) {
-                        // --- Trace: fail node on exception ---
-                        if (tracker && nodeRunId) {
-                            const existing = tracker.getNodeRun(nodeRunId);
-                            if (existing && existing.status === "running") {
-                                tracker.failNode(nodeRunId, nodeErr instanceof Error ? nodeErr : new Error(String(nodeErr)));
+                    ctx.logger.log(`${stepPrefix} → started`);
+                    const stepStart = performance.now();
+                    // === Tier 1: retry loop ===
+                    // Wraps step.process() with capped exponential backoff per
+                    // `step.retry`. Default `maxAttempts: 1` preserves
+                    // pre-Phase-4 behaviour exactly (single attempt, no retry).
+                    // Soft errors (model.data.error returned from the SDK)
+                    // participate in retry alongside thrown errors — both flow
+                    // through the catch block below.
+                    const retryConfig = step.retry;
+                    const maxAttempts = retryConfig ? Math.max(1, retryConfig.maxAttempts) : 1;
+                    // Tier 2 quick-wins — per-attempt timeout. When unset, the
+                    // step runs without a cap. Numeric `maxDurationMs` arrives
+                    // pre-parsed from `Configuration` (string `"30s"` →
+                    // `30000` via `parseDuration`).
+                    const maxDurationMs = step.maxDurationMs;
+                    let attempt = 0;
+                    while (true) {
+                        attempt += 1;
+                        try {
+                            const processInvocation = () => step.process(ctx, step);
+                            const model = typeof maxDurationMs === "number" && maxDurationMs > 0
+                                ? await wrapWithTimeout(processInvocation, maxDurationMs, step.name)
+                                : await processInvocation();
+                            ctx.response = model.data;
+                            // Treat soft errors (data carries `.error`) the same as
+                            // thrown errors so retry semantics are uniform.
+                            if (ctx.response?.error) {
+                                throw ctx.response.error;
+                            }
+                            // === Tier 1: idempotency cache write ===
+                            // Cache on the success path only — failed steps are
+                            // re-runnable. Honour `idempotencyKeyTTL` per step;
+                            // default 24h. A TTL of 0 stores an immediately-
+                            // expired entry (useful as a kill-switch).
+                            if (cacheStore && resolvedIdemKey && nodeRunId && traceRunId) {
+                                const ttlField = step.idempotencyKeyTTL;
+                                const ttlMs = typeof ttlField === "number" ? ttlField : DEFAULT_IDEMPOTENCY_TTL_MS;
+                                const now = Date.now();
+                                const expiresAt = ttlMs > 0 ? now + ttlMs : now - 1;
+                                cacheStore.setIdempotencyCache(workflowName, step.name, resolvedIdemKey, {
+                                    data: model.data,
+                                    cachedAt: now,
+                                    expiresAt,
+                                    sourceRunId: traceRunId,
+                                    sourceNodeRunId: nodeRunId,
+                                });
+                            }
+                            const stepDuration = (performance.now() - stepStart).toFixed(1);
+                            // --- Trace: complete node ---
+                            if (tracker && nodeRunId) {
+                                // `_stepMetrics` is stashed on ctx by RuntimeAdapterNode
+                                // when an adapter returns metrics (gRPC wire bytes,
+                                // duration, cpu, memory). Threading it through
+                                // `completeNode` is what gets the metrics into the
+                                // run store + NODE_COMPLETED event payload — Studio's
+                                // inspector reads them from there.
+                                const ctxAny = ctx;
+                                const stepMetrics = ctxAny._stepMetrics;
+                                ctxAny._stepMetrics = undefined;
+                                tracker.completeNode(nodeRunId, sanitize(ctx.response.data), stepMetrics);
+                                // PR 4 — advance the resume cursor after each
+                                // successful non-wait step. A subsequent wait step
+                                // reads this value to set its own cursor before
+                                // throwing WaitDispatchRequest. Only at top-level
+                                // (deep=false); nested branch flow doesn't update.
+                                if (!deep && traceRunId) {
+                                    tracker.getStore().updateRun(traceRunId, { lastCompletedStepIndex: i });
+                                }
+                            }
+                            const attemptSuffix = attempt > 1 ? ` after ${attempt} attempts` : "";
+                            ctx.logger.log(`${stepPrefix} → completed (${stepDuration}ms${attemptSuffix})`);
+                            break;
+                        }
+                        catch (nodeErr) {
+                            if (attempt < maxAttempts && retryConfig) {
+                                // More attempts remain — record this as a soft
+                                // failure and back off before retrying. The node
+                                // stays in `running` status; failNode is the
+                                // terminal call.
+                                if (tracker && nodeRunId) {
+                                    tracker.recordNodeAttemptFailed(nodeRunId, { attempt, error: nodeErr });
+                                }
+                                const backoffMs = computeBackoff(retryConfig, attempt);
+                                const errMsg = nodeErr instanceof Error ? nodeErr.message : String(nodeErr);
+                                ctx.logger.log(`${stepPrefix} → attempt ${attempt}/${maxAttempts} failed (${errMsg}), retrying in ${backoffMs}ms`);
+                                await sleep(backoffMs);
+                                continue;
+                            }
+                            // Final attempt — fail the node and propagate the
+                            // enriched error so RunnerSteps' outer catch can
+                            // wrap it as a GlobalError.
+                            if (tracker && nodeRunId) {
+                                const existing = tracker.getNodeRun(nodeRunId);
+                                if (existing && existing.status === "running") {
+                                    tracker.failNode(nodeRunId, nodeErr instanceof Error ? nodeErr : new Error(String(nodeErr)));
+                                }
+                            }
+                            // Tier 2 quick-wins — final-attempt timeout flips
+                            // the run to "timedOut" (distinct from "failed").
+                            // Only when the FINAL error was a StepTimeoutError;
+                            // mixed failures (some retries timed out, final
+                            // retry threw a different error) keep the normal
+                            // "failed" status.
+                            if (tracker &&
+                                traceRunId &&
+                                typeof maxDurationMs === "number" &&
+                                maxDurationMs > 0 &&
+                                nodeErr instanceof StepTimeoutError) {
+                                tracker.markRunTimedOut(traceRunId, {
+                                    stepId: step.name,
+                                    maxDurationMs,
+                                    attemptsExhausted: attempt,
+                                });
                             }
+                            const stepDuration = (performance.now() - stepStart).toFixed(1);
+                            const attemptSuffix = attempt > 1 ? ` after ${attempt} attempts` : "";
+                            ctx.logger.log(`${stepPrefix} → FAILED (${stepDuration}ms${attemptSuffix})`);
+                            // Enrich error with step context so developers know which step failed
+                            const originalMsg = nodeErr instanceof Error ? nodeErr.message : String(nodeErr);
+                            const enrichedError = new Error(`${stepPrefix} failed: ${originalMsg}`);
+                            enrichedError.cause = nodeErr;
+                            throw enrichedError;
                         }
-                        throw nodeErr;
                     }
                 }
                 else {
@@ -95,6 +418,23 @@ export default class RunnerSteps {
             }
         }
         catch (e) {
+            // PR 1 follow-up · A2 fix companion. RunCancelledError carries
+            // the cancellation contract end-to-end — wrapping it as
+            // GlobalError would defeat TriggerBase.run's `instanceof
+            // RunCancelledError` discrimination and the run would get
+            // failRun'd on top of an already-cancelled status. Pass through
+            // untouched so the catch in TriggerBase.run sees the right type.
+            if (e instanceof RunCancelledError) {
+                throw e;
+            }
+            // PR 4 — WaitDispatchRequest is the wait.for / wait.until
+            // step's signal to TriggerBase that it should schedule a
+            // deferred dispatch. Same pass-through rationale as
+            // RunCancelledError — the catch in TriggerBase.run translates
+            // it to DeferredDispatchSignal + 202.
+            if (e instanceof WaitDispatchRequest) {
+                throw e;
+            }
             let error_context = {};
             if (e instanceof GlobalError) {
                 error_context = e;

package/dist/RunnerSteps.js.map

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