Merge branch 'main' into current-file

Author: Patrick-Erichsen

.continue/rules/colors.yaml

@@ -0,0 +1,27 @@
+name: GUI
+version: 0.0.1
+schema: v1
+rules:
+  - name: Extension Color Themes
+    rule: |
+      When adding colors to components, use tailwind color classes.
+      Do NOT use explicit colors like text-gray-400. Instead, use theme colors.
+
+      The common available theme colors are:
+      - For normal text: foreground, description, description-muted
+      - For other text, icons, etc: success, warning, error, accent, link
+      - For general components background, border, border-focus
+      - For specific components: 
+          - Button: primary, primary-foreground, primary-hover, secondary, secondary-foreground, secondary-hover
+          - Input: input, input-foreground, input-border, input-placeholder
+          - Badge: badge, badge-foreground
+          - List/Dropdown items: list-hover, list-active, list-active-foreground
+          - Code Editor: editor, editor-foreground
+
+      Any of these colors can be used in tailwind e.g. bg-primary, text-success, border-error, hover:bg-list-hover, etc.
+    globs: "gui/**/*.tsx"
+# Excluding the following less-used colors:
+# Command (only used by tip-tap): command, command-foreground, command-border, command-border-focus
+# Find widget colors: find-match, find-match-selected
+# table-oddRow
+

.github/workflows/metrics.yaml

@@ -0,0 +1,75 @@
+name: Monthly issue metrics
+on:
+  workflow_dispatch:
+  schedule:
+    # Runs every Monday at 9:00 AM PST (17:00 UTC)
+    - cron: "0 17 * * 1"
+
+  push:
+    branches:
+      - nate/metrics-action
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: issue metrics
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: read
+    steps:
+      - name: Get dates for last month
+        shell: bash
+        run: |
+          # Calculate the first day of the previous month
+          first_day=$(date -d "last month" +%Y-%m-01)
+
+          # Calculate the last day of the previous month
+          last_day=$(date -d "$first_day +1 month -1 day" +%Y-%m-%d)
+
+          #Set an environment variable with the date range
+          echo "$first_day..$last_day"
+          echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+
+      - name: Run issue-metrics tool
+        uses: github/issue-metrics@v3
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SEARCH_QUERY: 'repo:continuedev/continue created:${{ env.last_month }} -reason:"not planned"'
+
+      - name: Read metrics file content
+        id: read-metrics
+        run: |
+          content=$(cat ./issue_metrics.md)
+          # This prepares the content in a way that can be used in GitHub Actions
+          content="${content//'%'/'%25'}"
+          content="${content//$'\n'/'%0A'}"
+          # content="${content//$'\r'/'%0D'}"
+          echo "metrics_content=$content" >> "$GITHUB_OUTPUT"
+
+      - name: Post a message in a channel
+        uses: slackapi/[email protected]
+        with:
+          webhook: ${{ secrets.ISSUE_PR_METRICS_SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            text: "Issue / PR Metrics Report"
+            blocks:
+                - type: "header"
+                  text:
+                    type: "plain_text"
+                    text: "Monthly Issue Metrics Report"
+                    emoji: true
+                - type: "section"
+                  text:
+                    type: "mrkdwn"
+                    text: |
+                      ${{ steps.read-metrics.outputs.metrics_content }}
+
+      - name: Upload metrics report as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: issue-metrics-report
+          path: ./issue_metrics.md

CONTRIBUTING.md

@@ -3,35 +3,36 @@
 ## Table of Contents
 
 - [Contributing to Continue](#contributing-to-continue)
-    - [Table of Contents](#table-of-contents)
+  - [Table of Contents](#table-of-contents)
 - [❤️ Ways to Contribute](#️-ways-to-contribute)
-    - [👋 Continue Contribution Ideas](#-continue-contribution-ideas)
-    - [🐛 Report Bugs](#-report-bugs)
-    - [✨ Suggest Enhancements](#-suggest-enhancements)
-    - [📖 Updating / Improving Documentation](#-updating--improving-documentation)
-        - [Running the Documentation Server Locally](#running-the-documentation-server-locally)
-            - [Method 1: NPM Script](#method-1-npm-script)
-            - [Method 2: VS Code Task](#method-2-vs-code-task)
-    - [🧑‍💻 Contributing Code](#-contributing-code)
-        - [Environment Setup](#environment-setup)
-            - [Pre-requisites](#pre-requisites)
-            - [Fork the Continue Repository](#fork-the-continue-repository)
-            - [VS Code](#vs-code)
-                - [Debugging](#debugging)
-            - [JetBrains](#jetbrains)
-        - [Our Git Workflow](#our-git-workflow)
-        - [Development workflow](#development-workflow)
-        - [Formatting](#formatting)
-        - [Testing](#testing)
-        - [Review Process](#review-process)
-        - [Getting help](#getting-help)
-    - [Contribtuing new LLM Providers/Models](#contribtuing-new-llm-providersmodels)
-        - [Adding an LLM Provider](#adding-an-llm-provider)
-        - [Adding Models](#adding-models)
-    - [📐 Continue Architecture](#-continue-architecture)
-        - [Continue VS Code Extension](#continue-vs-code-extension)
-        - [Continue JetBrains Extension](#continue-jetbrains-extension)
-    - [Contibutor License Agreement](#contributor-license-agreement-cla)
+  - [👋 Continue Contribution Ideas](#-continue-contribution-ideas)
+  - [🐛 Report Bugs](#-report-bugs)
+  - [✨ Suggest Enhancements](#-suggest-enhancements)
+  - [📖 Updating / Improving Documentation](#-updating--improving-documentation)
+    - [Running the Documentation Server Locally](#running-the-documentation-server-locally)
+      - [Method 1: NPM Script](#method-1-npm-script)
+      - [Method 2: VS Code Task](#method-2-vs-code-task)
+  - [🧑‍💻 Contributing Code](#-contributing-code)
+    - [Environment Setup](#environment-setup)
+      - [Pre-requisites](#pre-requisites)
+      - [Fork the Continue Repository](#fork-the-continue-repository)
+      - [VS Code](#vs-code)
+        - [Debugging](#debugging)
+      - [JetBrains](#jetbrains)
+    - [Our Git Workflow](#our-git-workflow)
+    - [Development workflow](#development-workflow)
+    - [Formatting](#formatting)
+    - [Theme Colors](#theme-colors)
+    - [Testing](#testing)
+    - [Review Process](#review-process)
+    - [Getting help](#getting-help)
+  - [Contribtuing new LLM Providers/Models](#contribtuing-new-llm-providersmodels)
+    - [Adding an LLM Provider](#adding-an-llm-provider)
+    - [Adding Models](#adding-models)
+  - [📐 Continue Architecture](#-continue-architecture)
+    - [Continue VS Code Extension](#continue-vs-code-extension)
+    - [Continue JetBrains Extension](#continue-jetbrains-extension)
+  - [Contibutor License Agreement](#contributor-license-agreement-cla)
 
 # ❤️ Ways to Contribute
 
@@ -60,9 +61,9 @@ an enhancement are:
 
 - Create an issue
 
-    - First, check whether a similar proposal has already been made
-    - If not, [create an issue](https://github.com/continuedev/continue/issues)
-    - Please describe the enhancement in as much detail as you can, and why it would be useful
+  - First, check whether a similar proposal has already been made
+  - If not, [create an issue](https://github.com/continuedev/continue/issues)
+  - Please describe the enhancement in as much detail as you can, and why it would be useful
 
 - Join the [Continue Discord](https://discord.gg/NWtdYexhMs) and tell us about your idea in the `#feedback` channel
 
@@ -140,12 +141,12 @@ nvm use
 
 2. Start debugging:
 
-    1. Switch to Run and Debug view
-    2. Select `Launch extension` from drop down
-    3. Hit play button
-    4. This will start the extension in debug mode and open a new VS Code window with it installed
-        1. The new VS Code window with the extension is referred to as the _Host VS Code_
-        2. The window you started debugging from is referred to as the _Main VS Code_
+   1. Switch to Run and Debug view
+   2. Select `Launch extension` from drop down
+   3. Hit play button
+   4. This will start the extension in debug mode and open a new VS Code window with it installed
+      1. The new VS Code window with the extension is referred to as the _Host VS Code_
+      2. The window you started debugging from is referred to as the _Main VS Code_
 
 3. To package the extension, run `npm run package` in the `extensions/vscode` directory, select `Tasks: Run Task` and
    then select `vscode-extension:package`. This will generate `extensions/vscode/build/continue-{VERSION}.vsix`, which
@@ -192,6 +193,22 @@ To keep the Continue codebase clean and maintainable, we expect the following fr
 Continue uses [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) to format
 JavaScript/TypeScript. Please install the Prettier extension in VS Code and enable "Format on Save" in your settings.
 
+### Theme Colors
+
+Continue has a set of named theme colors that we map to extension colors and tailwind classes, which can be found in [gui/src/styles/theme.ts](gui/src/styles/theme.ts)
+
+Guidelines for using theme colors:
+
+- Use Tailwind colors whenever possible. If developing in VS Code, download the [Tailwind CSS Intellisense extension](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss) for great suggestions
+- Avoid using any explicit classes and CSS variables outside the theme (e.g. `text-yellow-400`)
+
+Guidelines for adding/updating theme colors:
+
+- Choose sensible VS Code variables to add/update in [gui/src/styles/theme.ts](gui/src/styles/theme.ts) (see [here](https://code.visualstudio.com/api/references/theme-color) and [here](https://www.notion.so/1fa1d55165f78097b551e3bc296fcf76?pvs=25) for inspiration)
+- Choose sensible Jetbrains named colors to add/update in `GetTheme.kt` (flagship LLMs can give you good suggestions to try)
+- Update `tailwind.config.js` if needed
+- Use the Theme Test Page to check colors. This can be accessed by going to `Settings` -> `Help` -> `Theme Test Page` in dev/debug mode.
+
 ### Testing
 
 We have a mix of unit, functional, and e2e test suites, with a primary focus on functional testing. These tests run on
@@ -239,10 +256,10 @@ model:
 
 - [AddNewModel page](./gui/src/pages/AddNewModel/configs/) - This directory defines which model options are shown in the
   side bar model selection UI. To add a new model:
-    1. Add a `ModelPackage` entry for the model into [configs/models.ts](./gui/src/pages/AddNewModel/configs/models.ts),
-       following the lead of the many examples near the top of the file
-    2. Add the model within its provider's array
-       to [configs/providers.ts](./gui/src/pages/AddNewModel/configs/providers.ts) (add provider if needed)
+  1. Add a `ModelPackage` entry for the model into [configs/models.ts](./gui/src/pages/AddNewModel/configs/models.ts),
+     following the lead of the many examples near the top of the file
+  2. Add the model within its provider's array
+     to [configs/providers.ts](./gui/src/pages/AddNewModel/configs/providers.ts) (add provider if needed)
 - LLM Providers: Since many providers use their own custom strings to identify models, you'll have to add the
   translation from Continue's model name (the one you added to `index.d.ts`) and the model string for each of these
   providers: [Ollama](./core/llm/llms/Ollama.ts), [Together](./core/llm/llms/Together.ts),
@@ -264,4 +281,4 @@ We require all contributors to accept the CLA and have made it as easy as commen
    I have read the CLA Document and I hereby sign the CLA
    ```
 
-3. The CLA‑Assistant bot records your signature in the repo and marks the status check as passed.
+3. The CLA‑Assistant bot records your signature in the repo and marks the status check as passed.

binary/package-lock.json

@@ -226,6 +226,7 @@ describe("Test Suite", () => {
       title: "Test Model",
       provider: "openai",
       model: "gpt-3.5-turbo",
+      underlyingProviderName: "openai",
     };
     await messenger.request("config/addModel", {
       model,
@@ -252,6 +253,7 @@ describe("Test Suite", () => {
       title: "Test Model",
       provider: "mock",
       model: "gpt-3.5-turbo",
+      underlyingProviderName: "mock",
     };
     await messenger.request("config/addModel", {
       model,

binary/test/binary.test.ts

@@ -244,7 +244,7 @@ export class CompletionProvider {
         prefix,
         suffix,
         prompt,
-        modelProvider: llm.providerName,
+        modelProvider: llm.underlyingProviderName,
         modelName: llm.model,
         completionOptions,
         cacheHit,

core/autocomplete/CompletionProvider.ts

@@ -1,6 +1,6 @@
+import { streamResponse } from "@continuedev/fetch";
 import { SlashCommand } from "../../index.js";
 import { removeQuotesAndEscapes } from "../../util/index.js";
-import { streamResponse } from "../../llm/stream.js";
 
 const HttpSlashCommand: SlashCommand = {
   name: "http",

core/commands/slash/http.ts

@@ -627,6 +627,7 @@ async function intermediateToFinalConfig({
 function llmToSerializedModelDescription(llm: ILLM): ModelDescription {
   return {
     provider: llm.providerName,
+    underlyingProviderName: llm.underlyingProviderName,
     model: llm.model,
     title: llm.title ?? llm.model,
     apiKey: llm.apiKey,

core/config/load.ts

@@ -151,4 +151,42 @@ This is a test rule without a heading.`;
     );
     expect(result.name).toBe("custom-rule");
   });
+
+  it("should include description from frontmatter", () => {
+    const content = `---
+globs: "**/test/**/*.kt"
+name: Test Rule
+description: This is a rule description from frontmatter
+---
+
+# Test Rule
+
+This is the content of the rule.`;
+
+    const result = convertMarkdownRuleToContinueRule(
+      "/path/to/rule.md",
+      content,
+    );
+    expect(result.description).toBe(
+      "This is a rule description from frontmatter",
+    );
+  });
+
+  it("should include `alwaysApply` from frontmatter", () => {
+    const content = `---
+globs: "**/test/**/*.kt"
+name: Test Rule
+alwaysApply: false
+---
+
+# Test Rule
+
+This is a rule with alwaysApply explicitly set to false.`;
+
+    const result = convertMarkdownRuleToContinueRule(
+      "/path/to/rule.md",
+      content,
+    );
+    expect(result.alwaysApply).toBe(false);
+  });
 });