Merge pull request #4808 from continuedev/nate/config-yaml-not-json

Nate/config-yaml-not-json

Author: sestinj

core/config/ConfigHandler.test.ts

@@ -19,7 +19,7 @@ describe.skip("Test the ConfigHandler and E2E config loading", () => {
 
   test("should load the default config successfully", async () => {
     const result = await testConfigHandler.loadConfig();
-    expect(result.config!.models.length).toBe(defaultConfig.models.length);
+    expect(result.config!.models.length).toBe(defaultConfig.models?.length);
   });
 
   test.skip("should add a system message from config.ts", async () => {

core/config/default.ts

@@ -1,93 +1,37 @@
-import {
-  ContextProviderWithParams,
-  ModelDescription,
-  SerializedContinueConfig,
-  SlashCommandDescription,
-} from "../";
+import { ConfigYaml } from "@continuedev/config-yaml";
 
-export const FREE_TRIAL_MODELS: ModelDescription[] = [
-  {
-    title: "Claude 3.5 Sonnet (Free Trial)",
-    provider: "free-trial",
-    model: "claude-3-5-sonnet-latest",
-    systemMessage:
-      "You are an expert software developer. You give helpful and concise responses.",
-  },
-  {
-    title: "GPT-4o (Free Trial)",
-    provider: "free-trial",
-    model: "gpt-4o",
-    systemMessage:
-      "You are an expert software developer. You give helpful and concise responses.",
-  },
-  {
-    title: "Llama3.1 70b (Free Trial)",
-    provider: "free-trial",
-    model: "llama3.1-70b",
-    systemMessage:
-      "You are an expert software developer. You give helpful and concise responses.",
-  },
-  {
-    title: "Codestral (Free Trial)",
-    provider: "free-trial",
-    model: "codestral-latest",
-    systemMessage:
-      "You are an expert software developer. You give helpful and concise responses.",
-  },
+export const defaultContextProvidersVsCode: NonNullable<
+  ConfigYaml["context"]
+>[number][] = [
+  { provider: "code" },
+  { provider: "docs" },
+  { provider: "diff" },
+  { provider: "terminal" },
+  { provider: "problems" },
+  { provider: "folder" },
+  { provider: "codebase" },
 ];
 
-export const defaultContextProvidersVsCode: ContextProviderWithParams[] = [
-  { name: "code", params: {} },
-  { name: "docs", params: {} },
-  { name: "diff", params: {} },
-  { name: "terminal", params: {} },
-  { name: "problems", params: {} },
-  { name: "folder", params: {} },
-  { name: "codebase", params: {} },
+export const defaultContextProvidersJetBrains: NonNullable<
+  ConfigYaml["context"]
+>[number][] = [
+  { provider: "diff" },
+  { provider: "folder" },
+  { provider: "codebase" },
 ];
 
-export const defaultContextProvidersJetBrains: ContextProviderWithParams[] = [
-  { name: "diff", params: {} },
-  { name: "folder", params: {} },
-  { name: "codebase", params: {} },
-];
-
-export const defaultSlashCommandsVscode: SlashCommandDescription[] = [
-  {
-    name: "share",
-    description: "Export the current chat session to markdown",
-  },
-  {
-    name: "cmd",
-    description: "Generate a shell command",
-  },
-  {
-    name: "commit",
-    description: "Generate a git commit message",
-  },
-];
-
-export const defaultSlashCommandsJetBrains = [
-  {
-    name: "share",
-    description: "Export the current chat session to markdown",
-  },
-  {
-    name: "commit",
-    description: "Generate a git commit message",
-  },
-];
-
-export const defaultConfig: SerializedContinueConfig = {
+export const defaultConfig: ConfigYaml = {
+  name: "Local Assistant",
+  version: "1.0.0",
+  schema: "v1",
   models: [],
-  contextProviders: defaultContextProvidersVsCode,
-  slashCommands: defaultSlashCommandsVscode,
-  data: [],
+  context: defaultContextProvidersVsCode,
 };
 
-export const defaultConfigJetBrains: SerializedContinueConfig = {
+export const defaultConfigJetBrains: ConfigYaml = {
+  name: "Local Assistant",
+  version: "1.0.0",
+  schema: "v1",
   models: [],
-  contextProviders: defaultContextProvidersJetBrains,
-  slashCommands: defaultSlashCommandsJetBrains,
-  data: [],
+  context: defaultContextProvidersJetBrains,
 };

core/config/load.ts

@@ -70,12 +70,6 @@ import {
 } from "../util/paths";
 import { localPathToUri } from "../util/pathToUri";
 
-import {
-  defaultContextProvidersJetBrains,
-  defaultContextProvidersVsCode,
-  defaultSlashCommandsJetBrains,
-  defaultSlashCommandsVscode,
-} from "./default";
 import { getSystemPromptDotFile } from "./getSystemPromptDotFile";
 import { modifyAnyConfigWithSharedConfig } from "./sharedConfig";
 import { getModelByRole, isSupportedLanceDbCpuTargetForLinux } from "./util";
@@ -122,7 +116,7 @@ function loadSerializedConfig(
   let config: SerializedContinueConfig = overrideConfigJson!;
   if (!config) {
     try {
-      config = resolveSerializedConfig(getConfigJsonPath(ideType));
+      config = resolveSerializedConfig(getConfigJsonPath());
     } catch (e) {
       throw new Error(`Failed to parse config.json: ${e}`);
     }
@@ -162,16 +156,6 @@ function loadSerializedConfig(
     );
   }
 
-  // Set defaults if undefined (this lets us keep config.json uncluttered for new users)
-  config.contextProviders ??=
-    ideType === "vscode"
-      ? [...defaultContextProvidersVsCode]
-      : [...defaultContextProvidersJetBrains];
-  config.slashCommands ??=
-    ideType === "vscode"
-      ? [...defaultSlashCommandsVscode]
-      : [...defaultSlashCommandsJetBrains];
-
   if (os.platform() === "linux" && !isSupportedLanceDbCpuTargetForLinux(ide)) {
     config.disableIndexing = true;
   }

core/config/migrateSharedConfig.ts

@@ -1,7 +1,6 @@
 import { IDE } from "..";
 import { deduplicateArray } from "../util";
 import { GlobalContext } from "../util/GlobalContext";
-import { editConfigJson } from "../util/paths";
 import { resolveSerializedConfig } from "./load";
 import { SharedConfigSchema } from "./sharedConfig";
 
@@ -196,11 +195,6 @@ export function migrateJsonSharedConfig(filepath: string, ide: IDE): void {
 
     if (effected) {
       new GlobalContext().updateSharedConfig(shareConfigUpdates);
-      editConfigJson(() => config);
-      // void ide.showToast(
-      //   "warning",
-      //   "Migrated deprecated Continue JSON settings. Edit in the Settings Page",
-      // );
     }
   } catch (e) {
     throw new Error(`Migration: Failed to parse config.json: ${e}`);

core/config/onboarding.ts

@@ -1,6 +1,4 @@
-import { SerializedContinueConfig } from "../";
-
-import { FREE_TRIAL_MODELS } from "./default";
+import { ConfigYaml } from "@continuedev/config-yaml";
 
 export const TRIAL_FIM_MODEL = "codestral-latest";
 export const LOCAL_ONBOARDING_PROVIDER_TITLE = "Ollama";
@@ -9,64 +7,46 @@ export const LOCAL_ONBOARDING_FIM_TITLE = "Qwen2.5-Coder 1.5B";
 export const LOCAL_ONBOARDING_CHAT_MODEL = "llama3.1:8b";
 export const LOCAL_ONBOARDING_CHAT_TITLE = "Llama 3.1 8B";
 export const LOCAL_ONBOARDING_EMBEDDINGS_MODEL = "nomic-embed-text:latest";
+export const LOCAL_ONBOARDING_EMBEDDINGS_TITLE = "Nomic Embed";
 
 /**
  * We set the "best" chat + autocopmlete models by default
  * whenever a user doesn't have a config.json
  */
-export function setupBestConfig(
-  config: SerializedContinueConfig,
-): SerializedContinueConfig {
+export function setupBestConfig(config: ConfigYaml): ConfigYaml {
   return {
     ...config,
-    models: config.models.filter((model) => model.provider !== "free-trial"),
+    models: config.models,
   };
 }
 
-export function setupLocalConfig(
-  config: SerializedContinueConfig,
-): SerializedContinueConfig {
+export function setupLocalConfig(config: ConfigYaml): ConfigYaml {
   return {
     ...config,
     models: [
       {
-        title: LOCAL_ONBOARDING_CHAT_TITLE,
+        name: LOCAL_ONBOARDING_CHAT_TITLE,
         provider: "ollama",
         model: LOCAL_ONBOARDING_CHAT_MODEL,
+        roles: ["chat", "edit", "apply"],
+      },
+      {
+        name: LOCAL_ONBOARDING_FIM_TITLE,
+        provider: "ollama",
+        model: LOCAL_ONBOARDING_FIM_MODEL,
+        roles: ["autocomplete"],
+      },
+      {
+        name: LOCAL_ONBOARDING_EMBEDDINGS_TITLE,
+        provider: "ollama",
+        model: LOCAL_ONBOARDING_EMBEDDINGS_MODEL,
+        roles: ["embed"],
       },
-      ...config.models.filter((model) => model.provider !== "free-trial"),
+      ...(config.models ?? []),
     ],
-    tabAutocompleteModel: {
-      title: LOCAL_ONBOARDING_FIM_TITLE,
-      provider: "ollama",
-      model: LOCAL_ONBOARDING_FIM_MODEL,
-    },
-    embeddingsProvider: {
-      provider: "ollama",
-      model: LOCAL_ONBOARDING_EMBEDDINGS_MODEL,
-    },
   };
 }
 
-export function setupQuickstartConfig(
-  config: SerializedContinueConfig,
-): SerializedContinueConfig {
-  return {
-    ...config,
-    models: [
-      ...FREE_TRIAL_MODELS,
-      ...config.models.filter((model) => model.provider !== "free-trial"),
-    ],
-    tabAutocompleteModel: {
-      title: "Tab Autocomplete",
-      provider: "free-trial",
-      model: TRIAL_FIM_MODEL,
-    },
-    embeddingsProvider: {
-      provider: "free-trial",
-    },
-    reranker: {
-      name: "free-trial",
-    },
-  };
+export function setupQuickstartConfig(config: ConfigYaml): ConfigYaml {
+  return config;
 }

core/config/profile/doLoadConfig.ts

@@ -55,7 +55,7 @@ export default async function doLoadConfig(
 
   // Migrations for old config files
   // Removes
-  const configJsonPath = getConfigJsonPath(ideInfo.ideType);
+  const configJsonPath = getConfigJsonPath();
   if (fs.existsSync(configJsonPath)) {
     migrateJsonSharedConfig(configJsonPath, ide);
   }