diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.cs b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.cs
index a80abfc2a7..d09e7ff182 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.cs
@@ -110,7 +110,8 @@ foreach (string edge in ByLine(this.Edges))
 
 }
  
-            this.Write("\n\n        // Build the workflow\n        return builder.Build();\n    }\n}\n");
+            this.Write("\n\n        // Build the workflow\n        return builder.Build(validateOrphans: fal" +
+                    "se);\n    }\n}\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.tt b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.tt
index 4050e368cd..8de0ba466d 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.tt
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ProviderTemplate.tt
@@ -70,6 +70,6 @@ foreach (string edge in ByLine(this.Edges))
  #>
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
 }
diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/Interpreter/WorkflowActionVisitor.cs b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/Interpreter/WorkflowActionVisitor.cs
index a4ba035d6c..de90787cfd 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/Interpreter/WorkflowActionVisitor.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/Interpreter/WorkflowActionVisitor.cs
@@ -52,7 +52,7 @@ internal sealed class WorkflowActionVisitor : DialogActionVisitor
         this._workflowModel.Build(builder);
 
         // Build final workflow
-        return builder.WorkflowBuilder.Build();
+        return builder.WorkflowBuilder.Build(validateOrphans: false);
     }
 
     protected override void Visit(ActionScope item)
diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowBuilder.cs b/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowBuilder.cs
index 3e9ee0d143..674a65f7f6 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowBuilder.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowBuilder.cs
@@ -28,7 +28,7 @@ public class WorkflowBuilder
     }
 
     private int _edgeCount;
-    private readonly Dictionary<string, ExecutorBinding> _executors = [];
+    private readonly Dictionary<string, ExecutorBinding> _executorBindings = [];
     private readonly Dictionary<string, HashSet<Edge>> _edges = [];
     private readonly HashSet<string> _unboundExecutors = [];
     private readonly HashSet<EdgeConnection> _conditionlessConnections = [];
@@ -51,51 +51,51 @@ public class WorkflowBuilder
         this._startExecutorId = this.Track(start).Id;
     }
 
-    private ExecutorBinding Track(ExecutorBinding registration)
+    private ExecutorBinding Track(ExecutorBinding binding)
     {
         // If the executor is unbound, create an entry for it, unless it already exists.
         // Otherwise, update the entry for it, and remove the unbound tag
-        if (registration.IsPlaceholder && !this._executors.ContainsKey(registration.Id))
+        if (binding.IsPlaceholder && !this._executorBindings.ContainsKey(binding.Id))
         {
             // If this is an unbound executor, we need to track it separately
-            this._unboundExecutors.Add(registration.Id);
+            this._unboundExecutors.Add(binding.Id);
         }
-        else if (!registration.IsPlaceholder)
+        else if (!binding.IsPlaceholder)
         {
             // If there is already a bound executor with this ID, we need to validate (to best efforts)
             // that the two are matching (at least based on type)
-            if (this._executors.TryGetValue(registration.Id, out ExecutorBinding? existing))
+            if (this._executorBindings.TryGetValue(binding.Id, out ExecutorBinding? existing))
             {
-                if (existing.ExecutorType != registration.ExecutorType)
+                if (existing.ExecutorType != binding.ExecutorType)
                 {
                     throw new InvalidOperationException(
-                        $"Cannot bind executor with ID '{registration.Id}' because an executor with the same ID but a different type ({existing.ExecutorType.Name} vs {registration.ExecutorType.Name}) is already bound.");
+                        $"Cannot bind executor with ID '{binding.Id}' because an executor with the same ID but a different type ({existing.ExecutorType.Name} vs {binding.ExecutorType.Name}) is already bound.");
                 }
 
                 if (existing.RawValue is not null &&
-                    !ReferenceEquals(existing.RawValue, registration.RawValue))
+                    !ReferenceEquals(existing.RawValue, binding.RawValue))
                 {
                     throw new InvalidOperationException(
-                        $"Cannot bind executor with ID '{registration.Id}' because an executor with the same ID but different instance is already bound.");
+                        $"Cannot bind executor with ID '{binding.Id}' because an executor with the same ID but different instance is already bound.");
                 }
             }
             else
             {
-                this._executors[registration.Id] = registration;
-                if (this._unboundExecutors.Contains(registration.Id))
+                this._executorBindings[binding.Id] = binding;
+                if (this._unboundExecutors.Contains(binding.Id))
                 {
-                    this._unboundExecutors.Remove(registration.Id);
+                    this._unboundExecutors.Remove(binding.Id);
                 }
             }
         }
 
-        if (registration is RequestPortBinding portRegistration)
+        if (binding is RequestPortBinding portRegistration)
         {
             RequestPort port = portRegistration.Port;
             this._requestPorts[port.Id] = port;
         }
 
-        return registration;
+        return binding;
     }
 
     /// <summary>
@@ -369,25 +369,86 @@ public class WorkflowBuilder
     public WorkflowBuilder AddFanInEdge(ExecutorBinding target, params IEnumerable<ExecutorBinding> sources)
         => this.AddFanInEdge(sources, target);
 
-    private void Validate()
+    private void Validate(bool validateOrphans)
     {
-        // Validate that there are no unbound executors
+        // Check that there are no "unbound" (defined as placeholders that have not been replaced by real bindings)
+        // executors.
         if (this._unboundExecutors.Count > 0)
         {
             throw new InvalidOperationException(
                 $"Workflow cannot be built because there are unbound executors: {string.Join(", ", this._unboundExecutors)}.");
         }
 
-        // TODO: This is likely a pipe-dream, but can we do any type-checking on the edges? (Not without instantiating the executors...)
+        // Make sure that all nodes are connected to the start executor (transitively)
+        HashSet<string> remainingExecutors = new(this._executorBindings.Keys);
+        Queue<string> toVisit = new([this._startExecutorId]);
+
+        if (!validateOrphans)
+        {
+            return;
+        }
+
+        while (toVisit.Count > 0)
+        {
+            string currentId = toVisit.Dequeue();
+            bool unvisited = remainingExecutors.Remove(currentId);
+
+            if (unvisited &&
+                this._edges.TryGetValue(currentId, out HashSet<Edge>? outgoingEdges))
+            {
+                foreach (Edge edge in outgoingEdges)
+                {
+                    switch (edge.Data)
+                    {
+                        case DirectEdgeData directEdgeData:
+                            toVisit.Enqueue(directEdgeData.SinkId);
+                            break;
+                        case FanOutEdgeData fanOutEdgeData:
+                            foreach (string targetId in fanOutEdgeData.SinkIds)
+                            {
+                                toVisit.Enqueue(targetId);
+                            }
+                            break;
+                        case FanInEdgeData fanInEdgeData:
+                            toVisit.Enqueue(fanInEdgeData.SinkId);
+                            break;
+                    }
+
+                    // Ideally we would be able to validate that the types accepted by the target executor(s) are compatible
+                    // with those produced by the source executor. However, this is not possible at this time for a number of
+                    // reasons:
+                    //
+                    // - Right now we do not require users to specify the types produced by Executors exhaustively. This will
+                    //   likely change at some point in the future as part of implementing support for polymorphism in message
+                    //   handling. Until then it cannot be clear what types are produced by an upstream Executor.
+                    // - Edges with conditionals / target selectors can route messages
+                    // - We intend to expand the API surface of FanIn edges to allow different aggregation and synchronization
+                    //   strategies; this could introduce type transformations which we may not be able to validate here.
+                    // - All of the above seem like they can be solved with some effort, but the biggest blocker is that we
+                    //   currently support async Executor factories, and Executors register message handlers at runtime, so we
+                    //   cannot know which types they accept until they are instantiated, and we cannot instantiate them at
+                    //   build time because we are in an obligate (for DI-compatibility) synchronous context.
+                    //
+                    // TODO: Revisit the async Executor factory decision if we have a way to deal with "conditional" and
+                    //   "target selector-based" routing.
+                }
+            }
+        }
+
+        if (remainingExecutors.Count > 0)
+        {
+            throw new InvalidOperationException(
+                $"Workflow cannot be built because there are unreachable executors: {string.Join(", ", remainingExecutors)}.");
+        }
     }
 
-    private Workflow BuildInternal(Activity? activity = null)
+    private Workflow BuildInternal(bool validateOrphans, Activity? activity = null)
     {
         activity?.AddEvent(new ActivityEvent(EventNames.BuildStarted));
 
         try
         {
-            this.Validate();
+            this.Validate(validateOrphans);
         }
         catch (Exception ex) when (activity is not null)
         {
@@ -403,7 +464,7 @@ public class WorkflowBuilder
 
         var workflow = new Workflow(this._startExecutorId, this._name, this._description)
         {
-            ExecutorBindings = this._executors,
+            ExecutorBindings = this._executorBindings,
             Edges = this._edges,
             Ports = this._requestPorts,
             OutputExecutors = this._outputExecutors
@@ -433,13 +494,15 @@ public class WorkflowBuilder
     /// <summary>
     /// Builds and returns a workflow instance.
     /// </summary>
+    /// <param name="validateOrphans">Specifies whether workflow validation should check for Executor nodes that are
+    /// not reachable from the starting executor.</param>
     /// <exception cref="InvalidOperationException">Thrown if there are unbound executors in the workflow definition,
     /// or if the start executor is not bound.</exception>
-    public Workflow Build()
+    public Workflow Build(bool validateOrphans = true)
     {
         using Activity? activity = s_activitySource.StartActivity(ActivityNames.WorkflowBuild);
 
-        var workflow = this.BuildInternal(activity);
+        var workflow = this.BuildInternal(validateOrphans, activity);
 
         activity?.AddEvent(new ActivityEvent(EventNames.BuildCompleted));
 
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/AddConversationMessage.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/AddConversationMessage.cs
index 5b86a2c0fb..5692130893 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/AddConversationMessage.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/AddConversationMessage.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -114,6 +114,6 @@ public static class WorkflowProvider
         builder.AddEdge(workflowTest, addMessage);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ClearAllVariables.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ClearAllVariables.cs
index 23f9655c08..ab67854e51 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ClearAllVariables.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ClearAllVariables.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -80,6 +80,6 @@ public static class WorkflowProvider
         builder.AddEdge(myWorkflow, clearAll);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Condition.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Condition.cs
index 2107c642ec..2e38cc1859 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Condition.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Condition.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -175,6 +175,6 @@ public static class WorkflowProvider
         builder.AddEdge(conditionItemEvenactionsPost, conditionItemEvenPost);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ConditionElse.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ConditionElse.cs
index 0deafc2e28..8aebc5c8a8 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ConditionElse.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ConditionElse.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -167,6 +167,6 @@ public static class WorkflowProvider
         builder.AddEdge(conditionGroupTestelseactionsPost, conditionGroupTestPost);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CopyConversationMessages.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CopyConversationMessages.cs
index e9ca90fd83..c5a1fc88fd 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CopyConversationMessages.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CopyConversationMessages.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -90,6 +90,6 @@ public static class WorkflowProvider
         builder.AddEdge(workflowTest, copyMessages);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CreateConversation.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CreateConversation.cs
index edba442230..21e86a5765 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CreateConversation.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/CreateConversation.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -83,6 +83,6 @@ public static class WorkflowProvider
         builder.AddEdge(workflowTest, conversationCreate);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTable.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTable.cs
index 02fdd4ee9a..0c612dcae9 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTable.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTable.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -82,6 +82,6 @@ public static class WorkflowProvider
         builder.AddEdge(myWorkflow, setVar);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTableV2.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTableV2.cs
index 02fdd4ee9a..0c612dcae9 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTableV2.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EditTableV2.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -82,6 +82,6 @@ public static class WorkflowProvider
         builder.AddEdge(myWorkflow, setVar);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndConversation.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndConversation.cs
index 5d59c0f7ae..9cf72036fd 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndConversation.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndConversation.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -89,6 +89,6 @@ public static class WorkflowProvider
         builder.AddEdge(endAllRestart, sendActivity1);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndDialog.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndDialog.cs
index 5d59c0f7ae..9cf72036fd 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndDialog.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/EndDialog.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -89,6 +89,6 @@ public static class WorkflowProvider
         builder.AddEdge(endAllRestart, sendActivity1);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Goto.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Goto.cs
index 112e315d3d..d684232acf 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Goto.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/Goto.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -138,6 +138,6 @@ public static class WorkflowProvider
         builder.AddEdge(sendActivity3, endAll);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/InvokeAgent.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/InvokeAgent.cs
index 780d45e583..efb5b29719 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/InvokeAgent.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/InvokeAgent.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -109,6 +109,6 @@ public static class WorkflowProvider
         builder.AddEdge(myWorkflow, invokeAgent);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopBreak.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopBreak.cs
index 678ba4c370..f9bd0b6bd8 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopBreak.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopBreak.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -180,6 +180,6 @@ public static class WorkflowProvider
         builder.AddEdge(foreachLoopEnd, foreachLoopNext);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopContinue.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopContinue.cs
index 32147adf76..507f99995c 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopContinue.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopContinue.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -180,6 +180,6 @@ public static class WorkflowProvider
         builder.AddEdge(foreachLoopEnd, foreachLoopNext);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopEach.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopEach.cs
index 0d4f7470af..6d141cfe21 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopEach.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/LoopEach.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -176,6 +176,6 @@ public static class WorkflowProvider
         builder.AddEdge(foreachLoopEnd, foreachLoopNext);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ParseValue.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ParseValue.cs
index e975d390c1..55d4ba1efb 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ParseValue.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ParseValue.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -101,6 +101,6 @@ public static class WorkflowProvider
         builder.AddEdge(setVar, parseVar);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ResetVariable.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ResetVariable.cs
index e71641023a..a8208ff74a 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ResetVariable.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/ResetVariable.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -98,6 +98,6 @@ public static class WorkflowProvider
         builder.AddEdge(setVar, clearVar);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessage.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessage.cs
index 38bcbbca33..b45acec1f8 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessage.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessage.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -86,6 +86,6 @@ public static class WorkflowProvider
         builder.AddEdge(workflowTest, getMessageSingle);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessages.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessages.cs
index de4c56e9e6..781012910c 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessages.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/RetrieveConversationMessages.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -99,6 +99,6 @@ public static class WorkflowProvider
         builder.AddEdge(workflowTest, getMessagesAll);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SendActivity.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SendActivity.cs
index baf83d79e6..69a99467ca 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SendActivity.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SendActivity.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -105,6 +105,6 @@ public static class WorkflowProvider
         builder.AddEdge(setInput, activityInput);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetTextVariable.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetTextVariable.cs
index 36f4e7922d..98b3bf2351 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetTextVariable.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetTextVariable.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -85,6 +85,6 @@ public static class WorkflowProvider
         builder.AddEdge(myWorkflow, setText);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetVariable.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetVariable.cs
index d05f4d1d94..84bf8ff5f5 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetVariable.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Workflows/SetVariable.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 // </auto-generated>
@@ -82,6 +82,6 @@ public static class WorkflowProvider
         builder.AddEdge(myWorkflow, setVar);
 
         // Build the workflow
-        return builder.Build();
+        return builder.Build(validateOrphans: false);
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowBuilderSmokeTests.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowBuilderSmokeTests.cs
index b5485043b3..8bc5455b70 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowBuilderSmokeTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowBuilderSmokeTests.cs
@@ -21,6 +21,51 @@ public partial class WorkflowBuilderSmokeTests
                 (msg, ctx) => ctx.SendMessageAsync(msg));
     }
 
+    [Fact]
+    public void Test_Validation_FailsWhenUnboundExecutors()
+    {
+        Func<Workflow> act = () =>
+        {
+            return new WorkflowBuilder("start")
+                       .AddEdge(new NoOpExecutor("start"), "unbound")
+                       .Build();
+        };
+
+        act.Should().Throw<InvalidOperationException>();
+    }
+
+    [Fact]
+    public void Test_Validation_FailsWhenUnreachableExecutors()
+    {
+        Func<Workflow> act = () =>
+        {
+            return new WorkflowBuilder("start")
+                       .BindExecutor(new NoOpExecutor("start"))
+                       .AddEdge(new NoOpExecutor("unreachable"), new NoOpExecutor("also-unreachable"))
+                       .Build();
+        };
+        act.Should().Throw<InvalidOperationException>();
+    }
+
+    [Fact]
+    public void Test_Validation_AddEdgesOutOfOrderDoesNotImpactReachability()
+    {
+        Workflow workflow = new WorkflowBuilder("start")
+                                .BindExecutor(new NoOpExecutor("start"))
+                                .AddEdge(new NoOpExecutor("not-unreachable"), new NoOpExecutor("also-not-unreachable"))
+                                .AddEdge("start", "not-unreachable")
+                                .Build();
+
+        workflow.StartExecutorId.Should().Be("start");
+
+        workflow.ExecutorBindings.Should().HaveCount(3);
+        workflow.ExecutorBindings.Should().ContainKey("start");
+        workflow.ExecutorBindings.Should().ContainKey("not-unreachable");
+        workflow.ExecutorBindings.Should().ContainKey("also-not-unreachable");
+
+        workflow.ExecutorBindings.Values.Should().AllSatisfy(binding => binding.ExecutorType.Should().Be<NoOpExecutor>());
+    }
+
     [Fact]
     public void Test_LateBinding_Executor()
     {