Merge pull request #191 from TerminalFi/fixups

Author: TerminalFi

Main.sublime-commands

@@ -3,6 +3,55 @@
         "caption": "Copilot: Chat",
         "command": "copilot_conversation_chat"
     },
+    {
+        "caption": "Copilot: Explain",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/explain {{ sel[0] }}"
+        }
+    },
+    {
+        "caption": "Copilot: Generate Tests",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/tests {{ sel[0] }}"
+        }
+    },
+    {
+        "caption": "Copilot: Generate Docs",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/doc {{ sel[0] }}"
+        }
+    },
+    {
+        "caption": "Copilot: Fix This",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/fix {{ sel[0] }}"
+        }
+    },
+    {
+        "caption": "Copilot: Simplify This",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/simplify {{ sel[0] }}"
+        }
+    },
+    {
+        "caption": "Copilot: Feedback",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/feedback"
+        }
+    },
+    {
+        "caption": "Copilot: Help",
+        "command": "copilot_conversation_chat",
+        "args": {
+            "message": "/help"
+        }
+    },
     {
         "caption": "Copilot: Destroy Conversation",
         "command": "copilot_conversation_destroy"

plugin/commands.py

@@ -199,33 +199,35 @@ def run(self, view_id: int | None = None) -> None:
 
 
 class CopilotConversationChatShimCommand(LspWindowCommand):
-    def run(self, window_id: int, follow_up: str = "") -> None:
+    def run(self, window_id: int, message: str = "") -> None:
         if not (window := find_window_by_id(window_id)):
             return
 
         conversation_manager = WindowConversationManager(window)
         if not (view := find_view_by_id(conversation_manager.last_active_view_id)):
             return
 
-        view.run_command("copilot_conversation_chat", {"follow_up": follow_up})
+        view.run_command("copilot_conversation_chat", {"message": message})
 
 
 class CopilotConversationChatCommand(LspTextCommand):
     @_provide_plugin_session()
-    def run(self, plugin: CopilotPlugin, session: Session, _: sublime.Edit, follow_up: str = "") -> None:
+    def run(self, plugin: CopilotPlugin, session: Session, _: sublime.Edit, message: str = "") -> None:
         if not (window := self.view.window()):
             return
+
         manager = WindowConversationManager(window)
         if manager.conversation_id:
             manager.open()
-            manager.prompt(callback=lambda x: self._on_prompt(plugin, session, x), initial_text=follow_up)
+            manager.prompt(callback=lambda msg: self._on_prompt(plugin, session, msg), initial_text=message)
             return
+
         session.send_request(
             Request(
                 REQ_CONVERSATION_PRECONDITIONS,
                 {},
             ),
-            lambda x: self._on_result_conversation_preconditions(plugin, session, x),
+            lambda msg: self._on_result_conversation_preconditions(plugin, session, msg),
         )
 
     def _on_result_conversation_preconditions(self, plugin: CopilotPlugin, session: Session, payload) -> None:
@@ -248,7 +250,7 @@ def _on_result_conversation_preconditions(self, plugin: CopilotPlugin, session:
                     # "workspaceFolder": Ji.Type.Optional(Ji.Type.String()),
                 },
             ),
-            lambda x: self._on_result_conversation_create(plugin, session, x),
+            lambda msg: self._on_result_conversation_create(plugin, session, msg),
         )
 
     def _on_result_conversation_create(self, plugin: CopilotPlugin, session: Session, payload) -> None:
@@ -272,6 +274,14 @@ def _on_prompt(self, plugin: CopilotPlugin, session: Session, msg: str):
             manager.prompt(callback=lambda x: self._on_prompt(plugin, session, x), initial_text=msg)
             return
 
+        if msg in (
+            "/fix",
+            "/tests",
+            "/doc",
+            "/explain",
+            "/simplify",
+        ):
+            msg = msg + "\n\n{{ sel[0] }}"
         template = load_string_template(msg)
         sel = []
         if not (view := find_view_by_id(manager.last_active_view_id)):
@@ -505,7 +515,7 @@ def _on_result_coversation_agents(self, payload: list[CopilotRequestCoversationA
         window = self.view.window()
         if not window:
             return
-        window.show_quick_panel([(item["id"], item["description"]) for item in payload], lambda _: None)
+        window.show_quick_panel([[item["slug"], item["description"]] for item in payload], lambda _: None)
 
 
 class CopilotConversationTemplatesCommand(LspTextCommand):

plugin/templates/chat_panel.md.jinja

@@ -39,5 +39,5 @@
 {% endfor %}
 
 {% if follow_up %}
-Follow up: <a class="icon-link" href='{{ follow_up_url }}'>{{ follow_up }}</a>
+Follow up: <a class="icon-link follow-up" href='{{ follow_up_url }}'>{{ follow_up }}</a>
 {% endif %}

plugin/types.py

@@ -170,7 +170,8 @@ class CopilotPayloadConversationTemplate(TypedDict, total=True):
 
 
 class CopilotRequestCoversationAgent(TypedDict, total=True):
-    id: str
+    slug: str
+    name: str
     description: str
 
 

plugin/ui/chat.py

@@ -34,7 +34,7 @@ def last_active_view_id(self) -> int:
         )
 
     @last_active_view_id.setter
-    def last_active_view_id(self, value: str) -> None:
+    def last_active_view_id(self, value: int) -> None:
         set_copilot_setting(self.window, COPILOT_WINDOW_CONVERSATION_SETTINGS_PREFIX, "view_last_active_view_id", value)
 
     @property
@@ -179,7 +179,7 @@ def completion_content(self) -> str:
             follow_up=self.conversation_manager.follow_up,
             follow_up_url=sublime.command_url(
                 "copilot_conversation_chat_shim",
-                {"window_id": self.conversation_manager.window.id(), "follow_up": self.conversation_manager.follow_up},
+                {"window_id": self.conversation_manager.window.id(), "message": self.conversation_manager.follow_up},
             ),
             close_url=sublime.command_url(
                 "copilot_conversation_close",