Merge branch 'main' into fsinfront

Author: sestinj

.github/workflows/pr_checks.yaml

@@ -1,7 +1,7 @@
 name: PR checks
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - main
     paths:
@@ -22,21 +22,10 @@ on:
       - ".github/workflows/**"
 
 jobs:
-  validate-pr:
-    runs-on: ubuntu-latest
-    environment: tests-requiring-secrets
-    steps:
-      - uses: actions/checkout@v4
-
   install-root:
-    needs: validate-pr
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          # This is important - it switches from the base repo to the fork
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -57,9 +46,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -86,12 +72,8 @@ jobs:
   core-checks:
     needs: install-core
     runs-on: ubuntu-latest
-    environment: tests-requiring-secrets
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -122,9 +104,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -157,9 +136,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -191,9 +167,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -231,9 +204,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -268,9 +238,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -303,9 +270,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -321,6 +285,7 @@ jobs:
           cd core
           npm test
         env:
+          IGNORE_API_KEY_TESTS: ${{ github.event.pull_request.head.repo.fork }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
@@ -333,9 +298,6 @@ jobs:
       test_file_matrix: ${{ steps.vscode-get-test-file-matrix.outputs.test_file_matrix }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Cache node modules
         uses: actions/cache@v3
@@ -363,9 +325,6 @@ jobs:
     needs: [install-vscode, install-core]
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -399,9 +358,6 @@ jobs:
     needs: [install-vscode, install-core]
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -443,17 +399,13 @@ jobs:
       ]
     runs-on: ubuntu-latest
     # Tests requiring secrets need approval from maintainers
-    environment: tests-requiring-secrets
     strategy:
       fail-fast: false
       matrix:
         test_file: ${{ fromJson(needs.vscode-get-test-file-matrix.outputs.test_file_matrix) }}
         command: ["e2e:ci:run", "e2e:ci:run-yaml"]
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -492,6 +444,7 @@ jobs:
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts
           echo -e "Host ssh-test-container\n\tHostName $SSH_HOST\n\tUser ec2-user\n\tIdentityFile ~/.ssh/id_rsa" >> ~/.ssh/config
+        if: ${{ github.event.pull_request.head.repo.fork == false }}
 
       - name: Set up Xvfb
         run: |
@@ -501,7 +454,7 @@ jobs:
       - name: Run e2e tests
         run: |
           cd extensions/vscode
-          TEST_FILE="${{ matrix.test_file }}" npm run ${{ matrix.command }}
+          IGNORE_SSH_TESTS="${{ github.event.pull_request.head.repo.fork }}" TEST_FILE="${{ matrix.test_file }}" npm run ${{ matrix.command }}
         env:
           DISPLAY: :99
 
@@ -517,9 +470,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - uses: actions/setup-node@v4
         with:
@@ -552,10 +502,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
       - uses: actions/cache@v4
         with:
           path: core/node_modules

SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability, please do not open a public issue. Instead, please report it by emailing [email protected]. We will be highly responsive to all security concerns and ask that you give us sufficient time to investigate and address the vulnerability before disclosing it publicly.
+
+Please include the following details in your report:
+
+- A description of the vulnerability
+- Steps to reproduce the issue
+- Your assessment of the potential impact
+- Any possible mitigations
+
+## Contact
+
+For any other questions or concerns related to security, please contact us at [email protected].

binary/package-lock.json

@@ -246,6 +246,7 @@ export class CompletionProvider {
         completionOptions,
         cacheHit,
         filepath: helper.filepath,
+        numLines: completion.split("\n").length,
         completionId: helper.input.completionId,
         gitRepo: await this.ide.getRepoName(helper.filepath),
         uniqueId: await this.ide.getUniqueId(),

core/autocomplete/CompletionProvider.ts

@@ -1,10 +1,4 @@
-import {
-  Position,
-  Range,
-  RangeInFile,
-  RangeInFileWithContents,
-  TabAutocompleteOptions,
-} from "../..";
+import { Position, Range, RangeInFile, TabAutocompleteOptions } from "../..";
 import { AutocompleteCodeSnippet } from "../snippets/types";
 
 export type RecentlyEditedRange = RangeInFile & {
@@ -42,6 +36,7 @@ export interface AutocompleteOutcome extends TabAutocompleteOptions {
   modelName: string;
   completionOptions: any;
   cacheHit: boolean;
+  numLines: number;
   filepath: string;
   gitRepo?: string;
   completionId: string;

core/autocomplete/util/types.ts

@@ -1,9 +1,17 @@
 import * as fs from "node:fs";
 
+import {
+  AssistantUnrolled,
+  ConfigResult,
+  FullSlug,
+} from "@continuedev/config-yaml";
+import * as YAML from "yaml";
+
 import {
   ControlPlaneClient,
   ControlPlaneSessionInfo,
 } from "../control-plane/client.js";
+import { getControlPlaneEnv, useHub } from "../control-plane/env.js";
 import {
   BrowserSerializedContinueConfig,
   ContinueConfig,
@@ -15,15 +23,8 @@ import {
 import Ollama from "../llm/llms/Ollama.js";
 import { GlobalContext } from "../util/GlobalContext.js";
 import { getConfigJsonPath, getConfigYamlPath } from "../util/paths.js";
-
-import {
-  AssistantUnrolled,
-  ConfigResult,
-  FullSlug,
-} from "@continuedev/config-yaml";
-import * as YAML from "yaml";
-import { getControlPlaneEnv, useHub } from "../control-plane/env.js";
 import { localPathToUri } from "../util/pathToUri.js";
+
 import {
   LOCAL_ONBOARDING_CHAT_MODEL,
   ONBOARDING_LOCAL_MODEL_TITLE,
@@ -135,6 +136,7 @@ export class ConfigHandler {
               { ...assistant.configResult, config: renderedConfig },
               assistant.ownerSlug,
               assistant.packageSlug,
+              assistant.iconUrl,
               assistant.configResult.config?.version ?? "latest",
               this.controlPlaneClient,
               this.ide,
@@ -336,11 +338,11 @@ export class ConfigHandler {
     this.updateListeners.push(listener);
   }
 
-  async reloadConfig() {
+  async reloadConfig(additionalContextProviders: IContextProvider[] = []) {
     // TODO: this isn't right, there are two different senses in which you want to "reload"
 
     const { config, errors, configLoadInterrupted } =
-      await this.currentProfile.reloadConfig();
+      await this.currentProfile.reloadConfig(additionalContextProviders);
 
     if (config) {
       this.inactiveProfiles.forEach((profile) => profile.clearConfig());
@@ -390,6 +392,6 @@ export class ConfigHandler {
 
   registerCustomContextProvider(contextProvider: IContextProvider) {
     this.additionalContextProviders.push(contextProvider);
-    void this.reloadConfig();
+    void this.reloadConfig(this.additionalContextProviders);
   }
 }

core/config/ConfigHandler.ts

@@ -3,6 +3,7 @@ import {
   ConfigValidationError,
   FullSlug,
 } from "@continuedev/config-yaml";
+
 import {
   BrowserSerializedContinueConfig,
   ContinueConfig,
@@ -18,9 +19,16 @@ export interface ProfileDescription {
   profileType: "control-plane" | "local" | "platform";
   title: string;
   id: string;
+  iconUrl: string;
   errors: ConfigValidationError[] | undefined;
 }
 
+export interface OrganizationDescription {
+  id: string;
+  iconUrl: string;
+  name: string;
+}
+
 export class ProfileLifecycleManager {
   private savedConfigResult: ConfigResult<ContinueConfig> | undefined;
   private savedBrowserConfigResult?: ConfigResult<BrowserSerializedContinueConfig>;
@@ -42,12 +50,12 @@ export class ProfileLifecycleManager {
   }
 
   // Clear saved config and reload
-  async reloadConfig(): Promise<ConfigResult<ContinueConfig>> {
+  async reloadConfig(additionalContextProviders: IContextProvider[] = []): Promise<ConfigResult<ContinueConfig>> {
     this.savedConfigResult = undefined;
     this.savedBrowserConfigResult = undefined;
     this.pendingConfigPromise = undefined;
 
-    return this.loadConfig([], true);
+    return this.loadConfig(additionalContextProviders, true);
   }
 
   async loadConfig(

core/config/ProfileLifecycleManager.ts

@@ -1,4 +1,5 @@
 import { ConfigJson } from "@continuedev/config-types";
+import { ConfigResult } from "@continuedev/config-yaml";
 
 import { ControlPlaneClient } from "../../control-plane/client.js";
 import {
@@ -7,9 +8,8 @@ import {
   IdeSettings,
   SerializedContinueConfig,
 } from "../../index.js";
-
-import { ConfigResult } from "@continuedev/config-yaml";
 import { ProfileDescription } from "../ProfileLifecycleManager.js";
+
 import doLoadConfig from "./doLoadConfig.js";
 import { IProfileLoader } from "./IProfileLoader.js";
 
@@ -32,6 +32,7 @@ export default class ControlPlaneProfileLoader implements IProfileLoader {
     this.description = {
       id: workspaceId,
       profileType: "control-plane",
+      iconUrl: "",
       fullSlug: {
         ownerSlug: "",
         packageSlug: "",