Merge branch 'main' into pe/generating-text-lump

Author: Patrick-Erichsen

.github/pull_request_template.md

@@ -9,7 +9,7 @@
 
 ## Screenshots
 
-[ For visual changes, include screenshots. ]
+[ For visual changes, include screenshots. Screen recordings are particularly helpful, and appreciated! ]
 
 ## Testing instructions
 

.github/workflows/jetbrains-release.yaml

@@ -54,7 +54,7 @@ jobs:
           ref: ${{ github.event.release.tag_name }}
 
       - name: Import Apple certificate
-        uses: apple-actions/import-codesign-certs@v3
+        uses: apple-actions/import-codesign-certs@v5
         with:
           keychain: ${{ github.run_id }}
           keychain-password: ${{ github.run_id }}

CONTRIBUTING.md

@@ -139,15 +139,15 @@ Similarly, any changes to `core` or `extensions/vscode` will be automatically in
 
 #### JetBrains
 
-See the [`CONTRIBUTING.md`](./extensions/intellij/CONTRIBUTING.md) for the JetBrains extension.
+See [`intellij/CONTRIBUTING.md`](./extensions/intellij/CONTRIBUTING.md) for the JetBrains extension.
 
 ### Our Git Workflow
 
 We keep a single permanent branch: `main`. When we are ready to create a "pre-release" version, we create a tag on the `main` branch titled `v0.9.x-vscode`, which automatically triggers the workflow in [preview.yaml](./.github/workflows/preview.yaml), which builds and releases a version of the VS Code extension. When a release has been sufficiently tested, we will create a new release titled `v0.8.x-vscode`, triggering a similar workflow in [main.yaml](./.github/workflows/main.yaml), which will build and release a main release of the VS Code extension. Any hotfixes can be made by creating a feature branch from the tag for the release in question. This workflow is well explained by <http://releaseflow.org>.
 
 ### Testing
 
-We have a mix of unit, functional, and e2e test suites, with a primary focus on functional testing. These tests run on each pull request. If your PR causes one of these tests to fail, we will ask that you resolve the issue before we merge.
+We have a mix of unit, functional, and e2e test suites, with a primary focus on functional testing. These tests run on each pull request. If your PR causes one of these tests to fail, we will ask that you to resolve the issue before we merge.
 
 When contributing, please update or create the appropriate tests to help verify the correctness of your implementaiton.
 
@@ -217,7 +217,7 @@ Continue consists of 2 parts that are split so that it can be extended to work i
 
 1. **Continue GUI** - The Continue GUI is a React application that gives the user control over Continue. It displays the current chat history, allows the user to ask questions, invoke slash commands, and use context providers. The GUI also handles most state and holds as much of the logic as possible so that it can be reused between IDEs.
 
-2. **Continue Extension** - The Continue Extension is a plugin for the IDE which implements the [IDE Interface](./core/index.d.ts#L229). This allows the GUI to request information from or actions to be taken within the IDE. This same interface is used regardless of IDE. The first Continue extensions we have built are for VS Code and JetBrains, but we plan to build clients for other IDEs in the future. The IDE Client must 1. implement IDE Interface, as is done [here](./extensions/vscode/src/ideProtocol.ts) for VS Code and 2. display the Continue GUI in a sidebar, like [here](./extensions/vscode/src/ContinueGUIWebviewViewProvider.ts).
+2. **Continue Extension** - The Continue Extension is a plugin for the IDE which implements the [IDE Interface](./core/index.d.ts#L229). This allows the GUI to request information from or actions to be taken within the IDE. This same interface is used regardless of IDE. The first Continue extensions we have built are for VS Code and JetBrains, but we plan to build clients for other IDEs in the future. The IDE Client must 1. implement IDE Interface, as is done [here](./extensions/vscode/src/VsCodeIde.ts) for VS Code and 2. display the Continue GUI in a sidebar, like [here](./extensions/vscode/src/ContinueGUIWebviewViewProvider.ts).
 
 ### Continue VS Code Extension
 

binary/package-lock.json

@@ -5,6 +5,7 @@ import {
   getParserForFile,
   getQueryForFile,
 } from "../../util/treeSitter";
+import { findUriInDirs } from "../../util/uri";
 
 interface FileInfo {
   imports: { [key: string]: RangeInFileWithContents[] };
@@ -44,7 +45,15 @@ export class ImportDefinitionsService {
 
     let fileContents: string | undefined = undefined;
     try {
-      fileContents = await this.ide.readFile(filepath);
+      const { foundInDir } = findUriInDirs(
+        filepath,
+        await this.ide.getWorkspaceDirs(),
+      );
+      if (!foundInDir) {
+        return null;
+      } else {
+        fileContents = await this.ide.readFile(filepath);
+      }
     } catch (err) {
       // File removed
       return null;

core/autocomplete/context/ImportDefinitionsService.ts

@@ -1,74 +1,41 @@
 import { CustomCommand, SlashCommand, SlashCommandDescription } from "../";
 import { renderTemplatedString } from "../promptFiles/v1/renderTemplatedString";
+import { replaceSlashCommandWithPromptInChatHistory } from "../promptFiles/v1/updateChatHistory";
 import { renderChatMessage } from "../util/messageContent";
 
 import SlashCommands from "./slash";
 
 export function slashFromCustomCommand(
   customCommand: CustomCommand,
 ): SlashCommand {
+  const commandName = customCommand.name.startsWith("/")
+    ? customCommand.name.substring(1)
+    : customCommand.name;
   return {
-    name: customCommand.name,
+    name: commandName,
     description: customCommand.description ?? "",
     prompt: customCommand.prompt,
     run: async function* ({ input, llm, history, ide, completionOptions }) {
-      // Remove slash command prefix from input
-      let userInput = input;
-      if (userInput.startsWith(`/${customCommand.name}`)) {
-        userInput = userInput
-          .slice(customCommand.name.length + 1, userInput.length)
-          .trimStart();
-      }
-
       // Render prompt template
-      let promptUserInput: string;
+      let renderedPrompt: string;
       if (customCommand.prompt.includes("{{{ input }}}")) {
-        promptUserInput = await renderTemplatedString(
+        renderedPrompt = await renderTemplatedString(
           customCommand.prompt,
           ide.readFile.bind(ide),
-          { input: userInput },
+          { input },
         );
       } else {
-        promptUserInput = customCommand.prompt + "\n\n" + userInput;
+        renderedPrompt = customCommand.prompt + "\n\n" + input;
       }
 
-      const messages = [...history];
-      // Find the last chat message with this slash command and replace it with the user input
-      for (let i = messages.length - 1; i >= 0; i--) {
-        const message = messages[i];
-        const { role, content } = message;
-        if (role !== "user") {
-          continue;
-        }
-
-        if (
-          Array.isArray(content) &&
-          content.some(
-            (part) =>
-              "text" in part && part.text?.startsWith(`/${customCommand.name}`),
-          )
-        ) {
-          messages[i] = {
-            ...message,
-            content: content.map((part) => {
-              if (
-                "text" in part &&
-                part.text.startsWith(`/${customCommand.name}`)
-              ) {
-                return { type: "text", text: promptUserInput };
-              }
-              return part;
-            }),
-          };
-          break;
-        } else if (
-          typeof content === "string" &&
-          content.startsWith(`/${customCommand.name}`)
-        ) {
-          messages[i] = { ...message, content: promptUserInput };
-          break;
-        }
-      }
+      // Replaces slash command messages with the rendered prompt
+      // which INCLUDES the input
+      const messages = replaceSlashCommandWithPromptInChatHistory(
+        history,
+        commandName,
+        renderedPrompt,
+        undefined,
+      );
 
       for await (const chunk of llm.streamChat(
         messages,

core/commands/index.ts

@@ -2,6 +2,9 @@ import { AssistantUnrolled, ModelConfig } from "@continuedev/config-yaml";
 
 import { SerializedContinueConfig } from "../..";
 
+/*
+TODO this is not functional
+*/
 export function convertConfigJsonToConfigYaml(
   configJson: SerializedContinueConfig,
 ): AssistantUnrolled {

core/config/yaml/convertFromJson.ts

@@ -39,7 +39,7 @@ async function modelConfigToBaseLLM(
 
   let options: LLMOptions = {
     ...rest,
-    // contextLength: model.defaultCompletionOptions?.contextLength ?? undefined,
+    contextLength: model.defaultCompletionOptions?.contextLength,
     completionOptions: {
       ...(model.defaultCompletionOptions ?? {}),
       model: model.model,