Skip to content

Commit f41e6b5

Browse files
authored
Merge branch 'main' into mark/lessrequests
2 parents 048c673 + 0597708 commit f41e6b5

File tree

95 files changed

+746
-17446
lines changed

Some content is hidden

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

95 files changed

+746
-17446
lines changed

.changeset/bright-hornets-bow.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+
Switched autocomplete to showing completions inline

.changeset/green-teams-pull.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@kilocode/cli": patch
3+
---
4+
5+
Improved stability of the approval menu, preventing it from showing when you don't expect it

.changeset/hip-lands-search.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"kilo-code": patch
3+
---
4+
5+
Fix broken sign-in links

.github/workflows/code-qa.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ jobs:
162162
with:
163163
distribution: 'jetbrains'
164164
java-version: '21'
165+
check-latest: false
166+
token: ${{ secrets.GITHUB_TOKEN }}
165167
- name: Install system dependencies
166168
run: |
167169
sudo apt-get update
@@ -209,4 +211,4 @@ jobs:
209211
run: pnpm install
210212
- name: Run unit tests
211213
working-directory: cli
212-
run: pnpm test
214+
run: pnpm test

.github/workflows/marketplace-publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ jobs:
134134
with:
135135
distribution: "jetbrains"
136136
java-version: "21"
137+
check-latest: false
138+
token: ${{ secrets.GITHUB_TOKEN }}
137139
- name: Install system dependencies
138140
run: |
139141
sudo apt-get update

.vscode/launch.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,23 @@
4444
},
4545
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
4646
"presentation": { "hidden": false, "group": "tasks", "order": 1 }
47+
},
48+
{
49+
"name": "Run Extension [Local Backend]",
50+
"type": "extensionHost",
51+
"request": "launch",
52+
"runtimeExecutable": "${execPath}",
53+
"args": ["--extensionDevelopmentPath=${workspaceFolder}/src", "--disable-extensions"],
54+
"sourceMaps": true,
55+
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
56+
"preLaunchTask": "${defaultBuildTask}",
57+
"env": {
58+
"NODE_ENV": "development",
59+
"VSCODE_DEBUG_MODE": "true",
60+
"KILOCODE_BACKEND_BASE_URL": "${input:kilocodeBackendBaseUrl}"
61+
},
62+
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
63+
"presentation": { "hidden": false, "group": "tasks", "order": 2 }
4764
}
4865
],
4966
"inputs": [
@@ -52,6 +69,12 @@
5269
"description": "Directory the dev extension will open in",
5370
"default": "${workspaceFolder}/launch",
5471
"type": "promptString"
72+
},
73+
{
74+
"id": "kilocodeBackendBaseUrl",
75+
"description": "Override the kilocode backend base URL",
76+
"default": "http://localhost:3000",
77+
"type": "promptString"
5578
}
5679
]
5780
}

DEVELOPMENT.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,18 @@ These hooks help maintain code quality and consistency. If you encounter issues
248248
- Check the Output panel in VSCode (View > Output) and select "Kilo Code" from the dropdown
249249
- For webview issues, use the browser developer tools in the webview (right-click > "Inspect Element")
250250
251+
### Testing with Local Backend
252+
253+
To test the extension against a local Kilo Code backend:
254+
255+
1. **Set up your local backend** at `http://localhost:3000`
256+
2. **Use the "Run Extension [Local Backend]" launch configuration**:
257+
- Go to Run and Debug (Ctrl+Shift+D)
258+
- Select "Run Extension [Local Backend]" from the dropdown
259+
- Press F5 to start debugging
260+
261+
This automatically sets the `KILOCODE_BACKEND_BASE_URL` environment variable, making all sign-in/sign-up buttons point to your local backend instead of production.
262+
251263
## Contributing
252264
253265
We welcome contributions to Kilo Code! Here's how you can help:

apps/kilocode-docs/docs/cli.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ to start the CLI and begin a new task with your preferred model and relevant mod
4242
| `/model list` | List available models | |
4343
| `/model info` | Prints description for a specific model by name | `/model info z-ai/glm-4.5v` |
4444
| `/model select` | Select and switch to a new model | |
45+
| `/config` | Open configuration editor (same as `kilocode config`) | |
4546
| `/new` | Start a new task with the agent with a clean slate | |
4647
| `/help` | List available commands and how to use them | |
4748
| `/exit` | Exit the CLI | |
@@ -56,6 +57,10 @@ You can reference the [Provider Configuration Guide](https://github.com/Kilo-Org
5657

5758
to complete configuration with an interactive workflow on the command line.
5859

60+
:::tip
61+
You can also use the `/config` slash command during an interactive session, which is equivalent to running `kilocode config`.
62+
:::
63+
5964
## Autonomous mode (Non-Interactive)
6065

6166
Autonomous mode allows Kilo Code to run in automated environments like CI/CD pipelines without requiring user interaction.

apps/playwright-e2e/helpers/webview-helpers.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,18 @@ export async function clickSaveSettingsButton(webviewFrame: FrameLocator): Promi
100100
}
101101
}
102102

103+
/**
104+
* Waits for all tooltips to be dismissed before proceeding.
105+
* This is necessary when tooltips appear after clicking elements and need to animate away
106+
* before taking screenshots to avoid inconsistent visual states.
107+
*/
108+
export async function waitForTooltipsToDismiss(webviewFrame: FrameLocator): Promise<void> {
109+
const tooltipContent = webviewFrame.locator('[data-slot="tooltip-content"]')
110+
await tooltipContent.waitFor({ state: "detached", timeout: 3000 }).catch(() => {
111+
// If timeout, tooltips should be gone by now anyway
112+
})
113+
}
114+
103115
/**
104116
* Freezes all GIFs on the page by converting them to static PNG images.
105117
* Also sets up a MutationObserver to handle dynamically added GIFs.

apps/playwright-e2e/tests/chat.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test.describe("E2E Chat Test", () => {
1717
await waitForWebviewText(page, "Generate, refactor, and debug code with AI assistance")
1818

1919
await (await getChatInput(page)).focus()
20-
await page.waitForTimeout(1000) // Let the page settle to avoid flakes
20+
await page.waitForTimeout(3000) // Let the page settle to avoid flakes
2121
await takeScreenshot("ready-to-chat")
2222

2323
// Don't take any more screenshots after the reponse starts-

0 commit comments

Comments
 (0)