Revert "Add new session handling"

This reverts commit caeb5301c1d9f9f999894dfab9625bce6adc06b9.

server/chatSessionSerializer.js

@@ -1,139 +0,0 @@
-const ROOT_JSON_KEY = '__historyRootJson';
-const VERSION_META_FIELDS = ['toolCalls', 'responseEdits', 'responseSegments', 'error'];
-
-function validateAndRepairTree(rootMessage) {
-  const repair = (msg) => {
-    if (!msg) return;
-    if (msg.content === undefined || msg.content === null) {
-      msg.content = '';
-    }
-    if (msg.versions && Array.isArray(msg.versions)) {
-      for (const version of msg.versions) {
-        if (version.content === undefined || version.content === null) {
-          version.content = '';
-        }
-        if (version.tail && Array.isArray(version.tail)) {
-          for (const tailMsg of version.tail) {
-            repair(tailMsg);
-          }
-        }
-      }
-    }
-  };
-  repair(rootMessage);
-  return rootMessage;
-}
-
-function cloneAndRepairTree(rootMessage) {
-  return validateAndRepairTree(JSON.parse(JSON.stringify(rootMessage)));
-}
-
-function getActiveVersion(message) {
-  if (!message) return null;
-  const versions = Array.isArray(message.versions) ? message.versions : [];
-  if (!versions.length) {
-    message.versions = [{ content: message.content ?? '', tail: [], timestamp: Date.now() }];
-    message.currentVersionIdx = 0;
-    return message.versions[0];
-  }
-  const currentVersionIdx = Number.isInteger(message.currentVersionIdx)
-    ? Math.max(0, Math.min(message.currentVersionIdx, versions.length - 1))
-    : 0;
-  message.currentVersionIdx = currentVersionIdx;
-  if (!Array.isArray(message.versions[currentVersionIdx].tail)) {
-    message.versions[currentVersionIdx].tail = [];
-  }
-  if (message.versions[currentVersionIdx].content === undefined || message.versions[currentVersionIdx].content === null) {
-    message.versions[currentVersionIdx].content = message.content ?? '';
-  }
-  return message.versions[currentVersionIdx];
-}
-
-function cloneVersionMetaValue(value) {
-  if (value === undefined) return undefined;
-  return JSON.parse(JSON.stringify(value));
-}
-
-function syncMessageFromActiveVersion(message) {
-  if (!message) return message;
-  const currentVersion = getActiveVersion(message);
-  if (!currentVersion) return message;
-  message.content = currentVersion.content ?? message.content ?? '';
-  VERSION_META_FIELDS.forEach((key) => {
-    if (key in currentVersion) {
-      message[key] = cloneVersionMetaValue(currentVersion[key]);
-    } else {
-      delete message[key];
-    }
-  });
-  return message;
-}
-
-function cloneJson(value) {
-  return JSON.parse(JSON.stringify(value));
-}
-
-export function extractFlatHistory(rootMessage) {
-  if (!rootMessage) return [];
-
-  const toFlatEntry = (message) => {
-    const cloned = cloneJson(message);
-    if (cloned.content === undefined || cloned.content === null) {
-      cloned.content = '';
-    }
-    syncMessageFromActiveVersion(cloned);
-    if (Array.isArray(cloned.versions)) {
-      cloned.versions = cloned.versions.map((version) => ({
-        ...version,
-        tail: [],
-      }));
-    }
-    return cloned;
-  };
-
-  const history = [toFlatEntry(rootMessage)];
-  const currentVerIdx = rootMessage.currentVersionIdx ?? 0;
-
-  if (!Array.isArray(rootMessage.versions) || currentVerIdx >= rootMessage.versions.length) {
-    return history;
-  }
-
-  const currentTail = rootMessage.versions[currentVerIdx]?.tail;
-  if (currentTail && Array.isArray(currentTail)) {
-    const walkTail = (tail) => {
-      for (let i = 0; i < tail.length; i++) {
-        const msg = tail[i];
-        if (msg?.content === undefined || msg?.content === null) {
-          msg.content = '';
-        }
-        syncMessageFromActiveVersion(msg);
-        history.push(toFlatEntry(msg));
-        const ver = msg.versions?.[msg.currentVersionIdx ?? 0];
-        if (ver?.tail && Array.isArray(ver.tail)) {
-          walkTail(ver.tail);
-        }
-        if (msg.role === 'user' && Array.isArray(msg.versions) && msg.versions.length > 1) {
-          break;
-        }
-      }
-    };
-    walkTail(currentTail);
-  }
-
-  return history;
-}
-
-export function serializeSessionForClient(session) {
-  const rootMessage = Array.isArray(session?.history) && session.history[0]
-    ? cloneAndRepairTree(session.history[0])
-    : null;
-  return {
-    id: session?.id,
-    name: session?.name,
-    created: session?.created,
-    history: rootMessage ? extractFlatHistory(rootMessage) : [],
-    model: session?.model || null,
-    updatedAt: session?.updatedAt || null,
-    [ROOT_JSON_KEY]: rootMessage ? JSON.stringify(rootMessage) : null,
-  };
-}

server/index.js

@@ -10,13 +10,11 @@ import rateLimit from 'express-rate-limit';
 import fs from 'fs';
 import { registerFeedbackRoutes } from './handleFeedback.js';
 import { abortActiveStream, handleWsMessage } from './wsHandler.js';
-import { serializeSessionForClient } from './chatSessionSerializer.js';
 import { sessionStore, initStoreConfig } from './sessionStore.js';
 import { SUPABASE_URL, SUPABASE_ANON_KEY } from './config.js';
 import { safeSend } from './helpers.js';
 import { verifySupabaseToken } from './auth.js';
 import { mediaStore } from './mediaStore.js';
-import { pendingTurnstileTokens } from './turnstileState.js';
 
 export { SUPABASE_URL, SUPABASE_ANON_KEY };
 export { LIGHTNING_BASE, PUBLIC_URL } from './config.js';
@@ -413,12 +411,12 @@ app.get('/api/db/chats', async (req, res) => {
         })),
       });
     }
-      const items = [];
-      for (const listedSession of listed) {
-        const full = await sessionStore.getUserSessionResolved(resolved.user.id, listedSession.id);
-        if (full) items.push(serializeSessionForClient(full));
-      }
-      res.json({ items });
+    const items = [];
+    for (const listedSession of listed) {
+      const full = await sessionStore.getUserSessionResolved(resolved.user.id, listedSession.id);
+      if (full) items.push(full);
+    }
+    res.json({ items });
   } catch (err) {
     console.error('db chats list error', err);
     res.status(500).json({ error: 'db:chats_list_failed' });
@@ -438,7 +436,7 @@ app.post('/api/db/chats', async (req, res) => {
     if (Object.keys(patch).length) {
       created = await sessionStore.updateUserSession(resolved.user.id, resolved.accessToken, created.id, patch);
     }
-    res.status(201).json({ item: serializeSessionForClient(created) });
+    res.status(201).json({ item: created });
   } catch (err) {
     console.error('db chat create error', err);
     res.status(500).json({ error: 'db:chat_create_failed' });
@@ -451,7 +449,7 @@ app.get('/api/db/chats/:sessionId', async (req, res) => {
   try {
     const session = await sessionStore.getUserSessionResolved(resolved.user.id, req.params.sessionId);
     if (!session) return res.status(404).json({ error: 'db:chat_not_found' });
-    res.json({ item: serializeSessionForClient(session) });
+    res.json({ item: session });
   } catch (err) {
     console.error('db chat get error', err);
     res.status(500).json({ error: 'db:chat_get_failed' });
@@ -475,7 +473,7 @@ app.patch('/api/db/chats/:sessionId', async (req, res) => {
       patch
     );
     if (!updated) return res.status(404).json({ error: 'db:chat_not_found' });
-    res.json({ item: serializeSessionForClient(updated) });
+    res.json({ item: updated });
   } catch (err) {
     console.error('db chat patch error', err);
     res.status(500).json({ error: 'db:chat_update_failed' });
@@ -728,7 +726,7 @@ app.get('/api/db/export', async (req, res) => {
     const chats = [];
     for (const listedSession of listed) {
       const full = await sessionStore.getUserSessionResolved(resolved.user.id, listedSession.id);
-      if (full) chats.push(serializeSessionForClient(full));
+      if (full) chats.push(full);
     }
 
     const mediaResult = await mediaStore.listAll(resolved.owner, { view: 'all' });
@@ -990,6 +988,8 @@ app.get('/api/media/:id/content', async (req, res) => {
   }
 });
 
+const pendingTurnstileTokens = new Map(); // token -> expiry
+
 app.post('/api/turnstile', async (req, res) => {
   try {
     const token = req.body?.token;

server/sessionStore.js

@@ -53,9 +53,6 @@ function ensureSessionShape(raw, fallbackId = null) {
     created,
     history: Array.isArray(raw?.history) ? raw.history : [],
     model: raw?.model || null,
-    updatedAt: typeof raw?.updatedAt === 'string' && raw.updatedAt.trim()
-      ? raw.updatedAt
-      : nowIso(),
   };
 }
 
@@ -180,7 +177,6 @@ function sessionForList(meta, loaded) {
     created: Number.isFinite(source.created) ? source.created : Date.now(),
     history: loaded?.history || [],
     model: source.model || null,
-    updatedAt: source.updatedAt || null,
   };
 }
 

server/turnstileState.js

@@ -1 +0,0 @@
-export const pendingTurnstileTokens = new Map();

server/wsHandler.js

@@ -17,7 +17,7 @@ import { systemPromptStore } from './systemPromptStore.js';
 import { getWebSearchUsage } from './webSearchUsageStore.js';
 import crypto from 'crypto';
 import path from 'path';
-import { pendingTurnstileTokens } from './turnstileState.js';
+import { pendingTurnstileTokens } from './index.js';
 
 /**
  * Message Structure: Tree-based with versioned tails
@@ -48,7 +48,6 @@ import { pendingTurnstileTokens } from './turnstileState.js';
 
 const activeStreams = new Map();
 const VERSION_META_FIELDS = ['toolCalls', 'responseEdits', 'responseSegments', 'error'];
-const ROOT_JSON_KEY = '__historyRootJson';
 const CONTINUE_ASSISTANT_PROMPT =
   'Continue your previous response exactly where it left off. Do not restart, summarize, or repeat the opening. Preserve the same formatting and only add the missing continuation.';
 const FREE_WEB_SEARCH_LIMIT = 15;
@@ -455,13 +454,7 @@ const handlers = {
           await sessionStore.updateUserSession(client.userId, client.accessToken, sessionId, { history: newHistory, name: newName });
         else sessionStore.updateTempSession(client.tempId, sessionId, { history: newHistory, name: newName });
 
-        safeSend(ws, {
-          type: aborted ? 'chat:aborted' : 'chat:done',
-          sessionId,
-          name: newName,
-          history: extractFlatHistory(newRootMessage),
-          [ROOT_JSON_KEY]: JSON.stringify(newRootMessage),
-        });
+        safeSend(ws, { type: aborted ? 'chat:aborted' : 'chat:done', sessionId, name: newName, history: extractFlatHistory(newRootMessage) });
       },
       onError(err) {
         activeStreams.delete(ws);
@@ -532,15 +525,7 @@ const handlers = {
       return safeSend(ws, { type: 'error', message: 'Failed to apply edit - message lost' });
     }
     
-    safeSend(ws, {
-      type: 'chat:messageEdited',
-      sessionId,
-      messageId: targetMsg.id,
-      messageIndex,
-      message: updatedTargetMsg,
-      history: updatedFlatHistory,
-      [ROOT_JSON_KEY]: JSON.stringify(newRoot),
-    });
+    safeSend(ws, { type: 'chat:messageEdited', sessionId, messageId: targetMsg.id, messageIndex, message: updatedTargetMsg, history: updatedFlatHistory });
   },
 
   'chat:selectVersion': async (ws, msg, client) => {
@@ -575,14 +560,7 @@ const handlers = {
     }
     
     // Send back with messageId for clarity
-    safeSend(ws, {
-      type: 'chat:versionSelected',
-      sessionId,
-      messageId: targetMsg.id,
-      messageIndex,
-      history: extractFlatHistory(newRoot),
-      [ROOT_JSON_KEY]: JSON.stringify(newRoot),
-    });
+    safeSend(ws, { type: 'chat:versionSelected', sessionId, messageId: targetMsg.id, messageIndex, history: extractFlatHistory(newRoot) });
   },
 
   'chat:assistantAction': async (ws, msg, client) => {
@@ -731,13 +709,7 @@ const handlers = {
           sessionStore.updateTempSession(client.tempId, sessionId, { history: newHistory, name: newName });
         }
 
-        safeSend(ws, {
-          type: 'chat:done',
-          sessionId,
-          name: newName,
-          history: extractFlatHistory(newRoot),
-          [ROOT_JSON_KEY]: JSON.stringify(newRoot),
-        });
+        safeSend(ws, { type: 'chat:done', sessionId, name: newName, history: extractFlatHistory(newRoot) });
       },
       onError(err) {
         activeStreams.delete(ws);
@@ -881,22 +853,7 @@ const handlers = {
   },
 };
 
-export function serializeSessionForClient(session) {
-  const rootMessage = Array.isArray(session?.history) && session.history[0]
-    ? cloneAndRepairTree(session.history[0])
-    : null;
-  return {
-    id: session?.id,
-    name: session?.name,
-    created: session?.created,
-    history: rootMessage ? extractFlatHistory(rootMessage) : [],
-    model: session?.model || null,
-    updatedAt: session?.updatedAt || null,
-    [ROOT_JSON_KEY]: rootMessage ? JSON.stringify(rootMessage) : null,
-  };
-}
-
-function ser(s) { return serializeSessionForClient(s); }
+function ser(s) { return { id: s.id, name: s.name, created: s.created, history: s.history || [], model: s.model }; }
 
 function getClientOwner(client) {
   return client.userId
@@ -1136,10 +1093,6 @@ function cloneVersionMetaValue(value) {
   return JSON.parse(JSON.stringify(value));
 }
 
-function cloneJson(value) {
-  return JSON.parse(JSON.stringify(value));
-}
-
 function syncMessageFromActiveVersion(message) {
   if (!message) return message;
   const currentVersion = getActiveVersion(message);
@@ -1190,23 +1143,16 @@ function appendConversationTurn(rootMessage, userEntry, assistantEntry, mediaEnt
 
 function extractFlatHistory(rootMessage) {
   if (!rootMessage) return [];
-
-  const toFlatEntry = (message) => {
-    const cloned = cloneJson(message);
-    if (cloned.content === undefined || cloned.content === null) {
-      cloned.content = '';
-    }
-    syncMessageFromActiveVersion(cloned);
-    if (Array.isArray(cloned.versions)) {
-      cloned.versions = cloned.versions.map((version) => ({
-        ...version,
-        tail: [],
-      }));
+  
+  // Helper to ensure message has valid content
+  const ensureValidContent = (msg) => {
+    if (msg.content === undefined || msg.content === null) {
+      msg.content = '';
     }
-    return cloned;
+    return syncMessageFromActiveVersion(msg);
   };
-
-  const history = [toFlatEntry(rootMessage)];
+  
+  const history = [ensureValidContent(rootMessage)];
   const currentVerIdx = rootMessage.currentVersionIdx ?? 0;
   
   if (!Array.isArray(rootMessage.versions)) {
@@ -1225,11 +1171,7 @@ function extractFlatHistory(rootMessage) {
     const walkTail = (tail) => {
       for (let i = 0; i < tail.length; i++) {
         const msg = tail[i];
-        if (msg?.content === undefined || msg?.content === null) {
-          msg.content = '';
-        }
-        syncMessageFromActiveVersion(msg);
-        history.push(toFlatEntry(msg));
+        history.push(ensureValidContent(msg));
         const ver = msg.versions?.[msg.currentVersionIdx ?? 0];
         if (ver?.tail && Array.isArray(ver.tail)) {
           walkTail(ver.tail);