Update wsHandler.js

server/wsHandler.js

@@ -214,7 +214,11 @@ const handlers = {
       async onDone(text, toolCalls, aborted, sessionNameFromTag) {
         activeStreams.delete(ws);
         const finalText = text || fullText;
-        const userEntry = buildEntry('user', content);
+        
+        // Only create user entry if content was actually provided
+        const userEntry = (content !== undefined && content !== null && content !== '')
+          ? buildEntry('user', content)
+          : null;
 
         const resolvedMap = new Map(toolCallsCollected.map(c => [c.id, c]));
         const mergedCalls = (toolCalls || []).map(c => {
@@ -227,7 +231,8 @@ const handlers = {
         let newRootMessage = rootMessage ? validateAndRepairTree(JSON.parse(JSON.stringify(rootMessage))) : null;
         
         if (!newRootMessage) {
-          // First message in session
+          // First message in session - must have user entry
+          if (!userEntry) return safeSend(ws, { type: 'error', message: 'No content for first message' });
           newRootMessage = userEntry;
           const asstWrap = { ...asstEntry };
           newRootMessage.versions[0].tail = [asstWrap];
@@ -236,7 +241,9 @@ const handlers = {
           const currentVerIdx = newRootMessage.currentVersionIdx ?? 0;
           let currentTail = newRootMessage.versions[currentVerIdx].tail || [];
           currentTail = JSON.parse(JSON.stringify(currentTail));
-          currentTail.push(userEntry);
+          if (userEntry) {
+            currentTail.push(userEntry);
+          }
           currentTail.push(asstEntry);
           newRootMessage.versions[currentVerIdx].tail = currentTail;
         }
@@ -433,7 +440,7 @@ function extractFlatHistory(rootMessage) {
   
   // Helper to ensure message has valid content
   const ensureValidContent = (msg) => {
-    if (!msg.content && msg.content !== '' && msg.content !== 0) {
+    if (msg.content === undefined || msg.content === null) {
       console.warn(`Message ${msg.id} has missing content, defaulting to empty string`);
       msg.content = '';
     }