Bugfixes

app.py

@@ -249,6 +249,9 @@ async def main(message: cl.Message):
                 }
             )
 
+            # Save history after adding tool calls to prevent corruption
+            cl.user_session.set("message_history", history)
+
             for tool_call in response_message.tool_calls:
                 tool_name = tool_call.function.name
                 tool_args = json.loads(tool_call.function.arguments)
@@ -441,34 +444,52 @@ async def main(message: cl.Message):
                     f"Added tool result to history for {tool_name}: {str(tool_result)[:100]}..."
                 )
 
+                # Save history immediately after adding tool result to prevent corruption
+                cl.user_session.set("message_history", history)
+
             # Now let the AI provide a final response with the tool results
-            async with cl.Step(name="Responding", type="llm") as response_step:
-                response_step.input = "Generating response based on tool results"
-
-                final_response = await openai_client.chat.completions.create(
-                    model="gpt-4o",
-                    messages=history,
-                    tools=aggregated_tools if aggregated_tools else None,
-                    tool_choice="none",  # No more tool calls - just respond
-                )
+            try:
+                async with cl.Step(name="Responding", type="llm") as response_step:
+                    response_step.input = "Generating response based on tool results"
+
+                    final_response = await openai_client.chat.completions.create(
+                        model="gpt-4o",
+                        messages=history,
+                        tools=aggregated_tools if aggregated_tools else None,
+                        tool_choice="none",  # No more tool calls - just respond
+                    )
 
-                final_message = final_response.choices[0].message
-                response_step.output = final_message
+                    final_message = final_response.choices[0].message
+                    response_step.output = final_message
 
-                if final_message.content:
-                    await cl.Message(content=final_message.content).send()
-                    history.append(
-                        {"role": "assistant", "content": final_message.content}
-                    )
+                    if final_message.content:
+                        await cl.Message(content=final_message.content).send()
+                        history.append(
+                            {"role": "assistant", "content": final_message.content}
+                        )
+                        # Save history after successful final response
+                        cl.user_session.set("message_history", history)
+            except Exception as final_response_error:
+                log.error(f"Error in final response generation: {final_response_error}")
+                # Even if final response fails, tool results are already in history
+                # Send a fallback message to user
+                await cl.Message(
+                    content="I've executed the tool successfully but encountered an issue generating a response. The results should be displayed above."
+                ).send()
+                # Make sure history is saved even on error
+                cl.user_session.set("message_history", history)
         else:
             # If no tool was called, the AI's first response is the final answer.
             final_answer = response_message.content
             if final_answer:
                 await cl.Message(content=final_answer).send()
+                history.append({"role": "assistant", "content": final_answer})
+                # Save history after assistant response
+                cl.user_session.set("message_history", history)
 
     except Exception as e:
         log.error(f"Error in main message loop: {e}")
         traceback.print_exc()
         await cl.Message(content=f"An error occurred: {e}").send()
-
-    cl.user_session.set("message_history", history)
+        # Save history even on top-level error to prevent corruption
+        cl.user_session.set("message_history", history)