ts convo history

app/utils.py

@@ -178,7 +178,7 @@ def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 80
     current_turn_messages = []
     
     # Process messages in reverse to get the most recent turns
-    for msg in reversed(messages):
+    for i, msg in enumerate(reversed(messages)):
         # Skip if this is one of the first messages we already included
         if (first_user_msg and msg == first_user_msg) or (first_assistant_msg and msg == first_assistant_msg):
             continue
@@ -200,17 +200,18 @@ def build_conversation_context(messages, max_turns: int = 3, max_chars: int = 80
         char_count += msg_chars
         msgs_included += 1
         
-        # Check if we've completed a turn (user message followed by assistant)
-        if msg.role == 'user':
-            # Look ahead to see if there's a corresponding assistant message
-            # We need to check if the next message in the original order is an assistant
-            msg_index = messages.index(msg)
-            if msg_index + 1 < len(messages) and messages[msg_index + 1].role == 'assistant':
-                # This is a complete turn, increment counter
-                turn_count += 1
-                if turn_count > max_turns:
-                    logger.info(f"Stopping context build: reached max_turns ({max_turns})")
-                    break
+        # Check if we've completed a turn (assistant message followed by user in reverse order)
+        if msg.role == 'assistant':
+            # Look ahead to see if there's a corresponding user message
+            # In reverse order, we expect: assistant, user, assistant, user...
+            if i + 1 < len(messages):
+                next_msg = list(reversed(messages))[i + 1]
+                if next_msg.role == 'user':
+                    # This is a complete turn, increment counter
+                    turn_count += 1
+                    if turn_count >= max_turns:
+                        logger.info(f"Stopping context build: reached max_turns ({max_turns})")
+                        break
         
         logger.debug(f"Added {role_label} message ({msg_chars} chars, {msgs_included} total messages)")