Versions

server/chatStream.js

@@ -129,6 +129,17 @@ export async function streamChat(ws, {
     { role: "user", content: userMessage },
   ];
 
+  // Validate messages before API call
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.role !== "assistant" || !msg.tool_calls) {
+      if (typeof msg.content !== "string") {
+        console.error(`Message ${i} has invalid content:`, msg);
+        throw new Error(`Message ${i} missing or invalid content property`);
+      }
+    }
+  }
+
   try {
     const stream = await client.chat.completions.create({
       model:  model || "lightning",
@@ -190,7 +201,7 @@ function normalizeMessage(msg) {
       .join("\n");
     return { role: msg.role, content: textOnly || "" };
   }
-  return { role: msg.role, content: msg.content };
+  return { role: msg.role, content: msg.content ?? "" };
 }
 
 function buildToolList(tools) {

server/wsHandler.js

@@ -192,6 +192,16 @@ const handlers = {
         const asstEntry = buildEntry('assistant', finalText, mergedCalls);
         const newHistory = [...(session.history || []), userEntry, asstEntry];
 
+        // Update tails for all versioned messages to include new messages
+        for (let i = 0; i < newHistory.length; i++) {
+          const msg = newHistory[i];
+          if (msg.versions) {
+            for (const version of msg.versions) {
+              version.tail = newHistory.slice(i + 1);
+            }
+          }
+        }
+
         // Use session name from XML tag; fall back to existing name or default
         let newName = session.name;
         if (sessionNameFromTag) {