diff --git a/binary/package-lock.json b/binary/package-lock.json
index c026c940c9..158342e0b9 100644
--- a/binary/package-lock.json
+++ b/binary/package-lock.json
@@ -118,6 +118,7 @@
         "@types/jest": "^29.5.12",
         "@types/jquery": "^3.5.29",
         "@types/jsdom": "^21.1.6",
+        "@types/json-schema": "^7.0.15",
         "@types/mozilla-readability": "^0.2.1",
         "@types/mustache": "^4.2.5",
         "@types/node-fetch": "^2.6.11",
diff --git a/core/config/load.ts b/core/config/load.ts
index b7ce400eb3..9a6599608e 100644
--- a/core/config/load.ts
+++ b/core/config/load.ts
@@ -33,7 +33,6 @@ import {
 } from "../commands/index.js";
 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";
@@ -70,7 +69,7 @@ import {
   defaultSlashCommandsVscode,
 } from "./default";
 import { getSystemPromptDotFile } from "./getSystemPromptDotFile";
-import { isSupportedLanceDbCpuTarget } from "./util";
+// import { isSupportedLanceDbCpuTarget } from "./util";
 import { ConfigValidationError, validateConfig } from "./validation.js";
 
 export interface ConfigResult<T> {
@@ -176,9 +175,10 @@ function loadSerializedConfig(
       ? [...defaultSlashCommandsVscode]
       : [...defaultSlashCommandsJetBrains];
 
-  if (!isSupportedLanceDbCpuTarget(ide)) {
-    config.disableIndexing = true;
-  }
+  // Temporarily disabling this check until we can verify the commands are accuarate
+  // if (!isSupportedLanceDbCpuTarget(ide)) {
+  //   config.disableIndexing = true;
+  // }
 
   return { config, errors, configLoadInterrupted: false };
 }
@@ -235,6 +235,13 @@ 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,
@@ -394,9 +401,14 @@ async function intermediateToFinalConfig(
         | ContextProviderWithParams
         | undefined
     )?.params || {};
+
   const DEFAULT_CONTEXT_PROVIDERS = [
     new FileContextProvider({}),
-    new CodebaseContextProvider(codebaseContextParams),
+    // Add codebase provider if indexing is enabled
+    ...(!config.disableIndexing
+      ? [await getCodebaseProvider(codebaseContextParams)]
+      : []),
+    // Add prompt files provider if enabled
     ...(loadPromptFiles ? [new PromptFilesContextProvider({})] : []),
   ];
 
diff --git a/extensions/vscode/package-lock.json b/extensions/vscode/package-lock.json
index 110229e036..26d319d834 100644
--- a/extensions/vscode/package-lock.json
+++ b/extensions/vscode/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.9.250",
+  "version": "0.9.251",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.9.250",
+      "version": "0.9.251",
       "license": "Apache-2.0",
       "dependencies": {
         "@continuedev/fetch": "^1.0.3",