Quick merge main 2025 07 25

.continue/rules/typescript-enum-usage.md

@@ -0,0 +1,6 @@
+---
+globs: "**/*.{ts,tsx}"
+alwaysApply: false
+---
+
+Use enums instead of simple string unions when possible in TypeScript code

.github/pull_request_template.md

@@ -8,9 +8,9 @@
 - [] The relevant docs, if any, have been updated or created
 - [] The relevant tests, if any, have been updated or created
 
-## Screenshots
+## Screen recording or screenshot
 
-[ For visual changes, include screenshots. Screen recordings are particularly helpful, and appreciated! ]
+[ When applicable, please include a short screen recording or screenshot - this makes it much easier for us as contributors to review and understand your changes. See [this PR](https://github.com/continuedev/continue/pull/6455) as a good example. ]
 
 ## Tests
 

.github/workflows/jetbrains-release.yaml

@@ -63,7 +63,6 @@ jobs:
 
       - name: Bump version in gradle.properties
         run: |
-          cd extensions/intellij
           awk '/pluginVersion=/{split($0,a,"="); split(a[2],b,"."); b[3]+=1; printf "%s=%s.%s.%s\n",a[1],b[1],b[2],b[3];next}1' gradle.properties > tmp && mv tmp gradle.properties
           rm -rf tmp
           NEW_VERSION=$(grep 'pluginVersion=' gradle.properties | cut -d'=' -f2)
@@ -224,10 +223,6 @@ jobs:
       #     apple-product-id: dev.continue.continue-binary
       #     options: --options runtime --entitlements entitlements.xml
 
-      # Build plugin
-      - name: Build plugin
-        run: ./gradlew buildPlugin
-
       # Publish the plugin to JetBrains Marketplace
       - name: Publish EAP Plugin
         if: github.event_name == 'release' || github.event.inputs.publish_build == 'true'
@@ -237,7 +232,7 @@ jobs:
           PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
           PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
           RELEASE_CHANNEL: eap
-        run: ./gradlew publishPlugin
+        run: ./gradlew publishPlugin --info --stacktrace
 
       - name: Publish Stable Plugin
         if: github.event_name == 'release' || github.event.inputs.publish_build == 'true'
@@ -247,7 +242,7 @@ jobs:
           PRIVATE_KEY: ${{ secrets.JETBRAINS_PRIVATE_KEY }}
           PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
           RELEASE_CHANNEL: default
-        run: ./gradlew publishPlugin
+        run: ./gradlew publishPlugin --info --stacktrace
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact

.github/workflows/pr_checks.yaml

@@ -53,7 +53,10 @@ jobs:
 
   install-config-yaml:
     needs: install-root
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -80,7 +83,10 @@ jobs:
 
   install-openai-adapters:
     needs: install-root
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -136,7 +142,10 @@ jobs:
 
   install-core:
     needs: install-root
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -384,7 +393,10 @@ jobs:
   install-vscode:
     needs:
       [install-root, install-core, install-config-yaml, install-openai-adapters]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -666,7 +678,10 @@ jobs:
           echo "Test files: ${{ steps.vscode-get-test-file-matrix.outputs.test_file_matrix }}"
 
   vscode-package-extension:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     needs:
       [
         install-vscode,
@@ -723,7 +738,7 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: vscode-extension-build
+          name: vscode-extension-build-${{ runner.os }}
           path: extensions/vscode/build
 
   vscode-download-e2e-dependencies:
@@ -820,7 +835,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: vscode-extension-build
+          name: vscode-extension-build-Linux
           path: extensions/vscode/build
 
       - name: Download e2e dependencies

CONTRIBUTING.md

@@ -192,6 +192,7 @@ To keep the Continue codebase clean and maintainable, we expect the following fr
 - Keep changes focused. Multiple unrelated fixes should be opened as separate PRs
 - Write or update tests for new functionality
 - Update relevant documentation in the `docs` folder
+- **For new features**: Include a short screen recording or screenshot demonstrating the new functionality. This makes it much easier for us as contributors to review and understand your changes. See [this PR](https://github.com/continuedev/continue/pull/6455) as a good example
 - Open a PR against the `main` branch. Make sure to fill in the PR template
 
 ### Formatting

core/autocomplete/CompletionProvider.ts

@@ -10,7 +10,7 @@ import { BracketMatchingService } from "./filtering/BracketMatchingService.js";
 import { CompletionStreamer } from "./generation/CompletionStreamer.js";
 import { postprocessCompletion } from "./postprocessing/index.js";
 import { shouldPrefilter } from "./prefiltering/index.js";
-import { getAllSnippets } from "./snippets/index.js";
+import { getAllSnippetsWithoutRace } from "./snippets/index.js";
 import { renderPrompt } from "./templating/index.js";
 import { GetLspDefinitionsFunction } from "./types.js";
 import { AutocompleteDebouncer } from "./util/AutocompleteDebouncer.js";
@@ -121,6 +121,12 @@ export class CompletionProvider {
       ...config?.tabAutocompleteOptions,
       ...llm.autocompleteOptions,
     };
+
+    // Enable static contextualization if defined.
+    if (config?.experimental?.enableStaticContextualization) {
+      options.experimental_enableStaticContextualization = true;
+    }
+
     return options;
   }
 
@@ -171,7 +177,7 @@ export class CompletionProvider {
       }
 
       const [snippetPayload, workspaceDirs] = await Promise.all([
-        getAllSnippets({
+        getAllSnippetsWithoutRace({
           helper,
           ide: this.ide,
           getDefinitionsFromLsp: this.getDefinitionsFromLsp,
@@ -258,6 +264,10 @@ export class CompletionProvider {
         ...helper.options,
       };
 
+      if (options.experimental_enableStaticContextualization) {
+        outcome.enabledStaticContextualization = true;
+      }
+
       //////////
 
       // Save to cache

core/autocomplete/context/ContextRetrievalService.ts

@@ -2,23 +2,27 @@ import { IDE } from "../..";
 import {
   AutocompleteCodeSnippet,
   AutocompleteSnippetType,
+  AutocompleteStaticSnippet,
 } from "../snippets/types";
 import { HelperVars } from "../util/HelperVars";
 
 import { ImportDefinitionsService } from "./ImportDefinitionsService";
 import { getSymbolsForSnippet } from "./ranking";
 import { RootPathContextService } from "./root-path-context/RootPathContextService";
+import { StaticContextService } from "./static-context/StaticContextService";
 
 export class ContextRetrievalService {
   private importDefinitionsService: ImportDefinitionsService;
   private rootPathContextService: RootPathContextService;
+  private staticContextService: StaticContextService;
 
   constructor(private readonly ide: IDE) {
     this.importDefinitionsService = new ImportDefinitionsService(this.ide);
     this.rootPathContextService = new RootPathContextService(
       this.importDefinitionsService,
       this.ide,
     );
+    this.staticContextService = new StaticContextService(this.ide);
   }
 
   public async getSnippetsFromImportDefinitions(
@@ -71,6 +75,12 @@ export class ContextRetrievalService {
     );
   }
 
+  public async getStaticContextSnippets(
+    helper: HelperVars,
+  ): Promise<AutocompleteStaticSnippet[]> {
+    return this.staticContextService.getContext(helper);
+  }
+
   /**
    * Initialize the import definitions cache for a file.
    * This is normally done automatically when the active text editor changes,