Merge branch 'main' into stop

3 files changed, 15 insertions, 5 deletions

diff --git a/continuedev/src/continuedev/server/gui.py b/continuedev/src/continuedev/server/gui.py
index b2f23bac..4e960f7c 100644
--- a/continuedev/src/continuedev/server/gui.py
+++ b/continuedev/src/continuedev/server/gui.py
@@ -1,6 +1,6 @@
 import json
 from fastapi import Depends, Header, WebSocket, APIRouter
-from typing import Any, Type, TypeVar, Union
+from typing import Any, List, Type, TypeVar, Union
 from pydantic import BaseModel
 from uvicorn.main import Server
 
@@ -83,8 +83,8 @@ class GUIProtocolServer(AbstractGUIProtocolServer):
                 self.on_clear_history()
             elif message_type == "delete_at_index":
                 self.on_delete_at_index(data["index"])
-            elif message_type == "delete_context_item_at_index":
-                self.on_delete_context_item_at_index(data["index"])
+            elif message_type == "delete_context_at_indices":
+                self.on_delete_context_at_indices(data["indices"])
         except Exception as e:
             print(e)
 
@@ -123,9 +123,9 @@ class GUIProtocolServer(AbstractGUIProtocolServer):
     def on_delete_at_index(self, index: int):
         asyncio.create_task(self.session.autopilot.delete_at_index(index))
 
-    def on_delete_context_item_at_index(self, index: int):
+    def on_delete_context_at_indices(self, indices: List[int]):
         asyncio.create_task(
-            self.session.autopilot.delete_context_item_at_index(index)
+            self.session.autopilot.delete_context_at_indices(indices)
         )
 
 
diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index e2685493..ea355d3c 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -160,6 +160,12 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
             "edit": file_edit.dict()
         })
 
+    async def showDiff(self, filepath: str, replacement: str):
+        await self._send_json("showDiff", {
+            "filepath": filepath,
+            "replacement": replacement
+        })
+
     async def setFileOpen(self, filepath: str, open: bool = True):
         # Autopilot needs access to this.
         await self._send_json("setFileOpen", {
diff --git a/continuedev/src/continuedev/server/ide_protocol.py b/continuedev/src/continuedev/server/ide_protocol.py
index de2eea27..2e1f78d7 100644
--- a/continuedev/src/continuedev/server/ide_protocol.py
+++ b/continuedev/src/continuedev/server/ide_protocol.py
@@ -95,6 +95,10 @@ class AbstractIdeProtocolServer(ABC):
     def onHighlightedCodeUpdate(self, range_in_files: List[RangeInFileWithContents]):
         """Called when highlighted code is updated"""
 
+    @abstractmethod
+    async def showDiff(self, filepath: str, replacement: str):
+        """Show a diff"""
+
     @abstractproperty
     def workspace_directory(self) -> str:
         """Get the workspace directory"""