diff --git a/src/session/session.rs b/src/session/session.rs
index a7d9ec7..558dac3 100644
--- a/src/session/session.rs
+++ b/src/session/session.rs
@@ -1126,6 +1126,13 @@ impl SessionManager {
                     .map_err(|e| AgentError::Other(format!("persist error: {}", e)))?;
             }
 
+            // Check if we need to generate a title (after 10 user messages)
+            if session_guard.should_generate_title() {
+                if let Err(e) = session_guard.generate_title().await {
+                    tracing::warn!("failed to generate title: {}", e);
+                }
+            }
+
             result.final_response.content
         };