From 9fc08fdc27722dd841c5bff01b5ed5795d6b8acc Mon Sep 17 00:00:00 2001
From: Jake Pullen <hello@jake-is.me>
Date: Mon, 27 Oct 2025 10:38:11 +0000
Subject: [PATCH] =?UTF-8?q?patch:=20=F0=9F=A9=B9=20Added=20startup=20step?=
 =?UTF-8?q?=20to=20load=20memory=20into=20message=20history=20Also=20added?=
 =?UTF-8?q?=20small=20clarification=20on=20adding=20separate=20expert=20mo?=
 =?UTF-8?q?dels?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         | 5 +----
 pyproject.toml                     | 2 +-
 src/__init__.py                    | 2 +-
 src/config/user_config_template.py | 2 ++
 src/main.py                        | 4 +++-
 uv.lock                            | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e75e8a..f739a45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,4 @@ src/config/user_config.py
 *.db
 .cache/
 .cache.sqlite
-.cache
-
-# logging files
-*.log
\ No newline at end of file
+.cache
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index f35f23d..e08259a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Merlin"
-version = "1.2.1"
+version = "1.2.2"
 description = "Merlin - Your AI Assistant with multi-agent architecture"
 readme = "README.md"
 requires-python = ">=3.14"
diff --git a/src/__init__.py b/src/__init__.py
index 0e40c9d..215cd76 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,6 +1,6 @@
 """Merlin - Your AI Assistant."""
 
-__version__ = "0.1.0"
+__version__ = "1.2.2"
 __author__ = "sorcware"
 
 from main import main
diff --git a/src/config/user_config_template.py b/src/config/user_config_template.py
index 095c402..37d94fd 100644
--- a/src/config/user_config_template.py
+++ b/src/config/user_config_template.py
@@ -30,6 +30,8 @@ class Model:
         }
 
         # Expert agents personal config
+        # if using multiple models from your host set above
+        # you only need to add the model name.
         EXPERTS = {
             "default": {
                 # 'model_name': 'claude-3-sonnet',
diff --git a/src/main.py b/src/main.py
index f9ac8b5..6b1b4e4 100644
--- a/src/main.py
+++ b/src/main.py
@@ -12,6 +12,7 @@
 from rich.text import Text
 
 from core.model_factory import ModelFactory
+from experts.memory import MemoryAgent
 from experts.orchestrator import TheOracle
 
 console = Console()
@@ -119,7 +120,8 @@ def display_response_and_routing(result):
 def chat_interface():
     """Provide main chat interface for interacting with Merlin."""
     history = setup_chat_interface()
-
+    # Add the long term memory to the start of the history
+    history.messages.append({"memory": MemoryAgent()._load_memory_file()})
     try:
         while True:
             # Styled user input
diff --git a/uv.lock b/uv.lock
index 215f9db..2b38599 100644
--- a/uv.lock
+++ b/uv.lock
@@ -724,7 +724,7 @@ wheels = [
 
 [[package]]
 name = "merlin"
-version = "1.2.1"
+version = "1.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "dspy" },