Skip to content

Commit a7a0a4f

Browse files
authored
Merge branch 'main' into roo-v3.30.0
2 parents ba2bd91 + c79df25 commit a7a0a4f

File tree

77 files changed

+3718
-1082
lines changed

Some content is hidden

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

77 files changed

+3718
-1082
lines changed

.changeset/green-melons-retire.md

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

.changeset/grumpy-cities-wave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"kilocode-docs": patch
3+
---
4+
5+
add docs for env var overrides in cli

.changeset/shaggy-sloths-clean.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@kilocode/cli": minor
3+
---
4+
5+
add shell mode

.changeset/silly-guests-wonder.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@kilocode/cli": minor
3+
---
4+
5+
adds support for overriding config with env vars

.changeset/tender-files-leave.md

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

.github/copilot-instructions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ let j = 3
5151

5252
## Special Cases
5353

54-
### Kilocode specific file
55-
56-
- if the filename or directory name contains kilocode no marking with comments is required
57-
- if the file lives inside of the jetbrains/ or cli/ root folder, no marking with comments is required
58-
5954
### New Files
6055

6156
If you're creating a completely new file that doesn't exist in Roo, add this comment at the top:
6257

6358
```
6459
// kilocode_change - new file
6560
```
61+
62+
### Kilocode specific file - these rules take precedence over all other rules above
63+
64+
- if the filename or directory name contains kilocode no marking with comments is required
65+
- if the file lives inside of the jetbrains/ or cli/ root folder, no marking with comments is required

.github/workflows/marketplace-publish.yml

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

57
env:
@@ -14,6 +16,11 @@ jobs:
1416
runs-on: ubuntu-latest
1517
permissions:
1618
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'
1724
steps:
1825
- name: Checkout code
1926
uses: actions/checkout@v4
@@ -103,6 +110,11 @@ jobs:
103110
publish-jetbrains:
104111
needs: publish-extension
105112
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'
106118
steps:
107119
- name: Checkout code
108120
uses: actions/checkout@v4
@@ -165,11 +177,11 @@ jobs:
165177
path: jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}
166178
- name: JetBrains Marketplace Publisher
167179
run: |
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
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

CHANGELOG.md

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

3+
## [v4.116.1]
4+
5+
- [#3533](https://github.com/Kilo-Org/kilocode/pull/3533) [`f5bb82d`](https://github.com/Kilo-Org/kilocode/commit/f5bb82ddf4038ed2d9e5a1266c9e6b0dc09c0af5) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Fix hang at startup
6+
7+
## [v4.116.0]
8+
9+
- [#3288](https://github.com/Kilo-Org/kilocode/pull/3288) [`afeca17`](https://github.com/Kilo-Org/kilocode/commit/afeca176f4ef7d227831715b5e5a672fcf3fe58f) Thanks [@mcowger](https://github.com/mcowger)! - Add Native MCP Support for JSON Tool Calling
10+
11+
### Patch Changes
12+
13+
- [#3471](https://github.com/Kilo-Org/kilocode/pull/3471) [`9895a95`](https://github.com/Kilo-Org/kilocode/commit/9895a959b9bb8a14aab6ec11267a2bb0e12fb78c) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Allow native tool calling fro Qwen Code provider
14+
15+
- [#3513](https://github.com/Kilo-Org/kilocode/pull/3513) [`ff2e459`](https://github.com/Kilo-Org/kilocode/commit/ff2e4595777683265559f81f82dd9cbb0dc2e9f3) Thanks [@markijbema](https://github.com/markijbema)! - Prevent autocomplete from suggesting duplicating the previous or next line
16+
17+
- [#3523](https://github.com/Kilo-Org/kilocode/pull/3523) [`ba5416a`](https://github.com/Kilo-Org/kilocode/commit/ba5416ae3083fb5225ed7e9f0e1018203e611b84) Thanks [@markijbema](https://github.com/markijbema)! - Removed the gutter animation for autocomplete
18+
19+
- [#2893](https://github.com/Kilo-Org/kilocode/pull/2893) [`37d8493`](https://github.com/Kilo-Org/kilocode/commit/37d8493a4d2629d0498f089b40f850ddae0c91fc) Thanks [@ivanarifin](https://github.com/ivanarifin)! - fix(virtual-quota): display active model in UI for the frontend
20+
21+
When the backend switches the model, it now sends out a "model has changed" signal by emitting event.
22+
The main application logic catches this signal and immediately tells the user interface to refresh itself.
23+
The user interface then updates the display to show the name of the new, currently active model.
24+
This will also keep the backend and the frontend active model in sync
25+
326
## [v4.115.0]
427

528
- [#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

apps/kilocode-docs/docs/cli.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,14 @@ This instructs the AI to proceed without user input.
244244
echo "Implement the new feature" | kilocode --auto --timeout 600
245245
```
246246
247+
## Environment Variable Overrides
248+
249+
The CLI supports overriding config values with environment variables. The supported environment variables are:
250+
251+
- `KILO_PROVIDER`: Override the active provider ID
252+
- For `kilocode` provider: `KILOCODE_<FIELD_NAME>` (e.g., `KILOCODE_MODEL` → `kilocodeModel`)
253+
- For other providers: `KILO_<FIELD_NAME>` (e.g., `KILO_API_KEY` → `apiKey`)
254+
247255
## Local Development
248256

249257
### DevTools
@@ -257,4 +265,3 @@ Use the `/teams` command to see a list of all organizations you can switch into.
257265
Use `/teams select` and start typing the team name to switch teams.
258266

259267
The process is the same when switching into a Team or Enterprise organization.
260-
The process is the same when switching into a Team or Enterprise organization.

apps/playwright-e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"clean": "rimraf test-results playwright-report .turbo"
1313
},
1414
"devDependencies": {
15-
"@playwright/test": "^1.53.1",
15+
"@playwright/test": "^1.56.1",
1616
"@roo-code/config-eslint": "workspace:^",
1717
"@roo-code/config-typescript": "workspace:^",
1818
"@roo-code/types": "workspace:^",

0 commit comments

Comments
 (0)