Skip to content

Commit 151f4bc

Browse files
committed
Merge branch 'main' into roo-v3.30.0
# Conflicts: # packages/types/src/providers/cerebras.ts # src/core/prompts/tools/native-tools/getAllowedJSONToolsForMode.ts # src/extension.ts # webview-ui/src/components/ui/hooks/useSelectedModel.ts
2 parents 830d9f5 + 7feb3ff commit 151f4bc

File tree

98 files changed

+3897
-827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+3897
-827
lines changed

.changeset/green-melons-retire.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"kilo-code": minor
3+
---
4+
5+
Add Native MCP Support for JSON Tool Calling

.changeset/long-foxes-win.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/loose-jars-obey.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/lovely-views-press.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/puny-brooms-listen.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/spicy-kings-appear.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/tender-files-leave.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"kilo-code": patch
3+
---
4+
5+
fix(virtual-quota): display active model in UI for the frontend
6+
7+
When the backend switches the model, it now sends out a "model has changed" signal by emitting event.
8+
The main application logic catches this signal and immediately tells the user interface to refresh itself.
9+
The user interface then updates the display to show the name of the new, currently active model.
10+
This will also keep the backend and the frontend active model in sync

.changeset/yellow-monkeys-tease.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/marketplace-publish.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Publish Extension
22
on:
3-
pull_request:
4-
types: [closed]
53
workflow_dispatch:
64

75
env:
@@ -16,11 +14,6 @@ jobs:
1614
runs-on: ubuntu-latest
1715
permissions:
1816
contents: write # Required for pushing tags.
19-
if: >
20-
( github.event_name == 'pull_request' &&
21-
github.event.pull_request.base.ref == 'main' &&
22-
contains(github.event.pull_request.title, 'Changeset version bump') ) ||
23-
github.event_name == 'workflow_dispatch'
2417
steps:
2518
- name: Checkout code
2619
uses: actions/checkout@v4
@@ -110,11 +103,6 @@ jobs:
110103
publish-jetbrains:
111104
needs: publish-extension
112105
runs-on: ubuntu-latest
113-
if: >
114-
( github.event_name == 'pull_request' &&
115-
github.event.pull_request.base.ref == 'main' &&
116-
contains(github.event.pull_request.title, 'Changeset version bump') ) ||
117-
github.event_name == 'workflow_dispatch'
118106
steps:
119107
- name: Checkout code
120108
uses: actions/checkout@v4
@@ -177,11 +165,11 @@ jobs:
177165
path: jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}
178166
- name: JetBrains Marketplace Publisher
179167
run: |
180-
curl \
181-
-X POST \
182-
-H "Authorization: Bearer ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}" \
183-
-F "file=@jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}" \
184-
-F "pluginId=28350" \
185-
-F "channel=stable" \
186-
-F "isHidden=false" \
187-
https://plugins.jetbrains.com/plugin/uploadPlugin
168+
curl \
169+
-X POST \
170+
-H "Authorization: Bearer ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}" \
171+
-F "file=@jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}" \
172+
-F "pluginId=28350" \
173+
-F "channel=stable" \
174+
-F "isHidden=false" \
175+
https://plugins.jetbrains.com/plugin/uploadPlugin

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# kilo-code
22

3+
## [v4.115.0]
4+
5+
- [#3486](https://github.com/Kilo-Org/kilocode/pull/3486) [`2b89d84`](https://github.com/Kilo-Org/kilocode/commit/2b89d8472123e48db866e10a88b5b6160812d73e) Thanks [@markijbema](https://github.com/markijbema)! - Show MCP tool instead of server name when asked to approve a tool
6+
7+
- [#3466](https://github.com/Kilo-Org/kilocode/pull/3466) [`e623ce1`](https://github.com/Kilo-Org/kilocode/commit/e623ce146bbad7453355ee84a4b4bb2fc894b031) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Thanks @pranjaldatta! Added support for Inception as a provider
8+
9+
- [#2435](https://github.com/Kilo-Org/kilocode/pull/2435) [`c13fe3c`](https://github.com/Kilo-Org/kilocode/commit/c13fe3c634496b9e1fc08371822a4071407ff9bc) Thanks [@catrielmuller](https://github.com/catrielmuller)! - Auto Cleanup automatically manages your task history by removing old tasks to free up disk space and improve performance - https://kilocode.ai/docs/advanced-usage/auto-cleanup
10+
11+
### Patch Changes
12+
13+
- [#3428](https://github.com/Kilo-Org/kilocode/pull/3428) [`b3c0e10`](https://github.com/Kilo-Org/kilocode/commit/b3c0e102cad5e48fe1389dc55a287dfc0072ed33) Thanks [@markijbema](https://github.com/markijbema)! - Do less requests for autocomplete when no completion could be found
14+
15+
- [#3502](https://github.com/Kilo-Org/kilocode/pull/3502) [`94552b8`](https://github.com/Kilo-Org/kilocode/commit/94552b8704efa80a9f7aee8ad601a3f291ffe7f2) Thanks [@catrielmuller](https://github.com/catrielmuller)! - Revert orphaned partial ask messages fix
16+
317
## [v4.114.1]
418

519
- [#3188](https://github.com/Kilo-Org/kilocode/pull/3188) [`131fa0e`](https://github.com/Kilo-Org/kilocode/commit/131fa0ee68d6f47172a968489129071a7da88de3) Thanks [@NikoDi2000](https://github.com/NikoDi2000)! - Add missing enable/disable word wrap tooltips

0 commit comments

Comments
 (0)