add descriptions to all commands, fixup duplicate edit messages

Author: dlants

README.md

@@ -43,11 +43,8 @@ TLDR:
 - `<leader>mp` is for `:Magenta paste-selection`. In visual mode it will take the current selection and paste it into the input buffer.
 - `<leader>mc` is for `:Magenta context-files` with your _current_ file. It will pin the current file to your context.
 - `<leader>mf` is for `:Magenta context-files` it allows you to select files via fzf-lua, and will pin those files to your context. This requires that fzf-lua is installed.
-
-In the input buffer or the display buffer:
-
-- `<leader>a` is for `:Magenta abort`, which will abort the current in-flight request.
-- `<leader>c` is for `:Magenta clear`, which will clear the current chat.
+- `<leader>mc` is for `:Magenta clear`, which will clear the current chat.
+- `<leader>ma` is for `:Magenta abort`, which will abort the current in-flight request.
 
 The display buffer is not modifiable, however you can interact with some parts of the display buffer by pressing `<CR>`. For example, you can expand the tool request and responses to see their details, and you can trigger a diff to appear on file edits.
 

bun/chat/chat.ts

@@ -563,26 +563,6 @@ ${msg.error.stack}`,
         }
       }
 
-      for (const filePath in msg.edits) {
-        for (const requestId of msg.edits[filePath].requestIds) {
-          const toolWrapper = model.toolManager.toolWrappers[requestId];
-          if (!toolWrapper) {
-            throw new Error(
-              `Expected to find tool use with requestId ${requestId}`,
-            );
-          }
-
-          messageContent.push({
-            type: "tool_use",
-            request: toolWrapper.model.request,
-          });
-
-          toolResponseContent.push(
-            toolManagerModel.getToolResult(toolWrapper.model),
-          );
-        }
-      }
-
       const out: ProviderMessage[] = [
         {
           role: msg.role,

bun/sidebar.ts

@@ -73,8 +73,6 @@ export class Sidebar {
     const displayHeight = Math.floor((totalHeight - cmdHeight) * 0.8);
     const inputHeight = totalHeight - displayHeight - 2;
 
-    // await nvim.command("clearjumps");
-
     let displayBuffer: NvimBuffer;
     if (existingDisplayBuffer) {
       displayBuffer = existingDisplayBuffer;
@@ -84,18 +82,6 @@ export class Sidebar {
       await displayBuffer.setOption("buftype", "nofile");
       await displayBuffer.setOption("swapfile", false);
       await displayBuffer.setOption("filetype", "markdown");
-      await displayBuffer.setKeymap({
-        mode: "n",
-        lhs: "<leader>c",
-        rhs: ":Magenta clear<CR>",
-        opts: { silent: true, noremap: true },
-      });
-      await displayBuffer.setKeymap({
-        mode: "n",
-        lhs: "<leader>a",
-        rhs: ":Magenta abort<CR>",
-        opts: { silent: true, noremap: true },
-      });
     }
     const displayWindowId = (await this.nvim.call("nvim_open_win", [
       displayBuffer.id,
@@ -125,18 +111,6 @@ export class Sidebar {
         rhs: ":Magenta send<CR>",
         opts: { silent: true, noremap: true },
       });
-      await inputBuffer.setKeymap({
-        mode: "n",
-        lhs: "<leader>c",
-        rhs: ":Magenta clear<CR>",
-        opts: { silent: true, noremap: true },
-      });
-      await inputBuffer.setKeymap({
-        mode: "n",
-        lhs: "<leader>a",
-        rhs: ":Magenta abort<CR>",
-        opts: { silent: true, noremap: true },
-      });
     }
 
     const inputWindowId = (await this.nvim.call("nvim_open_win", [

bun/tools/toolManager.ts

@@ -186,7 +186,7 @@ export function init({ nvim, lsp }: { nvim: Nvim; lsp: Lsp }) {
     }
   }
 
-  function displayRequest(model: ToolModel): string {
+  function displayRequestInput(model: ToolModel): string {
     switch (model.type) {
       case "get_file":
         return GetFile.displayInput(model.request.input);
@@ -231,7 +231,7 @@ ${result.result.value}
   ) {
     return withBindings(
       d`${renderToolContents(model.model, dispatch)}${
-        model.showRequest ? d`\n${displayRequest(model.model)}` : ""
+        model.showRequest ? d`\nid: ${model.model.request.id}\n${displayRequestInput(model.model)}` : ""
       }${model.showResult ? displayResult(model.model) : ""}`,
       {
         "<CR>": () =>

lua/magenta/init.lua

@@ -15,15 +15,18 @@ M.setup = function(opts)
   M.options = vim.tbl_deep_extend("force", M.defaults, opts or {})
 
   M.start(true)
-  vim.api.nvim_set_keymap("n", "<leader>mt", ":Magenta toggle<CR>", {silent = true, noremap = true})
-  vim.api.nvim_set_keymap("v", "<leader>mp", ":Magenta paste-selection<CR>", {silent = true, noremap = true})
+  vim.api.nvim_set_keymap("n", "<leader>mc", ":Magenta clear<CR>", {silent = true, noremap = true, desc = "Clear Magenta state"})
+  vim.api.nvim_set_keymap("n", "<leader>ma", ":Magenta abort<CR>", {silent = true, noremap = true, desc = "Abort current Magenta operation"})
+  vim.api.nvim_set_keymap("n", "<leader>mt", ":Magenta toggle<CR>", {silent = true, noremap = true, desc = "Toggle Magenta window"})
+  vim.api.nvim_set_keymap("v", "<leader>mp", ":Magenta paste-selection<CR>", {silent = true, noremap = true, desc = "Send selection to Magenta"})
   vim.api.nvim_set_keymap(
     "n",
-    "<leader>mc", -- like "magenta current"?
+    "<leader>mb", -- like "magenta buffer"?
     "",
     {
       noremap = true,
       silent = true,
+      desc = "Add current buffer to Magenta context",
       callback = function()
         local current_file = vim.fn.expand("%:p")
         vim.cmd("Magenta context-files " .. vim.fn.shellescape(current_file))
@@ -38,6 +41,7 @@ M.setup = function(opts)
     {
       noremap = true,
       silent = true,
+      desc = "Select files to add to Magenta context",
       callback = function()
         local success, fzf = pcall(require, "fzf-lua")
         if not success then
@@ -65,7 +69,7 @@ end
 
 M.testSetup = function()
   -- do not start. The test runner will start the process for us.
-  vim.api.nvim_set_keymap("n", "<leader>m", ":Magenta toggle<CR>", {silent = true, noremap = true})
+  vim.api.nvim_set_keymap("n", "<leader>m", ":Magenta toggle<CR>", {silent = true, noremap = true, desc = "Toggle Magenta window"})
 end
 
 M.start = function(silent)
@@ -108,7 +112,8 @@ M.bridge = function(channelId)
     end,
     {
       nargs = "+",
-      range = true
+      range = true,
+      desc = "Execute Magenta command"
     }
   )