Merge branch 'master' of github.com:visagang/BotSharp into features/vguruparan

Author: vguruparan

src/Infrastructure/BotSharp.Abstraction/Conversations/Dtos/ChatResponseDto.cs

@@ -46,6 +46,10 @@ public class ChatResponseDto : InstructResult
     [JsonPropertyName("is_streaming")]
     public bool IsStreaming { get; set; }
 
+    [JsonPropertyName("thought")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public Dictionary<string, string?>? Thought { get; set; }
+
     [JsonPropertyName("meta_data")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Dictionary<string, string?>? MetaData { get; set; }

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

@@ -114,6 +114,10 @@ public class DialogMetaData
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? ToolCallId { get; set; }
 
+    [JsonPropertyName("thought")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public Dictionary<string, string?>? Thought { get; set; }
+
     [JsonPropertyName("meta_data")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Dictionary<string, string?>? MetaData { get; set; }

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

@@ -76,6 +76,9 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? ToolCallId { get; set; }
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public Dictionary<string, string?>? Thought { get; set; }
+
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Dictionary<string, string?>? MetaData { get; set; }
 
@@ -141,7 +144,6 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool IsStreaming { get; set; }
 
-
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool IsFromUser => Role == AgentRole.User;
 
@@ -210,6 +212,7 @@ public static RoleDialogModel From(RoleDialogModel source,
             Data = source.Data,
             IsStreaming = source.IsStreaming,
             Annotations = source.Annotations,
+            Thought = source.Thought != null ? new(source.Thought) : null,
             MetaData = source.MetaData != null ? new(source.MetaData) : null
         };
     }

src/Infrastructure/BotSharp.Abstraction/MLTasks/Settings/LlmModelSetting.cs

@@ -99,7 +99,10 @@ public class ReasoningSetting
 public class WebSearchSetting
 {
     public bool IsDefault { get; set; }
+
+    [Obsolete("Set SearchContextSize in Parameters")]
     public string? SearchContextSize { get; set; }
+    public Dictionary<string, ModelParamSetting>? Parameters { get; set; }
 }
 #endregion
 

src/Infrastructure/BotSharp.Abstraction/Rules/Constants/RuleConstant.cs

@@ -0,0 +1,32 @@
+namespace BotSharp.Abstraction.Rules.Constants;
+
+public static class RuleConstant
+{
+    public const int MAX_GRAPH_RECURSION = 1000;
+
+    public const string INPUT_SCHEMA_KEY = "input_schema";
+    public const string OUTPUT_SCHEMA_KEY = "output_schema";
+
+    public static IEnumerable<string> CONDITION_NODE_TYPES = new List<string>
+    {
+        "condition",
+        "criteria"
+    };
+
+    public static IEnumerable<string> ACTION_NODE_TYPES = new List<string>
+    {
+        "action"
+    };
+
+    public static IEnumerable<string> ROOT_NODE_TYPES = new List<string>
+    {
+        "root",
+        "start"
+    };
+
+    public static IEnumerable<string> END_NODE_TYPES = new List<string>
+    {
+        "end",
+        "terminal"
+    };
+}

src/Infrastructure/BotSharp.Abstraction/Rules/Frontier.cs

@@ -0,0 +1,85 @@
+namespace BotSharp.Core.Rules.Engines;
+
+/// <summary>
+/// Abstraction over the data structure that drives graph traversal order.
+/// Stack → DFS, Queue → BFS.  Swap the frontier mid-traversal to switch strategy.
+/// </summary>
+public interface IFrontier<T>
+{
+    void Add(T item);
+    T Remove();
+    int Count { get; }
+
+    /// <summary>
+    /// Drain every remaining item into <paramref name="other"/>, preserving order.
+    /// </summary>
+    void DrainTo(IFrontier<T> other);
+}
+
+/// <summary>
+/// LIFO frontier – produces depth-first traversal.
+/// </summary>
+public sealed class StackFrontier<T> : IFrontier<T>
+{
+    private readonly Stack<T> _stack = new();
+
+    public int Count => _stack.Count;
+
+    public void Add(T item) => _stack.Push(item);
+
+    public T Remove() => _stack.Pop();
+
+    public void DrainTo(IFrontier<T> other)
+    {
+        // Pop gives items in priority order (highest-weight first).
+        var items = new List<T>();
+        while (_stack.Count > 0)
+        {
+            items.Add(_stack.Pop());
+        }
+
+        if (other is StackFrontier<T>)
+        {
+            items.Reverse();
+        }
+
+        foreach (var item in items)
+        {
+            other.Add(item);
+        }
+    }
+}
+
+/// <summary>
+/// FIFO frontier – produces breadth-first traversal.
+/// </summary>
+public sealed class QueueFrontier<T> : IFrontier<T>
+{
+    private readonly Queue<T> _queue = new();
+
+    public int Count => _queue.Count;
+
+    public void Add(T item) => _queue.Enqueue(item);
+
+    public T Remove() => _queue.Dequeue();
+
+    public void DrainTo(IFrontier<T> other)
+    {
+        // Dequeue gives items in priority order (highest-weight first).
+        var items = new List<T>();
+        while (_queue.Count > 0)
+        {
+            items.Add(_queue.Dequeue());
+        }
+
+        if (other is StackFrontier<T>)
+        {
+            items.Reverse();
+        }
+
+        foreach (var item in items)
+        {
+            other.Add(item);
+        }
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Rules/IRuleEnd.cs

@@ -0,0 +1,5 @@
+namespace BotSharp.Abstraction.Rules;
+
+public interface IRuleEnd : IRuleFlowUnit
+{
+}

src/Infrastructure/BotSharp.Abstraction/Rules/IRuleFlowUnit.cs

@@ -18,4 +18,16 @@ public interface IRuleFlowUnit
     /// The trigger names
     /// </summary>
     IEnumerable<string>? Triggers => null;
+
+    /// <summary>
+    /// Schema describing the expected input parameters.
+    /// Used for validating that upstream nodes produce the required fields.
+    /// </summary>
+    FlowUnitSchema? InputSchema => null;
+
+    /// <summary>
+    /// Schema describing the output this unit produces.
+    /// Used for validating that downstream nodes receive the expected fields.
+    /// </summary>
+    FlowUnitSchema? OutputSchema => null;
 }

src/Infrastructure/BotSharp.Abstraction/Rules/IRuleRoot.cs

@@ -0,0 +1,5 @@
+namespace BotSharp.Abstraction.Rules;
+
+public interface IRuleRoot : IRuleFlowUnit
+{
+}

src/Infrastructure/BotSharp.Abstraction/Rules/Models/FlowUnitSchema.cs

@@ -0,0 +1,58 @@
+using System.Text.Json.Serialization;
+
+namespace BotSharp.Abstraction.Rules.Models;
+
+/// <summary>
+/// Describes the input or output contract of a rule flow unit (action or condition).
+/// Follows a JSON Schema-like structure with "properties" and "required" fields.
+/// </summary>
+public class FlowUnitSchema
+{
+    /// <summary>
+    /// Property definitions keyed by parameter name.
+    /// </summary>
+    [JsonPropertyName("properties")]
+    public Dictionary<string, FlowUnitSchemaProperty> Properties { get; set; } = [];
+
+    /// <summary>
+    /// List of required property names.
+    /// </summary>
+    [JsonPropertyName("required")]
+    public List<string> Required { get; set; } = [];
+
+    public FlowUnitSchema() { }
+
+    public FlowUnitSchema(
+        Dictionary<string, FlowUnitSchemaProperty> properties,
+        List<string>? required = null)
+    {
+        Properties = properties;
+        Required = required ?? [];
+    }
+}
+
+/// <summary>
+/// Describes a single property in a FlowUnitSchema.
+/// </summary>
+public class FlowUnitSchemaProperty
+{
+    /// <summary>
+    /// JSON type: "string", "number", "boolean", "object", "array"
+    /// </summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = "string";
+
+    /// <summary>
+    /// A brief explanation of the property's purpose.
+    /// </summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    public FlowUnitSchemaProperty() { }
+
+    public FlowUnitSchemaProperty(string type, string? description = null)
+    {
+        Type = type;
+        Description = description;
+    }
+}