From 08349e5c0ed4c17df0a892b939f85fec58d8ff44 Mon Sep 17 00:00:00 2001
From: Yiorgis Gozadinos <ggozadinos@gmail.com>
Date: Wed, 17 Dec 2025 17:55:40 +0200
Subject: [PATCH] QOL fixes for interactive cli research

---
 haiku_rag_slim/haiku/rag/cli.py      |  1 +
 haiku_rag_slim/haiku/rag/cli_chat.py | 59 +++++++++++++++++-----------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/haiku_rag_slim/haiku/rag/cli.py b/haiku_rag_slim/haiku/rag/cli.py
index cc8be9f6..bd1af435 100644
--- a/haiku_rag_slim/haiku/rag/cli.py
+++ b/haiku_rag_slim/haiku/rag/cli.py
@@ -359,6 +359,7 @@ def research(
                 client=client,
                 config=app.config,
                 search_filter=filter,
+                question=question,
             )
         finally:
             client.close()
diff --git a/haiku_rag_slim/haiku/rag/cli_chat.py b/haiku_rag_slim/haiku/rag/cli_chat.py
index 35070708..db79c758 100644
--- a/haiku_rag_slim/haiku/rag/cli_chat.py
+++ b/haiku_rag_slim/haiku/rag/cli_chat.py
@@ -369,6 +369,7 @@ async def run_chat_loop(
     client: HaikuRAG,
     config: AppConfig | None = None,
     search_filter: str | None = None,
+    question: str | None = None,
 ) -> None:
     """Run an interactive chat loop for research.
 
@@ -376,6 +377,7 @@ async def run_chat_loop(
         client: HaikuRAG client for document operations
         config: Application configuration (uses global config if None)
         search_filter: Optional SQL WHERE clause to filter documents
+        question: Optional initial research question (skips initial chat if provided)
     """
     config = config or get_config()
     console = Console()
@@ -392,31 +394,39 @@ async def run_chat_loop(
 
     while True:
         try:
-            # Initial conversation loop - chat until user wants to research
-            research_question = None
-            while research_question is None:
-                user_input = Prompt.ask("\n[bold blue]You[/bold blue]")
+            # Use provided question or get one through conversation
+            if question:
+                research_question = question
+                console.print(f"[dim]Starting research: {research_question}[/dim]")
+                question = None  # Clear so subsequent loops go through chat
+            else:
+                # Initial conversation loop - chat until user wants to research
+                research_question = None
+                while research_question is None:
+                    user_input = Prompt.ask("\n[bold blue]You[/bold blue]")
 
-                if not user_input.strip():
-                    continue
+                    if not user_input.strip():
+                        continue
 
-                if user_input.lower().strip() in ("exit", "quit", "q"):
-                    console.print("[dim]Goodbye![/dim]")
-                    return
+                    if user_input.lower().strip() in ("exit", "quit", "q"):
+                        console.print("[dim]Goodbye![/dim]")
+                        return
 
-                console.print("[dim]Thinking...[/dim]")
-                decision = await initial_chat(user_input, config)
+                    console.print("[dim]Thinking...[/dim]")
+                    decision = await initial_chat(user_input, config)
 
-                if decision.action == "research" and decision.research_question:
-                    research_question = decision.research_question
-                    console.print(f"[dim]Starting research: {research_question}[/dim]")
-                elif decision.action == "chat" and decision.message:
-                    console.print(
-                        f"\n[bold cyan]Assistant:[/bold cyan] {decision.message}"
-                    )
-                else:
-                    # Fallback - treat as research question
-                    research_question = user_input
+                    if decision.action == "research" and decision.research_question:
+                        research_question = decision.research_question
+                        console.print(
+                            f"[dim]Starting research: {research_question}[/dim]"
+                        )
+                    elif decision.action == "chat" and decision.message:
+                        console.print(
+                            f"\n[bold cyan]Assistant:[/bold cyan] {decision.message}"
+                        )
+                    else:
+                        # Fallback - treat as research question
+                        research_question = user_input
 
             console.print()
             report = await run_interactive_research(
@@ -447,7 +457,8 @@ async def run_chat_loop(
             console.print(Markdown(f"**Sources:** {report.sources_summary}"))
 
         except KeyboardInterrupt:
-            console.print("\n[dim]Interrupted. Type 'exit' to quit.[/dim]")
+            console.print("\n[dim]Goodbye![/dim]")
+            return
         except Exception as e:
             console.print(f"[red]Error: {e}[/red]")
 
@@ -456,6 +467,7 @@ def interactive_research(
     client: HaikuRAG,
     config: AppConfig | None = None,
     search_filter: str | None = None,
+    question: str | None = None,
 ) -> None:
     """Entry point for interactive research mode.
 
@@ -463,5 +475,6 @@ def interactive_research(
         client: HaikuRAG client for document operations
         config: Application configuration (uses global config if None)
         search_filter: Optional SQL WHERE clause to filter documents
+        question: Optional initial research question (skips initial chat if provided)
     """
-    asyncio.run(run_chat_loop(client, config, search_filter))
+    asyncio.run(run_chat_loop(client, config, search_filter, question))