Merge branch 'refs/heads/main' into intellij_cache_diff

# Conflicts:
#	gui/src/redux/slices/sessionSlice.ts

Author: ferenci84

.gitignore

@@ -157,6 +157,7 @@ Icon?
 notes.md
 
 manual-testing-sandbox/.idea/**
+manual-testing-sandbox/.continue/**
 extensions/intellij/.idea/**
 
 **/.idea/workspace.xml

binary/package-lock.json

@@ -10,6 +10,7 @@ export function slashFromCustomCommand(
   return {
     name: customCommand.name,
     description: customCommand.description ?? "",
+    prompt: customCommand.prompt,
     run: async function* ({ input, llm, history, ide, completionOptions }) {
       // Remove slash command prefix from input
       let userInput = input;

core/commands/index.ts

@@ -1,6 +1,7 @@
+import { v4 as uuidv4 } from "uuid";
+
 import { ContextItemWithId, RangeInFileWithContents } from "../";
 import { findUriInDirs, getUriPathBasename } from "../util/uri";
-import { v4 as uuidv4 } from "uuid";
 
 export function rifWithContentsToContextItem(
   rif: RangeInFileWithContents,

core/commands/util.ts

@@ -387,16 +387,6 @@ export class ConfigHandler {
       this.ideSettingsPromise,
     );
 
-    // After login, default to the first org as the selected org
-    try {
-      const orgs = await this.controlPlaneClient.listOrganizations();
-      if (orgs.length) {
-        await this.setSelectedOrgId(orgs[0].id);
-      }
-    } catch (e) {
-      console.error("Failed to fetch control plane profiles: ", e);
-    }
-
     this.fetchControlPlaneProfiles().catch(async (e) => {
       console.error("Failed to fetch control plane profiles: ", e);
       await this.loadLocalProfilesOnly();

core/config/ConfigHandler.ts

@@ -28,7 +28,6 @@ import {
   IdeType,
   ILLM,
   LLMOptions,
-  MCPOptions,
   ModelDescription,
   RerankerDescription,
   SerializedContinueConfig,
@@ -45,7 +44,6 @@ import ContinueProxyContextProvider from "../context/providers/ContinueProxyCont
 import CustomContextProviderClass from "../context/providers/CustomContextProvider";
 import FileContextProvider from "../context/providers/FileContextProvider";
 import { contextProviderClassFromName } from "../context/providers/index";
-import PromptFilesContextProvider from "../context/providers/PromptFilesContextProvider";
 import { useHub } from "../control-plane/env";
 import { allEmbeddingsProviders } from "../indexing/allEmbeddingsProviders";
 import { BaseLLM } from "../llm";
@@ -401,8 +399,6 @@ async function intermediateToFinalConfig(
     ...(!config.disableIndexing
       ? [new CodebaseContextProvider(codebaseContextParams)]
       : []),
-    // Add prompt files provider if enabled
-    ...(loadPromptFiles ? [new PromptFilesContextProvider({})] : []),
   ];
 
   const DEFAULT_CONTEXT_PROVIDERS_TITLES = DEFAULT_CONTEXT_PROVIDERS.map(
@@ -521,6 +517,8 @@ async function intermediateToFinalConfig(
     contextProviders,
     models,
     tools: allTools,
+    mcpServerStatuses: [],
+    slashCommands: config.slashCommands ?? [],
     modelsByRole: {
       chat: models,
       edit: models,
@@ -541,53 +539,18 @@ async function intermediateToFinalConfig(
     },
   };
 
-  // Apply MCP if specified
+  // Trigger MCP server refreshes (Config is reloaded again once connected!)
   const mcpManager = MCPManagerSingleton.getInstance();
-  function getMcpId(options: MCPOptions) {
-    return JSON.stringify(options);
-  }
-  if (config.experimental?.modelContextProtocolServers) {
-    await mcpManager.removeUnusedConnections(
-      config.experimental.modelContextProtocolServers.map(getMcpId),
-    );
-  }
-
-  if (config.experimental?.modelContextProtocolServers) {
-    const abortController = new AbortController();
-    const mcpConnectionTimeout = setTimeout(
-      () => abortController.abort(),
-      5000,
-    );
-
-    await Promise.allSettled(
-      config.experimental.modelContextProtocolServers?.map(
-        async (server, index) => {
-          try {
-            const mcpId = getMcpId(server);
-            const mcpConnection = mcpManager.createConnection(mcpId, server);
-            await mcpConnection.modifyConfig(
-              continueConfig,
-              mcpId,
-              abortController.signal,
-              "MCP Server",
-              server.faviconUrl,
-            );
-          } catch (e) {
-            let errorMessage = "Failed to load MCP server";
-            if (e instanceof Error) {
-              errorMessage += ": " + e.message;
-            }
-            errors.push({
-              fatal: false,
-              message: errorMessage,
-            });
-          } finally {
-            clearTimeout(mcpConnectionTimeout);
-          }
-        },
-      ) || [],
-    );
-  }
+  mcpManager.setConnections(
+    (config.experimental?.modelContextProtocolServers ?? []).map(
+      (server, index) => ({
+        id: `continue-mcp-server-${index + 1}`,
+        name: `MCP Server ${index + 1}`,
+        ...server,
+      }),
+    ),
+    false,
+  );
 
   // Handle experimental modelRole config values for apply and edit
   const inlineEditModel = getModelByRole(continueConfig, "inlineEdit")?.title;
@@ -667,11 +630,9 @@ async function finalToBrowserConfig(
     models: final.models.map(llmToSerializedModelDescription),
     systemMessage: final.systemMessage,
     completionOptions: final.completionOptions,
-    slashCommands: final.slashCommands?.map((s) => ({
-      name: s.name,
-      description: s.description,
-      params: s.params, // TODO: is this why params aren't referenced properly by slash commands?
-    })),
+    slashCommands: final.slashCommands?.map(
+      ({ run, ...slashCommandDescription }) => slashCommandDescription,
+    ),
     contextProviders: final.contextProviders?.map((c) => c.description),
     disableIndexing: final.disableIndexing,
     disableSessionTitles: final.disableSessionTitles,
@@ -681,6 +642,7 @@ async function finalToBrowserConfig(
     rules: final.rules,
     docs: final.docs,
     tools: final.tools,
+    mcpServerStatuses: final.mcpServerStatuses,
     tabAutocompleteOptions: final.tabAutocompleteOptions,
     usePlatform: await useHub(ide.getIdeSettings()),
     modelsByRole: Object.fromEntries(

core/config/load.ts

@@ -2,6 +2,7 @@ import { ConfigJson } from "@continuedev/config-types";
 import { ConfigResult } from "@continuedev/config-yaml";
 
 import { ControlPlaneClient } from "../../control-plane/client.js";
+import { PRODUCTION_ENV } from "../../control-plane/env.js";
 import {
   ContinueConfig,
   IDE,
@@ -10,7 +11,6 @@ import {
 } from "../../index.js";
 import { ProfileDescription } from "../ProfileLifecycleManager.js";
 
-import { PRODUCTION_ENV } from "../../control-plane/env.js";
 import doLoadConfig from "./doLoadConfig.js";
 import { IProfileLoader } from "./IProfileLoader.js";
 

core/config/profile/ControlPlaneProfileLoader.ts

@@ -1,11 +1,10 @@
 import { AssistantUnrolled, ConfigResult } from "@continuedev/config-yaml";
 
 import { ControlPlaneClient } from "../../control-plane/client.js";
+import { getControlPlaneEnv } from "../../control-plane/env.js";
 import { ContinueConfig, IDE, IdeSettings } from "../../index.js";
-
 import { ProfileDescription } from "../ProfileLifecycleManager.js";
 
-import { getControlPlaneEnv } from "../../control-plane/env.js";
 import doLoadConfig from "./doLoadConfig.js";
 import { IProfileLoader } from "./IProfileLoader.js";
 

core/config/profile/PlatformProfileLoader.ts

@@ -6,18 +6,24 @@ import {
   ConfigValidationError,
   ModelRole,
 } from "@continuedev/config-yaml";
+
 import {
   ContinueConfig,
   ContinueRcJson,
   IDE,
   IdeSettings,
   SerializedContinueConfig,
+  Tool,
 } from "../../";
+import { constructMcpSlashCommand } from "../../commands/slash/mcp";
+import { MCPManagerSingleton } from "../../context/mcp";
+import MCPContextProvider from "../../context/providers/MCPContextProvider";
 import { ControlPlaneProxyInfo } from "../../control-plane/analytics/IAnalyticsProvider.js";
 import { ControlPlaneClient } from "../../control-plane/client.js";
 import { getControlPlaneEnv } from "../../control-plane/env.js";
 import { TeamAnalytics } from "../../control-plane/TeamAnalytics.js";
 import ContinueProxy from "../../llm/llms/stubs/ContinueProxy";
+import { encodeMCPToolUri } from "../../tools/callTool";
 import { getConfigJsonPath, getConfigYamlPath } from "../../util/paths";
 import { localPathOrUriToPath } from "../../util/pathToUri";
 import { Telemetry } from "../../util/posthog";
@@ -26,6 +32,7 @@ import { loadContinueConfigFromJson } from "../load";
 import { migrateJsonSharedConfig } from "../migrateSharedConfig";
 import { rectifySelectedModelsFromGlobalContext } from "../selectedModels";
 import { loadContinueConfigFromYaml } from "../yaml/loadYaml";
+
 import { PlatformConfigMetadata } from "./PlatformProfileLoader";
 
 export default async function doLoadConfig(
@@ -93,15 +100,90 @@ export default async function doLoadConfig(
     configLoadInterrupted = result.configLoadInterrupted;
   }
 
-  // Rectify model selections for each role
-  if (newConfig) {
-    newConfig = rectifySelectedModelsFromGlobalContext(newConfig, profileId);
-  }
-
   if (configLoadInterrupted || !newConfig) {
     return { errors, config: newConfig, configLoadInterrupted: true };
   }
 
+  // TODO using config result but result with non-fatal errors is an antipattern?
+  // Remove ability have undefined errors, just have an array
+  errors = [...(errors ?? [])];
+
+  // Rectify model selections for each role
+  newConfig = rectifySelectedModelsFromGlobalContext(newConfig, profileId);
+
+  // Add things from MCP servers
+  const mcpManager = MCPManagerSingleton.getInstance();
+  const mcpServerStatuses = mcpManager.getStatuses();
+
+  // Slightly hacky just need connection's client to make slash command for now
+  const serializableStatuses = mcpServerStatuses.map((server) => {
+    const { client, ...rest } = server;
+    return rest;
+  });
+  newConfig.mcpServerStatuses = serializableStatuses;
+
+  for (const server of mcpServerStatuses) {
+    if (server.status === "connected") {
+      const serverTools: Tool[] = server.tools.map((tool) => ({
+        displayTitle: server.name + " " + tool.name,
+        function: {
+          description: tool.description,
+          name: tool.name,
+          parameters: tool.inputSchema,
+        },
+        faviconUrl: server.faviconUrl,
+        readonly: false,
+        type: "function" as const,
+        wouldLikeTo: "",
+        uri: encodeMCPToolUri(server.id, tool.name),
+        group: server.name,
+      }));
+      newConfig.tools.push(...serverTools);
+
+      const serverSlashCommands = server.prompts.map((prompt) =>
+        constructMcpSlashCommand(
+          server.client,
+          prompt.name,
+          prompt.description,
+          prompt.arguments?.map((a: any) => a.name),
+        ),
+      );
+      newConfig.slashCommands.push(...serverSlashCommands);
+
+      const submenuItems = server.resources.map((resource) => ({
+        title: resource.name,
+        description: resource.description ?? resource.name,
+        id: resource.uri,
+        icon: server.faviconUrl,
+      }));
+      if (submenuItems.length > 0) {
+        const serverContextProvider = new MCPContextProvider({
+          submenuItems,
+          mcpId: server.id,
+        });
+        newConfig.contextProviders.push(serverContextProvider);
+      }
+    }
+  }
+
+  // Detect duplicate tool names
+  const counts: Record<string, number> = {};
+  newConfig.tools.forEach((tool) => {
+    if (counts[tool.function.name]) {
+      counts[tool.function.name] = counts[tool.function.name] + 1;
+    } else {
+      counts[tool.function.name] = 1;
+    }
+  });
+  Object.entries(counts).forEach(([toolName, count]) => {
+    if (count > 1) {
+      errors!.push({
+        fatal: false,
+        message: `Duplicate (${count}) tools named "${toolName}" detected. Permissions will conflict and usage may be unpredictable`,
+      });
+    }
+  });
+
   newConfig.allowAnonymousTelemetry =
     newConfig.allowAnonymousTelemetry && (await ide.isTelemetryEnabled());
 

core/config/profile/doLoadConfig.ts

@@ -1,4 +1,5 @@
 import { ConfigValidationError } from "@continuedev/config-yaml";
+
 import { ModelDescription, SerializedContinueConfig } from "../";
 import { Telemetry } from "../util/posthog";