[NOTICKET] pass orchestrator search_query to sql executor for multi-turn context

src/api/v1/chat.py

@@ -202,6 +202,7 @@ async def chat_stream(request: ChatRequest, db: AsyncSession = Depends(get_db)):
             history = await history_task  # fast DB query (<100ms), done before orchestrator finishes
             intent_result = await orchestrator.analyze_message(request.message, history)
 
+            search_query = intent_result.get("search_query", request.message) or request.message
             if not intent_result.get("needs_search"):
                 retrieval_task.cancel()
                 try:
@@ -210,7 +211,6 @@ async def chat_stream(request: ChatRequest, db: AsyncSession = Depends(get_db)):
                     pass
                 raw_results = []
             else:
-                search_query = intent_result.get("search_query", request.message)
                 logger.info(f"Searching for: {search_query}")
                 if search_query != request.message:
                     retrieval_task.cancel()
@@ -233,16 +233,14 @@ async def chat_stream(request: ChatRequest, db: AsyncSession = Depends(get_db)):
 
             source_hint = intent_result.get("source_hint", "both")
             if source_hint in ("schema", "both"):
-                # Pass the user's raw natural-language question to the executor.
-                # `search_query` is the orchestrator's rewrite for retrieval —
-                # keyword-heavy, stripped of intent structure — and produces
-                # worse SQL when fed to db_executor. Smoke-test parity with
-                # `experiments/test_db_executor.py` requires the raw message.
+                # Use search_query (orchestrator's standalone rewrite) so follow-up
+                # messages like "dive deeper" or "show me last year" resolve correctly.
+                # For first-turn questions search_query == request.message, so no change.
                 query_results = await query_executor.execute(
                     results=raw_results,
                     user_id=request.user_id,
                     db=db,
-                    question=request.message,
+                    question=search_query,
                 )
                 query_context = _format_query_results(query_results)
                 if query_context: