Re-merge uncommitted files

Author: Calvinn Ng

core/autocomplete/ast.ts

@@ -47,6 +47,7 @@ export async function getTreePathAtCursor(
 
   return path;
 }
+}
 
 export async function getScopeAroundRange(
   range: RangeInFileWithContents,

core/config/default.ts

@@ -1,4 +1,36 @@
-import { SerializedContinueConfig } from "..";
+import {
+    ContextProviderWithParams,
+    ModelDescription,
+    SerializedContinueConfig,
+    SlashCommandDescription,
+  } from "../index.js";
+
+export const FREE_TRIAL_MODELS: ModelDescription[] = [
+    {
+      title: "GPT-4o (Free Trial)",
+      provider: "free-trial",
+      model: "gpt-4o",
+      systemMessage:
+        "You are an expert software developer. You give helpful and concise responses.",
+    },
+    {
+      title: "Llama3 70b (Free Trial)",
+      provider: "free-trial",
+      model: "llama3-70b",
+      systemMessage:
+        "You are an expert software developer. You give helpful and concise responses. Whenever you write a code block you include the language after the opening ticks.",
+    },
+    {
+      title: "Codestral (Free Trial)",
+      provider: "free-trial",
+      model: "codestral",
+    },
+    {
+      title: "Claude 3 Sonnet (Free Trial)",
+      provider: "free-trial",
+      model: "claude-3-sonnet-20240229",
+    },
+  ];
 
 export const defaultConfig: SerializedContinueConfig = {
   "models": [
@@ -66,7 +98,7 @@ export const defaultConfig: SerializedContinueConfig = {
   ],
   "tabAutocompleteOptions": {
     "template": "<｜fim▁begin｜>{{{prefix}}}<｜fim▁hole｜>{{{suffix}}}<｜fim▁end｜>",
-    "useSuffix": true,
+    "useFileSuffix": true,
     "useCache": true,
     "multilineCompletions": "auto",
     "debounceDelay": 50,
@@ -202,7 +234,7 @@ export const defaultConfigJetBrains: SerializedContinueConfig = {
   ],
   "tabAutocompleteOptions": {
     "template": "<｜fim▁begin｜>{{{prefix}}}<｜fim▁hole｜>{{{suffix}}}<｜fim▁end｜>",
-    "useSuffix": true,
+    "useFileSuffix": true,
     "useCache": true,
     "multilineCompletions": "auto",
     "debounceDelay": 50,
@@ -271,3 +303,61 @@ export const defaultConfigJetBrains: SerializedContinueConfig = {
     "provider": "transformers.js"
   }
 };
+  
+  export const defaultSlashCommandsVscode: SlashCommandDescription[] = [
+    {
+      name: "edit",
+      description: "Edit selected code",
+    },
+    {
+      name: "comment",
+      description: "Write comments for the selected code",
+    },
+    {
+      name: "share",
+      description: "Export the current chat session to markdown",
+    },
+    {
+      name: "cmd",
+      description: "Generate a shell command",
+    },
+    {
+      name: "commit",
+      description: "Generate a git commit message",
+    },
+  ];
+  
+  export const defaultSlashCommandsJetBrains = [
+    {
+      name: "edit",
+      description: "Edit selected code",
+    },
+    {
+      name: "comment",
+      description: "Write comments for the selected code",
+    },
+    {
+      name: "share",
+      description: "Export the current chat session to markdown",
+    },
+    {
+      name: "commit",
+      description: "Generate a git commit message",
+    },
+  ];
+  
+  export const defaultContextProvidersVsCode: ContextProviderWithParams[] = [
+    { name: "code", params: {} },
+    { name: "docs", params: {} },
+    { name: "diff", params: {} },
+    { name: "terminal", params: {} },
+    { name: "problems", params: {} },
+    { name: "folder", params: {} },
+    { name: "codebase", params: {} },
+  ];
+  
+  export const defaultContextProvidersJetBrains: ContextProviderWithParams[] = [
+    { name: "diff", params: {} },
+    { name: "folder", params: {} },
+    { name: "codebase", params: {} },
+  ];

core/config/load.ts

@@ -128,6 +128,13 @@ function loadSerializedConfig(
         getConfigJsonPathForRemote(ideSettings.remoteConfigServerUrl),
       );
       config = mergeJson(config, remoteConfigJson, "overwrite", configMergeKeys);
+
+      if (config.tabAutocompleteOptions) {
+        config.tabAutocompleteOptions.multilineCompletions = "never";
+    } else {
+        config.tabAutocompleteOptions = { multilineCompletions: "never" };
+    }
+
     } catch (e) {
       console.warn("Error loading remote config: ", e);
     }
@@ -229,6 +236,7 @@ async function intermediateToFinalConfig(
 ): Promise<ContinueConfig> {
   // Auto-detect models
   let models: BaseLLM[] = [];
+
   for (const desc of config.models) {
     if (isModelDescription(desc)) {
       const llm = await llmFromDescription(
@@ -327,7 +335,7 @@ async function intermediateToFinalConfig(
 
   // Tab autocomplete model
   let tabAutocompleteModels: BaseLLM[] = [];
-  if (config.tabAutocompleteModel) {
+  if (config.tabAutocompleteModels) {
     tabAutocompleteModels = (
       await Promise.all(
         (Array.isArray(config.tabAutocompleteModel)

core/index.d.ts

@@ -1,3 +1,5 @@
+import { Model } from "openai/resources";
+
 declare global {
   interface Window {
     ide?: "vscode";
@@ -853,6 +855,7 @@ export interface SerializedContinueConfig {
   env?: string[];
   allowAnonymousTelemetry?: boolean;
   models: ModelDescription[];
+  commandModels: ModelDescription[];
   systemMessage?: string;
   completionOptions?: BaseCompletionOptions;
   requestOptions?: RequestOptions;
@@ -863,7 +866,7 @@ export interface SerializedContinueConfig {
   disableSessionTitles?: boolean;
   userToken?: string;
   embeddingsProvider?: EmbeddingsProviderDescription;
-  tabAutocompleteModel?: ModelDescription | ModelDescription[];
+  tabAutocompleteModels?: ModelDescription | ModelDescription[];
   tabAutocompleteOptions?: Partial<TabAutocompleteOptions>;
   ui?: ContinueUIConfig;
   reranker?: RerankerDescription;

core/indexing/CodeSnippetsIndex.ts

@@ -1,34 +1,10 @@
-<<<<<<< HEAD
-import fs from "fs";
-import path from "path";
-import {
-=======
 import type {
->>>>>>> v0.9.184-vscode
   ChunkWithoutID,
   ContextItem,
   ContextSubmenuItem,
   IDE,
   IndexTag,
   IndexingProgressUpdate,
-<<<<<<< HEAD
-} from "..";
-import { getBasename, getLastNPathParts } from "../util/index.js";
-import {
-  getLanguageForFile,
-  getParserForFile,
-  supportedLanguages,
-} from "../util/treeSitter";
-import { DatabaseConnection, SqliteDb, tagToString } from "./refreshIndex";
-import {
-  CodebaseIndex,
-  IndexResultType,
-  MarkCompleteCallback,
-  RefreshIndexResults,
-} from "./types";
-
-export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
-=======
 } from "../index.js";
 import { getBasename, getLastNPathParts } from "../util/index.js";
 import {
@@ -46,7 +22,6 @@ import {
 
 export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
   relativeExpectedTime: number = 1;
->>>>>>> v0.9.184-vscode
   artifactId = "codeSnippets";
 
   constructor(private readonly ide: IDE) {}
@@ -70,45 +45,16 @@ export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
     )`);
   }
 
-<<<<<<< HEAD
-  private getQuerySource(filepath: string) {
-    const fullLangName = supportedLanguages[filepath.split(".").pop() ?? ""];
-    const sourcePath = path.join(
-      __dirname,
-      "..",
-      "tree-sitter",
-      "code-snippet-queries",
-      `tree-sitter-${fullLangName}-tags.scm`,
-    );
-    if (!fs.existsSync(sourcePath)) {
-      return "";
-    }
-    return fs.readFileSync(sourcePath).toString();
-  }
-
-=======
->>>>>>> v0.9.184-vscode
   async getSnippetsInFile(
     filepath: string,
     contents: string,
   ): Promise<(ChunkWithoutID & { title: string })[]> {
-<<<<<<< HEAD
-    const lang = await getLanguageForFile(filepath);
-    if (!lang) {
-      return [];
-    }
-=======
->>>>>>> v0.9.184-vscode
     const parser = await getParserForFile(filepath);
     if (!parser) {
       return [];
     }
     const ast = parser.parse(contents);
-<<<<<<< HEAD
-    const query = lang?.query(this.getQuerySource(filepath));
-=======
     const query = await getQueryForFile(filepath, TSQueryType.CodeSnippets);
->>>>>>> v0.9.184-vscode
     const matches = query?.matches(ast.rootNode);
 
     return (
@@ -138,12 +84,6 @@ export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
 
     for (let i = 0; i < results.compute.length; i++) {
       const compute = results.compute[i];
-<<<<<<< HEAD
-      const snippets = await this.getSnippetsInFile(
-        compute.path,
-        await this.ide.readFile(compute.path),
-      );
-=======
 
       let snippets: (ChunkWithoutID & { title: string })[] = [];
       try {
@@ -154,16 +94,11 @@ export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
       } catch (e) {
         // If can't parse, assume malformatted code
       }
->>>>>>> v0.9.184-vscode
 
       // Add snippets to sqlite
       for (const snippet of snippets) {
         const { lastID } = await db.run(
-<<<<<<< HEAD
-          `INSERT INTO code_snippets (path, cacheKey, content, title, startLine, endLine) VALUES (?, ?, ?, ?, ?, ?)`,
-=======
           "INSERT INTO code_snippets (path, cacheKey, content, title, startLine, endLine) VALUES (?, ?, ?, ?, ?, ?)",
->>>>>>> v0.9.184-vscode
           [
             compute.path,
             compute.cacheKey,
@@ -175,21 +110,13 @@ export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
         );
 
         await db.run(
-<<<<<<< HEAD
-          `INSERT INTO code_snippets_tags (snippetId, tag) VALUES (?, ?)`,
-=======
           "INSERT INTO code_snippets_tags (snippetId, tag) VALUES (?, ?)",
->>>>>>> v0.9.184-vscode
           [lastID, tagString],
         );
       }
 
       yield {
-<<<<<<< HEAD
-        desc: `Indexing ${compute.path}`,
-=======
         desc: `Indexing ${getBasename(compute.path)}`,
->>>>>>> v0.9.184-vscode
         progress: i / results.compute.length,
         status: "indexing",
       };
@@ -199,39 +126,24 @@ export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
     for (let i = 0; i < results.del.length; i++) {
       const del = results.del[i];
       const deleted = await db.run(
-<<<<<<< HEAD
-        `DELETE FROM code_snippets WHERE path = ? AND cacheKey = ?`,
-        [del.path, del.cacheKey],
-      );
-      await db.run(`DELETE FROM code_snippets_tags WHERE snippetId = ?`, [
-=======
         "DELETE FROM code_snippets WHERE path = ? AND cacheKey = ?",
         [del.path, del.cacheKey],
       );
       await db.run("DELETE FROM code_snippets_tags WHERE snippetId = ?", [
->>>>>>> v0.9.184-vscode
         deleted.lastID,
       ]);
       markComplete([del], IndexResultType.Delete);
     }
 
     for (let i = 0; i < results.addTag.length; i++) {
       const snippetsWithPath = await db.all(
-<<<<<<< HEAD
-        `SELECT * FROM code_snippets WHERE cacheKey = ?`,
-=======
         "SELECT * FROM code_snippets WHERE cacheKey = ?",
->>>>>>> v0.9.184-vscode
         [results.addTag[i].cacheKey],
       );
 
       for (const snippet of snippetsWithPath) {
         await db.run(
-<<<<<<< HEAD
-          `INSERT INTO code_snippets_tags (snippetId, tag) VALUES (?, ?)`,
-=======
           "INSERT INTO code_snippets_tags (snippetId, tag) VALUES (?, ?)",
->>>>>>> v0.9.184-vscode
           [snippet.id, tagString],
         );
       }
@@ -258,11 +170,7 @@ export class CodeSnippetsCodebaseIndex implements CodebaseIndex {
 
   static async getForId(id: number): Promise<ContextItem> {
     const db = await SqliteDb.get();
-<<<<<<< HEAD
-    const row = await db.get(`SELECT * FROM code_snippets WHERE id = ?`, [id]);
-=======
     const row = await db.get("SELECT * FROM code_snippets WHERE id = ?", [id]);
->>>>>>> v0.9.184-vscode
 
     return {
       name: row.title,