Merge branch 'main' into package-python

2 files changed, 4 insertions, 5 deletions

diff --git a/continuedev/src/continuedev/core/context.py b/continuedev/src/continuedev/core/context.py
index 3f5f6fd3..20725216 100644
--- a/continuedev/src/continuedev/core/context.py
+++ b/continuedev/src/continuedev/core/context.py
@@ -159,8 +159,9 @@ class ContextManager:
             if not meilisearch_running:
                 logger.warning(
                     "MeiliSearch not running, avoiding any dependent context providers")
-                self.context_providers = list(
-                    filter(lambda cp: cp.title == "code", self.context_providers))
+                self.context_providers = {
+                    title: provider for title, provider in self.context_providers.items() if title == "code"
+                }
 
     async def load_index(self, workspace_dir: str):
         for _, provider in self.context_providers.items():
diff --git a/continuedev/src/continuedev/core/sdk.py b/continuedev/src/continuedev/core/sdk.py
index 5065ff88..60a390ac 100644
--- a/continuedev/src/continuedev/core/sdk.py
+++ b/continuedev/src/continuedev/core/sdk.py
@@ -196,10 +196,8 @@ class ContinueSDK(AbstractContinueSDK):
         context_messages: List[ChatMessage] = await self.__autopilot.context_manager.get_chat_messages()
 
         # Insert at the end, but don't insert after latest user message or function call
-        i = -2 if (len(history_context) > 0 and (
-            history_context[-1].role == "user" or history_context[-1].role == "function")) else -1
         for msg in context_messages:
-            history_context.insert(i, msg)
+            history_context.insert(-1, msg)
 
         return history_context