Instruction-based tools

core/config/load.ts

@@ -396,7 +396,7 @@
   const DEFAULT_CONTEXT_PROVIDERS = [
     new FileContextProvider({}),
     // Add codebase provider if indexing is enabled
     ...(!config.disableIndexing
       ? [new CodebaseContextProvider(codebaseContextParams)]
       : []),
   ];
@@ -488,7 +488,7 @@
     }
     if (name === "llm") {
       const llm = models.find((model) => model.title === params?.modelTitle);
       if (!llm) {
         errors.push({
           fatal: false,
           message: `Unknown reranking model ${params?.modelTitle}`,
@@ -622,7 +622,7 @@
   return { config: continueConfig, errors };
 }
 
-function llmToSerializedModelDescription(llm: ILLM): ModelDescription {
+export function llmToSerializedModelDescription(llm: ILLM): ModelDescription {
   return {
     provider: llm.providerName,
     underlyingProviderName: llm.underlyingProviderName,

core/config/types.ts

@@ -1120,7 +1120,6 @@ declare global {
      * This is needed to crawl a large number of documentation sites that are dynamically rendered.
      */
     useChromiumForDocsCrawling?: boolean;
-    useTools?: boolean;
     modelContextProtocolServers?: MCPOptions[];
   }
 

core/index.d.ts

@@ -992,6 +992,7 @@ export interface Tool {
   uri?: string;
   faviconUrl?: string;
   group: string;
+  systemMessageDescription?: string;
   originalFunctionName?: string;
 }
 

core/llm/autodetect.ts

@@ -1,9 +1,4 @@
-import {
-  ChatMessage,
-  ModelCapability,
-  ModelDescription,
-  TemplateType,
-} from "../index.js";
+import { ChatMessage, ModelCapability, TemplateType } from "../index.js";
 
 import {
   anthropicTemplateMessages,
@@ -41,7 +36,6 @@ import {
   xWinCoderEditPrompt,
   zephyrEditPrompt,
 } from "./templates/edit.js";
-import { PROVIDER_TOOL_SUPPORT } from "./toolSupport.js";
 
 const PROVIDER_HANDLES_TEMPLATING: string[] = [
   "lmstudio",
@@ -102,17 +96,6 @@ const MODEL_SUPPORTS_IMAGES: string[] = [
   "granite-vision",
 ];
 
-function modelSupportsTools(modelDescription: ModelDescription) {
-  if (modelDescription.capabilities?.tools !== undefined) {
-    return modelDescription.capabilities.tools;
-  }
-  const providerSupport = PROVIDER_TOOL_SUPPORT[modelDescription.provider];
-  if (!providerSupport) {
-    return false;
-  }
-  return providerSupport(modelDescription.model) ?? false;
-}
-
 function modelSupportsImages(
   provider: string,
   model: string,
@@ -387,5 +370,4 @@ export {
   autodetectTemplateType,
   llmCanGenerateInParallel,
   modelSupportsImages,
-  modelSupportsTools,
 };

core/llm/llms/Bedrock.ts

@@ -9,6 +9,7 @@ import {
 } from "@aws-sdk/client-bedrock-runtime";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 
+import { llmToSerializedModelDescription } from "../../config/load.js";
 import {
   ChatMessage,
   Chunk,
@@ -17,7 +18,7 @@ import {
 } from "../../index.js";
 import { renderChatMessage, stripImages } from "../../util/messageContent.js";
 import { BaseLLM } from "../index.js";
-import { PROVIDER_TOOL_SUPPORT } from "../toolSupport.js";
+import { modelSupportsNativeTools } from "../toolSupport.js";
 import { getSecureID } from "../utils/getSecureID.js";
 
 interface ModelConfig {
@@ -308,13 +309,11 @@ class Bedrock extends BaseLLM {
       };
     }
 
-    const supportsTools =
-      (this.capabilities?.tools ||
-        PROVIDER_TOOL_SUPPORT.bedrock?.(options.model)) ??
-      false;
+    const modelDesc = llmToSerializedModelDescription(this);
+    const supportsTools = modelSupportsNativeTools(modelDesc);
 
     let toolConfig =
-      supportsTools && options.tools
+      supportsTools && !!options.tools
         ? ({
             tools: options.tools.map((tool) => ({
               toolSpec: {

core/llm/toolSupport.test.ts

@@ -1,9 +1,9 @@
 // core/llm/toolSupport.test.ts
-import { PROVIDER_TOOL_SUPPORT } from "./toolSupport";
+import { NATIVE_TOOL_SUPPORT } from "./toolSupport";
 
-describe("PROVIDER_TOOL_SUPPORT", () => {
+describe("NATIVE_TOOL_SUPPORT", () => {
   describe("continue-proxy", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["continue-proxy"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["continue-proxy"];
 
     it("should return true for Claude 3.5 models", () => {
       expect(
@@ -61,7 +61,7 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
   });
 
   describe("anthropic", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["anthropic"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["anthropic"];
 
     it("should return true for Claude 3.5 models", () => {
       expect(supportsFn("claude-3-5-sonnet")).toBe(true);
@@ -85,7 +85,7 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
   });
 
   describe("openai", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["openai"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["openai"];
 
     it("should return true for GPT-4 models", () => {
       expect(supportsFn("gpt-4")).toBe(true);
@@ -110,7 +110,7 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
   });
 
   describe("gemini", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["gemini"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["gemini"];
 
     it("should return true for all Gemini models", () => {
       expect(supportsFn("gemini-pro")).toBe(true);
@@ -130,7 +130,7 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
   });
 
   describe("bedrock", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["bedrock"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["bedrock"];
 
     it("should return true for Claude 3.5 Sonnet models", () => {
       expect(supportsFn("anthropic.claude-3-5-sonnet-20240620-v1:0")).toBe(
@@ -180,7 +180,7 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
   });
 
   describe("mistral", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["mistral"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["mistral"];
 
     it("should return true for supported models", () => {
       expect(supportsFn("mistral-large-latest")).toBe(true);
@@ -212,7 +212,7 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
   });
 
   describe("ollama", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["ollama"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["ollama"];
 
     it("should return true for supported models", () => {
       expect(supportsFn("llama3.1")).toBe(true);
@@ -256,17 +256,17 @@ describe("PROVIDER_TOOL_SUPPORT", () => {
 
   describe("edge cases", () => {
     it("should handle empty model names", () => {
-      expect(PROVIDER_TOOL_SUPPORT["continue-proxy"]("")).toBe(false);
-      expect(PROVIDER_TOOL_SUPPORT["anthropic"]("")).toBe(false);
-      expect(PROVIDER_TOOL_SUPPORT["openai"]("")).toBe(false);
-      expect(PROVIDER_TOOL_SUPPORT["gemini"]("")).toBe(false);
-      expect(PROVIDER_TOOL_SUPPORT["bedrock"]("")).toBe(false);
-      expect(PROVIDER_TOOL_SUPPORT["ollama"]("")).toBe(false);
+      expect(NATIVE_TOOL_SUPPORT["continue-proxy"]("")).toBe(false);
+      expect(NATIVE_TOOL_SUPPORT["anthropic"]("")).toBe(false);
+      expect(NATIVE_TOOL_SUPPORT["openai"]("")).toBe(false);
+      expect(NATIVE_TOOL_SUPPORT["gemini"]("")).toBe(false);
+      expect(NATIVE_TOOL_SUPPORT["bedrock"]("")).toBe(false);
+      expect(NATIVE_TOOL_SUPPORT["ollama"]("")).toBe(false);
     });
 
     it("should handle non-existent provider", () => {
       // @ts-ignore - Testing runtime behavior with invalid provider
-      expect(PROVIDER_TOOL_SUPPORT["non-existent"]).toBe(undefined);
+      expect(NATIVE_TOOL_SUPPORT["non-existent"]).toBe(undefined);
     });
   });
 });