From 811b4b3e1f5f9205e80b3c818ac08a3fc278c6fb Mon Sep 17 00:00:00 2001
From: Matyas Fenyves <16389204+uhhgoat@users.noreply.github.com>
Date: Fri, 31 Jul 2026 11:35:15 +0200
Subject: [PATCH] fix(group): align recovered branch with current tests

---
 routes/session_routes.py | 2 +-
 static/js/group.js       | 6 +++---
 static/js/sessions.js    | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/routes/session_routes.py b/routes/session_routes.py
index 7642bb7e3..8214c57dc 100644
--- a/routes/session_routes.py
+++ b/routes/session_routes.py
@@ -362,7 +362,7 @@ def _set_group_participant_folders(db, participant_ids: set[str], folder: str |
         return
     q = db.query(DbSession).filter(DbSession.id.in_(participant_ids))
     q = owner_filter(q, DbSession, user)
-    now = datetime.utcnow()
+    now = utcnow_naive()
     for participant in q.all():
         participant.folder = folder
         participant.updated_at = now
diff --git a/static/js/group.js b/static/js/group.js
index 2f2b98476..a3de2d540 100644
--- a/static/js/group.js
+++ b/static/js/group.js
@@ -816,10 +816,10 @@ function _createGroupBubble(model, box, options = {}) {
   wrap.style.position = 'relative';
 
   // Role label — use character name if assigned, otherwise model name
-  const roleLabel = model._groupName || (model.character ? model.character.characterName : chatRenderer.shortModel(model.mid));
+  const participantLabel = model._groupName || (model.character ? model.character.characterName : chatRenderer.shortModel(model.mid));
   const roleTs = new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
-  const displayLabel = options.whisper ? `Whisper from ${roleLabel}` : roleLabel;
-  wrap.innerHTML = `<div class="role">${uiModule.esc(displayLabel)} <span class="role-timestamp">${roleTs}</span></div><div class="body"></div>`;
+  const roleLabel = options.whisper ? `Whisper from ${participantLabel}` : participantLabel;
+  wrap.innerHTML = `<div class="role">${uiModule.esc(roleLabel)} <span class="role-timestamp">${roleTs}</span></div><div class="body"></div>`;
   chatRenderer.applyModelColor(wrap.querySelector('.role'), model.mid);
 
   // Spinner — identical to chat.js line 3062
diff --git a/static/js/sessions.js b/static/js/sessions.js
index 84232a5d3..651b15124 100644
--- a/static/js/sessions.js
+++ b/static/js/sessions.js
@@ -2214,13 +2214,12 @@ export async function selectSession(id, { keepSidebar = false, showLoading = tru
       for (const msg of msgHistory) {
         let renderMsg = msg;
         if (groupChildInfo && msg.role === 'assistant') {
+          const childMeta = { ...(msg.metadata || {}) };
+          childMeta.character_name = childMeta.character_name || groupChildInfo.name;
+          if (!childMeta.model && groupChildInfo.model) childMeta.model = groupChildInfo.model;
           renderMsg = {
             ...msg,
-            metadata: {
-              ...(msg.metadata || {}),
-              character_name: (msg.metadata && msg.metadata.character_name) || groupChildInfo.name,
-              model: (msg.metadata && msg.metadata.model) || groupChildInfo.model || '',
-            },
+            metadata: childMeta,
           };
         }
         try {