Merge branch 'main' into pe/assistant-unroll-bugfix

Author: sestinj

.github/workflows/auto-release.yml

@@ -1,6 +1,9 @@
 name: Create Automatic Release
 
 on:
+  push:
+    branches:
+      - nate/auto-main-release-draft
   schedule:
     - cron: "0 17 * * 1,3,5" # Run at 9am PST (17:00 UTC) on Monday, Wednesday, Friday
   workflow_dispatch: # Keep manual trigger option
@@ -13,30 +16,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Important for getting all tags and commits
-
-      - name: Get latest tag
-        id: get_latest_tag
-        run: |
-          # Get the latest tag ending in -vscode or default to v1.1.0-vscode if none exists
-          latest_tag=$(git tag --sort=-creatordate | grep -E "-vscode$" | head -n 1 || echo "v1.1.0-vscode")
-          echo "Latest tag: $latest_tag"
-          echo "LATEST_TAG=$latest_tag" >> $GITHUB_ENV
 
-      - name: Generate next version
-        id: generate_version
+      - name: Get version from package.json
+        id: get_version
         run: |
-          # Extract version numbers (handle the -vscode suffix)
-          version=${LATEST_TAG#v}  # Remove v prefix
-          version=${version%-vscode}  # Remove -vscode suffix
-          IFS='.' read -ra VERSION_PARTS <<< "$version"
-
-          # Increment patch version
-          ((VERSION_PARTS[2]++))
-
-          # Create new version string with -vscode suffix
-          new_version="v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}-vscode"
+          # Read version from package.json and add -vscode suffix
+          version=$(node -p "require('./extensions/vscode/package.json').version")
+          new_version="v${version}-vscode"
           echo "New version will be: $new_version"
           echo "NEW_VERSION=$new_version" >> $GITHUB_ENV
 
@@ -49,7 +35,7 @@ jobs:
             --generate-notes \
             --title "$NEW_VERSION" \
             --draft \
-            --latest
+            --latest \
             --prerelease
 
   create-jetbrains-release:
@@ -60,29 +46,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Important for getting all tags and commits
+          fetch-depth: 0
 
-      - name: Get latest tag
-        id: get_latest_tag
+      - name: Get version from gradle.properties
+        id: get_version
         run: |
-          # Get the latest tag ending in -jetbrains or default to v1.1.0-jetbrains if none exists
-          latest_tag=$(git tag --sort=-creatordate | grep -E "-jetbrains$" | head -n 1 || echo "v1.1.0-jetbrains")
-          echo "Latest tag: $latest_tag"
-          echo "LATEST_TAG=$latest_tag" >> $GITHUB_ENV
-
-      - name: Generate next version
-        id: generate_version
-        run: |
-          # Extract version numbers (handle the -jetbrains suffix)
-          version=${LATEST_TAG#v}  # Remove v prefix
-          version=${version%-jetbrains}  # Remove -jetbrains suffix
-          IFS='.' read -ra VERSION_PARTS <<< "$version"
-
-          # Increment patch version
-          ((VERSION_PARTS[2]++))
-
-          # Create new version string with -jetbrains suffix
-          new_version="v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}-jetbrains"
+          # Read version from gradle.properties and add -jetbrains suffix
+          version=$(grep '^pluginVersion=' extensions/intellij/gradle.properties | cut -d'=' -f2)
+          new_version="v${version}-jetbrains"
           echo "New version will be: $new_version"
           echo "NEW_VERSION=$new_version" >> $GITHUB_ENV
 
@@ -95,5 +66,5 @@ jobs:
             --generate-notes \
             --title "$NEW_VERSION" \
             --draft \
-            --latest
+            --latest \
             --prerelease

.github/workflows/jetbrains-release.yaml

@@ -37,6 +37,52 @@ jobs:
             echo "should_run=false" >> $GITHUB_OUTPUT
           fi
 
+  bump-version:
+    runs-on: ubuntu-latest
+    needs:
+      - check_release_name
+    if: github.event_name != 'workflow_dispatch' || github.event.inputs.publish_build == 'true'
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      # 0. Setup git
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Git
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+
+      - name: Create PR branch
+        run: |
+          BRANCH_NAME="chore/bump-jetbrains-version-$(date +%Y%m%d-%H%M%S)"
+          git checkout -b $BRANCH_NAME
+          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
+
+      - name: Bump version in gradle.properties
+        run: |
+          cd extensions/intelllij
+          awk '/pluginVersion=/{split($0,a,"="); split(a[2],b,"."); b[3]+=1; printf "%s=%s.%s.%s\n",a[1],b[1],b[2],b[3];next}1' gradle.properties > tmp && mv tmp gradle.properties
+          rm -rf tmp
+          NEW_VERSION=$(grep 'pluginVersion=' gradle.properties | cut -d'=' -f2)
+          echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.CI_GITHUB_TOKEN }}
+          commit-message: "chore: bump jetbrains extension version to ${{ env.NEW_VERSION }}"
+          title: "chore: bump jetbrains extension version to ${{ env.NEW_VERSION }}"
+          body: |
+            Automated PR to bump the JetBrains extension version after successful pre-release publication.
+
+            - Bumped version in extensions/intellij/gradle.properties to ${{ env.NEW_VERSION }}
+          branch: ${{ env.BRANCH_NAME }}
+          base: main
+          delete-branch: true
+
   # Prepare and publish the plugin to JetBrains Marketplace repository
   build:
     needs: check_release_name

.github/workflows/pr_checks.yaml

@@ -632,6 +632,4 @@ jobs:
       - name: Decide whether the needed jobs succeeded or failed
         uses: re-actors/alls-green@release/v1
         with:
-          allowed-failures:
-          allowed-skips:
           jobs: ${{ toJSON(needs) }}

.github/workflows/vscode-version-bump.yml

@@ -1,4 +1,4 @@
-name: VS Code Extension Version Bump
+name: Create VS Code main release draft
 on:
   schedule:
     # Runs at 7 AM PST (15:00 UTC) every Friday
@@ -15,6 +15,10 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history and tags
 
+      - name: Setup GitHub CLI
+        run: |
+          gh auth login --with-token <<< "${{ github.token }}"
+
       - name: Use Node.js from .nvmrc
         uses: actions/setup-node@v4
         with:
@@ -97,6 +101,15 @@ jobs:
           echo "Pushing branch to origin..."
           git push origin $NEW_BRANCH
 
+          # Add release creation
+          echo "Creating draft release..."
+          gh release create "${NEW_BRANCH}" \
+            --title "${NEW_BRANCH}" \
+            --generate-notes \
+            --draft \
+            --latest \
+            --notes-start-tag "${LAST_1_0_TAG}"
+
           echo "Version bump process completed successfully!"
 
       - name: Check for errors

.node-version

@@ -0,0 +1 @@
+20.11.0

binary/src/index.ts

@@ -1,6 +1,7 @@
 process.env.IS_BINARY = "true";
 import { Command } from "commander";
 import { Core } from "core/core";
+import { LLMLogFormatter } from "core/llm/logFormatter";
 import { FromCoreProtocol, ToCoreProtocol } from "core/protocol";
 import { IMessenger } from "core/protocol/messenger";
 import { getCoreLogsPath, getPromptLogsPath } from "core/util/paths";
@@ -33,9 +34,8 @@ program.action(async () => {
     const ide = new IpcIde(messenger);
     const promptLogsPath = getPromptLogsPath();
 
-    new Core(messenger, ide, async (text) => {
-      fs.appendFileSync(promptLogsPath, text + "\n\n");
-    });
+    const core = new Core(messenger, ide);
+    new LLMLogFormatter(core.llmLogger, fs.createWriteStream(promptLogsPath));
 
     console.log("[binary] Core started");
   } catch (e) {

core/.eslintrc.json

@@ -13,7 +13,7 @@
     "@typescript-eslint/semi": "off",
     "eqeqeq": "error",
     "complexity": ["error", { "max": 38 }],
-    "max-lines-per-function": ["error", { "max": 996 }],
+    "max-lines-per-function": ["error", { "max": 485 }],
     "max-statements": ["error", { "max": 114 }],
     "max-depth": ["error", { "max": 6 }],
     "max-nested-callbacks": ["error", { "max": 4 }],

core/autocomplete/util/AutocompleteLruCache.ts

@@ -39,42 +39,52 @@ export class AutocompleteLruCache {
     // If the query is "co" and we have "c" -> "ontinue" in the cache,
     // we should return "ntinue" as the completion.
     // Have to make sure we take the key with shortest length
-    const result = await this.db.get(
-      "SELECT key, value FROM cache WHERE ? LIKE key || '%' ORDER BY LENGTH(key) DESC LIMIT 1",
-      truncateSqliteLikePattern(prefix),
-    );
-
-    // Validate that the cached compeltion is a valid completion for the prefix
-    if (result && result.value.startsWith(prefix.slice(result.key.length))) {
-      await this.db.run(
-        "UPDATE cache SET timestamp = ? WHERE key = ?",
-        Date.now(),
-        prefix,
+    const truncatedPrefix = truncateSqliteLikePattern(prefix);
+    try {
+      const result = await this.db.get(
+        "SELECT key, value FROM cache WHERE ? LIKE key || '%' ORDER BY LENGTH(key) DESC LIMIT 1",
+        truncatedPrefix,
       );
-      // And then truncate so we aren't writing something that's already there
-      return result.value.slice(prefix.length - result.key.length);
+      // Validate that the cached completion is a valid completion for the prefix
+      if (
+        result &&
+        result.value.startsWith(truncatedPrefix.slice(result.key.length))
+      ) {
+        await this.db.run(
+          "UPDATE cache SET timestamp = ? WHERE key = ?",
+          Date.now(),
+          truncatedPrefix,
+        );
+        // And then truncate so we aren't writing something that's already there
+        return result.value.slice(truncatedPrefix.length - result.key.length);
+      }
+    } catch (e) {
+      // catches e.g. old SQLITE LIKE OR GLOB PATTERN TOO COMPLEX
+      console.error(e);
     }
 
     return undefined;
   }
 
   async put(prefix: string, completion: string) {
     const release = await this.mutex.acquire();
+
+    const truncatedPrefix = truncateSqliteLikePattern(prefix);
     try {
       await this.db.run("BEGIN TRANSACTION");
 
       try {
         const result = await this.db.get(
           "SELECT key FROM cache WHERE key = ?",
-          prefix,
+          truncatedPrefix,
         );
 
         if (result) {
           await this.db.run(
             "UPDATE cache SET value = ?, timestamp = ? WHERE key = ?",
             completion,
             Date.now(),
-            prefix,
+            truncatedPrefix,
           );
         } else {
           const count = await this.db.get(
@@ -89,7 +99,7 @@ export class AutocompleteLruCache {
 
           await this.db.run(
             "INSERT INTO cache (key, value, timestamp) VALUES (?, ?, ?)",
-            prefix,
+            truncatedPrefix,
             completion,
             Date.now(),
           );

core/commands/index.ts

@@ -1,6 +1,7 @@
 import { CustomCommand, SlashCommand, SlashCommandDescription } from "../";
 import { renderTemplatedString } from "../promptFiles/v1/renderTemplatedString";
 import { replaceSlashCommandWithPromptInChatHistory } from "../promptFiles/v1/updateChatHistory";
+import { renderPromptFileV2 } from "../promptFiles/v2/renderPromptFile";
 import { renderChatMessage } from "../util/messageContent";
 
 import SlashCommands from "./slash";
@@ -15,7 +16,16 @@ export function slashFromCustomCommand(
     name: commandName,
     description: customCommand.description ?? "",
     prompt: customCommand.prompt,
-    run: async function* ({ input, llm, history, ide, completionOptions }) {
+    run: async function* ({
+      input,
+      llm,
+      history,
+      ide,
+      completionOptions,
+      config,
+      selectedCode,
+      fetch,
+    }) {
       // Render prompt template
       let renderedPrompt: string;
       if (customCommand.prompt.includes("{{{ input }}}")) {
@@ -25,7 +35,21 @@ export function slashFromCustomCommand(
           { input },
         );
       } else {
-        renderedPrompt = customCommand.prompt + "\n\n" + input;
+        const renderedPromptFile = await renderPromptFileV2(
+          customCommand.prompt,
+          {
+            config,
+            llm,
+            ide,
+            selectedCode,
+            fetch,
+            fullInput: input,
+            embeddingsProvider: config.modelsByRole.embed[0],
+            reranker: config.modelsByRole.rerank[0],
+          },
+        );
+
+        renderedPrompt = renderedPromptFile[1];
       }
 
       // Replaces slash command messages with the rendered prompt

core/config/ConfigHandler.test.ts

@@ -9,9 +9,9 @@ import { defaultConfig } from "./default";
 
 describe.skip("Test the ConfigHandler and E2E config loading", () => {
   test("should show only local profile", () => {
-    const profiles = testConfigHandler.listProfiles();
+    const profiles = testConfigHandler.currentOrg.profiles;
     expect(profiles?.length).toBe(1);
-    expect(profiles?.[0].id).toBe("local");
+    expect(profiles?.[0].profileDescription.id).toBe("local");
 
     const currentProfile = testConfigHandler.currentProfile;
     expect(currentProfile?.profileDescription.id).toBe("local");