From 52ef983e75aebfba71b85cb8c3bbada151b55008 Mon Sep 17 00:00:00 2001
From: Yiorgis Gozadinos <ggozadinos@gmail.com>
Date: Sat, 28 Feb 2026 14:00:40 +0200
Subject: [PATCH] Fix default chat model, default to config.qa.model

---
 CHANGELOG.md                              | 1 +
 app/backend/main.py                       | 3 ++-
 haiku_rag_slim/haiku/rag/chat/__init__.py | 3 ++-
 haiku_rag_slim/haiku/rag/chat/app.py      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c8bfec4..918935b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 - **Compatibility with haiku.skills 0.5.1**: Replaced removed `SkillToolset.system_prompt` with `build_system_prompt(toolset.skill_catalog)` across chat TUI, backend app, and examples
 - **Minimum dependency**: Bumped `haiku.skills` requirement to `>=0.5.1`
+- **Chat model default**: Chat TUI and backend app now use the configured QA model instead of hardcoded `openai:gpt-4o`
 
 ## [0.32.1] - 2026-02-26
 
diff --git a/app/backend/main.py b/app/backend/main.py
index 586cb07f..d655d78e 100644
--- a/app/backend/main.py
+++ b/app/backend/main.py
@@ -17,6 +17,7 @@ from haiku.rag.client import HaikuRAG
 from haiku.rag.config import load_yaml_config
 from haiku.rag.config.models import AppConfig
 from haiku.rag.skills.rag import AGENT_PREAMBLE, create_skill
+from haiku.rag.utils import get_model
 from haiku.skills import SkillDeps, SkillToolset
 from haiku.skills.prompts import build_system_prompt
 
@@ -68,7 +69,7 @@ skill = create_skill(db_path=db_path, config=Config)
 toolset = SkillToolset(skills=[skill])
 
 agent = Agent(
-    os.getenv("HAIKU_CHAT_MODEL", "openai:gpt-4o"),
+    get_model(Config.qa.model, Config),
     instructions=build_system_prompt(toolset.skill_catalog, preamble=AGENT_PREAMBLE),
     toolsets=[toolset],
     deps_type=SkillDeps,
diff --git a/haiku_rag_slim/haiku/rag/chat/__init__.py b/haiku_rag_slim/haiku/rag/chat/__init__.py
index 07d8da3a..78a1d341 100644
--- a/haiku_rag_slim/haiku/rag/chat/__init__.py
+++ b/haiku_rag_slim/haiku/rag/chat/__init__.py
@@ -25,6 +25,7 @@ def run_chat(
 
     from haiku.rag.config import get_config
     from haiku.rag.skills.rag import create_skill
+    from haiku.rag.utils import get_model
 
     config = get_config()
     if db_path is None:
@@ -37,6 +38,6 @@ def run_chat(
         skill=skill,
         read_only=read_only,
         before=before,
-        model=model,
+        model=model or get_model(config.qa.model, config),
     )
     app.run()
diff --git a/haiku_rag_slim/haiku/rag/chat/app.py b/haiku_rag_slim/haiku/rag/chat/app.py
index 23a12ba0..7d8412db 100644
--- a/haiku_rag_slim/haiku/rag/chat/app.py
+++ b/haiku_rag_slim/haiku/rag/chat/app.py
@@ -102,7 +102,7 @@ class ChatApp(App):
         self._skill = skill
         self.read_only = read_only
         self.before = before
-        self._model = model or "openai:gpt-4o"
+        self._model = model
         self.client: HaikuRAG | None = None
         self.config = get_config()
         self._toolset: SkillToolset | None = None