Merge pull request #7224 from continuedev/dallin/context-defaults

feat: update default-included context providers

Author: RomneyDa

binary/package.json

@@ -39,7 +39,7 @@
     "pkg": "^5.8.1",
     "rimraf": "^5.0.7",
     "ts-jest": "^29.1.4",
-    "typescript": "^5.3.3"
+    "typescript": "^5.6.3"
   },
   "dependencies": {
     "@octokit/rest": "^20.0.2",

core/config/default.ts

@@ -1,37 +1,8 @@
 import { ConfigYaml } from "@continuedev/config-yaml";
 
-export const defaultContextProvidersVsCode: NonNullable<
-  ConfigYaml["context"]
->[number][] = [
-  { provider: "code" },
-  { provider: "docs" },
-  { provider: "diff" },
-  { provider: "terminal" },
-  { provider: "problems" },
-  { provider: "folder" },
-  { provider: "codebase" },
-];
-
-export const defaultContextProvidersJetBrains: NonNullable<
-  ConfigYaml["context"]
->[number][] = [
-  { provider: "diff" },
-  { provider: "folder" },
-  { provider: "codebase" },
-];
-
 export const defaultConfig: ConfigYaml = {
   name: "Local Agent",
   version: "1.0.0",
   schema: "v1",
   models: [],
-  context: defaultContextProvidersVsCode,
-};
-
-export const defaultConfigJetBrains: ConfigYaml = {
-  name: "Local Agent",
-  version: "1.0.0",
-  schema: "v1",
-  models: [],
-  context: defaultContextProvidersJetBrains,
 };

core/config/load.ts

@@ -19,7 +19,6 @@ import {
   ContinueRcJson,
   CustomContextProvider,
   EmbeddingsProviderDescription,
-  IContextProvider,
   IDE,
   IdeInfo,
   IdeSettings,
@@ -36,10 +35,6 @@ import { getLegacyBuiltInSlashCommandFromDescription } from "../commands/slash/b
 import { convertCustomCommandToSlashCommand } from "../commands/slash/customSlashCommand";
 import { slashCommandFromPromptFile } from "../commands/slash/promptFileSlashCommand";
 import { MCPManagerSingleton } from "../context/mcp/MCPManagerSingleton";
-import ContinueProxyContextProvider from "../context/providers/ContinueProxyContextProvider";
-import CustomContextProviderClass from "../context/providers/CustomContextProvider";
-import FileContextProvider from "../context/providers/FileContextProvider";
-import { contextProviderClassFromName } from "../context/providers/index";
 import { useHub } from "../control-plane/env";
 import { BaseLLM } from "../llm";
 import { LLMClasses, llmFromDescription } from "../llm/llms";
@@ -62,9 +57,11 @@ import {
 } from "../util/paths";
 import { localPathToUri } from "../util/pathToUri";
 
+import CustomContextProviderClass from "../context/providers/CustomContextProvider";
 import { getToolsForIde } from "../tools";
 import { resolveRelativePathInDir } from "../util/ideUtils";
 import { getWorkspaceRcConfigs } from "./json/loadRcConfigs";
+import { loadConfigContextProviders } from "./loadContextProviders";
 import { modifyAnyConfigWithSharedConfig } from "./sharedConfig";
 import {
   getModelByRole,
@@ -229,7 +226,7 @@ function applyRequestOptionsToModels(
 export function isContextProviderWithParams(
   contextProvider: CustomContextProvider | ContextProviderWithParams,
 ): contextProvider is ContextProviderWithParams {
-  return (contextProvider as ContextProviderWithParams).name !== undefined;
+  return "name" in contextProvider && !!contextProvider.name;
 }
 
 /** Only difference between intermediate and final configs is the `models` array */
@@ -386,50 +383,25 @@ async function intermediateToFinalConfig({
 
   applyRequestOptionsToModels(tabAutocompleteModels, config);
 
-  // These context providers are always included, regardless of what, if anything,
-  // the user has configured in config.json
-
-  const codebaseContextParams =
-    (
-      (config.contextProviders || [])
-        .filter(isContextProviderWithParams)
-        .find((cp) => cp.name === "codebase") as
-        | ContextProviderWithParams
-        | undefined
-    )?.params || {};
-
-  const DEFAULT_CONTEXT_PROVIDERS = [new FileContextProvider({})];
-
-  const DEFAULT_CONTEXT_PROVIDERS_TITLES = DEFAULT_CONTEXT_PROVIDERS.map(
-    ({ description: { title } }) => title,
-  );
-
-  // Context providers
-  const contextProviders: IContextProvider[] = DEFAULT_CONTEXT_PROVIDERS;
-
-  for (const provider of config.contextProviders || []) {
-    if (isContextProviderWithParams(provider)) {
-      const cls = contextProviderClassFromName(provider.name) as any;
-      if (!cls) {
-        if (!DEFAULT_CONTEXT_PROVIDERS_TITLES.includes(provider.name)) {
-          console.warn(`Unknown context provider ${provider.name}`);
-        }
-
-        continue;
-      }
-      const instance: IContextProvider = new cls(provider.params);
-
-      // Handle continue-proxy
-      if (instance.description.title === "continue-proxy") {
-        (instance as ContinueProxyContextProvider).workOsAccessToken =
-          workOsAccessToken;
-      }
+  // Load context providers
+  const { providers: contextProviders, errors: contextErrors } =
+    loadConfigContextProviders(
+      config.contextProviders
+        ?.filter((cp) => isContextProviderWithParams(cp))
+        .map((cp) => ({
+          provider: (cp as ContextProviderWithParams).name,
+          params: (cp as ContextProviderWithParams).params,
+        })),
+      !!config.docs?.length,
+      ideInfo.ideType,
+    );
 
-      contextProviders.push(instance);
-    } else {
-      contextProviders.push(new CustomContextProviderClass(provider));
+  for (const cp of config.contextProviders ?? []) {
+    if (!isContextProviderWithParams(cp)) {
+      contextProviders.push(new CustomContextProviderClass(cp));
     }
   }
+  errors.push(...contextErrors);
 
   // Embeddings Provider
   function getEmbeddingsILLM(

core/config/loadContextProviders.ts

@@ -0,0 +1,91 @@
+import {
+  AssistantUnrolledNonNullable,
+  ConfigValidationError,
+} from "@continuedev/config-yaml";
+import { IContextProvider, IdeType } from "..";
+import { contextProviderClassFromName } from "../context/providers";
+import CurrentFileContextProvider from "../context/providers/CurrentFileContextProvider";
+import DiffContextProvider from "../context/providers/DiffContextProvider";
+import DocsContextProvider from "../context/providers/DocsContextProvider";
+import FileContextProvider from "../context/providers/FileContextProvider";
+import ProblemsContextProvider from "../context/providers/ProblemsContextProvider";
+import RulesContextProvider from "../context/providers/RulesContextProvider";
+import TerminalContextProvider from "../context/providers/TerminalContextProvider";
+
+/*
+    Loads context providers based on configuration
+    - default providers will always be loaded, using config params if present
+    - other providers will be loaded if configured
+
+    NOTE the MCPContextProvider is added in doLoadConfig if any resources are present
+*/
+export function loadConfigContextProviders(
+  configContext: AssistantUnrolledNonNullable["context"],
+  hasDocs: boolean,
+  ideType: IdeType,
+): {
+  providers: IContextProvider[];
+  errors: ConfigValidationError[];
+} {
+  const providers: IContextProvider[] = [];
+  const errors: ConfigValidationError[] = [];
+  // Add from config
+  if (configContext) {
+    for (const config of configContext) {
+      const cls = contextProviderClassFromName(config.provider) as any;
+      if (!cls) {
+        errors.push({
+          fatal: false,
+          message: `Unknown context provider ${config.provider}`,
+        });
+        continue;
+      }
+      providers.push(
+        new cls({
+          name: config.name,
+          ...config.params,
+        }),
+      );
+    }
+  }
+
+  // Add from defaults if not found in config
+  const defaultProviders: IContextProvider[] = [
+    new FileContextProvider({}),
+    new CurrentFileContextProvider({}),
+    new DiffContextProvider({}),
+    new TerminalContextProvider({}),
+    new ProblemsContextProvider({}),
+    new RulesContextProvider({}),
+  ];
+
+  for (const defaultProvider of defaultProviders) {
+    if (
+      !providers.find(
+        (p) => p.description.title === defaultProvider.description.title,
+      )
+    ) {
+      providers.push(defaultProvider);
+    }
+  }
+
+  if (hasDocs && !providers?.some((cp) => cp.description.title === "docs")) {
+    providers.push(new DocsContextProvider({}));
+  }
+
+  // @problems and @terminal are not supported in jetbrains
+  const filteredProviders = providers.filter((pv) => {
+    if (ideType === "jetbrains") {
+      return (
+        pv.description.title !== TerminalContextProvider.description.title &&
+        pv.description.title !== ProblemsContextProvider.description.title
+      );
+    }
+    return true;
+  });
+
+  return {
+    providers: filteredProviders,
+    errors,
+  };
+}