update protocols based on previous changes

Author: Calvinn Ng

extensions/vscode/src/commands.ts

@@ -6,6 +6,7 @@ import * as vscode from "vscode";
 import { IDE, ContinueSDK } from "core";
 import { AutocompleteOutcome } from "core/autocomplete/completionProvider";
 import { ConfigHandler } from "core/config/handler";
+import { fetchwithRequestOptions } from "core/util/fetchWithOptions";
 import { logDevData } from "core/util/devdata";
 import { Telemetry } from "core/util/posthog";
 import { ContinueGUIWebviewViewProvider } from "./debugPanel";
@@ -276,6 +277,8 @@ const commandsMap: (
                 llm,
                 fullInput: text || "",
                 selectedCode: [],
+                fetch: (url, init) =>
+                  fetchwithRequestOptions(url, init, config.requestOptions),
               });
             }) || [],
           )

extensions/vscode/src/ideProtocol.ts

@@ -2,6 +2,7 @@ import * as child_process from "child_process";
 import { exec } from "child_process";
 import {
   ContinueRcJson,
+  FileType,
   IDE,
   IdeInfo,
   IndexTag,
@@ -10,6 +11,7 @@ import {
   Thread,
 } from "core";
 import { getContinueGlobalPath } from "core/util/paths";
+import { defaultIgnoreFile } from "core/indexing/ignore";
 import * as path from "path";
 import * as vscode from "vscode";
 import { DiffManager } from "./diff/horizontal";
@@ -28,6 +30,22 @@ class VsCodeIde implements IDE {
     this.ideUtils = new VsCodeIdeUtils();
   }
 
+  private authToken: string | undefined;
+  private askedForAuth = false;
+
+  async getGitHubAuthToken(): Promise<string | undefined> {
+    console.log("Reading Github Auth Token is not supported.")
+    return undefined;
+  }
+
+  async infoPopup(message: string): Promise<void> {
+    vscode.window.showInformationMessage(message);
+  }
+
+  async errorPopup(message: string): Promise<void> {
+    vscode.window.showErrorMessage(message);
+  }
+
   async getRepoName(dir: string): Promise<string | undefined> {
     const repo = await this.getRepo(vscode.Uri.file(dir));
     const remote =
@@ -79,6 +97,18 @@ class VsCodeIde implements IDE {
     );
   }
 
+  async getLastModified(files: string[]): Promise<{ [path: string]: number }> {
+    const pathToLastModified: { [path: string]: number } = {};
+    await Promise.all(
+      files.map(async (file) => {
+        const stat = await vscode.workspace.fs.stat(uriFromFilePath(file));
+        pathToLastModified[file] = stat.mtime;
+      }),
+    );
+
+    return pathToLastModified;
+  }
+
   async getStats(directory: string): Promise<{ [path: string]: number }> {
     const scheme = vscode.workspace.workspaceFolders?.[0].uri.scheme;
     const files = await this.listWorkspaceContents(directory);
@@ -255,6 +285,10 @@ class VsCodeIde implements IDE {
     return await this.ideUtils.getOpenFiles();
   }
 
+  async getCurrentFile(): Promise<string | undefined> {
+    return vscode.window.activeTextEditor?.document.uri.fsPath;
+  }
+
   async getPinnedFiles(): Promise<string[]> {
     const tabArray = vscode.window.tabGroups.all[0].tabs;
 
@@ -342,6 +376,19 @@ class VsCodeIde implements IDE {
   async getBranch(dir: string): Promise<string> {
     return this.ideUtils.getBranch(vscode.Uri.file(dir));
   }
+
+  getGitRootPath(dir: string): Promise<string | undefined> {
+    return this.ideUtils.getGitRoot(dir);
+  }
+
+  async listDir(dir: string): Promise<[string, FileType][]> {
+    const files = await vscode.workspace.fs.readDirectory(uriFromFilePath(dir));
+    return files
+      .filter(([name, type]) => {
+        !(type === vscode.FileType.File && defaultIgnoreFile.ignores(name));
+      })
+      .map(([name, type]) => [path.join(dir, name), type]) as any;
+  }
 }
 
 export { VsCodeIde };

extensions/vscode/src/webviewProtocol.ts

@@ -1,10 +1,12 @@
 import { ContextItemId, IDE } from "core";
 import { ConfigHandler } from "core/config/handler";
+import { fetchwithRequestOptions } from "core/util/fetchWithOptions";
 import {
   setupLocalMode,
   setupOptimizedExistingUserMode,
   setupOptimizedMode,
 } from "core/config/onboarding";
+import { SiteIndexingConfig } from "core"
 import { addModel, addOpenAIKey, deleteModel } from "core/config/util";
 import { indexDocs } from "core/indexing/docs";
 import TransformersJsEmbeddingsProvider from "core/indexing/embeddings/TransformersJsEmbeddingsProvider";
@@ -379,7 +381,14 @@ export class VsCodeWebviewProtocol {
       while (!next.done) {
         if (protocol.abortedMessageIds.has(msg.messageId)) {
           protocol.abortedMessageIds.delete(msg.messageId);
-          next = await gen.return({ completion: "", prompt: "" });
+          next = await gen.return({
+            completion: "",
+            prompt: "",
+            completionOptions: {
+              ...msg.data.completionOptions,
+              model: model.model,
+            },
+          });
           break;
         }
         yield { content: next.value };
@@ -403,7 +412,14 @@ export class VsCodeWebviewProtocol {
       while (!next.done) {
         if (protocol.abortedMessageIds.has(msg.messageId)) {
           protocol.abortedMessageIds.delete(msg.messageId);
-          next = await gen.return({ completion: "", prompt: "" });
+          next = await gen.return({
+            completion: "",
+            prompt: "",
+            completionOptions: {
+              ...msg.data.completionOptions,
+              model: model.model,
+            },
+          });
           break;
         }
         yield { content: next.value.content };
@@ -465,6 +481,8 @@ export class VsCodeWebviewProtocol {
         },
         selectedCode,
         config,
+        fetch: (url, init) =>
+          fetchwithRequestOptions(url, init, config.requestOptions),
       })) {
         if (content) {
           yield { content };
@@ -490,7 +508,11 @@ export class VsCodeWebviewProtocol {
       }
 
       try {
-        const items = await provider.loadSubmenuItems({ ide });
+        const items = await provider.loadSubmenuItems({ 
+          ide: this.ide, 
+          fetch: (url, init) =>
+            fetchwithRequestOptions(url, init, config.requestOptions)
+        });
         return items;
       } catch (e) {
         vscode.window.showErrorMessage(
@@ -526,8 +548,10 @@ export class VsCodeWebviewProtocol {
           embeddingsProvider: config.embeddingsProvider,
           reranker: config.reranker,
           fullInput,
-          ide,
+          ide,  
           selectedCode,
+          fetch: (url, init) =>
+            fetchwithRequestOptions(url, init, config.requestOptions),
         });
 
         Telemetry.capture("useContextProvider", {
@@ -542,20 +566,25 @@ export class VsCodeWebviewProtocol {
         return [];
       }
     });
+
     this.on("context/addDocs", (msg) => {
-      const { url, title } = msg.data;
-      const embeddingsProvider = new TransformersJsEmbeddingsProvider();
+      const siteIndexingConfig: SiteIndexingConfig = {
+        startUrl: msg.data.startUrl,
+        rootUrl: msg.data.rootUrl,
+        title: msg.data.title,
+        maxDepth: msg.data.maxDepth,
+      };
+
       vscode.window.withProgress(
         {
           location: vscode.ProgressLocation.Notification,
-          title: `Indexing ${title}`,
+          title: `Indexing ${msg.data.title}`,
           cancellable: false,
         },
         async (progress) => {
           for await (const update of indexDocs(
-            title,
-            new URL(url),
-            embeddingsProvider,
+            siteIndexingConfig,
+            new TransformersJsEmbeddingsProvider(),
           )) {
             progress.report({
               increment: update.progress,
@@ -564,7 +593,7 @@ export class VsCodeWebviewProtocol {
           }
 
           vscode.window.showInformationMessage(
-            `🎉 Successfully indexed ${title}`,
+            `🎉 Successfully indexed ${msg.data.title}`,
           );
 
           this.request("refreshSubmenuItems", undefined);