minor tweaks

dotnet/samples/AzureFunctions/09_Workflow/Program.cs

@@ -32,17 +32,9 @@ Workflow fulfillOrder = new WorkflowBuilder(orderParserExecutor)
     .AddEdge(orderEnricherExeecutor, paymentProcessorExecutor)
     .Build();
 
-//OrderCancel orderArchiverExecutor = new();
-//Workflow cancelOrder = new WorkflowBuilder(orderParserExecutor)
-//    .WithName("CancelOrder")
-//    .WithDescription("Cancel an order")
-//    .AddEdge(orderParserExecutor, orderLookupExecutor)
-//    .AddEdge(orderLookupExecutor, orderArchiverExecutor)
-//    .Build();
-
 var host = FunctionsApplication.CreateBuilder(args)
     .ConfigureFunctionsWebApplication()
-    .ConfigureDurableOptions(options => options.Workflows.AddWorkflow(fulfillOrder))
+    .ConfigureDurableOptions(options => options.Workflows.AddWorkflow(fulfillOrder, enableMcpToolTrigger: true))
     .Build();
 
 host.Run();

dotnet/samples/AzureFunctions/10_WorkflowConcurrent/PrepareQuery.cs

@@ -4,7 +4,7 @@ using Microsoft.Agents.AI.Workflows;
 
 namespace SingleAgent;
 
-internal sealed class ConcurrentStartExecutor() : Executor<string, string>("ConcurrentStartExecutor")
+internal sealed class PrepareQuery() : Executor<string, string>("PrepareQuery")
 {
     public override ValueTask<string> HandleAsync(string message, IWorkflowContext context, CancellationToken cancellationToken = default)
     {
@@ -19,19 +19,11 @@ internal sealed class ConcurrentStartExecutor() : Executor<string, string>("Conc
     }
 }
 
-internal sealed class ResultAggregationExecutor() : Executor<string[], string>("ResultAggregationExecutor")
+internal sealed class ResultAggregator() : Executor<string[], string>("ResultAggregator")
 {
-    /// <summary>
-    /// Handles incoming messages from the agents and aggregates their responses.
-    /// </summary>
-    /// <param name="message">The messages from the parallel agents.</param>
-    /// <param name="context">Workflow context for accessing workflow services and adding events.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests.
-    /// The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>A task representing the asynchronous operation.</returns>
     public override ValueTask<string> HandleAsync(string[] message, IWorkflowContext context, CancellationToken cancellationToken = default)
     {
-        // Aggregate all responses from parallel executors
+        // Aggregate all responses from parallel executors.
         string aggregatedResponse = string.Join("\n---\n", message);
         return ValueTask.FromResult($"Aggregated {message.Length} responses:\n{aggregatedResponse}");
     }

dotnet/samples/AzureFunctions/10_WorkflowConcurrent/Program.cs

@@ -27,8 +27,8 @@ AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
 AIAgent physicist = client.GetChatClient(deploymentName).CreateAIAgent("You are an expert in physics. You answer questions from a physics perspective.", "Physicist");
 AIAgent chemist = client.GetChatClient(deploymentName).CreateAIAgent("You are an expert in chemistry. You answer questions from a chemistry perspective.", "Chemist");
 
-var startExecutor = new ConcurrentStartExecutor();
-var aggregationExecutor = new ResultAggregationExecutor();
+var startExecutor = new PrepareQuery();
+var aggregationExecutor = new ResultAggregator();
 
 var workflow = new WorkflowBuilder(startExecutor)
     .WithName("ExpertReview")

dotnet/samples/AzureFunctions/10_WorkflowConcurrent/ResponseRouterExecutor.cs

@@ -1,27 +0,0 @@
-//// Copyright (c) Microsoft. All rights reserved.
-
-//using Microsoft.Agents.AI.Workflows;
-
-//namespace SingleAgent;
-
-///// <summary>
-///// Routes survey responses to appropriate teams based on rating and category.
-///// </summary>
-//public sealed class ResponseRouterExecutor() : Executor<string, string>("ResponseRouterExecutor")
-//{
-//    public override ValueTask<string> HandleAsync(string message, IWorkflowContext context, CancellationToken cancellationToken = default)
-//    {
-//        if (message.Contains("billing", StringComparison.OrdinalIgnoreCase))
-//        {
-//            return ValueTask.FromResult("Routed to Billing Team");
-//        }
-//        else if (message.Contains("technical", StringComparison.OrdinalIgnoreCase))
-//        {
-//            return ValueTask.FromResult("Routed to Technical Support Team");
-//        }
-//        else
-//        {
-//            return ValueTask.FromResult("Routed to General Support Team");
-//        }
-//    }
-//}

dotnet/samples/AzureFunctions/10_WorkflowConcurrent/SurveyResponseParserExecutor.cs

@@ -1,82 +0,0 @@
-//// Copyright (c) Microsoft. All rights reserved.
-
-//using System.Text.Json;
-//using System.Text.RegularExpressions;
-//using Microsoft.Agents.AI.Workflows;
-
-//namespace SingleAgent;
-
-///// <summary>
-///// This executor parses survey responses and produces structured output.
-///// Example input: "Rating: 8. The app is good but checkout process is confusing."
-///// </summary>
-//[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by workflow framework")]
-//internal sealed partial class SurveyResponseParserExecutor() : Executor<string, string>("SurveyResponseParserExecutor")
-//{
-//    private static readonly JsonSerializerOptions s_jsonOptions = new()
-//    {
-//        WriteIndented = true
-//    };
-
-//    [GeneratedRegex(@"Rating:\s*(\d+)", RegexOptions.IgnoreCase)]
-//    private static partial Regex RatingRegex();
-
-//    public override ValueTask<string> HandleAsync(string message, IWorkflowContext context, CancellationToken cancellationToken = default)
-//    {
-//        SurveyResponse response = this.ParseSurveyResponse(message);
-//        string jsonResult = JsonSerializer.Serialize(response, s_jsonOptions);
-//        return ValueTask.FromResult(jsonResult);
-//    }
-
-//    private SurveyResponse ParseSurveyResponse(string message)
-//    {
-//        // Parse the message to extract rating and comment
-//        int? rating = null;
-//        string comment = message;
-
-//        // Try to extract rating using pattern "Rating: {number}"
-//        Match ratingMatch = RatingRegex().Match(message);
-//        if (ratingMatch.Success && int.TryParse(ratingMatch.Groups[1].Value, out int parsedRating))
-//        {
-//            rating = parsedRating;
-
-//            // Remove the rating part from the message to get the comment
-//            // Find the position after the rating number
-//            int ratingEndIndex = ratingMatch.Index + ratingMatch.Length;
-
-//            // Skip any separators (period, comma, dash, etc.) and whitespace
-//            while (ratingEndIndex < message.Length &&
-//                   (char.IsWhiteSpace(message[ratingEndIndex]) ||
-//                    message[ratingEndIndex] == '.' ||
-//                    message[ratingEndIndex] == ',' ||
-//                    message[ratingEndIndex] == '-'))
-//            {
-//                ratingEndIndex++;
-//            }
-
-//            if (ratingEndIndex < message.Length)
-//            {
-//                comment = message[ratingEndIndex..].Trim();
-//            }
-//            else
-//            {
-//                comment = string.Empty;
-//            }
-//        }
-
-//        // Create and return the structured response
-//        return new SurveyResponse
-//        {
-//            Rating = rating,
-//            Comment = comment,
-//            OriginalMessage = message
-//        };
-//    }
-
-//    private sealed class SurveyResponse
-//    {
-//        public int? Rating { get; set; }
-//        public string Comment { get; set; } = string.Empty;
-//        public string OriginalMessage { get; set; } = string.Empty;
-//    }
-//}

dotnet/samples/AzureFunctions/11_WorkflowSharedState/OrderIdParserExecutor.cs

@@ -69,7 +69,6 @@ internal sealed class EmailSenderExecutor() : Executor<Order, string>("EmailSend
             SharedStateConstants.MessageScope,
             cancellationToken);
 
-        // Combine with the input message
         return storedMessage is not null
             ? $"From state: [{storedMessage}] | Input: [{message.Id}]"
             : $"No state found | Input: [{message.Id}]";

dotnet/samples/AzureFunctions/12_ConditionalEdges/OrderIdParser.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 // This sample demonstrates how to use durable state management in Azure Functions workflows.
-// The OrderIdParserExecutor writes a value to shared state, and the FraudValidation reads it back.
+// The OrderIdParser writes a value to shared state, and the FraudValidation reads it back.
 // The state is persisted durably using Durable Entities behind the scenes.
 
 using Microsoft.Agents.AI.Workflows;
@@ -32,7 +32,7 @@ internal sealed class Order
 
 public sealed record Customer(int Id, string Name, bool IsBlocked);
 
-internal sealed class OrderIdParserExecutor() : Executor<string, Order>("OrderIdParserExecutor")
+internal sealed class OrderIdParser() : Executor<string, Order>("OrderIdParser")
 {
     public override async ValueTask<Order> HandleAsync(string message, IWorkflowContext context, CancellationToken cancellationToken = default)
     {
@@ -65,7 +65,7 @@ internal sealed class OrderEnrich() : Executor<Order, Order>("EnrichOrder")
     }
 }
 
-internal sealed class PaymentProcesserExecutor() : Executor<Order, Order>("PaymentProcesserExecutor")
+internal sealed class PaymentProcesser() : Executor<Order, Order>("PaymentProcesser")
 {
     public override async ValueTask<Order> HandleAsync(Order message, IWorkflowContext context, CancellationToken cancellationToken = default)
     {
@@ -75,7 +75,7 @@ internal sealed class PaymentProcesserExecutor() : Executor<Order, Order>("Payme
     }
 }
 
-internal sealed class NotifyFraudExecutor() : Executor<Order, string>("NotifyFraud")
+internal sealed class NotifyFraud() : Executor<Order, string>("NotifyFraud")
 {
     public override async ValueTask<string> HandleAsync(Order message, IWorkflowContext context, CancellationToken cancellationToken = default)
     {

dotnet/samples/AzureFunctions/12_ConditionalEdges/Program.cs

@@ -6,10 +6,10 @@ using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
 using SingleAgent;
 
-OrderIdParserExecutor orderParser = new();
+OrderIdParser orderParser = new();
 OrderEnrich orderEnrich = new();
-PaymentProcesserExecutor paymentProcessor = new();
-NotifyFraudExecutor notifyFraud = new();
+PaymentProcesser paymentProcessor = new();
+NotifyFraud notifyFraud = new();
 
 WorkflowBuilder builder = new(orderParser);
 builder
@@ -21,6 +21,6 @@ var workflow = builder.WithName("AuditOrder").Build();
 
 FunctionsApplication.CreateBuilder(args)
     .ConfigureFunctionsWebApplication()
-    .ConfigureDurableOptions(options => options.Workflows.AddWorkflow(workflow))
+    .ConfigureDurableOptions(options => options.Workflows.AddWorkflow(workflow, enableMcpToolTrigger: true))
     .Build()
     .Run();

dotnet/samples/GettingStarted/Workflows/Visualization/Program.cs

@@ -1,6 +1,11 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using Azure;
+using Azure.AI.OpenAI;
+using Azure.Identity;
+using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Workflows;
+using OpenAI.Chat;
 
 namespace WorkflowVisualizationSample;
 
@@ -20,8 +25,29 @@ internal static class Program
     /// <param name="args">Command line arguments (not used).</param>
     private static void Main(string[] args)
     {
-        // Step 1: Build the workflow you want to visualize
-        Workflow workflow = WorkflowMapReduceSample.Program.BuildWorkflow();
+        // Get the Azure OpenAI endpoint and deployment name from environment variables.
+        string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT")
+            ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
+        string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT")
+            ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT is not set.");
+
+        // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
+        string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
+        AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+            ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
+            : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+
+        AIAgent physicist = client.GetChatClient(deploymentName).CreateAIAgent("You are an expert in physics. You answer questions from a physics perspective.", "Physicist");
+        AIAgent chemist = client.GetChatClient(deploymentName).CreateAIAgent("You are an expert in chemistry. You answer questions from a chemistry perspective.", "Chemist");
+
+        var startExecutor = new PrepareQuery();
+        var aggregationExecutor = new ResultAggregator();
+
+        var workflow = new WorkflowBuilder(startExecutor)
+            .WithName("ExpertReview")
+            .AddFanOutEdge(startExecutor, [physicist, chemist])
+            .AddFanInEdge([physicist, chemist], aggregationExecutor)
+            .Build();
 
         // Step 2: Generate and display workflow visualization
         Console.WriteLine("Generating workflow visualization...");
@@ -31,11 +57,30 @@ internal static class Program
         var mermaid = workflow.ToMermaidString();
         Console.WriteLine(mermaid);
         Console.WriteLine("=======");
+    }
+}
 
-        // DOT
-        Console.WriteLine("DiGraph string: *** Tip: To export DOT as an image, install Graphviz and pipe the DOT output to 'dot -Tsvg', 'dot -Tpng', etc. *** \n=======");
-        var dotString = workflow.ToDotString();
-        Console.WriteLine(dotString);
-        Console.WriteLine("=======");
+internal sealed class PrepareQuery() : Executor<string, string>("PrepareQuery")
+{
+    public override ValueTask<string> HandleAsync(string message, IWorkflowContext context, CancellationToken cancellationToken = default)
+    {
+        // do some initial parsing and validation of the message.
+        // Return a polished version ith additional metadta.
+        if (!message.StartsWith("Query for the agent:", StringComparison.OrdinalIgnoreCase))
+        {
+            message = "Query for the agent: " + message;
+        }
+
+        return ValueTask.FromResult(message);
+    }
+}
+
+internal sealed class ResultAggregator() : Executor<string[], string>("ResultAggregator")
+{
+    public override ValueTask<string> HandleAsync(string[] message, IWorkflowContext context, CancellationToken cancellationToken = default)
+    {
+        // Aggregate all responses from parallel executors.
+        string aggregatedResponse = string.Join("\n---\n", message);
+        return ValueTask.FromResult($"Aggregated {message.Length} responses:\n{aggregatedResponse}");
     }
 }

dotnet/samples/GettingStarted/Workflows/Visualization/Visualization.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
     <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows\Microsoft.Agents.AI.Workflows.csproj" />
     <ProjectReference Include="..\Concurrent\MapReduce\MapReduce.csproj" />
   </ItemGroup>