Fix tool call ordering

Author: Sg312

apps/sim/app/api/mothership/chat/route.ts

@@ -191,6 +191,26 @@ export async function POST(req: NextRequest) {
           if (result.toolCalls.length > 0) {
             assistantMessage.toolCalls = result.toolCalls
           }
+          if (result.contentBlocks.length > 0) {
+            assistantMessage.contentBlocks = result.contentBlocks.map((block) => {
+              const stored: Record<string, unknown> = { type: block.type }
+              if (block.content) stored.content = block.content
+              if (block.type === 'tool_call' && block.toolCall) {
+                stored.toolCall = {
+                  id: block.toolCall.id,
+                  name: block.toolCall.name,
+                  state:
+                    block.toolCall.result?.success !== undefined
+                      ? block.toolCall.result.success
+                        ? 'success'
+                        : 'error'
+                      : block.toolCall.status,
+                  result: block.toolCall.result,
+                }
+              }
+              return stored
+            })
+          }
 
           try {
             const [row] = await db

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -99,16 +99,21 @@ function mapStoredMessage(msg: TaskStoredMessage): ChatMessage {
     content: msg.content,
   }
 
-  if (Array.isArray(msg.toolCalls) && msg.toolCalls.length > 0) {
-    const blocks: ContentBlock[] = msg.toolCalls.map(mapStoredToolCall)
-    if (msg.content?.trim()) {
+  const hasContentBlocks = Array.isArray(msg.contentBlocks) && msg.contentBlocks.length > 0
+  const hasToolCalls = Array.isArray(msg.toolCalls) && msg.toolCalls.length > 0
+  const contentBlocksHaveTools =
+    hasContentBlocks && msg.contentBlocks!.some((b) => b.type === 'tool_call')
+
+  if (hasContentBlocks && (!hasToolCalls || contentBlocksHaveTools)) {
+    const blocks = msg.contentBlocks!.map(mapStoredBlock)
+    const hasText = blocks.some((b) => b.type === 'text' && b.content?.trim())
+    if (!hasText && msg.content?.trim()) {
       blocks.push({ type: 'text', content: msg.content })
     }
     mapped.contentBlocks = blocks
-  } else if (Array.isArray(msg.contentBlocks) && msg.contentBlocks.length > 0) {
-    const blocks = msg.contentBlocks.map(mapStoredBlock)
-    const hasText = blocks.some((b) => b.type === 'text' && b.content?.trim())
-    if (!hasText && msg.content?.trim()) {
+  } else if (hasToolCalls) {
+    const blocks: ContentBlock[] = msg.toolCalls!.map(mapStoredToolCall)
+    if (msg.content?.trim()) {
       blocks.push({ type: 'text', content: msg.content })
     }
     mapped.contentBlocks = blocks

apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts

@@ -185,12 +185,14 @@ export const sseHandlers: Record<string, SSEHandler> = {
       event.toolName || (data?.toolName as string | undefined) || (data?.name as string | undefined)
     if (!toolCallId || !toolName) return
     if (!context.toolCalls.has(toolCallId)) {
-      context.toolCalls.set(toolCallId, {
+      const toolCall = {
         id: toolCallId,
         name: toolName,
-        status: 'pending',
+        status: 'pending' as const,
         startTime: Date.now(),
-      })
+      }
+      context.toolCalls.set(toolCallId, toolCall)
+      addContentBlock(context, { type: 'tool_call', toolCall })
     }
   },
   tool_call: async (event, context, execContext, options) => {
@@ -217,15 +219,20 @@ export const sseHandlers: Record<string, SSEHandler> = {
 
     if (existing) {
       if (args && !existing.params) existing.params = args
+      if (
+        !context.contentBlocks.some((b) => b.type === 'tool_call' && b.toolCall?.id === toolCallId)
+      ) {
+        addContentBlock(context, { type: 'tool_call', toolCall: existing })
+      }
     } else {
-      context.toolCalls.set(toolCallId, {
+      const created = {
         id: toolCallId,
         name: toolName,
-        status: 'pending',
+        status: 'pending' as const,
         params: args,
         startTime: Date.now(),
-      })
-      const created = context.toolCalls.get(toolCallId)!
+      }
+      context.toolCalls.set(toolCallId, created)
       addContentBlock(context, { type: 'tool_call', toolCall: created })
     }