Merge branch 'main' into feat/watsonx_reranker_integration

Author: sestinj

.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 }}
+          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 }}
@@ -409,6 +409,14 @@ jobs:
           path: extensions/vscode/node_modules
           key: ${{ runner.os }}-vscode-node-modules-${{ hashFiles('extensions/vscode/package-lock.json') }}
 
+      # We don't want to cache the Continue extension, so it is deleted at the end of the job
+      - uses: actions/cache@v4
+        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') }}
+
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
@@ -436,7 +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 }}
+        if: ${{ github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' }}
 
       - name: Set up Xvfb
         run: |
@@ -446,10 +454,15 @@ jobs:
       - name: Run e2e tests
         run: |
           cd extensions/vscode
-          IGNORE_SSH_TESTS="${{ github.event.pull_request.head.repo.fork }}" TEST_FILE="${{ matrix.test_file }}" npm run ${{ matrix.command }}
+          IGNORE_SSH_TESTS="${{ github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' }}" TEST_FILE="${{ matrix.test_file }}" npm run ${{ matrix.command }}
         env:
           DISPLAY: :99
 
+      - name: Delete continue from test extensions
+        run: |
+          cd extensions/vscode
+          rm -rf e2e/.test-extensions/continue*
+
       - name: Upload e2e test screenshots
         if: failure()
         uses: actions/upload-artifact@v4

.github/workflows/stale-issue-helper.yaml

@@ -0,0 +1,25 @@
+name: "Label / close stale issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          close-issue-message: "This issue was closed because it wasn't updated for 10 days after being marked stale. If it's still important, please reopen + comment and we'll gladly take another look!"
+          stale-issue-message: "This issue hasn't been updated in 90 days and will be closed after an additional 10 days without activity. If it's still important, please leave a comment and share any new information that would help us address the issue."
+          days-before-stale: 90
+          days-before-close: 10
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          operations-per-run: 1000
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          exempt-issue-labels: "needs-triage,no-stale,high,highest"
+          exempt-pr-labels: "no-stale"

binary/core-dev-server.js

@@ -0,0 +1,6 @@
+const path = require('path');
+process.env.CONTINUE_DEVELOPMENT = true;
+
+process.env.CONTINUE_GLOBAL_DIR = path.join(process.env.PROJECT_DIR, 'extensions', '.continue-debug');
+
+require('./out/index.js');

binary/package-lock.json

@@ -0,0 +1,20 @@
+const fs = require('fs');
+const path = require('path');
+
+const logDirPath = path.join(__dirname, '..', 'extensions', '.continue-debug', 'logs');
+const logFilePath = path.join(logDirPath, "prompt.log");
+
+if (!fs.existsSync(logDirPath)) {
+  fs.mkdirSync(logDirPath, { recursive: true });
+}
+
+if (!fs.existsSync(logFilePath)) {
+  fs.createWriteStream(logFilePath).end();
+}
+
+console.log("Watching logs at " + logFilePath)
+
+fs.watch(logFilePath, () => {
+  // console.clear();
+  fs.createReadStream(logFilePath).pipe(process.stdout);
+});

binary/prompt-logs.js

@@ -134,6 +134,13 @@ export class CompletionProvider {
     token: AbortSignal | undefined,
   ): Promise<AutocompleteOutcome | undefined> {
     try {
+      // Create abort signal if not given
+      if (!token) {
+        const controller = this.loggingService.createAbortController(
+          input.completionId,
+        );
+        token = controller.signal;
+      }
       const startTime = Date.now();
       const options = await this._getAutocompleteOptions();
 
@@ -158,14 +165,6 @@ export class CompletionProvider {
         return undefined;
       }
 
-      // Create abort signal if not given
-      if (!token) {
-        const controller = this.loggingService.createAbortController(
-          input.completionId,
-        );
-        token = controller.signal;
-      }
-
       const [snippetPayload, workspaceDirs] = await Promise.all([
         getAllSnippets({
           helper,

core/autocomplete/CompletionProvider.ts

@@ -2,8 +2,7 @@ import ignore from "ignore";
 
 import type { FileType, IDE, SlashCommand } from "../..";
 import {
-  defaultIgnoreDir,
-  defaultIgnoreFile,
+  DEFAULT_IGNORE,
   getGlobalContinueIgArray,
   gitIgArrayFromFile,
 } from "../../indexing/ignore";
@@ -58,10 +57,7 @@ const OnboardSlashCommand: SlashCommand = {
 };
 
 async function getEntriesFilteredByIgnore(dir: string, ide: IDE) {
-  const ig = ignore()
-    .add(defaultIgnoreDir)
-    .add(defaultIgnoreFile)
-    .add(getGlobalContinueIgArray());
+  const ig = ignore().add(DEFAULT_IGNORE).add(getGlobalContinueIgArray());
   const entries = await ide.listDir(dir);
 
   const ignoreUri = joinPathsToUri(dir, ".gitignore");

core/commands/slash/onboard.ts

@@ -3,6 +3,11 @@ import * as fs from "fs";
 import os from "os";
 import path from "path";
 
+import {
+  ConfigResult,
+  ConfigValidationError,
+  ModelRole,
+} from "@continuedev/config-yaml";
 import { fetchwithRequestOptions } from "@continuedev/fetch";
 import * as JSONC from "comment-json";
 import * as tar from "tar";
@@ -31,14 +36,16 @@ import {
 import {
   slashCommandFromDescription,
   slashFromCustomCommand,
-} from "../commands/index.js";
+} from "../commands/index";
 import { AllRerankers } from "../context/allRerankers";
 import { MCPManagerSingleton } from "../context/mcp";
+import CodebaseContextProvider from "../context/providers/CodebaseContextProvider";
 import ContinueProxyContextProvider from "../context/providers/ContinueProxyContextProvider";
 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";
 import { llmFromDescription } from "../llm/llms";
@@ -62,14 +69,8 @@ import {
   getContinueDotEnv,
   getEsbuildBinaryPath,
 } from "../util/paths";
-
-import {
-  ConfigResult,
-  ConfigValidationError,
-  ModelRole,
-} from "@continuedev/config-yaml";
-import { useHub } from "../control-plane/env";
 import { localPathToUri } from "../util/pathToUri";
+
 import {
   defaultContextProvidersJetBrains,
   defaultContextProvidersVsCode,
@@ -78,7 +79,7 @@ import {
 } from "./default";
 import { getSystemPromptDotFile } from "./getSystemPromptDotFile";
 import { modifyAnyConfigWithSharedConfig } from "./sharedConfig";
-import { getModelByRole } from "./util";
+import { getModelByRole, isSupportedLanceDbCpuTargetForLinux } from "./util";
 import { validateConfig } from "./validation.js";
 
 export function resolveSerializedConfig(
@@ -172,10 +173,9 @@ function loadSerializedConfig(
       ? [...defaultSlashCommandsVscode]
       : [...defaultSlashCommandsJetBrains];
 
-  // Temporarily disabling this check until we can verify the commands are accuarate
-  // if (!isSupportedLanceDbCpuTarget(ide)) {
-  //   config.disableIndexing = true;
-  // }
+  if (os.platform() === "linux" && !isSupportedLanceDbCpuTargetForLinux(ide)) {
+    config.disableIndexing = true;
+  }
 
   return { config, errors, configLoadInterrupted: false };
 }
@@ -232,13 +232,6 @@ export function isContextProviderWithParams(
   return (contextProvider as ContextProviderWithParams).name !== undefined;
 }
 
-const getCodebaseProvider = async (params: any) => {
-  const { default: CodebaseContextProvider } = await import(
-    "../context/providers/CodebaseContextProvider"
-  );
-  return new CodebaseContextProvider(params);
-};
-
 /** Only difference between intermediate and final configs is the `models` array */
 async function intermediateToFinalConfig(
   config: Config,
@@ -405,7 +398,7 @@ async function intermediateToFinalConfig(
     new FileContextProvider({}),
     // Add codebase provider if indexing is enabled
     ...(!config.disableIndexing
-      ? [await getCodebaseProvider(codebaseContextParams)]
+      ? [new CodebaseContextProvider(codebaseContextParams)]
       : []),
     // Add prompt files provider if enabled
     ...(loadPromptFiles ? [new PromptFilesContextProvider({})] : []),

core/config/load.ts

@@ -20,6 +20,7 @@ export const sharedConfigSchema = z
     promptPath: z.string(),
 
     // `ui` in `ContinueConfig`
+    showSessionTabs: z.boolean(),
     codeBlockToolbarPosition: z.enum(["top", "bottom"]),
     fontSize: z.number(),
     codeWrap: z.boolean(),
@@ -134,6 +135,10 @@ export function modifyAnyConfigWithSharedConfig<
     configCopy.disableSessionTitles = sharedConfig.disableSessionTitles;
   }
 
+  if (sharedConfig.showSessionTabs !== undefined) {
+    configCopy.ui.showSessionTabs = sharedConfig.showSessionTabs;
+  }
+
   configCopy.experimental = {
     ...configCopy.experimental,
   };

core/config/sharedConfig.ts

@@ -1,4 +1,4 @@
-import { execSync } from "child_process";
+import fs from "fs";
 import os from "os";
 
 import {
@@ -121,63 +121,49 @@ export function getModelByRole<T extends keyof ExperimentalModelRoles>(
  *
  * See here for details: https://github.com/continuedev/continue/issues/940
  */
-export function isSupportedLanceDbCpuTarget(ide: IDE) {
+export function isSupportedLanceDbCpuTargetForLinux(ide?: IDE) {
   const CPU_FEATURES_TO_CHECK = ["avx2", "fma"] as const;
 
   const globalContext = new GlobalContext();
-  const globalContextVal = globalContext.get("isSupportedLanceDbCpuTarget");
+  const globalContextVal = globalContext.get(
+    "isSupportedLanceDbCpuTargetForLinux",
+  );
 
   // If we've already checked the CPU target, return the cached value
   if (globalContextVal !== undefined) {
     return globalContextVal;
   }
 
   const arch = os.arch();
-  const platform = os.platform();
 
   // This check only applies to x64
   //https://github.com/lancedb/lance/issues/2195#issuecomment-2057841311
   if (arch !== "x64") {
-    globalContext.update("isSupportedLanceDbCpuTarget", true);
+    globalContext.update("isSupportedLanceDbCpuTargetForLinux", true);
     return true;
   }
 
   try {
-    const cpuFlags = (() => {
-      switch (platform) {
-        case "darwin":
-          return execSync("sysctl -n machdep.cpu.features")
-            .toString()
-            .toLowerCase();
-        case "linux":
-          return execSync("cat /proc/cpuinfo").toString().toLowerCase();
-        case "win32":
-          return execSync("wmic cpu get caption /format:list")
-            .toString()
-            .toLowerCase();
-        default:
-          return "";
-      }
-    })();
+    const cpuFlags = fs.readFileSync("/proc/cpuinfo", "utf-8").toLowerCase();
 
-    const isSupportedLanceDbCpuTarget = cpuFlags
+    const isSupportedLanceDbCpuTargetForLinux = cpuFlags
       ? CPU_FEATURES_TO_CHECK.every((feature) => cpuFlags.includes(feature))
       : true;
 
     // If it's not a supported CPU target, and it's the first time we are checking,
     // show a toast to inform the user that we are going to disable indexing.
-    if (!isSupportedLanceDbCpuTarget) {
+    if (!isSupportedLanceDbCpuTargetForLinux && ide) {
       // We offload our async toast to `showUnsupportedCpuToast` to prevent making
-      // our config loading async upstream of `isSupportedLanceDbCpuTarget`
+      // our config loading async upstream of `isSupportedLanceDbCpuTargetForLinux`
       void showUnsupportedCpuToast(ide);
     }
 
     globalContext.update(
-      "isSupportedLanceDbCpuTarget",
-      isSupportedLanceDbCpuTarget,
+      "isSupportedLanceDbCpuTargetForLinux",
+      isSupportedLanceDbCpuTargetForLinux,
     );
 
-    return isSupportedLanceDbCpuTarget;
+    return isSupportedLanceDbCpuTargetForLinux;
   } catch (error) {
     // If we can't determine CPU features, default to true
     return true;
@@ -187,11 +173,13 @@ export function isSupportedLanceDbCpuTarget(ide: IDE) {
 async function showUnsupportedCpuToast(ide: IDE) {
   const shouldOpenLink = await ide.showToast(
     "warning",
-    "Codebase indexing is disabled due to CPU incompatibility",
+    "Codebase indexing disabled - Your Linux system lacks required CPU features (AVX2, FMA)",
     "Learn more",
   );
 
   if (shouldOpenLink) {
-    void ide.openUrl("https://github.com/continuedev/continue/pull/3551");
+    void ide.openUrl(
+      "https://docs.continue.dev/troubleshooting#i-received-a-codebase-indexing-disabled---your-linux-system-lacks-required-cpu-features-avx2-fma-notification",
+    );
   }
 }