resolve conflict

Author: Jicheng Lu

src/Infrastructure/BotSharp.Abstraction/Conversations/Enums/MessageTypeName.cs

@@ -3,7 +3,6 @@ namespace BotSharp.Abstraction.Conversations.Enums;
 public static class MessageTypeName
 {
     public const string Plain = "plain";
-    public const string Notification = "notification";
     public const string FunctionCall = "function";
     public const string Audio = "audio";
     public const string Error = "error";

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs

@@ -121,6 +121,12 @@ public class DialogMetaData
     [JsonPropertyName("sender_id")]
     public string? SenderId { get; set; }
 
+    /// <summary>
+    /// When true, message is persisted but omitted from default LLM dialog history and routing conversation text.
+    /// </summary>
+    [JsonPropertyName("exclude_from_context")]
+    public bool ExcludeFromContext { get; set; }
+
     [JsonPropertyName("create_at")]
     public DateTime CreatedTime { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -19,6 +19,11 @@ public class RoleDialogModel : ITrackableMessage
     /// </summary>
     public string MessageType { get; set; } = MessageTypeName.Plain;
 
+    /// <summary>
+    /// When true, message is stored but omitted from default LLM history and routing <c>[CONVERSATION]</c> (orthogonal to <see cref="MessageType"/>).
+    /// </summary>
+    public bool ExcludeFromContext { get; set; }
+
     /// <summary>
     /// The message label
     /// </summary>
@@ -191,6 +196,7 @@ public static RoleDialogModel From(RoleDialogModel source,
             CurrentAgentId = source.CurrentAgentId,
             MessageId = source.MessageId,
             MessageType = source.MessageType,
+            ExcludeFromContext = source.ExcludeFromContext,
             MessageLabel = source.MessageLabel,
             ToolCallId = source.ToolCallId,
             FunctionName = source.FunctionName,

src/Infrastructure/BotSharp.Abstraction/MCP/Models/McpServerConfigModel.cs

@@ -28,10 +28,19 @@ public class McpServerConfigModel
     public string? Description { get; set; }
 
     public McpSseServerConfig? SseConfig { get; set; }
+    public McpHttpServerConfig? HttpConfig { get; set; }
     public McpStdioServerConfig? StdioConfig { get; set; }
 }
 
-public class McpSseServerConfig
+public class McpSseServerConfig : McpHttpServerConfigBase
+{
+}
+
+public class McpHttpServerConfig : McpHttpServerConfigBase
+{
+}
+
+public class McpHttpServerConfigBase
 {
     public string EndPoint { get; set; } = null!;
     public TimeSpan ConnectionTimeout { get; init; } = TimeSpan.FromSeconds(30);
@@ -42,6 +51,6 @@ public class McpStdioServerConfig
 {
     public string Command { get; set; } = null!;
     public IList<string>? Arguments { get; set; }
-    public Dictionary<string, string>? EnvironmentVariables { get; set; }
+    public Dictionary<string, string?>? EnvironmentVariables { get; set; }
     public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromSeconds(5);
 }

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.Summary.cs

@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Models;
 using BotSharp.Abstraction.Settings;
@@ -24,7 +23,6 @@ public async Task<string> GetConversationSummary(ConversationSummaryModel model)
 
             if (dialogs.IsNullOrEmpty()) continue;
 
-            dialogs = dialogs.Where(x => x.MessageType != MessageTypeName.Notification).ToList();
             var content = GetConversationContent(dialogs);
             if (string.IsNullOrWhiteSpace(content)) continue;
 

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs

@@ -75,6 +75,7 @@ public async Task<List<RoleDialogModel>> GetDialogs(string conversationId, Conve
                 CurrentAgentId = meta?.AgentId ?? string.Empty,
                 MessageId = meta?.MessageId ?? string.Empty,
                 MessageType = meta?.MessageType ?? string.Empty,
+                ExcludeFromContext = meta?.ExcludeFromContext ?? false,
                 MessageLabel = meta?.MessageLabel,
                 CreatedAt = meta?.CreatedTime ?? default,
                 SenderId = senderId,
@@ -115,6 +116,7 @@ public async Task<List<RoleDialogModel>> GetDialogs(string conversationId, Conve
                 AgentId = dialog.CurrentAgentId,
                 MessageId = dialog.MessageId,
                 MessageType = dialog.MessageType,
+                ExcludeFromContext = dialog.ExcludeFromContext,
                 MessageLabel = dialog.MessageLabel,
                 ToolCallId = dialog.ToolCallId,
                 FunctionName = dialog.FunctionName,
@@ -143,6 +145,7 @@ public async Task<List<RoleDialogModel>> GetDialogs(string conversationId, Conve
                 AgentId = dialog.CurrentAgentId,
                 MessageId = dialog.MessageId,
                 MessageType = dialog.MessageType,
+                ExcludeFromContext = dialog.ExcludeFromContext,
                 MessageLabel = dialog.MessageLabel,
                 SenderId = dialog.SenderId,
                 FunctionName = dialog.FunctionName,

src/Infrastructure/BotSharp.Core/MCP/Managers/McpClientManager.cs

@@ -28,7 +28,17 @@ public McpClientManager(
             }
 
             IClientTransport? transport = null;
-            if (config.SseConfig != null)
+            if (config.HttpConfig != null)
+            {
+                transport = new HttpClientTransport(new HttpClientTransportOptions
+                {
+                    Name = config.Name,
+                    Endpoint = new Uri(config.HttpConfig.EndPoint),
+                    AdditionalHeaders = config.HttpConfig.AdditionalHeaders,
+                    ConnectionTimeout = config.HttpConfig.ConnectionTimeout
+                });
+            }
+            else if (config.SseConfig != null)
             {
                 transport = new HttpClientTransport(new HttpClientTransportOptions
                 {

src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetConversationContent.cs

@@ -6,8 +6,8 @@ public async Task<string> GetConversationContent(List<RoleDialogModel> dialogs,
     {
         var agentService = _services.GetRequiredService<IAgentService>();
         var conversation = "";
-
-        foreach (var dialog in dialogs.TakeLast(maxDialogCount))
+        var conversationDialogs = dialogs.Where(x => !x.ExcludeFromContext).TakeLast(maxDialogCount).ToList();
+        foreach (var dialog in conversationDialogs)
         {
             var role = dialog.Role;
             if (role != AgentRole.User)

src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeAgent.cs

@@ -38,13 +38,14 @@ public async Task<bool> InvokeAgent(
 
         RoleDialogModel response;
         var message = dialogs.Last();
+        var conversationDialogs = dialogs.Where(x => !x.ExcludeFromContext).ToList();
         if (options?.UseStream == true)
         {
-            response = await chatCompletion.GetChatCompletionsStreamingAsync(agent, dialogs);
+            response = await chatCompletion.GetChatCompletionsStreamingAsync(agent, conversationDialogs);
         }
         else
         {
-            response = await chatCompletion.GetChatCompletions(agent, dialogs);
+            response = await chatCompletion.GetChatCompletions(agent, conversationDialogs);
         }
 
         if (response.Role == AgentRole.Function && !string.IsNullOrEmpty(response.FunctionName))

src/Plugins/BotSharp.Plugin.Membase/GraphDb/MembaseGraphDb.cs

@@ -1,3 +1,4 @@
+using System.Net;
 using BotSharp.Plugin.Membase.Models.Graph;
 using Polly;
 using Polly.Timeout;
@@ -54,7 +55,7 @@ public async Task<GraphQueryResult> ExecuteQueryAsync(string query, GraphQueryEx
         }
         catch (ApiException ex)
         {
-            _logger.LogError($"Error when executing query in {Provider} graph db:\r\n{ex.Content}\r\n{query}\r\n{argLogs}");
+            _logger.LogError(ex, $"Error when executing query in {Provider} graph db:\r\n{ex.Content}\r\n{query}\r\n{argLogs}");
             throw;
         }
         catch (Exception ex)
@@ -154,7 +155,7 @@ private AsyncPolicy BuildRetryPolicy()
             .Handle<HttpRequestException>()
             .Or<TaskCanceledException>()
             .Or<TimeoutRejectedException>()
-            .Or<ApiException>(ex => ex.StatusCode == HttpStatusCode.ServiceUnavailable)
+            .Or<ApiException>(ex => ex.StatusCode == HttpStatusCode.ServiceUnavailable || ex.StatusCode == HttpStatusCode.InternalServerError)
             .WaitAndRetryAsync(
                 retryCount: RETRY_COUNT,
                 sleepDurationProvider: retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),