feat: System Message Tools

core/config/load.ts

@@ -262,7 +262,10 @@
     config.models.map(async (desc) => {
       if ("title" in desc) {
         const llm = await llmFromDescription(
-          desc,
+          {
+            ...desc,
+            systemMessage: desc.systemMessage ?? config.systemMessage,
+          },
           ide.readFile.bind(ide),
           getUriFromPath,
           uniqueId,
@@ -284,6 +287,7 @@
                     ...desc,
                     model: modelName,
                     title: modelName,
+                    systemMessage: desc.systemMessage ?? config.systemMessage,
                   },
                   ide.readFile.bind(ide),
                   getUriFromPath,
@@ -486,7 +490,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}`,
@@ -560,13 +564,6 @@
     }
   }
 
-  if (config.systemMessage) {
-    continueConfig.rules.unshift({
-      rule: config.systemMessage,
-      source: "json-systemMessage",
-    });
-  }
-
   // Trigger MCP server refreshes (Config is reloaded again once connected!)
   const mcpManager = MCPManagerSingleton.getInstance();
   mcpManager.setConnections(

core/config/sharedConfig.ts

@@ -21,6 +21,7 @@ export const sharedConfigSchema = z
     useCurrentFileAsContext: z.boolean(),
     optInNextEditFeature: z.boolean(),
     enableExperimentalTools: z.boolean(),
+    onlyUseSystemMessageTools: z.boolean(),
     codebaseToolCallingOnly: z.boolean(),
 
     // `ui` in `ContinueConfig`
@@ -184,6 +185,11 @@ export function modifyAnyConfigWithSharedConfig<
     configCopy.experimental.optInNextEditFeature =
       sharedConfig.optInNextEditFeature;
   }
+  if (sharedConfig.onlyUseSystemMessageTools !== undefined) {
+    configCopy.experimental.onlyUseSystemMessageTools =
+      sharedConfig.onlyUseSystemMessageTools;
+  }
+
   if (sharedConfig.codebaseToolCallingOnly !== undefined) {
     configCopy.experimental.codebaseToolCallingOnly =
       sharedConfig.codebaseToolCallingOnly;

core/config/types.ts

@@ -1122,7 +1122,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

@@ -1080,6 +1080,7 @@ export interface Tool {
   faviconUrl?: string;
   group: string;
   originalFunctionName?: string;
+  systemMessageDescription?: string;
 }
 
 interface ToolChoice {
@@ -1443,6 +1444,7 @@ export interface ExperimentalConfig {
   defaultContext?: DefaultContextProvider[];
   promptPath?: string;
   enableExperimentalTools?: boolean;
+  onlyUseSystemMessageTools?: boolean;
 
   /**
    * Quick actions are a way to add custom commands to the Code Lens of
@@ -1692,7 +1694,6 @@ export type RuleSource =
   | "model-options-agent"
   | "rules-block"
   | "colocated-markdown"
-  | "json-systemMessage"
   | ".continuerules";
 
 export interface RuleWithSource {

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",
@@ -107,17 +101,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,
@@ -400,5 +383,4 @@ export {
   autodetectTemplateType,
   llmCanGenerateInParallel,
   modelSupportsImages,
-  modelSupportsTools,
 };

core/llm/defaultSystemMessages.ts

@@ -62,6 +62,8 @@ export const DEFAULT_AGENT_SYSTEM_MESSAGE = `\
   You are in agent mode.
 
 ${CODEBLOCK_FORMATTING_INSTRUCTIONS}
+
+  When making changes to files, use provided tools, do not write codeblocks directly.
 </important_rules>`;
 
 // The note about read-only tools is for MCP servers

core/llm/index.ts

@@ -512,33 +512,27 @@ export abstract class BaseLLM implements ILLM {
   }
 
   private _formatChatMessages(messages: ChatMessage[]): string {
-    const msgsCopy = messages ? messages.map((msg) => ({ ...msg })) : [];
-    let formatted = "";
-    for (const msg of msgsCopy) {
-      formatted += this._formatChatMessage(msg);
-    }
-    return formatted;
+    return (messages ?? [])
+      .map((msg) => this._formatChatMessage(msg))
+      .join("\n\n");
   }
 
   private _formatChatMessage(msg: ChatMessage): string {
     let contentToShow = "";
     if (msg.role === "tool") {
       contentToShow = msg.content;
-    } else if (msg.role === "assistant" && msg.toolCalls) {
+    } else if (msg.role === "assistant" && msg.toolCalls?.length) {
       contentToShow = msg.toolCalls
         ?.map(
           (toolCall) =>
             `${toolCall.function?.name}(${toolCall.function?.arguments})`,
         )
         .join("\n");
     } else if ("content" in msg) {
-      if (Array.isArray(msg.content)) {
-        msg.content = renderChatMessage(msg);
-      }
-      contentToShow = msg.content;
+      contentToShow = renderChatMessage(msg);
     }
 
-    return `<${msg.role}>\n${contentToShow}\n\n`;
+    return `<${msg.role}>\n${contentToShow}`;
   }
 
   protected async *_streamFim(

core/llm/llms/Bedrock.ts

@@ -16,7 +16,7 @@ import { ChatMessage, Chunk, LLMOptions, MessageContent } from "../../index.js";
 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";
 import { withLLMRetry } from "../utils/retry.js";
 
@@ -288,7 +288,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/llms/index.ts

@@ -140,8 +140,6 @@ export async function llmFromDescription(
 
   let baseChatSystemMessage: string | undefined = undefined;
   if (desc.systemMessage !== undefined) {
-    // baseChatSystemMessage = DEFAULT_CHAT_SYSTEM_MESSAGE;
-    // baseChatSystemMessage += "\n\n";
     baseChatSystemMessage = await renderTemplatedString(
       Handlebars,
       desc.systemMessage,

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);
     });
   });
 });