continuedev
diff --git a/‎core/config/ConfigHandler.ts
+1 b/‎core/config/ConfigHandler.ts
+1
diff --git a/‎core/config/load.ts
+38-8 b/‎core/config/load.ts
+38-8
diff --git a/‎core/config/profile/ControlPlaneProfileLoader.ts
+5-55 b/‎core/config/profile/ControlPlaneProfileLoader.ts
+5-55
diff --git a/‎core/config/profile/LocalProfileLoader.ts
+8-32 b/‎core/config/profile/LocalProfileLoader.ts
+8-32
diff --git a/‎core/config/profile/doLoadConfig.ts
+69 b/‎core/config/profile/doLoadConfig.ts
+69
@@ -177,6 +177,7 @@ export class ConfigHandler {
     const localProfileLoader = new LocalProfileLoader(
       ide,
       ideSettingsPromise,
+      controlPlaneClient,
       writeLog,
     );
     this.profiles = [new ProfileLifecycleManager(localProfileLoader)];
 
@@ -36,6 +36,7 @@ import CustomLLMClass from "../llm/llms/CustomLLM.js";
 import FreeTrial from "../llm/llms/FreeTrial.js";
 import { llmFromDescription } from "../llm/llms/index.js";
 
+import ContinueProxyContextProvider from "../context/providers/ContinueProxyContextProvider.js";
 import { fetchwithRequestOptions } from "../util/fetchWithOptions.js";
 import { copyOf } from "../util/index.js";
 import mergeJson from "../util/merge.js";
@@ -59,6 +60,8 @@ import {
   getPromptFiles,
   slashCommandFromPromptFile,
 } from "./promptFile.js";
+import CodebaseContextProvider from "../context/providers/CodebaseContextProvider.js";
+
 const { execSync } = require("child_process");
 
 function resolveSerializedConfig(filepath: string): SerializedContinueConfig {
@@ -94,13 +97,16 @@ function loadSerializedConfig(
   workspaceConfigs: ContinueRcJson[],
   ideSettings: IdeSettings,
   ideType: IdeType,
+  overrideConfigJson: SerializedContinueConfig | undefined,
 ): SerializedContinueConfig {
   const configPath = getConfigJsonPath(ideType);
-  let config: SerializedContinueConfig;
-  try {
-    config = resolveSerializedConfig(configPath);
-  } catch (e) {
-    throw new Error(`Failed to parse config.json: ${e}`);
+  let config: SerializedContinueConfig = overrideConfigJson!;
+  if (!config) {
+    try {
+      config = resolveSerializedConfig(configPath);
+    } catch (e) {
+      throw new Error(`Failed to parse config.json: ${e}`);
+    }
   }
 
   if (config.allowAnonymousTelemetry === undefined) {
@@ -210,6 +216,7 @@ async function intermediateToFinalConfig(
   ideSettings: IdeSettings,
   uniqueId: string,
   writeLog: (log: string) => Promise<void>,
+  workOsAccessToken: string | undefined,
   allowFreeTrial: boolean = true,
 ): Promise<ContinueConfig> {
   // Auto-detect models
@@ -347,16 +354,31 @@ async function intermediateToFinalConfig(
     ).filter((x) => x !== undefined) as BaseLLM[];
   }
 
+  // These context providers are always included, regardless of what, if anything,
+  // the user has configured in config.json
+  const DEFAULT_CONTEXT_PROVIDERS = [
+    new FileContextProvider({}),
+    new CodebaseContextProvider({}),
+  ];
+
   // Context providers
-  const contextProviders: IContextProvider[] = [new FileContextProvider({})];
+  const contextProviders: IContextProvider[] = DEFAULT_CONTEXT_PROVIDERS;
   for (const provider of config.contextProviders || []) {
     if (isContextProviderWithParams(provider)) {
       const cls = contextProviderClassFromName(provider.name) as any;
       if (!cls) {
         console.warn(`Unknown context provider ${provider.name}`);
         continue;
       }
-      contextProviders.push(new cls(provider.params));
+      const instance: IContextProvider = new cls(provider.params);
+
+      // Handle continue-proxy
+      if (instance.description.title === "continue-proxy") {
+        (instance as ContinueProxyContextProvider).workOsAccessToken =
+          workOsAccessToken;
+      }
+
+      contextProviders.push(instance);
     } else {
       contextProviders.push(new CustomContextProviderClass(provider));
     }
@@ -536,9 +558,16 @@ async function loadFullConfigNode(
   ideType: IdeType,
   uniqueId: string,
   writeLog: (log: string) => Promise<void>,
+  workOsAccessToken: string | undefined,
+  overrideConfigJson: SerializedContinueConfig | undefined,
 ): Promise<ContinueConfig> {
   // Serialized config
-  let serialized = loadSerializedConfig(workspaceConfigs, ideSettings, ideType);
+  let serialized = loadSerializedConfig(
+    workspaceConfigs,
+    ideSettings,
+    ideType,
+    overrideConfigJson,
+  );
 
   // Convert serialized to intermediate config
   let intermediate = await serializedToIntermediateConfig(serialized, ide);
@@ -584,6 +613,7 @@ async function loadFullConfigNode(
     ideSettings,
     uniqueId,
     writeLog,
+    workOsAccessToken,
   );
   return finalConfig;
 }
 
@@ -6,20 +6,8 @@ import {
   SerializedContinueConfig,
 } from "../..";
 import { ControlPlaneClient } from "../../control-plane/client";
-import { TeamAnalytics } from "../../control-plane/TeamAnalytics";
-import ContinueProxy from "../../llm/llms/stubs/ContinueProxy";
-import { Telemetry } from "../../util/posthog";
-import {
-  defaultContextProvidersJetBrains,
-  defaultContextProvidersVsCode,
-  defaultSlashCommandsJetBrains,
-  defaultSlashCommandsVscode,
-} from "../default";
-import {
-  intermediateToFinalConfig,
-  serializedToIntermediateConfig,
-} from "../load";
 import { IProfileLoader } from "./IProfileLoader";
+import doLoadConfig from "./doLoadConfig";
 
 export default class ControlPlaneProfileLoader implements IProfileLoader {
   private static RELOAD_INTERVAL = 1000 * 60 * 15; // every 15 minutes
@@ -49,58 +37,20 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
   }
 
   async doLoadConfig(): Promise<ContinueConfig> {
-    const ideInfo = await this.ide.getIdeInfo();
     const settings =
       this.workspaceSettings ??
       ((await this.controlPlaneClient.getSettingsForWorkspace(
         this.profileId,
       )) as any);
-
-    // First construct a SerializedContinueConfig from the ControlPlaneSettings (TODO)
     const serializedConfig: SerializedContinueConfig = settings;
 
-    serializedConfig.contextProviders ??=
-      ideInfo.ideType === "vscode"
-        ? defaultContextProvidersVsCode
-        : defaultContextProvidersJetBrains;
-    serializedConfig.slashCommands ??=
-      ideInfo.ideType === "vscode"
-        ? defaultSlashCommandsVscode
-        : defaultSlashCommandsJetBrains;
-
-    const intermediateConfig = await serializedToIntermediateConfig(
-      serializedConfig,
+    return doLoadConfig(
       this.ide,
-    );
-
-    const uniqueId = await this.ide.getUniqueId();
-    const finalConfig = await intermediateToFinalConfig(
-      intermediateConfig,
-      this.ide,
-      await this.ideSettingsPromise,
-      uniqueId,
+      this.ideSettingsPromise,
+      this.controlPlaneClient,
       this.writeLog,
+      serializedConfig,
     );
-
-    // Set up team analytics/telemetry
-    await Telemetry.setup(true, uniqueId, ideInfo.extensionVersion);
-    await TeamAnalytics.setup(
-      settings.analytics,
-      uniqueId,
-      ideInfo.extensionVersion,
-    );
-
-    [
-      ...finalConfig.models,
-      ...(finalConfig.tabAutocompleteModels ?? []),
-    ].forEach(async (model) => {
-      if (model.providerName === "continue-proxy") {
-        const accessToken = await this.controlPlaneClient.getAccessToken();
-        (model as ContinueProxy).workOsAccessToken = accessToken;
-      }
-    });
-
-    return finalConfig;
   }
 
   setIsActive(isActive: boolean): void {}
 
@@ -1,6 +1,6 @@
-import { ContinueConfig, ContinueRcJson, IDE, IdeSettings } from "../..";
-import { Telemetry } from "../../util/posthog";
-import { loadFullConfigNode } from "../load";
+import { ContinueConfig, IDE, IdeSettings } from "../..";
+import { ControlPlaneClient } from "../../control-plane/client";
+import doLoadConfig from "./doLoadConfig";
 import { IProfileLoader } from "./IProfileLoader";
 
 export default class LocalProfileLoader implements IProfileLoader {
@@ -11,42 +11,18 @@ export default class LocalProfileLoader implements IProfileLoader {
   constructor(
     private ide: IDE,
     private ideSettingsPromise: Promise<IdeSettings>,
-    // private controlPlaneClient: ControlPlaneClient,
+    private controlPlaneClient: ControlPlaneClient,
     private writeLog: (message: string) => Promise<void>,
   ) {}
 
   async doLoadConfig(): Promise<ContinueConfig> {
-    let workspaceConfigs: ContinueRcJson[] = [];
-    try {
-      workspaceConfigs = await this.ide.getWorkspaceConfigs();
-    } catch (e) {
-      console.warn("Failed to load workspace configs");
-    }
-
-    const ideInfo = await this.ide.getIdeInfo();
-    const uniqueId = await this.ide.getUniqueId();
-    const ideSettings = await this.ideSettingsPromise;
-
-    const newConfig = await loadFullConfigNode(
+    return doLoadConfig(
       this.ide,
-      workspaceConfigs,
-      ideSettings,
-      ideInfo.ideType,
-      uniqueId,
+      this.ideSettingsPromise,
+      this.controlPlaneClient,
       this.writeLog,
+      undefined,
     );
-    newConfig.allowAnonymousTelemetry =
-      newConfig.allowAnonymousTelemetry &&
-      (await this.ide.isTelemetryEnabled());
-
-    // Setup telemetry only after (and if) we know it is enabled
-    await Telemetry.setup(
-      newConfig.allowAnonymousTelemetry ?? true,
-      await this.ide.getUniqueId(),
-      ideInfo.extensionVersion,
-    );
-
-    return newConfig;
   }
 
   setIsActive(isActive: boolean): void {}
 
@@ -0,0 +1,69 @@
+import {
+  ContinueRcJson,
+  IDE,
+  IdeSettings,
+  SerializedContinueConfig,
+} from "../..";
+import { ControlPlaneClient } from "../../control-plane/client";
+import { TeamAnalytics } from "../../control-plane/TeamAnalytics";
+import ContinueProxy from "../../llm/llms/stubs/ContinueProxy";
+import { Telemetry } from "../../util/posthog";
+import { loadFullConfigNode } from "../load";
+
+export default async function doLoadConfig(
+  ide: IDE,
+  ideSettingsPromise: Promise<IdeSettings>,
+  controlPlaneClient: ControlPlaneClient,
+  writeLog: (message: string) => Promise<void>,
+  overrideConfigJson: SerializedContinueConfig | undefined,
+) {
+  let workspaceConfigs: ContinueRcJson[] = [];
+  try {
+    workspaceConfigs = await ide.getWorkspaceConfigs();
+  } catch (e) {
+    console.warn("Failed to load workspace configs");
+  }
+
+  const ideInfo = await ide.getIdeInfo();
+  const uniqueId = await ide.getUniqueId();
+  const ideSettings = await ideSettingsPromise;
+  const workOsAccessToken = await controlPlaneClient.getAccessToken();
+
+  const newConfig = await loadFullConfigNode(
+    ide,
+    workspaceConfigs,
+    ideSettings,
+    ideInfo.ideType,
+    uniqueId,
+    writeLog,
+    workOsAccessToken,
+    overrideConfigJson,
+  );
+  newConfig.allowAnonymousTelemetry =
+    newConfig.allowAnonymousTelemetry && (await ide.isTelemetryEnabled());
+
+  // Setup telemetry only after (and if) we know it is enabled
+  await Telemetry.setup(
+    newConfig.allowAnonymousTelemetry ?? true,
+    await ide.getUniqueId(),
+    ideInfo.extensionVersion,
+  );
+
+  if (newConfig.analytics) {
+    await TeamAnalytics.setup(
+      newConfig.analytics as any, // TODO: Need to get rid of index.d.ts once and for all
+      uniqueId,
+      ideInfo.extensionVersion,
+    );
+  }
+
+  [...newConfig.models, ...(newConfig.tabAutocompleteModels ?? [])].forEach(
+    async (model) => {
+      if (model.providerName === "continue-proxy") {
+        (model as ContinueProxy).workOsAccessToken = workOsAccessToken;
+      }
+    },
+  );
+
+  return newConfig;
+}