Merge branch 'main' into docs-checks

Author: uinstinct

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -13,7 +13,7 @@ body:
       options:
         - label: I've tried using the "Ask AI" feature on the [Continue docs site](https://docs.continue.dev/) to see if the docs have an answer
           required: false
-        - label: I believe this is a bug. I'll try to join the [Continue Discord](https://discord.gg/NWtdYexhMs) for questions
+        - label: I'm not able to find a related conversation on [GitHub discussions](https://github.com/continuedev/continue/discussions) that reports the same bug
           required: false
         - label: I'm not able to find an [open issue](https://github.com/continuedev/continue/issues?q=is%3Aopen+is%3Aissue) that reports the same bug
           required: false

.github/workflows/jetbrains-release.yaml

@@ -95,7 +95,7 @@ jobs:
     needs: check_release_name
     if: needs.check_release_name.outputs.should_run == 'true' || github.event_name == 'workflow_dispatch'
     name: Build Plugin
-    runs-on: macos-13
+    runs-on: macos-latest
     permissions:
       contents: write
       pull-requests: write
@@ -358,7 +358,7 @@ jobs:
             platform: darwin
             arch: x64
             npm_config_arch: x64
-          - os: macos-13
+          - os: macos-latest
             platform: darwin
             arch: arm64
             npm_config_arch: arm64

.github/workflows/main.yaml

@@ -73,11 +73,11 @@ jobs:
             platform: alpine
             arch: x64
             npm_config_arch: x64
-          - os: macos-13
+          - os: macos-latest
             platform: darwin
             arch: x64
             npm_config_arch: x64
-          - os: macos-13
+          - os: macos-latest
             platform: darwin
             arch: arm64
             npm_config_arch: arm64

.github/workflows/preview.yaml

@@ -57,11 +57,11 @@ jobs:
             platform: alpine
             arch: x64
             npm_config_arch: x64
-          - os: macos-13
+          - os: macos-latest
             platform: darwin
             arch: x64
             npm_config_arch: x64
-          - os: macos-13
+          - os: macos-latest
             platform: darwin
             arch: arm64
             npm_config_arch: arm64

core/autocomplete/context/static-context/StaticContextService.ts

@@ -1,8 +1,7 @@
-import * as fs from "fs/promises";
 import path from "path";
 import { pathToFileURL } from "url";
 import Parser from "web-tree-sitter";
-import { IDE, Position } from "../../..";
+import { FileType, IDE, Position } from "../../../";
 import { localPathOrUriToPath } from "../../../util/pathToUri";
 import { getFullLanguageName, getQueryForFile } from "../../../util/treeSitter";
 import {
@@ -353,10 +352,7 @@ export class StaticContextService {
             if (foundContents.has(tdLocation.filepath)) {
               content = foundContents.get(tdLocation.filepath)!;
             } else {
-              content = await fs.readFile(
-                localPathOrUriToPath(tdLocation.filepath),
-                "utf8",
-              );
+              content = await this.ide.readFile(tdLocation.filepath);
               foundContents.set(tdLocation.filepath, content);
             }
 
@@ -854,24 +850,19 @@ export class StaticContextService {
       return skipDirs.includes(dirName) || dirName.startsWith(".");
     };
 
-    async function scanRecursively(currentPath: string): Promise<void> {
+    const scanRecursively = async (currentPath: string): Promise<void> => {
       try {
-        const entries = await fs.readdir(currentPath, {
-          withFileTypes: true,
-        });
-
-        for (const entry of entries) {
-          const fullPath = localPathOrUriToPath(
-            path.join(currentPath, entry.name),
-          );
+        const currentUri = pathToFileURL(currentPath).toString();
+        const entries = await this.ide.listDir(currentUri);
+        for (const [name, fileType] of entries) {
+          const fullPath = localPathOrUriToPath(path.join(currentPath, name));
 
-          if (entry.isDirectory()) {
-            // Skip common directories that typically don't contain source files
-            if (!shouldSkipDirectory(entry.name)) {
+          if (fileType === (2 as FileType.Directory)) {
+            if (!shouldSkipDirectory(name)) {
               await scanRecursively(fullPath);
             }
-          } else if (entry.isFile()) {
-            const extension = path.extname(entry.name).toLowerCase();
+          } else if (fileType === (1 as FileType.File)) {
+            const extension = path.extname(name).toLowerCase();
             if (tsExtensions.includes(extension)) {
               tsFiles.push(fullPath);
             }
@@ -880,7 +871,7 @@ export class StaticContextService {
       } catch (error) {
         console.error(`Error reading directory ${currentPath}:`, error);
       }
-    }
+    };
 
     await scanRecursively(dirPath);
     return tsFiles;

core/autocomplete/templating/AutocompleteTemplate.ts

@@ -192,7 +192,7 @@ const mercuryMultifileFimTemplate: AutocompleteTemplate = {
           suffix,
         ];
       }
-      return [`<|fim_prefix|>${prefix}`, suffix];
+      return [`${prefix}`, suffix];
     }
 
     const relativePaths = getShortestUniqueRelativeUriPaths(

core/config/yaml/models.vitest.ts

@@ -52,7 +52,7 @@ describe("llmsFromModelConfig requestOptions merging", () => {
       requestOptions: {
         timeout: 30000,
         headers: {
-          "User-Agent": "Continue/1.0.0",
+          "user-agent": "Continue/1.0.0",
         },
         proxy: "global-proxy",
       },
@@ -112,7 +112,7 @@ describe("llmsFromModelConfig requestOptions merging", () => {
     expect(llm.requestOptions).toEqual({
       timeout: 60000, // model-specific takes precedence
       headers: {
-        "User-Agent": "Continue/1.0.0", // from global request options
+        "user-agent": "Continue/1.0.0", // from global request options
         Authorization: "Bearer token123", // from model
       },
       proxy: "model-proxy", // model-specific takes precedence
@@ -236,7 +236,7 @@ describe("llmsFromModelConfig requestOptions merging", () => {
       expect(llm.requestOptions).toEqual({
         timeout: 120000, // model-specific takes precedence
         headers: {
-          "User-Agent": "Continue/1.0.0", // from global request options
+          "user-agent": "Continue/1.0.0", // from global request options
           "X-Custom": "autodetect", // from model
         },
         proxy: "global-proxy", // from global request options
@@ -302,7 +302,7 @@ describe("llmsFromModelConfig requestOptions merging", () => {
     expect(llm.requestOptions).toEqual({
       timeout: 90000,
       headers: {
-        "User-Agent": "Continue/1.0.0",
+        "user-agent": "Continue/1.0.0",
       },
       proxy: "global-proxy",
     });
@@ -345,7 +345,7 @@ describe("llmsFromModelConfig requestOptions merging", () => {
     const llm = result[0];
 
     expect(llm.requestOptions?.headers).toEqual({
-      "User-Agent": "Continue/1.0.0", // from global request options
+      "user-agent": "Continue/1.0.0", // from global request options
       "Cache-Control": "no-cache", // from global request options
       Authorization: "Bearer model-token", // from model
       Accept: "application/json", // from model (overrides config)

core/index.d.ts

@@ -513,7 +513,7 @@ export interface ChatHistoryItem {
   toolCallStates?: ToolCallState[];
   isGatheringContext?: boolean;
   reasoning?: Reasoning;
-  appliedRules?: RuleWithSource[];
+  appliedRules?: RuleMetadata[];
   conversationSummary?: string;
 }
 
@@ -1868,18 +1868,21 @@ export type RuleSource =
   | ".continuerules"
   | "agentFile";
 
-export interface RuleWithSource {
+export interface RuleMetadata {
   name?: string;
   slug?: string;
   source: RuleSource;
   globs?: string | string[];
   regex?: string | string[];
-  rule: string;
   description?: string;
   sourceFile?: string;
   alwaysApply?: boolean;
   invokable?: boolean;
 }
+export interface RuleWithSource extends RuleMetadata {
+  rule: string;
+}
+
 export interface CompleteOnboardingPayload {
   mode: OnboardingModes;
   provider?: string;

core/llm/rules/getSystemMessageWithRules.ts

@@ -1,6 +1,7 @@
 import { minimatch } from "minimatch";
 import {
   ContextItemWithId,
+  RuleMetadata,
   RuleWithSource,
   ToolResultChatMessage,
   UserChatMessage,
@@ -324,7 +325,7 @@ export const getApplicableRules = (
   return applicableRules;
 };
 
-export function getRuleId(rule: RuleWithSource): string {
+export function getRuleId(rule: RuleMetadata): string {
   return rule.slug ?? rule.sourceFile ?? rule.name ?? rule.source;
 }
 
@@ -342,7 +343,7 @@ export const getSystemMessageWithRules = ({
   rulePolicies?: RulePolicies;
 }): {
   systemMessage: string;
-  appliedRules: RuleWithSource[];
+  appliedRules: RuleMetadata[];
 } => {
   const appliedRules = getApplicableRules(
     userMessage,
@@ -359,8 +360,10 @@ export const getSystemMessageWithRules = ({
     systemMessage += rule.rule;
   }
 
+  const ruleMetadata = appliedRules.map(({ rule, ...rest }) => rest);
+
   return {
     systemMessage,
-    appliedRules,
+    appliedRules: ruleMetadata,
   };
 };

core/llm/rules/rules-utils.ts

@@ -1,14 +1,14 @@
-import { RuleWithSource } from "../..";
+import { RuleMetadata } from "../..";
 import { getLastNPathParts } from "../../util/uri";
 
-export function getRuleDisplayName(rule: RuleWithSource): string {
+export function getRuleDisplayName(rule: RuleMetadata): string {
   if (rule.name) {
     return rule.name;
   }
   return getRuleSourceDisplayName(rule);
 }
 
-export function getRuleSourceDisplayName(rule: RuleWithSource): string {
+export function getRuleSourceDisplayName(rule: RuleMetadata): string {
   switch (rule.source) {
     case ".continuerules":
       return "Project rules";