Parsing plan json from ActionPlanner result

dotnet/src/Extensions/Planning.ActionPlanner/ActionPlanner.cs

@@ -6,6 +6,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -83,22 +84,39 @@ public async Task<Plan> CreatePlanAsync(string goal)
         SKContext result = await this._plannerFunction.InvokeAsync(this._context).ConfigureAwait(false);
 
         ActionPlanResponse? planData;
-        try
+
+        /* Filter out good JSON from the result in case additional text is present:
+        * Follows the balancing group regex defined here: https://learn.microsoft.com/en-us/dotnet/standard/base-types/grouping-constructs-in-regular-expressions#balancing-group-definitions 
+        */
+        Regex planRegex = new(@"^[^{}]*(((?'Open'{)[^{}]*)+((?'Close-Open'})[^{}]*)+)*(?(Open)(?!))", RegexOptions.Singleline);
+        Match match = planRegex.Match(result.ToString());
+
+        if (match.Success && match.Groups["Close"].Length > 0)
         {
-            planData = JsonSerializer.Deserialize<ActionPlanResponse?>(result.ToString(), new JsonSerializerOptions
+            string planJson = $"{{{match.Groups["Close"].Value}}}";
+            try
+            {
+                planData = JsonSerializer.Deserialize<ActionPlanResponse?>(planJson, new JsonSerializerOptions
+                {
+                    AllowTrailingCommas = true,
+                    DictionaryKeyPolicy = null,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                    PropertyNameCaseInsensitive = true,
+                });
+            }
+            catch (Exception e)
             {
-                AllowTrailingCommas = true,
-                DictionaryKeyPolicy = null,
-                DefaultIgnoreCondition = JsonIgnoreCondition.Never,
-                PropertyNameCaseInsensitive = true,
-            });
+                throw new PlanningException(PlanningException.ErrorCodes.InvalidPlan,
+                    "Plan parsing error, invalid JSON", e);
+            }
         }
-        catch (Exception e)
+        else
         {
-            throw new PlanningException(PlanningException.ErrorCodes.InvalidPlan,
-                "Plan parsing error, invalid JSON", e);
+            throw new PlanningException(PlanningException.ErrorCodes.InvalidPlan, $"Failed to parse plan json string: '{result.ToString()}'");
         }
 
+
+
         if (planData == null)
         {
             throw new PlanningException(PlanningException.ErrorCodes.InvalidPlan, "The plan deserialized to a null object");

samples/apps/copilot-chat-app/webapi/CopilotChat/Skills/ChatSkills/ExternalInformationSkill.cs

@@ -125,13 +125,13 @@ public async Task<string> AcquireExternalInformationAsync(string userIntent, SKC
 
             if (plan.Steps.Count > 0)
             {
-                // Parameters stored in plan's top level state
-                this.MergeContextIntoPlan(context.Variables, plan.State);
+                // Parameters stored in plan's top level
+                this.MergeContextIntoPlan(context.Variables, plan.Parameters);
 
                 // TODO: Improve Kernel to give developers option to skip this override 
                 // (i.e., keep functions regardless of whether they're available in the planner's context or not)
                 Plan sanitizedPlan = this.SanitizePlan(plan, context);
-                sanitizedPlan.State.Update(plan.State);
+                sanitizedPlan.Parameters.Update(plan.Parameters);
 
                 this.ProposedPlan = new ProposedPlan(sanitizedPlan, this._planner.PlannerOptions!.Type, PlanState.NoOp);
             }

samples/apps/copilot-chat-app/webapp/src/components/chat/plan-viewer/PlanViewer.tsx

@@ -49,10 +49,9 @@ export const PlanViewer: React.FC<PlanViewerProps> = ({ message, messageIndex, g
 
     var planState = message.state ?? parsedContent.state;
 
-    // If plan came from ActionPlanner, use parameters from top-level plan state
-    // TODO: Can remove this after consuming nugets with #997 fixed
+    // If plan came from ActionPlanner, use parameters from top-level of plan
     if (parsedContent.type === PlanType.Action) {
-        originalPlan.steps[0].parameters = originalPlan.state;
+        originalPlan.steps[0].parameters = originalPlan.parameters;
     }
 
     const userIntentPrefix = 'User Intent:User intent: ';