From 7ccfda909e87adbc0bb672fad8b5a0aa3d7112c8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 06:52:16 +0000 Subject: [PATCH 01/11] Add chat persistence with sessions, messages, sidebar, rename, delete Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/18938176-f8ee-4198-8aed-5bd3c53fb369 Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 171 +++++- ...20260516065018_ChatPersistence.Designer.cs | 557 ++++++++++++++++++ .../20260516065018_ChatPersistence.cs | 69 +++ .../LifelogBbContextModelSnapshot.cs | 71 +++ LifelogBb/Models/Chat/ChatSessionListItem.cs | 9 + LifelogBb/Models/Chat/ChatViewModel.cs | 3 + LifelogBb/Models/Entities/ChatSession.cs | 13 + .../Models/Entities/ChatSessionMessage.cs | 20 + LifelogBb/Models/LifelogBbContext.cs | 8 + LifelogBb/Views/Chat/Index.cshtml | 160 ++++- 10 files changed, 1050 insertions(+), 31 deletions(-) create mode 100644 LifelogBb/Migrations/20260516065018_ChatPersistence.Designer.cs create mode 100644 LifelogBb/Migrations/20260516065018_ChatPersistence.cs create mode 100644 LifelogBb/Models/Chat/ChatSessionListItem.cs create mode 100644 LifelogBb/Models/Entities/ChatSession.cs create mode 100644 LifelogBb/Models/Entities/ChatSessionMessage.cs diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index b529917..8a7715a 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -3,6 +3,7 @@ using LifelogBb.Models.Chat; using LifelogBb.Models.Entities; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using System.Text.Json; using Westwind.AspNetCore.Markdown; @@ -19,12 +20,55 @@ public ChatController(LifelogBbContext context, ChatService chatService) _chatService = chatService; } - public IActionResult Index() + public async Task Index(long? id) { var config = Config.GetConfig(_context); + var sessions = await _context.ChatSessions + .OrderByDescending(s => s.UpdatedAt) + .Select(s => new ChatSessionListItem + { + Id = s.Id, + Name = s.Name, + UpdatedAt = s.UpdatedAt + }) + .ToListAsync(); + + ChatSession? activeSession = null; + if (id.HasValue) + { + activeSession = await _context.ChatSessions + .Include(s => s.Messages.OrderBy(m => m.SortOrder)) + .FirstOrDefaultAsync(s => s.Id == id.Value); + } + + if (activeSession == null && sessions.Count > 0) + { + activeSession = await _context.ChatSessions + .Include(s => s.Messages.OrderBy(m => m.SortOrder)) + .OrderByDescending(s => s.UpdatedAt) + .FirstOrDefaultAsync(); + } + + var messages = new List(); + if (activeSession != null) + { + foreach (var msg in activeSession.Messages) + { + messages.Add(new ChatMessageViewModel + { + Role = msg.Role, + Content = msg.Content + }); + } + } + var model = new ChatViewModel { - IsConfigured = !string.IsNullOrWhiteSpace(config.ChatApiKey) + IsConfigured = !string.IsNullOrWhiteSpace(config.ChatApiKey), + Sessions = sessions, + ActiveSessionId = activeSession?.Id, + ActiveSessionName = activeSession?.Name, + Messages = messages }; return View(model); } @@ -40,15 +84,24 @@ public async Task Send([FromBody] ChatSendRequest request) var conversation = new List(); - // Add existing conversation history - if (request.History != null) + // Load existing messages from the session if we have one + ChatSession? session = null; + if (request.SessionId.HasValue) { - foreach (var msg in request.History) + session = await _context.ChatSessions + .Include(s => s.Messages.OrderBy(m => m.SortOrder)) + .FirstOrDefaultAsync(s => s.Id == request.SessionId.Value); + } + + if (session != null) + { + // Build conversation from persisted messages + foreach (var msg in session.Messages) { conversation.Add(new ChatMessage { Role = msg.Role, - Content = msg.Content + Content = msg.Role == "assistant" ? StripHtml(msg.Content) : msg.Content }); } } @@ -63,13 +116,117 @@ public async Task Send([FromBody] ChatSendRequest request) var response = await _chatService.SendAsync(conversation); var html = Markdown.Parse(response); - return Json(new { response = html }); + // Persist to database + if (session == null) + { + session = new ChatSession + { + Name = request.Message.Length > 50 ? request.Message[..50] + "..." : request.Message + }; + session.SetCreateFields(); + _context.ChatSessions.Add(session); + await _context.SaveChangesAsync(); + } + + var nextSortOrder = session.Messages.Count > 0 + ? session.Messages.Max(m => m.SortOrder) + 1 + : 0; + + var userMsg = new ChatSessionMessage + { + ChatSessionId = session.Id, + Role = "user", + Content = request.Message, + SortOrder = nextSortOrder + }; + userMsg.SetCreateFields(); + + var assistantMsg = new ChatSessionMessage + { + ChatSessionId = session.Id, + Role = "assistant", + Content = html, + SortOrder = nextSortOrder + 1 + }; + assistantMsg.SetCreateFields(); + + _context.ChatSessionMessages.AddRange(userMsg, assistantMsg); + session.SetUpdateFields(); + await _context.SaveChangesAsync(); + + return Json(new { response = html, sessionId = session.Id, sessionName = session.Name }); + } + + [HttpPost] + [ValidateAntiForgeryToken] + public async Task CreateSession() + { + var session = new ChatSession + { + Name = "New Chat" + }; + session.SetCreateFields(); + _context.ChatSessions.Add(session); + await _context.SaveChangesAsync(); + + return RedirectToAction(nameof(Index), new { id = session.Id }); + } + + [HttpPost] + [ValidateAntiForgeryToken] + public async Task RenameSession([FromBody] RenameSessionRequest request) + { + if (request == null || string.IsNullOrWhiteSpace(request.Name)) + { + return Json(new { error = "Name is required." }); + } + + var session = await _context.ChatSessions.FindAsync(request.Id); + if (session == null) + { + return NotFound(); + } + + session.Name = request.Name.Length > 200 ? request.Name[..200] : request.Name; + session.SetUpdateFields(); + await _context.SaveChangesAsync(); + + return Json(new { success = true, name = session.Name }); + } + + [HttpPost] + [ValidateAntiForgeryToken] + public async Task DeleteSession(long id) + { + var session = await _context.ChatSessions.FindAsync(id); + if (session == null) + { + return NotFound(); + } + + _context.ChatSessions.Remove(session); + await _context.SaveChangesAsync(); + + return RedirectToAction(nameof(Index)); + } + + private static string StripHtml(string html) + { + // Simple HTML tag removal for sending back to AI as plain text + return System.Text.RegularExpressions.Regex.Replace(html, "<[^>]+>", "").Trim(); } } public class ChatSendRequest { public string Message { get; set; } = ""; + public long? SessionId { get; set; } public List? History { get; set; } } + + public class RenameSessionRequest + { + public long Id { get; set; } + public string Name { get; set; } = ""; + } } diff --git a/LifelogBb/Migrations/20260516065018_ChatPersistence.Designer.cs b/LifelogBb/Migrations/20260516065018_ChatPersistence.Designer.cs new file mode 100644 index 0000000..dfbb12a --- /dev/null +++ b/LifelogBb/Migrations/20260516065018_ChatPersistence.Designer.cs @@ -0,0 +1,557 @@ +// +using System; +using LifelogBb.Models; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace LifelogBb.Migrations +{ + [DbContext(typeof(LifelogBbContext))] + [Migration("20260516065018_ChatPersistence")] + partial class ChatPersistence + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "10.0.7"); + + modelBuilder.Entity("LifelogBb.Models.Entities.BucketList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("ImageFileName") + .HasColumnType("TEXT"); + + b.Property("ImageName") + .HasColumnType("TEXT"); + + b.Property("Status") + .HasColumnType("INTEGER"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BucketLists"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSession", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChatSessions"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSessionMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChatSessionId") + .HasColumnType("INTEGER"); + + b.Property("Content") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Role") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("INTEGER"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChatSessionId"); + + b.ToTable("ChatSessionMessages"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Config", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BucketListPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(12); + + b.Property("ChatApiKey") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ChatEndpoint") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("https://api.openai.com/v1/chat/completions"); + + b.Property("ChatMaxToolRoundtrips") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(10); + + b.Property("ChatModel") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("gpt-4o"); + + b.Property("ChatSystemPrompt") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("You are a helpful life-tracking assistant for LifelogBB. You can query the user's data (weights, journals, todos, goals, habits, quotes, strength trainings, endurance trainings) using the available tools. Summarize and analyze the data to help the user understand their progress and habits."); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("EnduranceTrainingPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("FeedTimeZone") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Europe/Berlin"); + + b.Property("FeedToken") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("ChangeMeInTheConfig"); + + b.Property("GoalPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("HabitPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("Height") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(170); + + b.Property("JournalPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("QuotePageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("StartOfWeek") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(1); + + b.Property("StrengthTrainingPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("TodoPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("UnitsType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.Property("WeightPageSize") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(20); + + b.Property("WeightWarning") + .ValueGeneratedOnAdd() + .HasColumnType("REAL") + .HasDefaultValue(1.0); + + b.Property("WeightWarningText") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("You are gaining weight!"); + + b.HasKey("Id"); + + b.ToTable("Configs"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.EnduranceTraining", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Distance") + .HasColumnType("REAL"); + + b.Property("Duration") + .HasColumnType("TEXT"); + + b.Property("Exercise") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Notes") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("EnduranceTrainings"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Goal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("CurrentValue") + .HasColumnType("REAL"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("InitialValue") + .HasColumnType("REAL"); + + b.Property("IsCompleted") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("TargetValue") + .HasColumnType("REAL"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Goals"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Habit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("IsCompleted") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RecurrenceRules") + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Habits"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Journal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Date") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("Text") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Date") + .IsUnique(); + + b.ToTable("Journals"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("Text") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.StrengthTraining", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Exercise") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Notes") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("Reps") + .HasColumnType("INTEGER"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.Property("Weight") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.ToTable("StrengthTrainings"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Todo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("Completed") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("DueDate") + .HasColumnType("TEXT"); + + b.Property("IsCompleted") + .HasColumnType("INTEGER"); + + b.Property("IsImportant") + .HasColumnType("INTEGER"); + + b.Property("Progress") + .HasColumnType("INTEGER"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Todos"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.Weight", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bmi") + .HasColumnType("REAL"); + + b.Property("BodyWeight") + .HasColumnType("REAL"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Height") + .HasColumnType("INTEGER"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Weights"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSessionMessage", b => + { + b.HasOne("LifelogBb.Models.Entities.ChatSession", "ChatSession") + .WithMany("Messages") + .HasForeignKey("ChatSessionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChatSession"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSession", b => + { + b.Navigation("Messages"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/LifelogBb/Migrations/20260516065018_ChatPersistence.cs b/LifelogBb/Migrations/20260516065018_ChatPersistence.cs new file mode 100644 index 0000000..e950f35 --- /dev/null +++ b/LifelogBb/Migrations/20260516065018_ChatPersistence.cs @@ -0,0 +1,69 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace LifelogBb.Migrations +{ + /// + public partial class ChatPersistence : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "ChatSessions", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", maxLength: 200, nullable: false), + CreatedAt = table.Column(type: "TEXT", nullable: false), + UpdatedAt = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ChatSessions", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "ChatSessionMessages", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + ChatSessionId = table.Column(type: "INTEGER", nullable: false), + Role = table.Column(type: "TEXT", nullable: false), + Content = table.Column(type: "TEXT", nullable: false), + SortOrder = table.Column(type: "INTEGER", nullable: false), + CreatedAt = table.Column(type: "TEXT", nullable: false), + UpdatedAt = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ChatSessionMessages", x => x.Id); + table.ForeignKey( + name: "FK_ChatSessionMessages_ChatSessions_ChatSessionId", + column: x => x.ChatSessionId, + principalTable: "ChatSessions", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_ChatSessionMessages_ChatSessionId", + table: "ChatSessionMessages", + column: "ChatSessionId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "ChatSessionMessages"); + + migrationBuilder.DropTable( + name: "ChatSessions"); + } + } +} diff --git a/LifelogBb/Migrations/LifelogBbContextModelSnapshot.cs b/LifelogBb/Migrations/LifelogBbContextModelSnapshot.cs index 022d698..73f9f5f 100644 --- a/LifelogBb/Migrations/LifelogBbContextModelSnapshot.cs +++ b/LifelogBb/Migrations/LifelogBbContextModelSnapshot.cs @@ -56,6 +56,61 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("BucketLists"); }); + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSession", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChatSessions"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSessionMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChatSessionId") + .HasColumnType("INTEGER"); + + b.Property("Content") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("Role") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("INTEGER"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChatSessionId"); + + b.ToTable("ChatSessionMessages"); + }); + modelBuilder.Entity("LifelogBb.Models.Entities.Config", b => { b.Property("Id") @@ -477,6 +532,22 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Weights"); }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSessionMessage", b => + { + b.HasOne("LifelogBb.Models.Entities.ChatSession", "ChatSession") + .WithMany("Messages") + .HasForeignKey("ChatSessionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChatSession"); + }); + + modelBuilder.Entity("LifelogBb.Models.Entities.ChatSession", b => + { + b.Navigation("Messages"); + }); #pragma warning restore 612, 618 } } diff --git a/LifelogBb/Models/Chat/ChatSessionListItem.cs b/LifelogBb/Models/Chat/ChatSessionListItem.cs new file mode 100644 index 0000000..903e72e --- /dev/null +++ b/LifelogBb/Models/Chat/ChatSessionListItem.cs @@ -0,0 +1,9 @@ +namespace LifelogBb.Models.Chat +{ + public class ChatSessionListItem + { + public long Id { get; set; } + public string Name { get; set; } = ""; + public DateTime UpdatedAt { get; set; } + } +} diff --git a/LifelogBb/Models/Chat/ChatViewModel.cs b/LifelogBb/Models/Chat/ChatViewModel.cs index bfce277..cb5c60a 100644 --- a/LifelogBb/Models/Chat/ChatViewModel.cs +++ b/LifelogBb/Models/Chat/ChatViewModel.cs @@ -5,5 +5,8 @@ public class ChatViewModel public List Messages { get; set; } = new(); public string UserInput { get; set; } = ""; public bool IsConfigured { get; set; } + public List Sessions { get; set; } = new(); + public long? ActiveSessionId { get; set; } + public string? ActiveSessionName { get; set; } } } diff --git a/LifelogBb/Models/Entities/ChatSession.cs b/LifelogBb/Models/Entities/ChatSession.cs new file mode 100644 index 0000000..d2006d4 --- /dev/null +++ b/LifelogBb/Models/Entities/ChatSession.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace LifelogBb.Models.Entities +{ + public class ChatSession : BaseEntity + { + [Required] + [StringLength(200)] + public string Name { get; set; } = "New Chat"; + + public ICollection Messages { get; set; } = new List(); + } +} diff --git a/LifelogBb/Models/Entities/ChatSessionMessage.cs b/LifelogBb/Models/Entities/ChatSessionMessage.cs new file mode 100644 index 0000000..75008ec --- /dev/null +++ b/LifelogBb/Models/Entities/ChatSessionMessage.cs @@ -0,0 +1,20 @@ +using System.ComponentModel.DataAnnotations; + +namespace LifelogBb.Models.Entities +{ + public class ChatSessionMessage : BaseEntity + { + [Required] + public long ChatSessionId { get; set; } + + [Required] + public string Role { get; set; } = "user"; + + [Required] + public string Content { get; set; } = ""; + + public int SortOrder { get; set; } + + public ChatSession ChatSession { get; set; } = null!; + } +} diff --git a/LifelogBb/Models/LifelogBbContext.cs b/LifelogBb/Models/LifelogBbContext.cs index 87c1d58..b226cd5 100644 --- a/LifelogBb/Models/LifelogBbContext.cs +++ b/LifelogBb/Models/LifelogBbContext.cs @@ -18,6 +18,8 @@ public class LifelogBbContext : DbContext public DbSet Habits { get; set; } = null!; public DbSet Goals { get; set; } = null!; public DbSet Configs { get; set; } = null!; + public DbSet ChatSessions { get; set; } = null!; + public DbSet ChatSessionMessages { get; set; } = null!; private readonly IConfiguration _configuration; @@ -77,6 +79,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity().Property(b => b.ChatSystemPrompt).HasDefaultValue("You are a helpful life-tracking assistant for LifelogBB. You can query the user's data (weights, journals, todos, goals, habits, quotes, strength trainings, endurance trainings) using the available tools. Summarize and analyze the data to help the user understand their progress and habits."); modelBuilder.Entity().Property(b => b.ChatMaxToolRoundtrips).HasDefaultValue(10); + modelBuilder.Entity() + .HasMany(s => s.Messages) + .WithOne(m => m.ChatSession) + .HasForeignKey(m => m.ChatSessionId) + .OnDelete(DeleteBehavior.Cascade); + modelBuilder.Entity().HasIndex(j => j.Date).IsUnique(); } diff --git a/LifelogBb/Views/Chat/Index.cshtml b/LifelogBb/Views/Chat/Index.cshtml index 1359587..a8535a7 100644 --- a/LifelogBb/Views/Chat/Index.cshtml +++ b/LifelogBb/Views/Chat/Index.cshtml @@ -7,9 +7,9 @@
@Html.AntiForgeryToken()
-
- @if (!Model.IsConfigured) - { + @if (!Model.IsConfigured) + { +
- } +
+ } +
+
+
+

Chats

+
+
+ +
+
+
+
+ @if (Model.Sessions.Count == 0) + { +
+ No chats yet +
+ } + @foreach (var session in Model.Sessions) + { +
+ + @session.Name + +
+ +
+ +
+
+
+ } +
+
+
+
-

Chat

+

+ + @(Model.ActiveSessionName ?? "Chat") +

-
-
- - Ask me anything about your life tracking data. -
+ @if (Model.Messages.Count == 0) + { +
+ + Ask me anything about your life tracking data. +
+ }
@@ -65,9 +119,17 @@ || document.querySelector('meta[name="RequestVerificationToken"]')?.content || ''; - let conversationHistory = []; + let currentSessionId = @(Model.ActiveSessionId.HasValue ? Model.ActiveSessionId.Value.ToString() : "null"); let isLoading = false; + // Render persisted messages on load + const persistedMessages = @Html.Raw(System.Text.Json.JsonSerializer.Serialize(Model.Messages, new System.Text.Json.JsonSerializerOptions { PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase })); + if (persistedMessages && persistedMessages.length > 0) { + persistedMessages.forEach(function (msg) { + addMessage(msg.role, msg.content); + }); + } + function scrollToBottom() { messagesContainer.scrollTop = messagesContainer.scrollHeight; } @@ -141,7 +203,7 @@ }, body: JSON.stringify({ message: message, - history: conversationHistory + sessionId: currentSessionId }) }); @@ -154,9 +216,14 @@ if (data.error) { addMessage('assistant', 'Error: ' + data.error); } else { - conversationHistory.push({ role: 'user', content: message }); - conversationHistory.push({ role: 'assistant', content: data.response }); addMessage('assistant', data.response); + // Update session ID if a new session was created + if (data.sessionId && !currentSessionId) { + currentSessionId = data.sessionId; + // Reload to show the new session in sidebar + window.location.href = '@Url.Action("Index", "Chat")' + '?id=' + data.sessionId; + return; + } } } } catch (err) { @@ -178,17 +245,62 @@ } }); + // Clear just the visual display (messages stay in DB) clearBtn.addEventListener('click', function () { - conversationHistory = []; messagesContainer.innerHTML = ''; - if (placeholder) { - const newPlaceholder = document.createElement('div'); - newPlaceholder.className = 'text-center text-secondary py-4'; - newPlaceholder.id = 'chat-placeholder'; - newPlaceholder.innerHTML = 'Ask me anything about your life tracking data.'; - messagesContainer.appendChild(newPlaceholder); - placeholder = newPlaceholder; - } + const newPlaceholder = document.createElement('div'); + newPlaceholder.className = 'text-center text-secondary py-4'; + newPlaceholder.id = 'chat-placeholder'; + newPlaceholder.innerHTML = 'Ask me anything about your life tracking data.'; + messagesContainer.appendChild(newPlaceholder); + placeholder = newPlaceholder; + }); + + // Delete session confirmation + document.querySelectorAll('.delete-session-form').forEach(function (form) { + form.addEventListener('submit', function (e) { + if (!confirm('This chat will be deleted forever. Continue?')) { + e.preventDefault(); + } + }); + }); + + // Rename session + document.querySelectorAll('.rename-session-btn').forEach(function (btn) { + btn.addEventListener('click', function (e) { + e.preventDefault(); + e.stopPropagation(); + const sessionId = this.dataset.sessionId; + const currentName = this.dataset.sessionName; + const newName = prompt('Enter new name:', currentName); + if (newName && newName.trim() && newName.trim() !== currentName) { + fetch('@Url.Action("RenameSession", "Chat")', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'RequestVerificationToken': antiForgeryToken + }, + body: JSON.stringify({ id: parseInt(sessionId), name: newName.trim() }) + }).then(function (res) { return res.json(); }) + .then(function (data) { + if (data.success) { + // Update sidebar link text + var item = document.getElementById('session-' + sessionId); + if (item) { + var link = item.querySelector('a'); + if (link) { + link.textContent = data.name; + link.title = data.name; + } + } + // Update header if this is the active session + if (parseInt(sessionId) === currentSessionId) { + document.getElementById('active-session-name').textContent = data.name; + } + } + }); + } + }); }); chatInput.focus(); From e13b02c8dd3a2b5e5f31997a2ddcca4b6998f3a2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 06:54:47 +0000 Subject: [PATCH 02/11] Address code review: use GeneratedRegex, extract magic numbers Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/18938176-f8ee-4198-8aed-5bd3c53fb369 Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index 8a7715a..2c84ef7 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -1,3 +1,4 @@ +using System.Text.RegularExpressions; using LifelogBb.ApiServices; using LifelogBb.Models; using LifelogBb.Models.Chat; @@ -9,8 +10,12 @@ namespace LifelogBb.Controllers { - public class ChatController : Controller + public partial class ChatController : Controller { + private const int DefaultSessionNameMaxLength = 50; + + [GeneratedRegex("<[^>]+>")] + private static partial Regex HtmlTagRegex(); private readonly LifelogBbContext _context; private readonly ChatService _chatService; @@ -121,7 +126,9 @@ public async Task Send([FromBody] ChatSendRequest request) { session = new ChatSession { - Name = request.Message.Length > 50 ? request.Message[..50] + "..." : request.Message + Name = request.Message.Length > DefaultSessionNameMaxLength + ? request.Message[..DefaultSessionNameMaxLength] + "..." + : request.Message }; session.SetCreateFields(); _context.ChatSessions.Add(session); @@ -187,7 +194,12 @@ public async Task RenameSession([FromBody] RenameSessionRequest r return NotFound(); } - session.Name = request.Name.Length > 200 ? request.Name[..200] : request.Name; + var maxLength = typeof(ChatSession) + .GetProperty(nameof(ChatSession.Name))! + .GetCustomAttributes(typeof(System.ComponentModel.DataAnnotations.StringLengthAttribute), false) + .Cast() + .FirstOrDefault()?.MaximumLength ?? 200; + session.Name = request.Name.Length > maxLength ? request.Name[..maxLength] : request.Name; session.SetUpdateFields(); await _context.SaveChangesAsync(); @@ -213,7 +225,7 @@ public async Task DeleteSession(long id) private static string StripHtml(string html) { // Simple HTML tag removal for sending back to AI as plain text - return System.Text.RegularExpressions.Regex.Replace(html, "<[^>]+>", "").Trim(); + return HtmlTagRegex().Replace(html, "").Trim(); } } From 33706289047154821ef31c8047bbaf178e6ed1c8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 07:29:14 +0000 Subject: [PATCH 03/11] fix: address PR review - session lookup, SortOrder race, context limit, rename attr, remove History Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/5a0978d3-2505-456f-91f9-5bd3c8cb0bba Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 20 +++++++++++++------- LifelogBb/Views/Chat/Index.cshtml | 6 +++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index 2c84ef7..dba8c9f 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -13,6 +13,7 @@ namespace LifelogBb.Controllers public partial class ChatController : Controller { private const int DefaultSessionNameMaxLength = 50; + private const int MaxConversationMessages = 20; [GeneratedRegex("<[^>]+>")] private static partial Regex HtmlTagRegex(); @@ -46,7 +47,7 @@ public async Task Index(long? id) .FirstOrDefaultAsync(s => s.Id == id.Value); } - if (activeSession == null && sessions.Count > 0) + if (!id.HasValue && activeSession == null && sessions.Count > 0) { activeSession = await _context.ChatSessions .Include(s => s.Messages.OrderBy(m => m.SortOrder)) @@ -98,10 +99,15 @@ public async Task Send([FromBody] ChatSendRequest request) .FirstOrDefaultAsync(s => s.Id == request.SessionId.Value); } + if (request.SessionId.HasValue && session == null) + { + return Json(new { error = "Session not found." }); + } + if (session != null) { - // Build conversation from persisted messages - foreach (var msg in session.Messages) + // Build conversation from persisted messages, capped to MaxConversationMessages + foreach (var msg in session.Messages.TakeLast(MaxConversationMessages)) { conversation.Add(new ChatMessage { @@ -135,9 +141,10 @@ public async Task Send([FromBody] ChatSendRequest request) await _context.SaveChangesAsync(); } - var nextSortOrder = session.Messages.Count > 0 - ? session.Messages.Max(m => m.SortOrder) + 1 - : 0; + var maxSortOrder = await _context.ChatSessionMessages + .Where(m => m.ChatSessionId == session.Id) + .MaxAsync(m => (int?)m.SortOrder); + var nextSortOrder = (maxSortOrder ?? -1) + 1; var userMsg = new ChatSessionMessage { @@ -233,7 +240,6 @@ public class ChatSendRequest { public string Message { get; set; } = ""; public long? SessionId { get; set; } - public List? History { get; set; } } public class RenameSessionRequest diff --git a/LifelogBb/Views/Chat/Index.cshtml b/LifelogBb/Views/Chat/Index.cshtml index a8535a7..ed4e440 100644 --- a/LifelogBb/Views/Chat/Index.cshtml +++ b/LifelogBb/Views/Chat/Index.cshtml @@ -284,7 +284,7 @@ }).then(function (res) { return res.json(); }) .then(function (data) { if (data.success) { - // Update sidebar link text + // Update sidebar link text and button attribute var item = document.getElementById('session-' + sessionId); if (item) { var link = item.querySelector('a'); @@ -292,6 +292,10 @@ link.textContent = data.name; link.title = data.name; } + var renameBtn = item.querySelector('.rename-session-btn'); + if (renameBtn) { + renameBtn.dataset.sessionName = data.name; + } } // Update header if this is the active session if (parseInt(sessionId) === currentSessionId) { From a4e2f3f113444cf1d702de7b00635cc31f5384c9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 07:38:45 +0000 Subject: [PATCH 04/11] fix: address remaining chat review feedback Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/bec98573-ee12-4c46-a333-cc5c36ca9d1f Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 86 ++++++++++++++----------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index dba8c9f..adc8d3a 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -1,11 +1,10 @@ -using System.Text.RegularExpressions; +using System.Collections.Concurrent; using LifelogBb.ApiServices; using LifelogBb.Models; using LifelogBb.Models.Chat; using LifelogBb.Models.Entities; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System.Text.Json; using Westwind.AspNetCore.Markdown; namespace LifelogBb.Controllers @@ -14,9 +13,7 @@ public partial class ChatController : Controller { private const int DefaultSessionNameMaxLength = 50; private const int MaxConversationMessages = 20; - - [GeneratedRegex("<[^>]+>")] - private static partial Regex HtmlTagRegex(); + private static readonly ConcurrentDictionary SessionMessageLocks = new(); private readonly LifelogBbContext _context; private readonly ChatService _chatService; @@ -63,7 +60,7 @@ public async Task Index(long? id) messages.Add(new ChatMessageViewModel { Role = msg.Role, - Content = msg.Content + Content = msg.Role == "assistant" ? Markdown.Parse(msg.Content) : msg.Content }); } } @@ -95,7 +92,6 @@ public async Task Send([FromBody] ChatSendRequest request) if (request.SessionId.HasValue) { session = await _context.ChatSessions - .Include(s => s.Messages.OrderBy(m => m.SortOrder)) .FirstOrDefaultAsync(s => s.Id == request.SessionId.Value); } @@ -106,13 +102,22 @@ public async Task Send([FromBody] ChatSendRequest request) if (session != null) { - // Build conversation from persisted messages, capped to MaxConversationMessages - foreach (var msg in session.Messages.TakeLast(MaxConversationMessages)) + var historyLimit = MaxConversationMessages - 1; + + // Build conversation from persisted messages, reserving one slot for the current user message + var historyMessages = await _context.ChatSessionMessages + .Where(m => m.ChatSessionId == session.Id) + .OrderByDescending(m => m.SortOrder) + .Take(historyLimit) + .OrderBy(m => m.SortOrder) + .ToListAsync(); + + foreach (var msg in historyMessages) { conversation.Add(new ChatMessage { Role = msg.Role, - Content = msg.Role == "assistant" ? StripHtml(msg.Content) : msg.Content + Content = msg.Content }); } } @@ -141,32 +146,41 @@ public async Task Send([FromBody] ChatSendRequest request) await _context.SaveChangesAsync(); } - var maxSortOrder = await _context.ChatSessionMessages - .Where(m => m.ChatSessionId == session.Id) - .MaxAsync(m => (int?)m.SortOrder); - var nextSortOrder = (maxSortOrder ?? -1) + 1; - - var userMsg = new ChatSessionMessage + var sessionMessageLock = SessionMessageLocks.GetOrAdd(session.Id, _ => new SemaphoreSlim(1, 1)); + await sessionMessageLock.WaitAsync(); + try { - ChatSessionId = session.Id, - Role = "user", - Content = request.Message, - SortOrder = nextSortOrder - }; - userMsg.SetCreateFields(); + var maxSortOrder = await _context.ChatSessionMessages + .Where(m => m.ChatSessionId == session.Id) + .MaxAsync(m => (int?)m.SortOrder); + var nextSortOrder = (maxSortOrder ?? -1) + 1; - var assistantMsg = new ChatSessionMessage - { - ChatSessionId = session.Id, - Role = "assistant", - Content = html, - SortOrder = nextSortOrder + 1 - }; - assistantMsg.SetCreateFields(); + var userMsg = new ChatSessionMessage + { + ChatSessionId = session.Id, + Role = "user", + Content = request.Message, + SortOrder = nextSortOrder + }; + userMsg.SetCreateFields(); - _context.ChatSessionMessages.AddRange(userMsg, assistantMsg); - session.SetUpdateFields(); - await _context.SaveChangesAsync(); + var assistantMsg = new ChatSessionMessage + { + ChatSessionId = session.Id, + Role = "assistant", + Content = response, + SortOrder = nextSortOrder + 1 + }; + assistantMsg.SetCreateFields(); + + _context.ChatSessionMessages.AddRange(userMsg, assistantMsg); + session.SetUpdateFields(); + await _context.SaveChangesAsync(); + } + finally + { + sessionMessageLock.Release(); + } return Json(new { response = html, sessionId = session.Id, sessionName = session.Name }); } @@ -228,12 +242,6 @@ public async Task DeleteSession(long id) return RedirectToAction(nameof(Index)); } - - private static string StripHtml(string html) - { - // Simple HTML tag removal for sending back to AI as plain text - return HtmlTagRegex().Replace(html, "").Trim(); - } } public class ChatSendRequest From 31e1345e39b85377e77add89f9977bcd6daf3af5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 07:43:25 +0000 Subject: [PATCH 05/11] fix: harden chat send history and persistence flow Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/bec98573-ee12-4c46-a333-cc5c36ca9d1f Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 94 ++++++++++++++++--------- 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index adc8d3a..172c3ca 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -1,11 +1,12 @@ -using System.Collections.Concurrent; using LifelogBb.ApiServices; using LifelogBb.Models; using LifelogBb.Models.Chat; using LifelogBb.Models.Entities; +using Microsoft.Data.Sqlite; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Westwind.AspNetCore.Markdown; +using System.Data; namespace LifelogBb.Controllers { @@ -13,7 +14,7 @@ public partial class ChatController : Controller { private const int DefaultSessionNameMaxLength = 50; private const int MaxConversationMessages = 20; - private static readonly ConcurrentDictionary SessionMessageLocks = new(); + private const int MaxSortOrderRetries = 3; private readonly LifelogBbContext _context; private readonly ChatService _chatService; @@ -102,13 +103,13 @@ public async Task Send([FromBody] ChatSendRequest request) if (session != null) { - var historyLimit = MaxConversationMessages - 1; + var maxHistoryMessages = MaxConversationMessages - 1; // Build conversation from persisted messages, reserving one slot for the current user message var historyMessages = await _context.ChatSessionMessages .Where(m => m.ChatSessionId == session.Id) .OrderByDescending(m => m.SortOrder) - .Take(historyLimit) + .Take(maxHistoryMessages) .OrderBy(m => m.SortOrder) .ToListAsync(); @@ -128,6 +129,10 @@ public async Task Send([FromBody] ChatSendRequest request) Role = "user", Content = request.Message }); + if (conversation.Count > MaxConversationMessages) + { + conversation = conversation.TakeLast(MaxConversationMessages).ToList(); + } var response = await _chatService.SendAsync(conversation); var html = Markdown.Parse(response); @@ -146,40 +151,53 @@ public async Task Send([FromBody] ChatSendRequest request) await _context.SaveChangesAsync(); } - var sessionMessageLock = SessionMessageLocks.GetOrAdd(session.Id, _ => new SemaphoreSlim(1, 1)); - await sessionMessageLock.WaitAsync(); - try + var persisted = false; + for (var attempt = 0; attempt < MaxSortOrderRetries && !persisted; attempt++) { - var maxSortOrder = await _context.ChatSessionMessages - .Where(m => m.ChatSessionId == session.Id) - .MaxAsync(m => (int?)m.SortOrder); - var nextSortOrder = (maxSortOrder ?? -1) + 1; - - var userMsg = new ChatSessionMessage + await using var transaction = await _context.Database.BeginTransactionAsync(IsolationLevel.Serializable, HttpContext.RequestAborted); + try { - ChatSessionId = session.Id, - Role = "user", - Content = request.Message, - SortOrder = nextSortOrder - }; - userMsg.SetCreateFields(); + var maxSortOrder = await _context.ChatSessionMessages + .Where(m => m.ChatSessionId == session.Id) + .MaxAsync(m => (int?)m.SortOrder, HttpContext.RequestAborted); + var nextSortOrder = (maxSortOrder ?? -1) + 1; - var assistantMsg = new ChatSessionMessage + var userMsg = new ChatSessionMessage + { + ChatSessionId = session.Id, + Role = "user", + Content = request.Message, + SortOrder = nextSortOrder + }; + userMsg.SetCreateFields(); + + var assistantMsg = new ChatSessionMessage + { + ChatSessionId = session.Id, + Role = "assistant", + Content = response, + SortOrder = nextSortOrder + 1 + }; + assistantMsg.SetCreateFields(); + + _context.ChatSessionMessages.AddRange(userMsg, assistantMsg); + session.SetUpdateFields(); + await _context.SaveChangesAsync(HttpContext.RequestAborted); + await transaction.CommitAsync(HttpContext.RequestAborted); + persisted = true; + } + catch (Exception ex) when (IsRetryableSqliteLockError(ex) && attempt < MaxSortOrderRetries - 1) { - ChatSessionId = session.Id, - Role = "assistant", - Content = response, - SortOrder = nextSortOrder + 1 - }; - assistantMsg.SetCreateFields(); - - _context.ChatSessionMessages.AddRange(userMsg, assistantMsg); - session.SetUpdateFields(); - await _context.SaveChangesAsync(); + _context.ChangeTracker.Clear(); + session = await _context.ChatSessions + .FirstAsync(s => s.Id == session.Id, HttpContext.RequestAborted); + await Task.Delay(50 * (attempt + 1), HttpContext.RequestAborted); + } } - finally + + if (!persisted) { - sessionMessageLock.Release(); + return Json(new { error = "Could not save message. Please try again." }); } return Json(new { response = html, sessionId = session.Id, sessionName = session.Name }); @@ -242,6 +260,18 @@ public async Task DeleteSession(long id) return RedirectToAction(nameof(Index)); } + + private static bool IsRetryableSqliteLockError(Exception exception) + { + var sqliteException = exception switch + { + DbUpdateException dbUpdateException when dbUpdateException.InnerException is SqliteException innerSqliteException => innerSqliteException, + SqliteException directSqliteException => directSqliteException, + _ => null + }; + + return sqliteException is { SqliteErrorCode: 5 or 6 or 517 }; + } } public class ChatSendRequest From c9250c9ef86a3d067f47945d8674cfc03a4fd495 Mon Sep 17 00:00:00 2001 From: Sebastian Pech Date: Sat, 16 May 2026 09:55:20 +0200 Subject: [PATCH 06/11] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index 172c3ca..299d085 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -186,12 +186,16 @@ public async Task Send([FromBody] ChatSendRequest request) await transaction.CommitAsync(HttpContext.RequestAborted); persisted = true; } - catch (Exception ex) when (IsRetryableSqliteLockError(ex) && attempt < MaxSortOrderRetries - 1) + catch (Exception ex) when (IsRetryableSqliteLockError(ex)) { _context.ChangeTracker.Clear(); - session = await _context.ChatSessions - .FirstAsync(s => s.Id == session.Id, HttpContext.RequestAborted); - await Task.Delay(50 * (attempt + 1), HttpContext.RequestAborted); + + if (attempt < MaxSortOrderRetries - 1) + { + session = await _context.ChatSessions + .FirstAsync(s => s.Id == session.Id, HttpContext.RequestAborted); + await Task.Delay(50 * (attempt + 1), HttpContext.RequestAborted); + } } } From 2b9ee1178fadec2f734e6339745373dc39bd84eb Mon Sep 17 00:00:00 2001 From: Sebastian Pech Date: Sat, 16 May 2026 09:55:29 +0200 Subject: [PATCH 07/11] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index 299d085..e486c92 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -154,9 +154,10 @@ public async Task Send([FromBody] ChatSendRequest request) var persisted = false; for (var attempt = 0; attempt < MaxSortOrderRetries && !persisted; attempt++) { - await using var transaction = await _context.Database.BeginTransactionAsync(IsolationLevel.Serializable, HttpContext.RequestAborted); try { + await using var transaction = await _context.Database.BeginTransactionAsync(IsolationLevel.Serializable, HttpContext.RequestAborted); + var maxSortOrder = await _context.ChatSessionMessages .Where(m => m.ChatSessionId == session.Id) .MaxAsync(m => (int?)m.SortOrder, HttpContext.RequestAborted); From 1ee706ffb30624b7176c3a813a4ad7a35e5878ef Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 07:58:52 +0000 Subject: [PATCH 08/11] fix: persist new chat session atomically with first messages Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/bd9c72a4-f6d5-4fd7-8efd-8867ebc4db50 Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 54 ++++++++++++++++--------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index e486c92..e66d9b3 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -138,18 +138,10 @@ public async Task Send([FromBody] ChatSendRequest request) var html = Markdown.Parse(response); // Persist to database - if (session == null) - { - session = new ChatSession - { - Name = request.Message.Length > DefaultSessionNameMaxLength - ? request.Message[..DefaultSessionNameMaxLength] + "..." - : request.Message - }; - session.SetCreateFields(); - _context.ChatSessions.Add(session); - await _context.SaveChangesAsync(); - } + var sessionId = session?.Id; + var newSessionName = request.Message.Length > DefaultSessionNameMaxLength + ? request.Message[..DefaultSessionNameMaxLength] + "..." + : request.Message; var persisted = false; for (var attempt = 0; attempt < MaxSortOrderRetries && !persisted; attempt++) @@ -158,14 +150,39 @@ public async Task Send([FromBody] ChatSendRequest request) { await using var transaction = await _context.Database.BeginTransactionAsync(IsolationLevel.Serializable, HttpContext.RequestAborted); + ChatSession sessionToPersist; + if (sessionId.HasValue) + { + var existingSession = await _context.ChatSessions + .FirstOrDefaultAsync(s => s.Id == sessionId.Value, HttpContext.RequestAborted); + + if (existingSession == null) + { + return Json(new { error = "Session not found." }); + } + + sessionToPersist = existingSession; + } + else + { + sessionToPersist = new ChatSession + { + Name = newSessionName + }; + sessionToPersist.SetCreateFields(); + _context.ChatSessions.Add(sessionToPersist); + await _context.SaveChangesAsync(HttpContext.RequestAborted); + sessionId = sessionToPersist.Id; + } + var maxSortOrder = await _context.ChatSessionMessages - .Where(m => m.ChatSessionId == session.Id) + .Where(m => m.ChatSessionId == sessionToPersist.Id) .MaxAsync(m => (int?)m.SortOrder, HttpContext.RequestAborted); var nextSortOrder = (maxSortOrder ?? -1) + 1; var userMsg = new ChatSessionMessage { - ChatSessionId = session.Id, + ChatSessionId = sessionToPersist.Id, Role = "user", Content = request.Message, SortOrder = nextSortOrder @@ -174,7 +191,7 @@ public async Task Send([FromBody] ChatSendRequest request) var assistantMsg = new ChatSessionMessage { - ChatSessionId = session.Id, + ChatSessionId = sessionToPersist.Id, Role = "assistant", Content = response, SortOrder = nextSortOrder + 1 @@ -182,9 +199,10 @@ public async Task Send([FromBody] ChatSendRequest request) assistantMsg.SetCreateFields(); _context.ChatSessionMessages.AddRange(userMsg, assistantMsg); - session.SetUpdateFields(); + sessionToPersist.SetUpdateFields(); await _context.SaveChangesAsync(HttpContext.RequestAborted); await transaction.CommitAsync(HttpContext.RequestAborted); + session = sessionToPersist; persisted = true; } catch (Exception ex) when (IsRetryableSqliteLockError(ex)) @@ -193,8 +211,6 @@ public async Task Send([FromBody] ChatSendRequest request) if (attempt < MaxSortOrderRetries - 1) { - session = await _context.ChatSessions - .FirstAsync(s => s.Id == session.Id, HttpContext.RequestAborted); await Task.Delay(50 * (attempt + 1), HttpContext.RequestAborted); } } @@ -205,7 +221,7 @@ public async Task Send([FromBody] ChatSendRequest request) return Json(new { error = "Could not save message. Please try again." }); } - return Json(new { response = html, sessionId = session.Id, sessionName = session.Name }); + return Json(new { response = html, sessionId = session!.Id, sessionName = session.Name }); } [HttpPost] From d746e4b38ab9fd71b3f0f02eb65120b827b3b5d4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 08:02:30 +0000 Subject: [PATCH 09/11] fix: avoid stale session id on transactional retry Agent-Logs-Url: https://github.com/spech66/lifelogbb/sessions/bd9c72a4-f6d5-4fd7-8efd-8867ebc4db50 Co-authored-by: spech66 <22615238+spech66@users.noreply.github.com> --- LifelogBb/Controllers/ChatController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LifelogBb/Controllers/ChatController.cs b/LifelogBb/Controllers/ChatController.cs index e66d9b3..01ee41c 100644 --- a/LifelogBb/Controllers/ChatController.cs +++ b/LifelogBb/Controllers/ChatController.cs @@ -158,6 +158,7 @@ public async Task Send([FromBody] ChatSendRequest request) if (existingSession == null) { + await transaction.RollbackAsync(HttpContext.RequestAborted); return Json(new { error = "Session not found." }); } @@ -172,7 +173,6 @@ public async Task Send([FromBody] ChatSendRequest request) sessionToPersist.SetCreateFields(); _context.ChatSessions.Add(sessionToPersist); await _context.SaveChangesAsync(HttpContext.RequestAborted); - sessionId = sessionToPersist.Id; } var maxSortOrder = await _context.ChatSessionMessages @@ -202,6 +202,7 @@ public async Task Send([FromBody] ChatSendRequest request) sessionToPersist.SetUpdateFields(); await _context.SaveChangesAsync(HttpContext.RequestAborted); await transaction.CommitAsync(HttpContext.RequestAborted); + sessionId = sessionToPersist.Id; session = sessionToPersist; persisted = true; } From a7d81d7a0a606d1d053897145bc45ed89531e882 Mon Sep 17 00:00:00 2001 From: Sebastian Pech Date: Sat, 16 May 2026 10:08:20 +0200 Subject: [PATCH 10/11] Fix style --- LifelogBb/Views/Chat/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LifelogBb/Views/Chat/Index.cshtml b/LifelogBb/Views/Chat/Index.cshtml index ed4e440..17c58f8 100644 --- a/LifelogBb/Views/Chat/Index.cshtml +++ b/LifelogBb/Views/Chat/Index.cshtml @@ -45,7 +45,7 @@
@session.Name From edc9002b73cbc35bf7a60edaeeb726148a30c9fb Mon Sep 17 00:00:00 2001 From: Sebastian Pech Date: Sat, 16 May 2026 10:08:28 +0200 Subject: [PATCH 11/11] Update TODO --- TODO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TODO.md b/TODO.md index 673490e..2ef6478 100644 --- a/TODO.md +++ b/TODO.md @@ -8,7 +8,7 @@ ToDos and Features for LifelogBB. ### In Progress :construction: -- [ ] Chat history persistence +- [x] Chat history persistence #### External tools