Merge branch 'main' into pe/remove-pre-indexed-docs-ui

Author: Patrick-Erichsen

core/config/load.ts

@@ -539,18 +539,21 @@ async function intermediateToFinalConfig(
   // Apply MCP if specified
   const mcpManager = MCPManagerSingleton.getInstance();
   if (config.experimental?.modelContextProtocolServers) {
-    await Promise.all(
+    const abortController = new AbortController();
+    const mcpConnectionTimeout = setTimeout(
+      () => abortController.abort(),
+      4000,
+    );
+
+    await Promise.allSettled(
       config.experimental.modelContextProtocolServers?.map(
         async (server, index) => {
-          const mcpId = index.toString();
-          const mcpConnection = mcpManager.createConnection(mcpId, server);
-          if (!mcpConnection) {
-            return;
-          }
-
-          const abortController = new AbortController();
-
           try {
+            const mcpId = index.toString();
+            const mcpConnection = mcpManager.createConnection(mcpId, server);
+            if (!mcpConnection) {
+              return;
+            }
             const mcpError = await mcpConnection.modifyConfig(
               continueConfig,
               mcpId,
@@ -561,14 +564,21 @@ async function intermediateToFinalConfig(
             if (mcpError) {
               errors.push(mcpError);
             }
-          } catch (e: any) {
+          } catch (e) {
+            let errorMessage = "Failed to load MCP server";
+            if (e instanceof Error) {
+              if (e.name === "AbortError") {
+                errorMessage += ": connection timed out";
+              } else {
+                errorMessage += ": " + e.message;
+              }
+            }
             errors.push({
               fatal: false,
-              message: `Failed to load MCP server: ${e.message}`,
+              message: errorMessage,
             });
-            if (e.name !== "AbortError") {
-              throw e;
-            }
+          } finally {
+            clearTimeout(mcpConnectionTimeout);
           }
         },
       ) || [],

core/config/yaml/loadYaml.ts

@@ -331,27 +331,27 @@ async function configYamlToContinueConfig(
 
   // Apply MCP if specified
   const mcpManager = MCPManagerSingleton.getInstance();
-  await Promise.all(
+  await Promise.allSettled(
     config.mcpServers?.map(async (server) => {
-      const mcpId = server.name;
-      const mcpConnection = mcpManager.createConnection(mcpId, {
-        transport: {
-          type: "stdio",
-          args: [],
-          ...server,
-        },
-      });
-      if (!mcpConnection) {
-        return;
-      }
-
       const abortController = new AbortController();
       const mcpConnectionTimeout = setTimeout(
         () => abortController.abort(),
-        5000,
+        4000,
       );
 
       try {
+        const mcpId = server.name;
+        const mcpConnection = mcpManager.createConnection(mcpId, {
+          transport: {
+            type: "stdio",
+            args: [],
+            ...server,
+          },
+        });
+        if (!mcpConnection) {
+          return;
+        }
+
         const mcpError = await mcpConnection.modifyConfig(
           continueConfig,
           mcpId,
@@ -362,16 +362,22 @@ async function configYamlToContinueConfig(
         if (mcpError) {
           errors.push(mcpError);
         }
-      } catch (e: any) {
+      } catch (e) {
+        let errorMessage = `Failed to load MCP server ${server.name}`;
+        if (e instanceof Error) {
+          if (e.name === "AbortError") {
+            errorMessage += ": connection timed out";
+          } else {
+            errorMessage += ": " + e.message;
+          }
+        }
         errors.push({
           fatal: false,
-          message: `Failed to load MCP server: ${e.message}`,
+          message: errorMessage,
         });
-        if (e.name !== "AbortError") {
-          throw e;
-        }
+      } finally {
+        clearTimeout(mcpConnectionTimeout);
       }
-      clearTimeout(mcpConnectionTimeout);
     }) ?? [],
   );
 

core/llm/constructMessages.ts

@@ -8,15 +8,18 @@ import { normalizeToMessageParts } from "../util/messageContent";
 
 import { modelSupportsTools } from "./autodetect";
 
-const TOOL_USE_RULES = `When using tools, follow the following guidelines:
-- Avoid calling tools unless they are absolutely necessary. For example, if you are asked a simple programming question you do not need web search. As another example, if the user asks you to explain something about code, do not create a new file.`;
+const TOOL_USE_RULES = `<tool_use_rules>
+  When using tools, follow the following guidelines:
+  - Avoid calling tools unless they are absolutely necessary. For example, if you are asked a simple programming question you do not need web search. As another example, if the user asks you to explain something about code, do not create a new file.
+</tool_use_rules>`;
 
 function constructSystemPrompt(
   modelDescription: ModelDescription,
   useTools: boolean,
 ): string | null {
-  let systemMessage =
-    "Always include the language and file name in the info string when you write code blocks, for example '```python file.py'.";
+  let systemMessage = `<important_rules>
+  Always include the language and file name in the info string when you write code blocks. If you are editing "src/main.py" for example, your code block should start with '\`\`\`python src/main.py'.
+</important_rules>`;
   if (useTools && modelSupportsTools(modelDescription)) {
     systemMessage += "\n\n" + TOOL_USE_RULES;
   }

core/llm/index.ts

@@ -821,6 +821,7 @@ export abstract class BaseLLM implements ILLM {
             for await (const chunk of stream) {
               const result = fromChatCompletionChunk(chunk);
               if (result) {
+                completion += result.content;
                 yield result;
               }
               if (!citations && (chunk as any).citations && Array.isArray((chunk as any).citations)) {

extensions/intellij/gradle.properties

@@ -3,7 +3,7 @@ pluginGroup=com.github.continuedev.continueintellijextension
 pluginName=continue-intellij-extension
 pluginRepositoryUrl=https://github.com/continuedev/continue
 # SemVer format -> https://semver.org
-pluginVersion=1.0.2
+pluginVersion=1.0.3
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=223
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension

extensions/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "continue",
   "icon": "media/icon.png",
   "author": "Continue Dev, Inc",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/continuedev/continue"