Bump the minor-and-patch group with 24 updates

src/Application/Features/Conversation/GenerateAIContent/GenerateAIContentQueryHandler.cs

@@ -7,6 +7,7 @@
 using Domain.Enums;
 using MediatR;
 using ConversationAggregate = Domain.Entities.Conversation;
+using ThoughtType = Domain.Enums.ThoughtType;
 
 namespace Application.Features.Conversation.GenerateAIContent;
 
@@ -17,6 +18,7 @@ namespace Application.Features.Conversation.GenerateAIContent;
 public sealed class GenerateAIContentQueryHandler(
     IMessageRepository messageRepository,
     IConversationRepository conversationRepository,
+    IThoughtRepository thoughtRepository,
     IAIService aiService,
     IChatNotifier chatNotifier,
     IUnitOfWork unitOfWork,
@@ -27,6 +29,8 @@ public sealed class GenerateAIContentQueryHandler(
         ?? throw new ArgumentNullException(nameof(messageRepository));
     private readonly IConversationRepository _conversationRepository = conversationRepository
         ?? throw new ArgumentNullException(nameof(conversationRepository));
+    private readonly IThoughtRepository _thoughtRepository = thoughtRepository
+        ?? throw new ArgumentNullException(nameof(thoughtRepository));
     private readonly IAIService _aiService = aiService
         ?? throw new ArgumentNullException(nameof(aiService));
     private readonly ICurrentUserService _currentUserService = currentUserService
@@ -71,21 +75,25 @@ public async Task<Result<Unit>> Handle(GenerateAIContentQuery request, Cancellat
                 "You don't have access to this conversation"));
         }
 
+        // 4. Create AI response message placeholder
+        var aiResponseMessage = conversation.AddMessage(
+            senderId: _currentUserService.UserId.Value,
+            content: "...Đang xử lý...", // Will be filled during streaming
+            type: MessageType.Text,
+            isFromBot: true
+        );
+
         try
         {
-            // 4. Create AI response message placeholder
-            var aiResponseMessage = conversation.AddMessage(
-                senderId: _currentUserService.UserId.Value,
-                content: "...Đang xử lý...", // Will be filled during streaming
-                type: MessageType.Text,
-                isFromBot: true
-            );
+            // 5. Create AI thinking activity through message
+            var thinkingActivity = aiResponseMessage.StartThinkingActivity();
 
             await _messageRepository.AddAsync(aiResponseMessage, cancellationToken);
             await _unitOfWork.SaveChangesAsync(cancellationToken);
 
-            // 5. Start AI streaming
+            // 6. Start AI streaming
             var fullResponse = string.Empty;
+            var thoughtStep = 0;
 
             await _aiService.GenerateResponseStreamAsync(
                 userMessage: message.Content,
@@ -97,13 +105,31 @@ await _aiService.GenerateResponseStreamAsync(
                     await _chatNotifier.SendChunkAsync(request.ConnectionId,
                         request.MessageId, request.ConversationId, chunk, cancellationToken);
                 },
-                onThought: (thought) => _chatNotifier.SendThoughtAsync(request.ConnectionId,
-                        request.MessageId, request.ConversationId, thought, cancellationToken),
+                onThought: async (thought) =>
+                {
+                    thoughtStep++;
+
+                    // 1. Gửi notification cho client ngay lập tức để UI phản hồi nhanh
+                    await _chatNotifier.SendThoughtAsync(request.ConnectionId,
+                        request.MessageId, request.ConversationId, thought, cancellationToken);
+
+                    var thoughtEntity = new Thought
+                    {
+                        ThinkingActivityId = thinkingActivity.Id,
+                        StepNumber = thoughtStep,
+                        Content = thought,
+                        Type = ThoughtType.Reasoning
+                    };
+
+                    await _thoughtRepository.AddAsync(thoughtEntity, cancellationToken);
+                    await _unitOfWork.SaveChangesAsync(cancellationToken);
+                },
                 cancellationToken: cancellationToken);
 
-            // 6. Update message with complete response
+            // 7. Complete the activity and update message
+            thinkingActivity.Complete();
             aiResponseMessage.Content = fullResponse;
-            _messageRepository.Update(aiResponseMessage);
+
             await _unitOfWork.SaveChangesAsync(cancellationToken);
 
             // 7. Notify client that streaming is complete
@@ -114,12 +140,19 @@ await _chatNotifier.SendCompleteAsync(request.ConnectionId, request.MessageId,
         }
         catch (Exception ex)
         {
+            // Mark activity as failed if it was created
+            if (aiResponseMessage?.ThinkingActivity != null && aiResponseMessage.ThinkingActivity.Status == ActivityStatus.Thinking)
+            {
+                aiResponseMessage.ThinkingActivity.Fail(ex.InnerException?.Message ?? ex.Message);
+                await _unitOfWork.SaveChangesAsync(cancellationToken);
+            }
+
             // Notify client about error
             await _chatNotifier.SendErrorAsync(request.ConnectionId, request.MessageId,
-                "Failed to generate AI response: " + ex.Message, cancellationToken);
+                "Failed to generate AI response: " + (ex.InnerException?.Message ?? ex.Message), cancellationToken);
 
             return Result.Failure<Unit>(Error.Failure("AI.GenerationFailed",
-                $"Failed to generate AI response: {ex.Message}"));
+                $"Failed to generate AI response: {ex.InnerException?.Message ?? ex.Message}"));
         }
     }
 }

src/Application/Features/Conversation/GetMessages/GetMessagesQuery.cs

@@ -3,6 +3,7 @@
 using Application.Common.Behaviors;
 using Application.Common.Models;
 using Domain.Common;
+using Domain.Entities;
 using Domain.Enums;
 
 namespace Application.Features.Conversation.GetMessages;
@@ -65,5 +66,82 @@ public sealed record MessageSummary
     /// Thời gian chỉnh sửa
     /// </summary>
     public DateTimeOffset? EditedAt { get; init; }
+
+    /// <summary>
+    /// Thinking activity của AI (chỉ có cho messages từ assistant)
+    /// </summary>
+    public ThinkingActivitySummary? ThinkingActivity { get; init; }
+}
+
+/// <summary>
+/// Thông tin ThinkingActivity cho message summary
+/// </summary>
+public sealed record ThinkingActivitySummary
+{
+    /// <summary>
+    /// ID của thinking activity
+    /// </summary>
+    public required Guid Id { get; init; }
+
+    /// <summary>
+    /// Trạng thái (Thinking, Completed, Error, Cancelled)
+    /// </summary>
+    public required string Status { get; init; }
+
+    /// <summary>
+    /// Tổng thời gian suy nghĩ
+    /// </summary>
+    public TimeSpan? Duration { get; init; }
+
+    /// <summary>
+    /// Thời gian bắt đầu
+    /// </summary>
+    public DateTimeOffset? StartedAt { get; init; }
+
+    /// <summary>
+    /// Thời gian hoàn thành
+    /// </summary>
+    public DateTimeOffset? CompletedAt { get; init; }
+
+    /// <summary>
+    /// Lý do lỗi (nếu có)
+    /// </summary>
+    public string? ErrorReason { get; init; }
+
+    /// <summary>
+    /// Danh sách các thought steps
+    /// </summary>
+    public IReadOnlyList<ThoughtSummary> Thoughts { get; init; } = [];
+}
+
+/// <summary>
+/// Thông tin Thought cho thinking activity
+/// </summary>
+public sealed record ThoughtSummary
+{
+    /// <summary>
+    /// ID của thought
+    /// </summary>
+    public required Guid Id { get; init; }
+
+    /// <summary>
+    /// Số thứ tự bước suy nghĩ
+    /// </summary>
+    public required int StepNumber { get; init; }
+
+    /// <summary>
+    /// Nội dung suy nghĩ
+    /// </summary>
+    public required string Content { get; init; }
+
+    /// <summary>
+    /// Loại suy nghĩ (Reasoning, Conclusion, etc.)
+    /// </summary>
+    public required string Type { get; init; }
+
+    /// <summary>
+    /// Thời gian tạo
+    /// </summary>
+    public required DateTimeOffset CreatedAt { get; init; }
 }
 

src/Application/Features/Conversation/GetMessages/GetMessagesQueryHandler.cs

@@ -4,6 +4,8 @@
 using Application.Interfaces.Services.Auth;
 using Domain.Common;
 using Domain.Constants;
+using Domain.Entities;
+using Domain.Enums;
 
 namespace Application.Features.Conversation.GetMessages;
 
@@ -66,7 +68,24 @@ public async Task<Result<PaginatedResult<MessageSummary>>> Handle(GetMessagesQue
                 IsFromBot = m.IsFromAssistant(),
                 CreatedAt = m.CreatedAt,
                 IsEdited = m.IsEdited,
-                EditedAt = m.EditedAt
+                EditedAt = m.EditedAt,
+                ThinkingActivity = m.ThinkingActivity != null ? new ThinkingActivitySummary
+                {
+                    Id = m.ThinkingActivity.Id,
+                    Status = m.ThinkingActivity.Status.ToString(),
+                    Duration = m.ThinkingActivity.Duration,
+                    StartedAt = m.ThinkingActivity.StartedAt,
+                    CompletedAt = m.ThinkingActivity.CompletedAt,
+                    ErrorReason = m.ThinkingActivity.ErrorReason,
+                    Thoughts = [.. m.ThinkingActivity.Thoughts.Select(t => new ThoughtSummary
+                    {
+                        Id = t.Id,
+                        StepNumber = t.StepNumber,
+                        Content = t.Content,
+                        Type = t.Type.ToString(),
+                        CreatedAt = t.CreatedAt
+                    })]
+                } : null
             })],
             TotalCount = messagesResult.TotalCount,
             PageNumber = messagesResult.PageNumber,

src/Application/Interfaces/Repositories/IThinkingActivityRepository.cs

@@ -0,0 +1,13 @@
+using Domain.Entities;
+
+namespace Application.Interfaces.Repositories;
+
+/// <summary>
+/// Interface for ThinkingActivity repository to handle data operations.
+/// </summary>
+public interface IThinkingActivityRepository
+{
+    Task AddAsync(ThinkingActivity activity, CancellationToken cancellationToken = default);
+    Task<ThinkingActivity?> GetByMessageIdAsync(Guid messageId, CancellationToken cancellationToken = default);
+    void Update(ThinkingActivity activity);
+}

src/Application/Interfaces/Repositories/IThoughtRepository.cs

@@ -0,0 +1,22 @@
+using Application.Common.Models;
+using Domain.Entities;
+
+namespace Application.Interfaces.Repositories;
+
+/// <summary>
+/// Interface for Thought repository to handle data operations.
+/// </summary>
+public interface IThoughtRepository
+{
+    Task AddAsync(Thought thought, CancellationToken cancellationToken = default);
+    Task AddRangeAsync(IEnumerable<Thought> thoughts, CancellationToken cancellationToken = default);
+    Task<PaginatedResult<Thought>> GetByActivityIdAsync(
+        Guid thinkingActivityId,
+        PaginationRequest paginationRequest,
+        CancellationToken cancellationToken = default);
+    Task<IReadOnlyList<Thought>> GetByActivityIdOrderedAsync(
+        Guid thinkingActivityId,
+        CancellationToken cancellationToken = default);
+    Task<Thought?> GetByIdAsync(Guid id, CancellationToken cancellationToken = default);
+    Task<int> GetMaxStepNumberAsync(Guid thinkingActivityId, CancellationToken cancellationToken = default);
+}

src/Domain/Entities/Message.cs

@@ -118,4 +118,32 @@ public string GetPreview(int maxLength = 100)
     /// Check if message is from user
     /// </summary>
     public bool IsFromUser() => string.Equals(Role, MessageRoles.User, StringComparison.OrdinalIgnoreCase);
+
+    // Navigation properties
+    public ThinkingActivity? ThinkingActivity { get; set; }
+
+    /// <summary>
+    /// Start a thinking activity for this AI message
+    /// </summary>
+    public ThinkingActivity StartThinkingActivity()
+    {
+        if (!IsFromAssistant())
+        {
+            throw new InvalidOperationException("Only AI assistant messages can have thinking activities");
+        }
+
+        if (ThinkingActivity != null)
+        {
+            throw new InvalidOperationException("Message already has an activity");
+        }
+
+        ThinkingActivity = new ThinkingActivity
+        {
+            MessageId = Id,
+            Status = ActivityStatus.Thinking
+        };
+        ThinkingActivity.Start();
+
+        return ThinkingActivity;
+    }
 }

src/Domain/Entities/RefreshToken.cs

@@ -77,6 +77,6 @@ public void Revoke(string reason, string? replacedByToken = null)
     {
         RevokedAt = DateTimeOffset.UtcNow;
         RevokedReason = reason;
-        ReplacedByToken = replacedByToken ?? Token;
+        ReplacedByToken = replacedByToken;
     }
 }