mcp

listify-api/src/assistant/assistant.service.ts

@@ -18,6 +18,10 @@ interface MistralAgentCompletionResponse {
     message?: {
       content?: string | null;
     };
+    messages?: Array<{
+      role?: string;
+      content?: string | null | unknown[];
+    }>;
   }>;
 }
 
@@ -36,7 +40,7 @@ export class AssistantService {
   ): Promise<AssistantChatResponse> {
     const messages = this.normalizeMessages(request.messages);
     const response = await this.callMistralAgent(userId, messages);
-    const content = response.choices?.[0]?.message?.content?.trim();
+    const content = this.extractAssistantContent(response);
 
     if (!content) {
       throw new ServiceUnavailableException('Mistral response was empty.');
@@ -149,7 +153,28 @@ export class AssistantService {
     }
 
     const response = responsePayload as MistralAgentCompletionResponse;
-    return response.choices?.[0]?.message?.content?.trim() ?? null;
+    const directContent = response.choices?.[0]?.message?.content?.trim();
+
+    if (directContent) {
+      return directContent;
+    }
+
+    for (const choice of response.choices ?? []) {
+      const assistantMessages = (choice.messages ?? [])
+        .filter((message) => message.role === 'assistant')
+        .reverse();
+
+      for (const message of assistantMessages) {
+        const content =
+          typeof message.content === 'string' ? message.content.trim() : '';
+
+        if (content) {
+          return content;
+        }
+      }
+    }
+
+    return null;
   }
 
   private async recordChatLog(input: {