destroy edit command

Author: TerminalFi

plugin/__init__.py

@@ -28,6 +28,8 @@
     CopilotConversationTurnDeleteCommand,
     CopilotConversationTurnDeleteShimCommand,
     CopilotEditConversationCreateCommand,
+    CopilotEditConversationDestroyShimCommand,
+    CopilotEditConversationDestroyCommand,
     CopilotGetPanelCompletionsCommand,
     CopilotGetPromptCommand,
     CopilotGetVersionCommand,
@@ -60,6 +62,8 @@
     "CopilotCheckStatusCommand",
     "CopilotCodeReviewCommand",
     "CopilotEditConversationCreateCommand",
+    "CopilotEditConversationDestroyShimCommand",
+    "CopilotEditConversationDestroyCommand",
     "CopilotClosePanelCompletionCommand",
     "CopilotConversationAgentsCommand",
     "CopilotConversationChatCommand",

plugin/client.py

@@ -33,8 +33,6 @@
     REQ_GET_VERSION,
     REQ_SET_EDITOR_INFO,
     REQ_CONTEXT_REGISTER_PROVIDERS,
-    COPILOT_ACCEPT_SUGGESTION_KINDS,
-    COPILOT_OUTPUT_PANEL_PREFIX,
     REQ_CONVERSATION_AGENTS,
     REQ_CONVERSATION_PRECONDITIONS,
     REQ_CONVERSATION_TEMPLATES,
@@ -62,6 +60,7 @@
     AccountStatus,
     CopilotPayloadCompletions,
     CopilotPayloadConversationContext,
+    CopilotPayloadConversationEntry,
     CopilotPayloadFeatureFlagsNotification,
     CopilotPayloadGetVersion,
     CopilotPayloadLogMessage,
@@ -70,10 +69,6 @@
     CopilotPayloadStatusNotification,
     NetworkProxy,
     T_Callable,
-    CopilotPayloadNotifyShown,
-    CopilotPayloadSetEditorInfo,
-    T_AccountStatus,
-    T_CompletionItem,
 )
 from .ui import ViewCompletionManager, ViewPanelCompletionManager, WindowConversationManager, WindowEditConversationManager
 from .utils import (
@@ -461,7 +456,7 @@ def _create_conversation_entry(
         reply: str, 
         turn_id: str | None = None,
         kind: str = "report"
-    ) -> dict[str, Any]:
+    ) -> CopilotPayloadConversationEntry:
         """Helper method to create a standardized conversation entry."""
         return {
             "kind": kind,
@@ -635,7 +630,7 @@ def _on_get_completions(
         vcm.show(completions, 0, get_session_setting(session, "completion_style"))
 
     @notification_handler(REQ_NOTIFY_SHOWN)
-    def _handle_notify_shown_notification(self, payload: CopilotPayloadNotifyShown) -> None:
+    def _handle_notify_shown_notification(self, payload: Any) -> None:
         pass
 
     @notification_handler(REQ_COPILOT_MODELS)

plugin/commands.py

@@ -60,6 +60,7 @@
     REQ_EDIT_CONVERSATION_CREATE,
     REQ_EDIT_CONVERSATION_TURN,
     REQ_EDIT_CONVERSATION_TURN_DELETE,
+    REQ_EDIT_CONVERSATION_DESTROY,
     REQ_CONVERSATION_REGISTER_TOOLS,
 )
 from .decorators import must_be_active_view
@@ -1447,6 +1448,15 @@ def _on_result_edit_conversation_turn_delete(
                 view.run_command("copilot_refresh_edit_conversation_panel", {"conversation_id": conversation_id})
                 break
 
+class CopilotEditConversationDestroyShimCommand(CopilotWindowCommand):
+    def run(self, conversation_id: str) -> None:
+        wecm = WindowEditConversationManager(self.window)
+        if not (view := find_view_by_id(wecm.source_view_id)):
+            status_message("Failed to find source view.")
+            return
+        # Focus the view so that the command runs
+        self.window.focus_view(view)
+        view.run_command("copilot_edit_conversation_destroy", {"conversation_id": conversation_id})
 
 class CopilotEditConversationDestroyCommand(CopilotTextCommand):
     """Command to destroy an edit conversation."""
@@ -1459,32 +1469,42 @@ def run(
         _: sublime.Edit,
         conversation_id: str
     ) -> None:
+        if not (
+            (window := self.view.window())
+            and (wecm := WindowEditConversationManager(window))
+            and wecm.conversation_id == conversation_id
+        ):
+            status_message("Failed to find window or edit conversation.")
+            return
+
         session.send_request(
             Request(
                 REQ_EDIT_CONVERSATION_DESTROY,
                 {
-                    "conversationId": conversation_id
+                    "editConversationId": conversation_id,
+                    "options": {},
                 }
             ),
-            lambda response: self._on_result_edit_conversation_destroy(conversation_id, response)
+            self._on_result_edit_conversation_destroy,
         )
 
-    def _on_result_edit_conversation_destroy(
-        self,
-        conversation_id: str,
-        payload: Any
-    ) -> None:
+    def _on_result_edit_conversation_destroy(self, payload: str) -> None:
         if not (window := self.view.window()):
+            status_message("Failed to find window")
+            return
+        if payload != "OK":
+            status_message("Failed to destroy edit conversation.")
             return
 
-        # Close and clean up the panel
-        panel_name = f"{COPILOT_OUTPUT_PANEL_PREFIX}_edit_{conversation_id[:8]}"
-        for view in window.views():
-            if view.settings().get('output.name') == panel_name:
-                view.close()
-                break
+        status_message("Destroyed edit conversation.")
+        wecm = WindowEditConversationManager(window)
+        wecm.close()
+        wecm.reset()
 
-        status_message("Edit conversation destroyed", icon="✅")
+    def is_enabled(self, event: dict[Any, Any] | None = None, point: int | None = None) -> bool:  # type: ignore
+        if not (window := self.view.window()):
+            return False
+        return bool(WindowEditConversationManager(window).conversation_id)
 
 
 class CopilotRefreshEditConversationPanelCommand(sublime_plugin.TextCommand):