interrupt to get the same treatment too!

src/wf_core/runtime/ops/interrupts.py

@@ -5,13 +5,14 @@ from typing import Any
 
 from wf_core.conditions import safe_resolve_path
 from wf_core.errors import WorkflowExecutionError
-from wf_core.models.steps import InterruptNode
+from wf_core.local_paths import LocalPathError, set_local_value
+from wf_core.models.steps import InputPathBinding, InputValueBinding, InterruptNode
 from wf_core.models.workflow import Workflow
 from wf_core.run_state import InterruptRequest, RunState, StepExecutionResult
 from wf_core.runtime.ops.flow import advance_frame, append_step_result_trace
 from wf_core.runtime.ops.index import WorkflowIndex
 from wf_core.runtime.ops.merges import ReducerDefinition
-from wf_core.runtime.ops.state import apply_mapped_state
+from wf_core.runtime.ops.state import apply_output_bindings
 
 
 def build_interrupt_request(
@@ -22,15 +23,25 @@ def build_interrupt_request(
     workflow_input: dict[str, Any],
     context: dict[str, Any],
 ) -> InterruptRequest:
-    payload = {
-        payload_field: safe_resolve_path(
-            source_path,
-            state=state,
-            workflow_input=workflow_input,
-            context=context,
-        )
-        for source_path, payload_field in node.request_map.items()
-    }
+    payload: dict[str, Any] = {}
+    for binding in node.request:
+        if isinstance(binding, InputValueBinding):
+            value = binding.value
+        elif isinstance(binding, InputPathBinding):
+            value = safe_resolve_path(
+                str(binding.path),
+                state=state,
+                workflow_input=workflow_input,
+                context=context,
+            )
+        else:
+            raise WorkflowExecutionError(
+                f"unsupported request binding for interrupt {node.id!r}"
+            )
+        try:
+            set_local_value(payload, binding.target, value)
+        except LocalPathError as exc:
+            raise WorkflowExecutionError(str(exc)) from exc
     return InterruptRequest(
         id=f"interrupt:{node.id}",
         frame_id=frame_id,
@@ -67,10 +78,10 @@ def resume_interrupt(
             f"interrupt node {step.id!r} does not declare resume outcome {resume_outcome!r}"
         )
 
-    state_changes = apply_mapped_state(
+    state_changes = apply_output_bindings(
         workflow,
+        step.resume,
         resume_payload,
-        step.out_map,
         run.state,
         reducers=reducers,
         missing_field_message="interrupt resume payload is missing required field {field}",