Update server/wsHandler.js

server/wsHandler.js

@@ -26,6 +26,8 @@ function bcast(wsClients, userId, data, excludeWs) {
 }
 
 const handlers = {
+  'ping': (ws) => { safeSend(ws, { type: 'pong' }); },
+
   'auth:login': async (ws, msg, client, wsClients) => {
     const { accessToken, tempId: clientTempId } = msg;
     if (!accessToken) return safeSend(ws, { type: 'auth:error', message: 'Missing token' });
@@ -153,7 +155,14 @@ const handlers = {
         activeStreams.delete(ws);
         const finalText = text || fullText;
         const userEntry = buildEntry('user', content);
-        const asstEntry = buildEntry('assistant', finalText, toolCalls || []);
+        // Merge: toolCalls from streamChat (OpenAI format) merged with
+        // resolved state/result info from toolCallsCollected (flat format)
+        const resolvedMap = new Map(toolCallsCollected.map(c => [c.id, c]));
+        const mergedCalls = (toolCalls || []).map(c => {
+          const resolved = resolvedMap.get(c.id) || {};
+          return { ...c, state: resolved.state || 'resolved', result: resolved.result };
+        });
+        const asstEntry = buildEntry('assistant', finalText, mergedCalls);
         // Assets (images/video/audio) are sent to the client via chat:asset events and
         // must NOT be pushed into LLM history — invalid roles cause blank responses.
         const newHistory = [...(session.history || []), userEntry, asstEntry];
@@ -238,9 +247,19 @@ const handlers = {
 function ser(s) { return { id: s.id, name: s.name, created: s.created, history: s.history || [], model: s.model }; }
 
 function buildEntry(role, content, toolCalls = []) {
+  // Normalize tool calls so the UI can always read call.name directly,
+  // regardless of whether they arrived in OpenAI format {function:{name,arguments}}
+  // or already-flat format {name, args}.
+  const normalizedCalls = toolCalls.map(c => ({
+    id:     c.id,
+    name:   c.name || c.function?.name,
+    args:   c.args ?? (c.function?.arguments ? (() => { try { return JSON.parse(c.function.arguments); } catch { return c.function.arguments; } })() : {}),
+    state:  c.state || 'resolved',
+    result: c.result,
+  }));
   return { role, content, timestamp: Date.now(),
     versions: [{ content, tail: [], timestamp: Date.now() }], currentVersionIdx: 0,
-    ...(toolCalls.length ? { toolCalls } : {}) };
+    ...(normalizedCalls.length ? { toolCalls: normalizedCalls } : {}) };
 }
 
 async function autoName(prompt, accessToken) {