fix: convert tool messages into user messages in react mode and fill … (#2584)

api/core/features/assistant_base_runner.py

@@ -606,6 +606,7 @@ class BaseAssistantApplicationRunner(AppRunner):
         for message in messages:
             result.append(UserPromptMessage(content=message.query))
             agent_thoughts: list[MessageAgentThought] = message.agent_thoughts
+            if agent_thoughts:
                 for agent_thought in agent_thoughts:
                     tools = agent_thought.tool
                     if tools:
@@ -637,5 +638,10 @@ class BaseAssistantApplicationRunner(AppRunner):
                             ),
                             *tool_call_response
                         ])
+                    if not tools:
+                        result.append(AssistantPromptMessage(content=agent_thought.thought))
+            else:
+                if message.answer:
+                    result.append(AssistantPromptMessage(content=message.answer))
 
         return result
\ No newline at end of file

api/core/features/assistant_cot_runner.py

@@ -154,7 +154,7 @@ class AssistantCotApplicationRunner(BaseAssistantApplicationRunner):
                 thought='',
                 action_str='',
                 observation='',
-                action=None
+                action=None,
             )
 
             # publish agent thought if it's first iteration
@@ -469,7 +469,7 @@ class AssistantCotApplicationRunner(BaseAssistantApplicationRunner):
                     thought=message.content,
                     action_str='',
                     action=None,
-                    observation=None
+                    observation=None,
                 )
                 if message.tool_calls:
                     try:
@@ -608,6 +608,13 @@ class AssistantCotApplicationRunner(BaseAssistantApplicationRunner):
                     overridden = True
                     break
             
+            # convert tool prompt messages to user prompt messages
+            for idx, prompt_message in enumerate(prompt_messages):
+                if isinstance(prompt_message, ToolPromptMessage):
+                    prompt_messages[idx] = UserPromptMessage(
+                        content=prompt_message.content
+                    )
+
             if not overridden:
                 prompt_messages.insert(0, SystemPromptMessage(
                     content=system_message,