fix: forward tool call info back to api

Author: samolego

tools/server/webui/src/utils/misc.ts

@@ -66,10 +66,16 @@ export function normalizeMsgsForAPI(messages: Readonly<Message[]>) {
 
     newContent += msg.content;
 
-    return {
+    const apiMsg = {
       role: msg.role,
       content: newContent,
-    };
+    } as APIMessage;
+
+    if (msg.tool_calls && msg.tool_calls.length > 0) {
+      apiMsg.tool_calls = msg.tool_calls;
+    }
+
+    return apiMsg;
   }) as APIMessage[];
 }
 
@@ -78,13 +84,19 @@ export function normalizeMsgsForAPI(messages: Readonly<Message[]>) {
  */
 export function filterThoughtFromMsgs(messages: APIMessage[]) {
   return messages.map((msg) => {
-    return {
+    const filteredMessage: APIMessage = {
       role: msg.role,
       content:
         msg.role === 'assistant'
           ? msg.content.split('</think>').at(-1)!.trim()
           : msg.content,
-    } as APIMessage;
+    };
+
+    if (msg.tool_calls && msg.tool_calls.length > 0) {
+      filteredMessage.tool_calls = msg.tool_calls;
+    }
+
+    return filteredMessage;
   });
 }
 

tools/server/webui/src/utils/storage.ts

@@ -136,8 +136,6 @@ const StorageUtils = {
   ): Promise<void> {
     if (messages.length === 0) return;
 
-    console.log('Saving messges! ' + JSON.stringify(messages));
-
     const { convId } = messages[0];
 
     // Verify conversation exists
@@ -196,15 +194,11 @@ const StorageUtils = {
           currNode: lastMsgId,
         });
       });
-
-      console.log(`Successfully saved chain of ${messages.length} messages`);
     } catch (error) {
       console.error('Error saving message chain:', error);
       throw error;
     }
 
-    if (isDev) console.log('Updated conversation:', convId);
-
     dispatchConversationChange(convId);
   },
 

tools/server/webui/src/utils/types.ts

@@ -62,7 +62,7 @@ export interface MessageExtraContext {
   content: string;
 }
 
-export type APIMessage = Pick<Message, 'role' | 'content'>;
+export type APIMessage = Pick<Message, 'role' | 'content' | 'tool_calls'>;
 
 export interface Conversation {
   id: string; // format: `conv-{timestamp}`