merge-main

Author: RomneyDa

Diff for: README.md

@@ -44,11 +44,11 @@
 
 ![edit](docs/static/img/edit.gif)
 
-## Actions
+## Agent
 
-[Actions](https://continue.dev/docs/actions/how-to-use-it) are shortcuts for common use cases
+[Agent](https://continue.dev/docs/agent/how-to-use-it) enables you to make more substantial changes to your codebase
 
-![actions](docs/static/img/actions.gif)
+![agent](docs/static/img/agent.gif)
 
 </div>
 

Diff for: binary/package-lock.json

@@ -88,7 +88,6 @@ export class RootPathContextService {
       default:
         // const type = node.type;
         // console.log(getSyntaxTreeString(node));
-        // debugger;
 
         query = await getQueryForFile(
           filepath,
@@ -165,7 +164,6 @@ export class RootPathContextService {
     )) {
       const key = RootPathContextService.keyFromNode(parentKey, astNode);
       // const type = astNode.type;
-      // debugger;
 
       const foundInCache = this.cache.get(key);
       const newSnippets =

Diff for: core/autocomplete/context/root-path-context/RootPathContextService.ts

@@ -127,7 +127,7 @@ async function configYamlToContinueConfig(
     models: [],
     tools: [...allTools],
     mcpServerStatuses: [],
-    systemMessage: config.rules?.join("\n"),
+    systemMessage: undefined,
     experimental: {
       modelContextProtocolServers: config.mcpServers?.map((mcpServer) => ({
         transport: {
@@ -211,15 +211,15 @@ async function configYamlToContinueConfig(
   for (const model of config.models ?? []) {
     model.roles = model.roles ?? modelsArrayRoles; // Default to all 4 chat-esque roles if not specified
     try {
-      const llms = await llmsFromModelConfig(
+      const llms = await llmsFromModelConfig({
         model,
         ide,
         uniqueId,
         ideSettings,
         writeLog,
         platformConfigMetadata,
-        continueConfig.systemMessage,
-      );
+        config: continueConfig,
+      });
 
       if (modelsArrayRoles.some((role) => model.roles?.includes(role))) {
         continueConfig.models.push(...llms);

Diff for: core/config/yaml/loadYaml.ts

@@ -1,6 +1,6 @@
 import { ModelConfig } from "@continuedev/config-yaml";
 
-import { IDE, IdeSettings, LLMOptions } from "../..";
+import { ContinueConfig, IDE, IdeSettings, LLMOptions } from "../..";
 import { BaseLLM } from "../../llm";
 import { LLMClasses } from "../../llm/llms";
 import { PlatformConfigMetadata } from "../profile/PlatformProfileLoader";
@@ -13,22 +13,29 @@ function getModelClass(
   return LLMClasses.find((llm) => llm.providerName === model.provider);
 }
 
-function getContinueProxyModelName(
-  ownerSlug: string,
-  packageSlug: string,
-  model: ModelConfig,
-): string {
-  return `${ownerSlug}/${packageSlug}/${model.provider}/${model.model}`;
-}
-
-async function modelConfigToBaseLLM(
-  model: ModelConfig,
-  uniqueId: string,
-  ideSettings: IdeSettings,
-  writeLog: (log: string) => Promise<void>,
-  platformConfigMetadata: PlatformConfigMetadata | undefined,
-  systemMessage: string | undefined,
-): Promise<BaseLLM | undefined> {
+// function getContinueProxyModelName(
+//   ownerSlug: string,
+//   packageSlug: string,
+//   model: ModelConfig,
+// ): string {
+//   return `${ownerSlug}/${packageSlug}/${model.provider}/${model.model}`;
+// }
+
+async function modelConfigToBaseLLM({
+  model,
+  uniqueId,
+  ideSettings,
+  writeLog,
+  platformConfigMetadata,
+  config,
+}: {
+  model: ModelConfig;
+  uniqueId: string;
+  ideSettings: IdeSettings;
+  writeLog: (log: string) => Promise<void>;
+  platformConfigMetadata: PlatformConfigMetadata | undefined;
+  config: ContinueConfig;
+}): Promise<BaseLLM | undefined> {
   const cls = getModelClass(model);
 
   if (!cls) {
@@ -50,7 +57,8 @@ async function modelConfigToBaseLLM(
     writeLog,
     uniqueId,
     title: model.name,
-    systemMessage,
+    systemMessage: config.systemMessage,
+    rules: config.rules,
     promptTemplates: model.promptTemplates,
     capabilities: {
       tools: model.capabilities?.includes("tool_use"),
@@ -127,16 +135,25 @@ async function modelConfigToBaseLLM(
   return llm;
 }
 
-async function autodetectModels(
-  llm: BaseLLM,
-  model: ModelConfig,
-  ide: IDE,
-  uniqueId: string,
-  ideSettings: IdeSettings,
-  writeLog: (log: string) => Promise<void>,
-  platformConfigMetadata: PlatformConfigMetadata | undefined,
-  systemMessage: string | undefined,
-): Promise<BaseLLM[]> {
+async function autodetectModels({
+  llm,
+  model,
+  ide,
+  uniqueId,
+  ideSettings,
+  writeLog,
+  platformConfigMetadata,
+  config,
+}: {
+  llm: BaseLLM;
+  model: ModelConfig;
+  ide: IDE;
+  uniqueId: string;
+  ideSettings: IdeSettings;
+  writeLog: (log: string) => Promise<void>;
+  platformConfigMetadata: PlatformConfigMetadata | undefined;
+  config: ContinueConfig;
+}): Promise<BaseLLM[]> {
   try {
     const modelNames = await llm.listModels();
     const detectedModels = await Promise.all(
@@ -146,8 +163,8 @@ async function autodetectModels(
           return undefined;
         }
 
-        return await modelConfigToBaseLLM(
-          {
+        return await modelConfigToBaseLLM({
+          model: {
             ...model,
             model: modelName,
             name: modelName,
@@ -156,8 +173,8 @@ async function autodetectModels(
           ideSettings,
           writeLog,
           platformConfigMetadata,
-          systemMessage,
-        );
+          config,
+        });
       }),
     );
     return detectedModels.filter((x) => typeof x !== "undefined") as BaseLLM[];
@@ -167,38 +184,46 @@ async function autodetectModels(
   }
 }
 
-export async function llmsFromModelConfig(
-  model: ModelConfig,
-  ide: IDE,
-  uniqueId: string,
-  ideSettings: IdeSettings,
-  writeLog: (log: string) => Promise<void>,
-  platformConfigMetadata: PlatformConfigMetadata | undefined,
-  systemMessage: string | undefined,
-): Promise<BaseLLM[]> {
-  const baseLlm = await modelConfigToBaseLLM(
+export async function llmsFromModelConfig({
+  model,
+  ide,
+  uniqueId,
+  ideSettings,
+  writeLog,
+  platformConfigMetadata,
+  config,
+}: {
+  model: ModelConfig;
+  ide: IDE;
+  uniqueId: string;
+  ideSettings: IdeSettings;
+  writeLog: (log: string) => Promise<void>;
+  platformConfigMetadata: PlatformConfigMetadata | undefined;
+  config: ContinueConfig;
+}): Promise<BaseLLM[]> {
+  const baseLlm = await modelConfigToBaseLLM({
     model,
     uniqueId,
     ideSettings,
     writeLog,
     platformConfigMetadata,
-    systemMessage,
-  );
+    config,
+  });
   if (!baseLlm) {
     return [];
   }
 
   if (model.model === AUTODETECT) {
-    const models = await autodetectModels(
-      baseLlm,
+    const models = await autodetectModels({
+      llm: baseLlm,
       model,
       ide,
       uniqueId,
       ideSettings,
       writeLog,
       platformConfigMetadata,
-      systemMessage,
-    );
+      config,
+    });
     return models;
   } else {
     return [baseLlm];

Diff for: core/config/yaml/models.ts

@@ -1,6 +1,7 @@
-import { DataDestination, ModelRole } from "@continuedev/config-yaml";
+import { DataDestination, ModelRole, Rule } from "@continuedev/config-yaml";
 import Parser from "web-tree-sitter";
 import { GetGhTokenArgs } from "./protocol/ide";
+
 declare global {
   interface Window {
     ide?: "vscode";
@@ -497,6 +498,7 @@ export interface LLMOptions {
   templateMessages?: (messages: ChatMessage[]) => string;
   writeLog?: (str: string) => Promise<void>;
   llmRequestHook?: (model: string, prompt: string) => any;
+  rules?: Rule[];
   apiKey?: string;
 
   // continueProperties
@@ -1143,6 +1145,7 @@ export interface ApplyState {
   numDiffs?: number;
   filepath?: string;
   fileContent?: string;
+  toolCallId?: string;
 }
 
 export interface RangeInFileWithContents {
@@ -1314,7 +1317,7 @@ export interface ContinueConfig {
   docs?: SiteIndexingConfig[];
   tools: Tool[];
   mcpServerStatuses: MCPServerStatus[];
-  rules?: string[];
+  rules?: Rule[];
   modelsByRole: Record<ModelRole, ILLM[]>;
   selectedModelByRole: Record<ModelRole, ILLM | null>;
   data?: DataDestination[];
@@ -1337,7 +1340,7 @@ export interface BrowserSerializedContinueConfig {
   docs?: SiteIndexingConfig[];
   tools: Tool[];
   mcpServerStatuses: MCPServerStatus[];
-  rules?: string[];
+  rules?: Rule[];
   usePlatform: boolean;
   tabAutocompleteOptions?: Partial<TabAutocompleteOptions>;
   modelsByRole: Record<ModelRole, ModelDescription[]>;

Diff for: core/index.d.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 // Generated by continue
 import { ChatMessage, MessagePart } from "../index.js";
 import {