continuedev
diff --git a/‎.github/workflows/jetbrains-build.yaml
+19-1 b/‎.github/workflows/jetbrains-build.yaml
+19-1
diff --git a/‎.github/workflows/jetbrains-release.yaml
+24-6 b/‎.github/workflows/jetbrains-release.yaml
+24-6
diff --git a/‎.vscode/launch.json
+16 b/‎.vscode/launch.json
+16
diff --git a/‎.vscode/tasks.json
+1-3 b/‎.vscode/tasks.json
+1-3
diff --git a/‎binary/package-lock.json
+5-2 b/‎binary/package-lock.json
+5-2
diff --git a/‎core/config/ConfigHandler.ts
+7 b/‎core/config/ConfigHandler.ts
+7
diff --git a/‎core/config/onboarding.ts
-5 b/‎core/config/onboarding.ts
-5
diff --git a/‎core/config/profile/LocalProfileLoader.ts
+1-1 b/‎core/config/profile/LocalProfileLoader.ts
+1-1
diff --git a/‎core/context/providers/DocsContextProvider.ts
+31-26 b/‎core/context/providers/DocsContextProvider.ts
+31-26
diff --git a/‎core/context/retrieval/retrieval.ts
+6-5 b/‎core/context/retrieval/retrieval.ts
+6-5
diff --git a/‎core/core.ts
+25 b/‎core/core.ts
+25
@@ -16,7 +16,7 @@ name: Build
 on:
   # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests)
   push:
-    branches: [main]
+    branches: [main, preview]
   # Trigger the workflow on any pull request
   # pull_request:
 
@@ -97,6 +97,12 @@ jobs:
           path: binary/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('binary/package-lock.json') }}
 
+      - name: Cache gui node_modules
+        uses: actions/cache@v3
+        with:
+          path: gui/node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('gui/package-lock.json') }}
+
       # npm install core
       - name: Install core node_modules
         run: |
@@ -109,6 +115,18 @@ jobs:
           cd ../../binary
           npm ci
 
+      # npm install gui
+      - name: Install gui node_modules
+        run: |
+          cd ../../gui
+          npm ci
+
+      # build gui
+      - name: Build gui
+        run: |
+          cd ../../gui
+          npm run build
+
       # Run prepackage.js script
       - name: Run prepackage script
         run: |
 
@@ -87,6 +87,12 @@ jobs:
           path: binary/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('binary/package-lock.json') }}
 
+      - name: Cache gui node_modules
+        uses: actions/cache@v3
+        with:
+          path: gui/node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('gui/package-lock.json') }}
+
       # npm install core
       - name: Install core node_modules
         run: |
@@ -99,6 +105,18 @@ jobs:
           cd ../../binary
           npm ci
 
+      # npm install gui
+      - name: Install gui node_modules
+        run: |
+          cd ../../gui
+          npm ci
+
+      # build gui
+      - name: Build gui
+        run: |
+          cd ../../gui
+          npm run build
+
       # Run prepackage.js script
       - name: Run prepackage script
         run: |
@@ -120,6 +138,12 @@ jobs:
         run: |
           ./gradlew patchChangelog --release-note="$CHANGELOG"
 
+      # Upload artifact as a release asset
+      - name: Upload Release Asset
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/*
+
       # Publish the plugin to JetBrains Marketplace
       - name: Publish Plugin
         env:
@@ -129,12 +153,6 @@ jobs:
           PRIVATE_KEY_PASSWORD: ${{ secrets.JETBRAINS_PRIVATE_KEY_PASSWORD }}
         run: ./gradlew publishPlugin
 
-      # Upload artifact as a release asset
-      - name: Upload Release Asset
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/*
-
       # Create a pull request
       - name: Create Pull Request
         if: ${{ steps.properties.outputs.changelog != '' }}
 
@@ -95,6 +95,22 @@
         // Avoid timing out when stopping on breakpoints during debugging in VSCode
         "MOCHA_TIMEOUT": "0"
       }
+    },
+    {
+      "name": "[Core] Jest Test Debugger, Current Open File",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": [
+        "--inspect-brk",
+        "${workspaceRoot}/core/node_modules/jest/bin/jest.js",
+        "--runInBand",
+        "--config",
+        "${workspaceRoot}/core/jest.config.js",
+        "${relativeFile}"
+      ],
+      "cwd": "${workspaceRoot}/core",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
     }
   ]
 }
@@ -12,9 +12,7 @@
         // To bundle the code the same way we do for publishing
         "vscode-extension:esbuild",
         // Start the React app that is used in the extension
-        "gui:dev",
-        // Start the docs site, without opening the browser
-        "docs:start"
+        "gui:dev"
       ],
       "group": {
         "kind": "build",
 
@@ -188,6 +188,13 @@ export class ConfigHandler {
     this.selectedProfileId = profileId;
     const newConfig = await this.loadConfig();
     this.notifyConfigListerners(newConfig);
+    const selectedProfiles =
+      this.globalContext.get("lastSelectedProfileForWorkspace") ?? {};
+    selectedProfiles[await this.getWorkspaceId()] = profileId;
+    this.globalContext.update(
+      "lastSelectedProfileForWorkspace",
+      selectedProfiles,
+    );
   }
 
   // A unique ID for the current workspace, built from folder names
 
@@ -10,11 +10,6 @@ export function setupApiKeysMode(
   return {
     ...config,
     models: config.models.filter((model) => model.provider !== "free-trial"),
-    tabAutocompleteModel: {
-      title: "Tab Autocomplete",
-      provider: "free-trial",
-      model: TRIAL_FIM_MODEL,
-    },
     embeddingsProvider: {
       provider: "free-trial",
     },
 
@@ -6,7 +6,7 @@ import { IProfileLoader } from "./IProfileLoader";
 export default class LocalProfileLoader implements IProfileLoader {
   static ID = "local";
   profileId = LocalProfileLoader.ID;
-  profileTitle = "config.json";
+  profileTitle = "Local Config";
 
   constructor(
     private ide: IDE,
 
@@ -5,6 +5,7 @@ import {
   ContextProviderExtras,
   ContextSubmenuItem,
   LoadSubmenuItemsArgs,
+  SiteIndexingConfig,
 } from "../../index.js";
 import { DocsService } from "../../indexing/docs/DocsService.js";
 import configs from "../../indexing/docs/preIndexedDocs.js";
@@ -108,40 +109,44 @@ class DocsContextProvider extends BaseContextProvider {
     ];
   }
 
-  async loadSubmenuItems(
-    args: LoadSubmenuItemsArgs,
-  ): Promise<ContextSubmenuItem[]> {
-    const docs = await this.docsService.list();
-    const submenuItems: ContextSubmenuItem[] = docs.map((doc) => ({
+  // Get combined site configs from preIndexedDocs and options.sites.
+  private _getDocsSitesConfig(): SiteIndexingConfig[] {
+    return [...configs, ...(this.options?.sites || [])];
+  }
+
+  // Get indexed docs as ContextSubmenuItems from database.
+  private async _getIndexedDocsContextSubmenuItems(): Promise<ContextSubmenuItem[]> {
+    return (await this.docsService.list()).map((doc) => ({
       title: doc.title,
       description: new URL(doc.baseUrl).hostname,
       id: doc.baseUrl,
-      metadata: {
-        preIndexed: !!configs.find((config) => config.title === doc.title),
-      },
     }));
+  }
 
-    submenuItems.push(
-      ...configs
-        // After it's actually downloaded, we don't want to show twice
-        .filter(
-          (config) => !submenuItems.some((item) => item.id === config.startUrl),
-        )
-        .map((config) => ({
-          title: config.title,
-          description: new URL(config.startUrl).hostname,
-          id: config.startUrl,
-          metadata: {
-            preIndexed: true,
-          },
-          // iconUrl: config.faviconUrl,
-        })),
-    );
+  async loadSubmenuItems(
+    args: LoadSubmenuItemsArgs,
+  ): Promise<ContextSubmenuItem[]> {
+    const submenuItemsMap = new Map<string, ContextSubmenuItem>();
+
+    for (const item of await this._getIndexedDocsContextSubmenuItems()) {
+      submenuItemsMap.set(item.id, item);
+    }
+
+    for (const config of this._getDocsSitesConfig()) {
+      submenuItemsMap.set(config.startUrl, {
+        id: config.startUrl,
+        title: config.title,
+        description: new URL(config.startUrl).hostname,
+        metadata: { preIndexed: !!configs.find((cnf) => cnf.title === config.title), },
+      });
+    }
+
+    const submenuItems = Array.from(submenuItemsMap.values());
 
     // Sort submenuItems such that the objects with titles which don't occur in configs occur first, and alphabetized
     submenuItems.sort((a, b) => {
-      const aTitleInConfigs = a.metadata?.preIndexed;
-      const bTitleInConfigs = b.metadata?.preIndexed;
+      const aTitleInConfigs = a.metadata?.preIndexed ?? false;
+      const bTitleInConfigs = b.metadata?.preIndexed ?? false;
 
       // Primary criterion: Items not in configs come first
       if (!aTitleInConfigs && bTitleInConfigs) {
 
@@ -5,7 +5,6 @@ import {
 } from "../../index.js";
 
 import { getRelativePath } from "../../util/index.js";
-import { RETRIEVAL_PARAMS } from "../../util/parameters.js";
 import { RetrievalPipelineOptions } from "./pipelines/BaseRetrievalPipeline.js";
 import NoRerankerRetrievalPipeline from "./pipelines/NoRerankerRetrievalPipeline.js";
 import RerankerRetrievalPipeline from "./pipelines/RerankerRetrievalPipeline.js";
@@ -29,12 +28,14 @@ export async function retrieveContextItemsFromEmbeddings(
     );
   }
 
-  const nFinal = options?.nFinal || RETRIEVAL_PARAMS.nFinal;
+  // Fill half of the context length, up to a max of 100 snippets
+  const contextLength = extras.llm.contextLength;
+  const tokensPerSnippet = 512;
+  const nFinal =
+    options?.nFinal ?? Math.min(50, contextLength / tokensPerSnippet / 2);
   const useReranking = extras.reranker !== undefined;
   const nRetrieve =
-    useReranking === false
-      ? nFinal
-      : options?.nRetrieve || RETRIEVAL_PARAMS.nRetrieve;
+    useReranking === false ? nFinal : options?.nRetrieve || 2 * nFinal;
 
   // Get tags to retrieve for
   const workspaceDirs = await extras.ide.getWorkspaceDirs();
 
@@ -242,6 +242,19 @@ export class Core {
       await this.docsService.delete(baseUrl);
       this.messenger.send("refreshSubmenuItems", undefined);
     });
+    on("context/indexDocs", async (msg) => {
+      const config = await this.config();
+      const provider: any = config.contextProviders?.find(
+        (provider) => provider.description.title === "docs",
+      );
+
+      const siteIndexingOptions: SiteIndexingConfig[] = provider ?
+        (mProvider => mProvider?.options?.sites || [])({ ...provider }) :
+        [];
+
+      await this.indexDocs(siteIndexingOptions, msg.data.reIndex);
+      this.ide.infoPopup("Docs indexing completed");
+    });
     on("context/loadSubmenuItems", async (msg) => {
       const config = await this.config();
       const items = config.contextProviders
@@ -623,4 +636,16 @@ export class Core {
       this.indexingState = update;
     }
   }
+
+  private async indexDocs(sites: SiteIndexingConfig[], reIndex: boolean): Promise<void> {
+    for (const site of sites) {
+      for await (const update of this.docsService.indexAndAdd(site, new TransformersJsEmbeddingsProvider(), reIndex)) {
+        // Temporary disabled posting progress updates to the UI due to
+        // possible collision with code indexing progress updates.
+
+        // this.messenger.request("indexProgress", update);
+        // this.indexingState = update;
+      }
+    }
+  }
 }
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,22 @@`
`95`	`95`	`// Avoid timing out when stopping on breakpoints during debugging in VSCode`
`96`	`96`	`"MOCHA_TIMEOUT": "0"`
`97`	`97`	`}`
	`98`	`+ },`
	`99`	`+ {`
	`100`	`+ "name": "[Core] Jest Test Debugger, Current Open File",`
	`101`	`+ "type": "node",`
	`102`	`+ "request": "launch",`
	`103`	`+ "runtimeArgs": [`
	`104`	`+ "--inspect-brk",`
	`105`	`+ "${workspaceRoot}/core/node_modules/jest/bin/jest.js",`
	`106`	`+ "--runInBand",`
	`107`	`+ "--config",`
	`108`	`+ "${workspaceRoot}/core/jest.config.js",`
	`109`	`+ "${relativeFile}"`
	`110`	`+ ],`
	`111`	`+ "cwd": "${workspaceRoot}/core",`
	`112`	`+ "console": "integratedTerminal",`
	`113`	`+ "internalConsoleOptions": "neverOpen"`
`98`	`114`	`}`
`99`	`115`	`]`
`100`	`116`	`}`