cortex rework continued.

cortex/context.py

@@ -84,6 +84,7 @@ def _init_session(session_id: str) -> Dict[str, Any]:
         "mood": "neutral",  # Future: mood tracking
         "active_project": None,  # Future: project context
         "message_count": 0,
+        "message_history": [],
     }
 
 
@@ -275,6 +276,13 @@ async def collect_context(session_id: str, user_prompt: str) -> Dict[str, Any]:
     state["last_user_message"] = user_prompt
     state["last_timestamp"] = now
     state["message_count"] += 1
+    # Save user turn to history
+    state["message_history"].append({
+    "user": user_prompt,
+    "assistant": ""   # assistant reply filled later by update_last_assistant_message()
+    })
+
+
 
     # F. Assemble unified context
     context_state = {
@@ -311,20 +319,27 @@ async def collect_context(session_id: str, user_prompt: str) -> Dict[str, Any]:
 # -----------------------------
 def update_last_assistant_message(session_id: str, message: str) -> None:
     """
-    Update session state with assistant's response.
-
-    Called by router.py after persona layer completes.
-
-    Args:
-        session_id: Session identifier
-        message: Assistant's final response text
+    Update session state with assistant's response and complete
+    the last turn inside message_history.
     """
-    if session_id in SESSION_STATE:
-        SESSION_STATE[session_id]["last_assistant_message"] = message
-        SESSION_STATE[session_id]["last_timestamp"] = datetime.now()
-        logger.debug(f"Updated assistant message for session {session_id}")
-    else:
+    session = SESSION_STATE.get(session_id)
+    if not session:
         logger.warning(f"Attempted to update non-existent session: {session_id}")
+        return
+
+    # Update last assistant message + timestamp
+    session["last_assistant_message"] = message
+    session["last_timestamp"] = datetime.now()
+
+    # Fill in assistant reply for the most recent turn
+    history = session.get("message_history", [])
+    if history:
+        # history entry already contains {"user": "...", "assistant": "...?"}
+        history[-1]["assistant"] = message
+
+    if VERBOSE_DEBUG:
+        logger.debug(f"Updated assistant message for session {session_id}")
+
 
 
 def get_session_state(session_id: str) -> Optional[Dict[str, Any]]: