Merge branch 'main' into chinese-docs-translation-sync

Author: chrarnoldus

.changeset/brave-beers-clean.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix @ mentions when editing messages

.changeset/changelog-config.js

@@ -2,15 +2,81 @@ name: Bug Report
 description: File a bug report
 type: "Bug"
 body:
+    - type: markdown
+      attributes:
+          value: |
+              Thank you for contributing! Please search similar issues first to see if your bug is already known:
+              https://github.com/Kilo-Org/kilocode/issues
+
+    - type: dropdown
+      id: plugin-type
+      attributes:
+          label: Plugin Type
+          description: Which plugin are you reporting this bug for?
+          options:
+              - VSCode Extension
+              - JetBrains Plugin
+              - Kilo Code CLI
+          default: 0
+      validations:
+          required: true
+
+    - type: input
+      id: version
+      attributes:
+          label: App Version
+          description: What version of Kilo Code are you using? (e.g., v3.3.1)
+      validations:
+          required: true
+
     - type: textarea
       id: description
       attributes:
           label: Description
-          description: |
-            Which app version are you using (e.g. v3.3.1)?
-            Which API Provider are you using (e.g. Kilo, OpenRouter, Anthropic)?
-            Which Model are you using (e.g. Claude 3.7 Sonnet)?
-            Steps to reproduce?
-            Relevant API request output?
-            Additional context?
-            Screenshots?
+          description: Describe what went wrong. Please include as much information as possible.
+      validations:
+          required: true
+
+    - type: textarea
+      id: steps
+      attributes:
+          label: Reproduction steps
+          description: How can we trigger this bug? Please provider clear steps so we can reproduce.
+          placeholder: |
+              1.
+              2.
+              3.
+      validations:
+          required: true
+
+    - type: input
+      id: provider
+      attributes:
+          label: Provider
+          description: What provider were you using when the issue occurred?
+          placeholder: "e.g., Kilo Code"
+      validations:
+          required: false
+
+    - type: input
+      id: model
+      attributes:
+          label: Model
+          description: What model were you using when the issue occurred?
+          placeholder: "e.g., Claude Sonnet 4"
+      validations:
+          required: false
+
+    - type: textarea
+      id: system-info
+      attributes:
+          label: System Information
+          description: What operating system and hardware are you using?
+          placeholder: |
+              e.g.
+              OS: Windows 11
+              CPU: Intel Core i7-11700K
+              GPU: NVIDIA GeForce RTX 3070
+              RAM: 32GB DDR4
+      validations:
+          required: false

.changeset/late-eggs-enter.md

@@ -53,7 +53,8 @@ let j = 3
 
 ### Kilocode specific file
 
-if the filename or directory name contains kilocode no marking with comments is required
+- if the filename or directory name contains kilocode no marking with comments is required
+- if the file lives inside of the jetbrains/ or cli/ root folder, no marking with comments is required
 
 ### New Files
 

.changeset/public-cloths-shine.md

@@ -0,0 +1,51 @@
+name: Build CLI package
+on:
+    push:
+        branches: [main]
+    pull_request:
+        branches: [main]
+    workflow_dispatch:
+env:
+    GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
+    NODE_VERSION: 20.19.2
+    PNPM_VERSION: 10.8.1
+    TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+    TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+jobs:
+    build-cli:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+            - name: Install pnpm
+              uses: pnpm/action-setup@v4
+              with:
+                  version: ${{ env.PNPM_VERSION }}
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ env.NODE_VERSION }}
+                  cache: "pnpm"
+            - name: Turbo cache setup
+              uses: actions/cache@v4
+              with:
+                  path: .turbo
+                  key: ${{ runner.os }}-turbo-${{ github.sha }}
+                  restore-keys: |
+                      ${{ runner.os }}-turbo-
+            - name: Install dependencies
+              run: pnpm install
+            - name: Create .env file
+              run: echo "KILOCODE_POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
+              working-directory: cli
+            - name: Build
+              run: pnpm run cli:bundle
+              shell: bash
+            - name: NPM Pack
+              run: npm pack
+              working-directory: cli/dist
+            - name: Upload artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: tarball
+                  path: cli/dist/*.tgz

.changeset/wet-poems-tease.md

@@ -161,7 +161,9 @@ jobs:
             - uses: actions/setup-java@v4
               with:
                   distribution: 'jetbrains'
-                  java-version: '17'
+                  java-version: '21'
+                  check-latest: false
+                  token: ${{ secrets.GITHUB_TOKEN }}
             - name: Install system dependencies
               run: |
                 sudo apt-get update
@@ -182,4 +184,31 @@ jobs:
               run: pnpm install
             - name: Build
               run: pnpm run jetbrains:build
-              shell: bash
+              shell: bash
+
+    test-cli:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+            - name: Install pnpm
+              uses: pnpm/action-setup@v4
+              with:
+                  version: ${{ env.PNPM_VERSION }}
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ env.NODE_VERSION }}
+                  cache: "pnpm"
+            - name: Turbo cache setup
+              uses: actions/cache@v4
+              with:
+                  path: .turbo
+                  key: ${{ runner.os }}-turbo-${{ github.sha }}
+                  restore-keys: |
+                      ${{ runner.os }}-turbo-
+            - name: Install dependencies
+              run: pnpm install
+            - name: Run unit tests
+              working-directory: cli
+              run: pnpm test

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -108,13 +108,19 @@ jobs:
                   echo "Successfully created GitHub Release v${current_package_version}"
 
     publish-jetbrains:
+        needs: publish-extension
         runs-on: ubuntu-latest
+        if: >
+            ( github.event_name == 'pull_request' &&
+            github.event.pull_request.base.ref == 'main' &&
+            contains(github.event.pull_request.title, 'Changeset version bump') ) ||
+            github.event_name == 'workflow_dispatch'
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
-                submodules: recursive
-                lfs: true
+                  submodules: recursive
+                  lfs: true
             - name: Install pnpm
               uses: pnpm/action-setup@v4
               with:
@@ -126,17 +132,19 @@ jobs:
                   cache: "pnpm"
             - uses: actions/setup-java@v4
               with:
-                  distribution: 'jetbrains'
-                  java-version: '17'
+                  distribution: "jetbrains"
+                  java-version: "21"
+                  check-latest: false
+                  token: ${{ secrets.GITHUB_TOKEN }}
             - name: Install system dependencies
               run: |
-                sudo apt-get update
-                sudo apt-get install -y \
-                  libx11-dev \
-                  libxkbfile-dev \
-                  pkg-config \
-                  build-essential \
-                  python3
+                  sudo apt-get update
+                  sudo apt-get install -y \
+                    libx11-dev \
+                    libxkbfile-dev \
+                    pkg-config \
+                    build-essential \
+                    python3
             - name: Turbo cache setup
               uses: actions/cache@v4
               with:
@@ -146,24 +154,34 @@ jobs:
                       ${{ runner.os }}-turbo-
             - name: Install dependencies
               run: pnpm install
+            - name: Create .env file
+              run: echo "KILOCODE_POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
             - name: Build
               run: pnpm run jetbrains:bundle
               shell: bash
             - name: Get bundle name
               id: get_bundle_name
               run: echo "BUNDLE_NAME=$(node jetbrains/plugin/scripts/get_bundle_name.js)" >> $GITHUB_ENV
+            - name: Attach to GitHub Release
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  current_package_version=$(node -p "require('./src/package.json').version")
+                  gh release upload "v${current_package_version}" \
+                    "jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}#JetBrains Plugin"
+                  echo "Successfully attached JetBrains plugin to GitHub Release v${current_package_version}"
             - name: Upload artifact
               uses: actions/upload-artifact@v4
               with:
                   name: ${{ env.BUNDLE_NAME }}
                   path: jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}
             - name: JetBrains Marketplace Publisher
-              run: | 
-                curl \
-                -X POST \
-                -H "Authorization: Bearer ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}" \
-                -F "file=@jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}" \
-                -F "pluginId=28350" \
-                -F "channel=stable" \
-                -F "isHidden=false" \
-                https://plugins.jetbrains.com/plugin/uploadPlugin
+              run: |
+                 curl \
+                 -X POST \
+                 -H "Authorization: Bearer ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}" \
+                 -F "file=@jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}" \
+                 -F "pluginId=28350" \
+                 -F "channel=stable" \
+                 -F "isHidden=false" \
+                 https://plugins.jetbrains.com/plugin/uploadPlugin