1 files changed, 7 insertions, 8 deletions

diff --git a/src/marlin.core/models/plan/ExecutionPlan.cs b/src/marlin.core/models/plan/ExecutionPlan.cs
index 24c40e4..fa84634 100644
--- a/src/marlin.core/models/plan/ExecutionPlan.cs
+++ b/src/marlin.core/models/plan/ExecutionPlan.cs
@@ -1,20 +1,19 @@
 namespace marlin.core.models.plan;
 
+using System.Collections.ObjectModel;
 using meta;
 using util;
 
 public class ExecutionPlan
 {
-    public IEnumerable<ExecutionCommand> Components => [..this._commands, ..this._deferredArtifactHandler, ..this._deferredCleanup];
+    public IEnumerable<ExecutionCommand> Components => [..this._commands, ..this._deferredCleanup];
 
     private readonly List<ExecutionCommand> _commands;
-    private readonly List<ExecutionCommand> _deferredArtifactHandler;
     private readonly List<ExecutionCommand> _deferredCleanup;
 
     public ExecutionPlan()
     {
         this._commands = new();
-        this._deferredArtifactHandler = new();
         this._deferredCleanup = new();
     }
 
@@ -31,10 +30,6 @@ public class ExecutionPlan
                     this._deferredCleanup.Add(command);
                     break;
 
-                case CommandRole.ArtifactHandler:
-                    this._deferredArtifactHandler.Add(command);
-                    break;
-
                 default:
                     throw new InvalidOperationException($"Cannot defer {command.Role}");
             }
@@ -117,6 +112,10 @@ public class ExecutionPlan
 
         run = VariableExpander.Expand(run, args);
 
+        IReadOnlyDictionary<string, string> artifacts = step is RecipeStep rs
+            ? rs.Artifacts
+            : ReadOnlyDictionary<string, string>.Empty;
+
         ExecutionCommand stepCommand = new ExecutionCommand
         {
             Id = step.Id,
@@ -124,12 +123,12 @@ public class ExecutionPlan
             Command = run,
             Role = step switch
             {
-                ArtifactHandlerStep => CommandRole.ArtifactHandler,
                 RecipeStep => CommandRole.Step,
                 CleanupStep => CommandRole.Cleanup,
                 _ => throw new ArgumentOutOfRangeException()
             },
             FailBehavior = fail.Value,
+            Artifacts = artifacts,
             Deferred = defer
         };