feat: System Message Tools

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/llm/autodetect.ts

@@ -41,7 +41,7 @@ import {
   xWinCoderEditPrompt,
   zephyrEditPrompt,
 } from "./templates/edit.js";
-import { PROVIDER_TOOL_SUPPORT } from "./toolSupport.js";
+import { NATIVE_TOOL_SUPPORT } from "./toolSupport.js";
 
 const PROVIDER_HANDLES_TEMPLATING: string[] = [
   "lmstudio",
@@ -106,17 +106,30 @@ const MODEL_SUPPORTS_IMAGES: string[] = [
   "granite-vision",
 ];
 
-function modelSupportsTools(modelDescription: ModelDescription) {
+function modelSupportsNativeTools(modelDescription: ModelDescription) {
   if (modelDescription.capabilities?.tools !== undefined) {
     return modelDescription.capabilities.tools;
   }
-  const providerSupport = PROVIDER_TOOL_SUPPORT[modelDescription.provider];
+  const providerSupport = NATIVE_TOOL_SUPPORT[modelDescription.provider];
   if (!providerSupport) {
     return false;
   }
   return providerSupport(modelDescription.model) ?? false;
 }
 
+export function modelIsGreatWithNativeTools(
+  modelDescription: ModelDescription,
+): boolean {
+  const model = modelDescription.model;
+  if (
+    model.toLowerCase().includes("claude") &&
+    ["3.5", "3-5", "3.7", "3-7", "-4"].some((p) => model.includes(p))
+  ) {
+    return true;
+  }
+  return false;
+}
+
 function modelSupportsImages(
   provider: string,
   model: string,
@@ -393,5 +406,5 @@ export {
   autodetectTemplateType,
   llmCanGenerateInParallel,
   modelSupportsImages,
-  modelSupportsTools,
+  modelSupportsNativeTools,
 };

core/llm/llms/Bedrock.ts

@@ -21,7 +21,7 @@ import {
 import { safeParseToolCallArgs } from "../../tools/parseArgs.js";
 import { renderChatMessage, stripImages } from "../../util/messageContent.js";
 import { BaseLLM } from "../index.js";
-import { PROVIDER_TOOL_SUPPORT } from "../toolSupport.js";
+import { NATIVE_TOOL_SUPPORT } from "../toolSupport.js";
 import { getSecureID } from "../utils/getSecureID.js";
 
 interface ModelConfig {
@@ -312,7 +312,7 @@ class Bedrock extends BaseLLM {
     // First get tools
     const supportsTools =
       (this.capabilities?.tools ||
-        PROVIDER_TOOL_SUPPORT.bedrock?.(options.model)) ??
+        NATIVE_TOOL_SUPPORT.bedrock?.(options.model)) ??
       false;
 
     let toolConfig: undefined | ToolConfiguration = undefined;

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("cohere", () => {
-    const supportsFn = PROVIDER_TOOL_SUPPORT["cohere"];
+    const supportsFn = NATIVE_TOOL_SUPPORT["cohere"];
 
     it("should return true for Command models", () => {
       expect(supportsFn("command-r")).toBe(true);
@@ -123,7 +123,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);
@@ -143,7 +143,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(
@@ -193,7 +193,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);
@@ -225,7 +225,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);
@@ -270,17 +270,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);
     });
   });
 });