feat(nvim)!: switch to new native tool calling schema for codecompanion

Author: Davidyz

lua/vectorcode/integrations/codecompanion.lua

@@ -88,7 +88,16 @@ local make_tool = check_cli_wrap(function(opts)
           type(cb) == "function",
           "Please upgrade CodeCompanion.nvim to at least 13.5.0"
         )
-        assert(vim.list_contains({ "ls", "query" }, action.command))
+        if not (vim.list_contains({ "ls", "query" }, action.command)) then
+          if action.options.query ~= nil then
+            action.command = "query"
+          else
+            return {
+              status = "error",
+              data = "Need to specify the command (`ls` or `query`).",
+            }
+          end
+        end
         if opts.auto_submit[action.command] then
           vim.schedule(function()
             vim.api.nvim_input("<Esc>")
@@ -107,7 +116,6 @@ local make_tool = check_cli_wrap(function(opts)
               and vim.uv.fs_stat(action.options.project_root).type == "directory"
             then
               vim.list_extend(args, { "--project_root", action.options.project_root })
-              vim.list_extend(args, { "--absolute" })
             else
               agent.chat:add_message(
                 { role = "user", content = "INVALID PROJECT ROOT! USE THE LS COMMAND!" },
@@ -128,10 +136,12 @@ local make_tool = check_cli_wrap(function(opts)
               vim.list_extend(args, existing_files)
             end
           end
+          vim.list_extend(args, { "--absolute" })
           logger.info(
             "CodeCompanion query tool called the runner with the following args: ",
             args
           )
+
           job_runner.run_async(args, function(result, error)
             vim.schedule(function()
               if opts.auto_submit[action.command] then
@@ -173,56 +183,47 @@ local make_tool = check_cli_wrap(function(opts)
       end,
     },
     schema = {
-      {
-        tool = {
-          _attr = { name = "vectorcode" },
-          action = {
-            command = "query",
-            options = {
-              query = { "keyword1", "keyword2" },
-              count = 5,
+      type = "function",
+      ["function"] = {
+        name = "vectorcode",
+        description = "Retrieves code documents using semantic search or lists indexed projects",
+        parameters = {
+          type = "object",
+          properties = {
+            command = {
+              type = "string",
+              enum = { "query", "ls" },
+              description = "Action to perform: 'query' for semantic search or 'ls' to list projects",
             },
-          },
-        },
-      },
-      {
-        tool = {
-          _attr = { name = "vectorcode" },
-          action = {
-            command = "query",
             options = {
-              query = { "keyword1" },
-              count = 2,
+              type = "object",
+              properties = {
+                query = {
+                  type = "array",
+                  items = { type = "string" },
+                  description = "Search keywords (required for 'query' command). Orthogornal keywords should be in distinct strings.",
+                },
+                count = {
+                  type = "integer",
+                  description = "Number of documents to retrieve, must be positive",
+                },
+                project_root = {
+                  type = "string",
+                  description = "Project path to search within (must be from 'ls' results)",
+                },
+              },
+              required = { "query" },
+              additionalProperties = false,
             },
           },
+          required = { "command" },
+          additionalProperties = false,
         },
-      },
-      {
-        tool = {
-          _attr = { name = "vectorcode" },
-          action = {
-            command = "query",
-            options = {
-              query = { "keyword1" },
-              count = 3,
-              project_root = "path/to/other/project",
-            },
-          },
-        },
-      },
-      {
-        tool = {
-          _attr = { name = "vectorcode" },
-          action = {
-            command = "ls",
-          },
-        },
+        strict = true,
       },
     },
-    system_prompt = function(schema, xml2lua)
+    system_prompt = function()
       local guidelines = {
-        "  - Ensure XML is **valid and follows the schema**",
-        "  - Make sure the tools xml block is **surrounded by ```xml**",
         "  - The path of a retrieved file will be wrapped in `<path>` and `</path>` tags. Its content will be right after the `</path>` tag, wrapped by `<content>` and `</content>` tags",
         "  - If you used the tool, tell users that they may need to wait for the results and there will be a virtual text indicator showing the tool is still running",
         "  - Include one single command call for VectorCode each time. You may include multiple keywords in the command",
@@ -269,40 +270,37 @@ local make_tool = check_cli_wrap(function(opts)
 
 1. **Purpose**: This gives you the ability to access the repository to find information that you may need to assist the user.
 
-2. **Usage**: Return an XML markdown code block that retrieves relevant documents corresponding to the generated query.
-
-3. **Key Points**:
+2. **Key Points**:
 %s 
 
-4. **Actions**:
-
-a) **Query for 5 documents using 2 keywords: `keyword1` and `keyword2`**:
-
-```xml
-%s
+3. Example Tool Call
+**Querying a project and retrieve the 10 most relevant files with keywords "keyword1" and "keyword2"**
 ```
-
-b) **Query for 2 documents using one keyword: `keyword1`**:
-
-```xml
-%s
+{
+  "_attr": "vectorcode",
+  {
+    "action": "query",
+    "options": {
+      "query": ["keyword1", "keyword2"],
+      "count": 10,
+      "project_root": "/path/to/project",
+    }
+  }
+}
 ```
-c) **Query for 3 documents using one keyword: `keyword1` in a different project located at `path/to/other/project` (relative to current working directory)**:
-```xml
-%s
+
+**Listing available projects**
 ```
-d) **Get all indexed project**
-```xml
-%s
+{
+  "_attr": "vectorcode",
+  {
+    "action": "ls"
+  }
+}
 ```
 
-Remember:
-- Minimize explanations unless prompted. Focus on generating correct XML.]],
-        table.concat(guidelines, "\n"),
-        xml2lua.toXml({ tools = { schema[1] } }),
-        xml2lua.toXml({ tools = { schema[2] } }),
-        xml2lua.toXml({ tools = { schema[3] } }),
-        xml2lua.toXml({ tools = { schema[4] } })
+]],
+        table.concat(guidelines, "\n")
       )
     end,
     output = {