Merge branch 'main' into feat/watsonx_reranker_integration

Author: sestinj

.continueignore

@@ -5,4 +5,5 @@ docs/docs/languages
 .vscode/
 .archive/
 **/*.scm
-**/*.diff
+**/*.diff
+.continue/

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @continuedev/continue-code-reviewers

.github/workflows/pr_checks.yaml

@@ -275,7 +275,7 @@ jobs:
           cd core
           npm test
         env:
-          IGNORE_API_KEY_TESTS: ${{ github.event.pull_request.head.repo.fork == true && github.actor == 'dependabot[bot]' }}
+          IGNORE_API_KEY_TESTS: ${{ github.event.pull_request.head.repo.fork == true || github.actor == 'dependabot[bot]' }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
@@ -420,8 +420,7 @@ jobs:
         id: test-extensions-cache
         with:
           path: extensions/vscode/e2e/.test-extensions
-          # package.json used as the key because that's where the download script is defined
-          key: vscode-test-extensions-${{ hashFiles('extensions/vscode/package.json') }}
+          key: CONSTANT
 
       - name: Download build artifact
         uses: actions/download-artifact@v4
@@ -460,7 +459,7 @@ jobs:
       - name: Run e2e tests
         run: |
           cd extensions/vscode
-          IGNORE_SSH_TESTS="${{ github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' }}" TEST_FILE="${{ matrix.test_file }}" npm run ${{ matrix.command }}
+          IGNORE_SSH_TESTS="${{ github.event.pull_request.head.repo.fork == true || github.actor == 'dependabot[bot]' }}" TEST_FILE="${{ matrix.test_file }}" npm run ${{ matrix.command }}
         env:
           DISPLAY: :99
 

.gitignore

@@ -168,4 +168,5 @@ extensions/.continue-debug/
 
 *.vsix
 
-.continuerules
+.continuerules
+**/.continue/assistants/

.prettierignore

@@ -14,4 +14,5 @@ gui/dist
 **/.continueignore
 CHANGELOG.md
 **/continue_tutorial.py
-**/node_modules
+**/node_modules
+**/CODEOWNERS

README.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-**[Continue](https://docs.continue.dev) enables to developers to create, share, and use custom AI code assistants with our open-source [VS Code](https://marketplace.visualstudio.com/items?itemName=Continue.continue) and [JetBrains](https://plugins.jetbrains.com/plugin/22707-continue-extension) extensions and [hub of models, rules, prompts, docs, and other building blocks](https://hub.continue.dev)**
+**[Continue](https://docs.continue.dev) enables developers to create, share, and use custom AI code assistants with our open-source [VS Code](https://marketplace.visualstudio.com/items?itemName=Continue.continue) and [JetBrains](https://plugins.jetbrains.com/plugin/22707-continue-extension) extensions and [hub of models, rules, prompts, docs, and other building blocks](https://hub.continue.dev)**
 
 </div>
 

binary/package-lock.json

@@ -262,7 +262,7 @@ export class CompletionProvider {
 
       // When using the JetBrains extension, Mark as displayed
       const ideType = (await this.ide.getIdeInfo()).ideType;
-      if (ideType === "jetbrains") {
+      if (ideType.toLowerCase() === "jetbrains") {
         this.markDisplayed(input.completionId, outcome);
       }
 

core/autocomplete/CompletionProvider.ts

@@ -1,5 +1,3 @@
-import * as fs from "node:fs";
-
 import { ConfigResult, FullSlug } from "@continuedev/config-yaml";
 
 import {
@@ -17,9 +15,8 @@ import {
 } from "../index.js";
 import Ollama from "../llm/llms/Ollama.js";
 import { GlobalContext } from "../util/GlobalContext.js";
-import { getConfigJsonPath, getConfigYamlPath } from "../util/paths.js";
-import { localPathToUri } from "../util/pathToUri.js";
 
+import { getAllAssistantFiles } from "./loadLocalAssistants.js";
 import {
   LOCAL_ONBOARDING_CHAT_MODEL,
   LOCAL_ONBOARDING_PROVIDER_TITLE,
@@ -53,6 +50,7 @@ export class ConfigHandler {
     private ideSettingsPromise: Promise<IdeSettings>,
     private readonly writeLog: (text: string) => Promise<void>,
     sessionInfoPromise: Promise<ControlPlaneSessionInfo | undefined>,
+    private readonly didSelectOrganization?: (orgId: string | null) => void,
   ) {
     this.ide = ide;
     this.ideSettingsPromise = ideSettingsPromise;
@@ -86,6 +84,25 @@ export class ConfigHandler {
     });
   }
 
+  /**
+   * Users can define as many local assistants as they want in a `.continue/assistants` folder
+   */
+  private async getLocalAssistantProfiles() {
+    const assistantFiles = await getAllAssistantFiles(this.ide);
+    const profiles = assistantFiles.map((assistant) => {
+      return new LocalProfileLoader(
+        this.ide,
+        this.ideSettingsPromise,
+        this.controlPlaneClient,
+        this.writeLog,
+        assistant,
+      );
+    });
+    return profiles.map(
+      (profile) => new ProfileLifecycleManager(profile, this.ide),
+    );
+  }
+
   /**
    * Retrieves the titles of additional context providers that are of type "submenu".
    *
@@ -103,8 +120,9 @@ export class ConfigHandler {
     } catch (e) {
       // If this fails, make sure at least local profile is loaded
       console.error("Failed to fetch control plane profiles in init: ", e);
-      await this.updateAvailableProfiles([this.localProfileManager]);
+      await this.loadLocalProfilesOnly();
     }
+
     try {
       const configResult = await this.loadConfig();
       this.notifyConfigListeners(configResult);
@@ -135,14 +153,12 @@ export class ConfigHandler {
 
   async openConfigProfile(profileId?: string) {
     let openProfileId = profileId || this.selectedProfileId;
-    if (openProfileId === "local") {
+    const profile = this.profiles?.find(
+      (p) => p.profileDescription.id === openProfileId,
+    );
+    if (profile?.profileDescription.profileType === "local") {
       const ideInfo = await this.ide.getIdeInfo();
-      const configYamlPath = getConfigYamlPath(ideInfo.ideType);
-      if (fs.existsSync(configYamlPath)) {
-        await this.ide.openFile(localPathToUri(configYamlPath));
-      } else {
-        await this.ide.openFile(localPathToUri(getConfigJsonPath()));
-      }
+      await this.ide.openFile(profile.profileDescription.uri);
     } else {
       const env = await getControlPlaneEnv(this.ide.getIdeSettings());
       await this.ide.openUrl(`${env.APP_URL}${openProfileId}`);
@@ -161,35 +177,39 @@ export class ConfigHandler {
     let profiles: ProfileLifecycleManager[] | null = null;
     if (!userId) {
       // Not logged in
-      profiles = [this.localProfileManager];
+      const allLocalProfiles = await this.getAllLocalProfiles();
+      profiles = [...allLocalProfiles];
     } else {
       // Logged in
       const assistants =
         await this.controlPlaneClient.listAssistants(selectedOrgId);
 
-      const hubProfiles = assistants.map((assistant) => {
-        const profileLoader = new PlatformProfileLoader(
-          {
-            ...assistant.configResult,
-            config: assistant.configResult.config,
-          },
-          assistant.ownerSlug,
-          assistant.packageSlug,
-          assistant.iconUrl,
-          assistant.configResult.config?.version ?? "latest",
-          this.controlPlaneClient,
-          this.ide,
-          this.ideSettingsPromise,
-          this.writeLog,
-          this.reloadConfig.bind(this),
-        );
-
-        return new ProfileLifecycleManager(profileLoader, this.ide);
-      });
+      const hubProfiles = await Promise.all(
+        assistants.map(async (assistant) => {
+          const profileLoader = await PlatformProfileLoader.create(
+            {
+              ...assistant.configResult,
+              config: assistant.configResult.config,
+            },
+            assistant.ownerSlug,
+            assistant.packageSlug,
+            assistant.iconUrl,
+            assistant.configResult.config?.version ?? "latest",
+            this.controlPlaneClient,
+            this.ide,
+            this.ideSettingsPromise,
+            this.writeLog,
+            this.reloadConfig.bind(this),
+          );
+
+          return new ProfileLifecycleManager(profileLoader, this.ide);
+        }),
+      );
 
       if (selectedOrgId === null) {
         // Personal
-        profiles = [...hubProfiles, this.localProfileManager];
+        const allLocalProfiles = await this.getAllLocalProfiles();
+        profiles = [...hubProfiles, ...allLocalProfiles];
       } else {
         // Organization
         profiles = hubProfiles;
@@ -199,6 +219,16 @@ export class ConfigHandler {
     await this.updateAvailableProfiles(profiles);
   }
 
+  private async getAllLocalProfiles() {
+    const localAssistantProfiles = await this.getLocalAssistantProfiles();
+    return [this.localProfileManager, ...localAssistantProfiles];
+  }
+
+  private async loadLocalProfilesOnly() {
+    const allLocalProfiles = await this.getAllLocalProfiles();
+    await this.updateAvailableProfiles(allLocalProfiles);
+  }
+
   private async updateAvailableProfiles(profiles: ProfileLifecycleManager[]) {
     this.profiles = profiles;
 
@@ -278,7 +308,7 @@ export class ConfigHandler {
     } else {
       try {
         const workspaces = await this.controlPlaneClient.listWorkspaces();
-        const profiles = [this.localProfileManager];
+        const profiles = await this.getAllLocalProfiles();
         workspaces.forEach((workspace) => {
           const profileLoader = new ControlPlaneProfileLoader(
             workspace.id,
@@ -296,7 +326,7 @@ export class ConfigHandler {
         await this.updateAvailableProfiles(profiles);
       } catch (e: any) {
         console.error("Failed to load profiles: ", e);
-        await this.updateAvailableProfiles([this.localProfileManager]);
+        await this.loadLocalProfilesOnly();
       }
     }
   }
@@ -311,17 +341,22 @@ export class ConfigHandler {
   async getSelectedOrgId(): Promise<string | null> {
     const selectedOrgs =
       this.globalContext.get("lastSelectedOrgIdForWorkspace") ?? {};
-    return selectedOrgs[await this.getWorkspaceId()] ?? null;
+    const workspaceId = await this.getWorkspaceId();
+    return selectedOrgs[workspaceId] ?? null;
   }
 
   async setSelectedOrgId(orgId: string | null) {
     const selectedOrgs =
       this.globalContext.get("lastSelectedOrgIdForWorkspace") ?? {};
     selectedOrgs[await this.getWorkspaceId()] = orgId;
     this.globalContext.update("lastSelectedOrgIdForWorkspace", selectedOrgs);
+    this.didSelectOrganization?.(orgId);
   }
 
   async setSelectedProfile(profileId: string | null) {
+    console.log(
+      `Changing selected profile from ${this.selectedProfileId} to ${profileId}`,
+    );
     this.selectedProfileId = profileId;
     const result = await this.loadConfig();
     this.notifyConfigListeners(result);
@@ -353,9 +388,20 @@ export class ConfigHandler {
       Promise.resolve(sessionInfo),
       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.updateAvailableProfiles([this.localProfileManager]);
+      await this.loadLocalProfilesOnly();
       await this.reloadConfig();
     });
   }

core/config/ConfigHandler.ts

@@ -21,6 +21,7 @@ export interface ProfileDescription {
   id: string;
   iconUrl: string;
   errors: ConfigValidationError[] | undefined;
+  uri: string;
 }
 
 export interface OrganizationDescription {
@@ -77,14 +78,18 @@ export class ProfileLifecycleManager {
     // Set pending config promise
     this.pendingConfigPromise = new Promise(async (resolve, reject) => {
       let result: ConfigResult<ContinueConfig>;
+      // This try catch is expected to catch high-level errors that aren't block-specific
+      // Like invalid json, invalid yaml, file read errors, etc.
+      // NOT block-specific loading errors
       try {
         result = await this.profileLoader.doLoadConfig();
-      } catch (e: any) {
+      } catch (e) {
+        const message = e instanceof Error ? e.message : "Error loading config";
         result = {
           errors: [
             {
               fatal: true,
-              message: e.message,
+              message,
             },
           ],
           config: undefined,
@@ -99,7 +104,6 @@ export class ProfileLifecycleManager {
         ).concat(additionalContextProviders);
       }
 
-      this.savedConfigResult = result;
       resolve(result);
     });