Merge branch 'master' of https://github.com/SciSharp/BotSharp into features/add-utility-visibility

Author: iceljc

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs

@@ -70,6 +70,11 @@ public async Task<Agent> GetAgent(string id)
         }
 
         profile.Plugin = GetPlugin(profile.Id);
+
+        //add default instruction to ChannelInstructions
+        var defaultInstruction = new ChannelInstruction() { Channel = string.Empty, Instruction = profile?.Instruction };
+        profile.ChannelInstructions.Insert(0, defaultInstruction);
+
         return profile;
     }
 

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs

@@ -73,14 +73,10 @@ private void OverrideInstructionByChannel(Agent agent)
 
         var state = _services.GetRequiredService<IConversationStateService>();
         var channel = state.GetState("channel");
-
-        if (string.IsNullOrWhiteSpace(channel))
-        {
-            return;
-        }
-
+        
         var found = instructions.FirstOrDefault(x => x.Channel.IsEqualTo(channel));
-        agent.Instruction = !string.IsNullOrWhiteSpace(found?.Instruction) ? found.Instruction : agent.Instruction;
+        var defaultInstruction = instructions.FirstOrDefault(x => x.Channel == string.Empty);
+        agent.Instruction = !string.IsNullOrWhiteSpace(found?.Instruction) ? found.Instruction : defaultInstruction?.Instruction;
     }
 
     private void PopulateState(Dictionary<string, object> dict)