Preview

.vscode/launch.json

@@ -57,7 +57,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode"
       ],
       "outFiles": [
-        "${workspaceFolder}/extensions/vscode/out/**/*.js",
+        "${workspaceFolder}/extensions/vscode/out/extension.js",
         "/Users/natesesti/.continue/config.ts"
       ],
       "preLaunchTask": "vscode-extension:build"

core/autocomplete/completionProvider.ts

@@ -395,7 +395,7 @@ export async function getTabCompletion(
     if (llm.model.includes("codestral")) {
       // Codestral sometimes starts with an extra space
       if (completion[0] === " " && completion[1] !== " ") {
-        if (suffix.startsWith("\n")) {
+        if (prefix.endsWith(" ") && suffix.startsWith("\n")) {
           completion = completion.slice(1);
         }
       }

core/autocomplete/lineStream.ts

@@ -109,12 +109,16 @@ export async function* skipLines(stream: LineStream): LineStream {
   }
 }
 
+const LINES_TO_REMOVE_BEFORE_START = [
+  "<COMPLETION>",
+  "[CODE]",
+  "<START EDITING HERE>",
+];
+
 function shouldRemoveLineBeforeStart(line: string): boolean {
   return (
     line.trimStart().startsWith("```") ||
-    line.trim() === "[CODE]" ||
-    line.trim() === "" ||
-    line.trim() === "<START EDITING HERE>"
+    LINES_TO_REMOVE_BEFORE_START.some((l) => line.trim() === l)
   );
 }
 

core/config/default.ts

@@ -33,7 +33,7 @@ export const FREE_TRIAL_MODELS: ModelDescription[] = [
 ];
 
 export const defaultConfig: SerializedContinueConfig = {
-  models: FREE_TRIAL_MODELS,
+  models: [],
   customCommands: [
     {
       name: "test",

core/config/load.ts

@@ -150,15 +150,18 @@ async function serializedToIntermediateConfig(
   }
 
   const workspaceDirs = await ide.getWorkspaceDirs();
-  const promptFiles = (
-    await Promise.all(
-      workspaceDirs.map((dir) =>
-        getPromptFiles(ide, path.join(dir, ".prompts")),
-      ),
+  const promptFolder = initial.experimental?.promptPath;
+
+  let promptFiles: { path: string; content: string }[] = [];
+  if (promptFolder) {
+    promptFiles = (
+      await Promise.all(
+        workspaceDirs.map((dir) => getPromptFiles(ide, promptFolder)),
+      )
     )
-  )
-    .flat()
-    .filter(({ path }) => path.endsWith(".prompt"));
+      .flat()
+      .filter(({ path }) => path.endsWith(".prompt"));
+  }
 
   // Also read from ~/.continue/.prompts
   promptFiles.push(...readAllGlobalPromptFiles());

core/config/promptFile.ts

@@ -9,7 +9,7 @@ export async function getPromptFiles(
   dir: string,
 ): Promise<{ path: string; content: string }[]> {
   try {
-    const paths = await ide.listWorkspaceContents(dir);
+    const paths = await ide.listWorkspaceContents(dir, false);
     const results = paths.map(async (path) => {
       const content = await ide.readFile(path);
       return { path, content };
@@ -55,10 +55,17 @@ export function slashCommandFromPromptFile(
 
       // Render prompt template
       const diff = await ide.getDiff();
+      const currentFilePath = await ide.getCurrentFile();
       const promptUserInput = await renderTemplatedString(
         prompt,
         ide.readFile.bind(ide),
-        { input: userInput, diff },
+        {
+          input: userInput,
+          diff,
+          currentFile: currentFilePath
+            ? await ide.readFile(currentFilePath)
+            : undefined,
+        },
       );
 
       const messages = [...history];

core/config/types.ts

@@ -385,7 +385,7 @@ declare global {
       stackDepth: number,
     ): Promise<string[]>;
     getAvailableThreads(): Promise<Thread[]>;
-    listWorkspaceContents(directory?: string): Promise<string[]>;
+    listWorkspaceContents(directory?: string, useGitIgnore?: boolean): Promise<string[]>;
     listFolders(): Promise<string[]>;
     getWorkspaceDirs(): Promise<string[]>;
     getWorkspaceConfigs(): Promise<ContinueRcJson[]>;

core/context/providers/CodeHighlightsContextProvider.ts

@@ -6,8 +6,6 @@ import {
 import { getBasename } from "../../util/index.js";
 import { BaseContextProvider } from "../index.js";
 
-// import { getHighlightsThatFit, ILLMContextSizer } from "llm-code-highlighter/dist/index.continue";
-
 const HIGHLIGHTS_TOKEN_BUDGET = 2000;
 
 class CodeHighlightsContextProvider extends BaseContextProvider {
@@ -22,6 +20,9 @@ class CodeHighlightsContextProvider extends BaseContextProvider {
     query: string,
     extras: ContextProviderExtras,
   ): Promise<ContextItem[]> {
+    // const { getHighlightsThatFit } = await import(
+    //   "llm-code-highlighter/src/index.continue.js"
+    // );
     const ide = extras.ide;
     const openFiles = await ide.getOpenFiles();
     const allFiles: { name: string; absPath: string; content: string }[] =
@@ -34,11 +35,11 @@ class CodeHighlightsContextProvider extends BaseContextProvider {
           };
         }),
       );
-    // const contextSizer =  {
+    // const contextSizer = {
     //   fits(content: string): boolean {
     //     return countTokens(content, "") < HIGHLIGHTS_TOKEN_BUDGET;
-    //   }
-    // } as ILLMContextSizer
+    //   },
+    // };
     // const repoMap = await getHighlightsThatFit(
     //   contextSizer,
     //   [],
@@ -49,7 +50,7 @@ class CodeHighlightsContextProvider extends BaseContextProvider {
     //         relPath: file.name,
     //         code: file.content,
     //       };
-    //     })
+    //     }),
     // );
     // return [
     //   {

core/context/providers/FileTreeContextProvider.ts

@@ -4,22 +4,14 @@ import {
   ContextProviderExtras,
 } from "../../index.js";
 import { BaseContextProvider } from "../index.js";
+import { splitPath } from "../../util/index.js";
 
 interface Directory {
   name: string;
   files: string[];
   directories: Directory[];
 }
 
-function splitPath(path: string, withRoot?: string): string[] {
-  let parts = path.includes("/") ? path.split("/") : path.split("\\");
-  if (withRoot !== undefined) {
-    const rootParts = splitPath(withRoot);
-    parts = parts.slice(rootParts.length - 1);
-  }
-  return parts;
-}
-
 function formatFileTree(tree: Directory, indentation = ""): string {
   let result = "";
   for (const file of tree.files) {

core/context/providers/OpenFilesContextProvider.ts

@@ -3,7 +3,7 @@ import {
   ContextProviderDescription,
   ContextProviderExtras,
 } from "../../index.js";
-import { getBasename } from "../../util/index.js";
+import { getRelativePath } from "../../util/index.js";
 import { BaseContextProvider } from "../index.js";
 
 class OpenFilesContextProvider extends BaseContextProvider {
@@ -22,11 +22,12 @@ class OpenFilesContextProvider extends BaseContextProvider {
     const openFiles = this.options?.onlyPinned
       ? await ide.getPinnedFiles()
       : await ide.getOpenFiles();
+    const workspaceDirs = await extras.ide.getWorkspaceDirs();
     return await Promise.all(
       openFiles.map(async (filepath: string) => {
         return {
           description: filepath,
-          content: `\`\`\`${getBasename(filepath)}\n${await ide.readFile(
+          content: `\`\`\`${await getRelativePath(filepath, workspaceDirs)}\n${await ide.readFile(
             filepath,
           )}\n\`\`\``,
           name: (filepath.split("/").pop() ?? "").split("\\").pop() ?? "",

core/context/providers/index.ts

@@ -1,6 +1,7 @@
 import { ContextProviderName } from "../../index.js";
 import { BaseContextProvider } from "../index.js";
 import CodeContextProvider from "./CodeContextProvider.js";
+// import CodeHighlightsContextProvider from "./CodeHighlightsContextProvider.js";
 import CodebaseContextProvider from "./CodebaseContextProvider.js";
 import CurrentFileContextProvider from "./CurrentFileContextProvider.js";
 import DatabaseContextProvider from "./DatabaseContextProvider.js";

core/context/retrieval/retrieval.ts

@@ -6,7 +6,7 @@ import {
 } from "../../index.js";
 import { LanceDbIndex } from "../../indexing/LanceDbIndex.js";
 
-import { deduplicateArray, getBasename } from "../../util/index.js";
+import { deduplicateArray, getRelativePath } from "../../util/index.js";
 import { RETRIEVAL_PARAMS } from "../../util/parameters.js";
 import { retrieveFts } from "./fullTextSearch.js";
 
@@ -149,7 +149,7 @@ export async function retrieveContextItemsFromEmbeddings(
 
   return [
     ...results.map((r) => {
-      const name = `${getBasename(r.filepath)} (${r.startLine}-${r.endLine})`;
+      const name = `${getRelativePath(r.filepath, workspaceDirs)} (${r.startLine}-${r.endLine})`;
       const description = `${r.filepath} (${r.startLine}-${r.endLine})`;
       return {
         name,

core/index.d.ts

@@ -404,7 +404,10 @@ export interface IDE {
     stackDepth: number,
   ): Promise<string[]>;
   getAvailableThreads(): Promise<Thread[]>;
-  listWorkspaceContents(directory?: string): Promise<string[]>;
+  listWorkspaceContents(
+    directory?: string,
+    useGitIgnore?: boolean,
+  ): Promise<string[]>;
   listFolders(): Promise<string[]>;
   getWorkspaceDirs(): Promise<string[]>;
   getWorkspaceConfigs(): Promise<ContinueRcJson[]>;
@@ -751,6 +754,7 @@ interface ExperimentalConfig {
   contextMenuPrompts?: ContextMenuConfig;
   modelRoles?: ModelRoles;
   defaultContext?: "activeFile"[];
+  promptPath?: string;
 }
 
 export interface SerializedContinueConfig {

core/llm/index.ts

@@ -263,6 +263,7 @@
           { ...this.requestOptions },
         );
 
+        // Error mapping to be more helpful
         if (!resp.ok) {
           let text = await resp.text();
           if (resp.status === 404 && !resp.url.includes("/v1")) {
@@ -276,6 +277,12 @@
               text =
                 "This may mean that you forgot to add '/v1' to the end of your 'apiBase' in config.json.";
             }
+          } else if (
+            resp.status === 404 &&
+            resp.url.includes("api.openai.com")
+          ) {
+            text =
+              "You may need to add pre-paid credits before using the OpenAI API.";
           }
           throw new Error(
             `HTTP ${resp.status} ${resp.statusText} from ${resp.url}\n\n${text}`,
@@ -284,6 +291,10 @@
 
         return resp;
       } catch (e: any) {
+        console.warn(
+          `${e.message}\n\nCode: ${e.code}\nError number: ${e.errno}\nSyscall: ${e.erroredSysCall}\nType: ${e.type}\n\n${e.stack}`,
+        );
+
         if (
           e.code === "ECONNREFUSED" &&
           e.message.includes("http://127.0.0.1:11434")
@@ -292,9 +303,7 @@
             "Failed to connect to local Ollama instance. To start Ollama, first download it at https://ollama.ai.",
           );
         }
-        throw new Error(
-          `${e.message}\n\nCode: ${e.code}\nError number: ${e.errno}\nSyscall: ${e.erroredSysCall}\nType: ${e.type}\n\n${e.stack}`,
-        );
+        throw new Error(e.message);
       }
     };
     return withExponentialBackoff<Response>(

core/llm/llms/LlamaCpp.ts

@@ -16,6 +16,9 @@ class LlamaCpp extends BaseLLM {
       min_p: options.minP,
       mirostat: options.mirostat,
       stop: options.stop,
+      top_k: options.topK,
+      top_p: options.topP,
+      temperature: options.temperature,
     };
 
     return finalOptions;

core/protocol/ide.ts

@@ -13,7 +13,10 @@ import { IdeSettings } from "./ideWebview";
 export type ToIdeFromWebviewOrCoreProtocol = {
   // Methods from IDE type
   getIdeInfo: [undefined, IdeInfo];
-  listWorkspaceContents: [undefined, string[]];
+  listWorkspaceContents: [
+    { directory?: string; useGitIgnore?: boolean },
+    string[],
+  ];
   getWorkspaceDirs: [undefined, string[]];
   listFolders: [undefined, string[]];
   writeFile: [{ path: string; contents: string }, void];

core/util/filesystem.ts

@@ -110,7 +110,10 @@ class FileSystemIde implements IDE {
     return Promise.resolve();
   }
 
-  listWorkspaceContents(): Promise<string[]> {
+  listWorkspaceContents(
+    directory?: string,
+    useGitIgnore?: boolean,
+  ): Promise<string[]> {
     return new Promise((resolve, reject) => {
       fs.readdir("/tmp/continue", (err, files) => {
         if (err) {

core/util/index.ts

@@ -1,3 +1,7 @@
+import {
+    ContextProviderExtras,
+  } from "../index.js";
+
 export function removeQuotesAndEscapes(output: string): string {
   output = output.trim();
 
@@ -97,6 +101,26 @@ export function getLastNPathParts(filepath: string, n: number): string {
   return filepath.split(/[\\/]/).slice(-n).join("/");
 }
 
+export function getRelativePath(filepath: string, workspaceDirs: string[]): string {
+    for (const workspaceDir of workspaceDirs) {
+        const filepathParts = splitPath(filepath);
+        const workspaceDirParts = splitPath(workspaceDir);
+        if (filepathParts.slice(0, workspaceDirParts.length).join('/') === workspaceDirParts.join('/')) {
+            return filepathParts.slice(workspaceDirParts.length).join('/');
+        }
+    }
+    return splitPath(filepath).pop() ?? ''; // If the file is not in any of the workspaces, return the plain filename
+}
+
+export function splitPath(path: string, withRoot?: string): string[] {
+    let parts = path.includes("/") ? path.split("/") : path.split("\\");
+    if (withRoot !== undefined) {
+        const rootParts = splitPath(withRoot);
+        parts = parts.slice(rootParts.length - 1);
+    }
+    return parts;
+}
+
 export function getMarkdownLanguageTagForFile(filepath: string): string {
   const ext = filepath.split(".").pop();
   switch (ext) {

core/util/messageIde.ts

@@ -92,8 +92,14 @@ export class MessageIde implements IDE {
     return await this.request("getTerminalContents", undefined);
   }
 
-  async listWorkspaceContents(directory?: string): Promise<string[]> {
-    return await this.request("listWorkspaceContents", undefined);
+  async listWorkspaceContents(
+    directory?: string,
+    useGitIgnore?: boolean,
+  ): Promise<string[]> {
+    return await this.request("listWorkspaceContents", {
+      directory,
+      useGitIgnore,
+    });
   }
 
   async getWorkspaceDirs(): Promise<string[]> {