034f4d4e8d
Merge remote-tracking branch 'origin/main' into feat/cli-local-run
...
# Conflicts:
# package.json
2026-04-27 15:08:21 +03:00
94f9ddbfeb
Merge pull request #9427 from Kilo-Org/docs/autocomplete-mercury-model
...
docs: document Mercury Edit autocomplete model (BYOK only)
2026-04-27 13:46:10 +02:00
d17d4cae88
docs(kilo-docs): restore list tool docs
2026-04-27 14:45:52 +03:00
50c4a179fd
chore: update nix node_modules hashes
2026-04-27 11:45:28 +00:00
566b4507c8
Merge pull request #9477 from Kilo-Org/imanolmaiztegui/kilo-opencode-v1.14.22
...
OpenCode v1.14.22
2026-04-27 13:25:56 +02:00
4de3298777
Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.14.22
2026-04-27 13:19:20 +02:00
93044b183b
test(session): add explicit variant field to subtask cost propagation test
...
Include `variant: undefined` in metadata objects to match the expected
shape returned by the provider, ensuring the assertion compares all
fields accurately.
2026-04-27 13:17:40 +02:00
76b53c6403
fix(opencode): resolve merge conflict in session prompt test
...
Remove conflict markers left from rebasing the subtask cost
propagation test, keeping the version without the extra `variant`
field.
2026-04-27 13:16:32 +02:00
4267cd319b
test(session): add test for handleSubtask propagating child session cost to wrapper
...
Verify that when a subtask completes, the child session's assistant
cost is correctly propagated to the parent wrapper message. This
covers the cost aggregation path in handleSubtask for subagent
interactions.
2026-04-27 13:15:27 +02:00
438316b09a
fix(cli): stop hardcoding opencode in kilo pr ( #6824 )
...
* fix(cli): stop hardcoding opencode in kilo pr
* fix(cli): stop hardcoding opencode in kilo pr
* fix pr command cli resolution for subcommand args
2026-04-27 13:14:47 +02:00
f7bea4f520
docs: add @git-changes to VS Code context mentions ( #9505 )
...
* docs: add @git-changes mention to VS Code context mentions page
* Apply suggestion from @kilo-code-bot[bot]
Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
---------
Co-authored-by: scuttlebot <scuttlebot@olearycrew.com >
Co-authored-by: Marius <marius@kilocode.ai >
Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
2026-04-27 13:14:47 +02:00
2704656e39
refactor(cli): simplify stats cost
2026-04-27 13:14:10 +02:00
12e92fa247
chore(cli): mark stats cost line
2026-04-27 13:14:10 +02:00
9e419b3e86
fix(cli): count subagent stats
2026-04-27 13:14:10 +02:00
2a94a0cc11
fix(cli): ignore deleted cost sync
2026-04-27 13:14:10 +02:00
af0227b1ab
fix(cli): exclude subagent sessions from stats aggregate
...
The task tool propagates each child session's total cost into the parent's tool-wrapper assistant message. Counting both root and child sessions in `kilo stats` would double-count that contribution. Filter `getAllSessions()` to root sessions (parent_id IS NULL), matching how the TUI session list and web sidebar already treat child sessions.
2026-04-27 13:14:10 +02:00
d9bed85e78
fix(cli): sync processor cost after subagent propagation
...
finish-step and cleanup previously re-wrote the parent assistant message with a stale in-memory cost, clobbering the subagent cost written by task.ts during tool execution. Refresh from DB before each write so the propagated cost is preserved across steps. Verified live via side-by-side `kilo serve` vs dev `bun serve` with 2 parallel subagents; parent now shows own LLM + children, matching real spend.
2026-04-27 13:14:10 +02:00
f57479c657
fix(cli): serialize concurrent subagent cost propagation
2026-04-27 13:14:10 +02:00
aaaa191b76
fix(cli): include subagent costs in session total ( #6321 )
...
When a session spawned subagents via the task tool, the displayed cost reflected only the parent's own LLM steps. Propagate each subagent's total up to the invoking assistant message so every UI sums the full tree.
2026-04-27 13:14:10 +02:00
baf4bae91c
fix(cli): stop hardcoding opencode in kilo pr ( #6824 )
...
* fix(cli): stop hardcoding opencode in kilo pr
* fix(cli): stop hardcoding opencode in kilo pr
* fix pr command cli resolution for subcommand args
2026-04-27 12:57:30 +02:00
99ffef184a
Merge branch 'main' into feat/cli-local-run
2026-04-27 13:46:23 +03:00
2d8fd28fd1
docs: clarify Mercury Edit BYOK is temporary
2026-04-27 10:44:06 +00:00
a38393af9c
Merge branch 'main' into docs/autocomplete-mercury-model
2026-04-27 12:42:15 +02:00
87d1d96487
docs: add @git-changes to VS Code context mentions ( #9505 )
...
* docs: add @git-changes mention to VS Code context mentions page
* Apply suggestion from @kilo-code-bot[bot]
Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
---------
Co-authored-by: scuttlebot <scuttlebot@olearycrew.com >
Co-authored-by: Marius <marius@kilocode.ai >
Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
2026-04-27 10:41:43 +00:00
5be897cec3
Merge pull request #9448 from Kilo-Org/fix/costs-of-subagents
...
fix(cli): include subagent costs in session total
2026-04-27 13:30:17 +03:00
6d5f686b8d
Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.14.22
2026-04-27 12:30:06 +02:00
6b31ddd168
Merge branch 'main' into feat/cli-local-run
2026-04-27 13:29:37 +03:00
b344ac97c6
fix(vscode): restore disabled provider management ( #9551 )
...
* fix(vscode): restore disabled provider management
* fix(vscode): allow disabling Kilo Gateway
* fixup! fix(vscode): allow disabling Kilo Gateway
* fixup! fixup! fix(vscode): allow disabling Kilo Gateway
* chore: update kilo-vscode visual regression baselines
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2026-04-27 12:22:43 +02:00
dfcb3f4e5d
Merge branch 'feat/cli-local-run' of https://github.com/Kilo-Org/kilocode into feat/cli-local-run
2026-04-27 13:22:09 +03:00
41e63f6d68
chore: fix annotation markers after main merge
2026-04-27 13:21:47 +03:00
fc9cf245a5
Merge pull request #9310 from Kilo-Org/mark/mercury-autocomplete-integration
...
feat(autocomplete): add Mercury Edit by Inception as selectable autocomplete model
2026-04-27 12:18:20 +02:00
e101781bfc
Merge branch 'fix/costs-of-subagents' of https://github.com/Kilo-Org/kilocode into fix/costs-of-subagents
2026-04-27 13:11:54 +03:00
16abe9679f
chore(cli): fix type error after main merge
...
Add missing 'variant' property to task tool metadata in prompt-effect test, required after upstream added model variant support to the task tool's ExecuteResult type.
2026-04-27 13:11:31 +03:00
60e8aafe80
Merge pull request #9552 from Kilo-Org/mark/9527-clear-agent-model-override
...
fix(vscode): allow clearing agent model override
2026-04-27 12:10:31 +02:00
b938e7d042
Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.14.22
2026-04-27 12:05:36 +02:00
bb81bca909
Merge remote-tracking branch 'origin/main' into feat/cli-local-run
2026-04-27 13:03:16 +03:00
67993d094e
Merge remote-tracking branch 'origin/main' into fix/costs-of-subagents
2026-04-27 13:03:15 +03:00
c5614cc54e
feat(vscode): open config files from settings ( #9548 )
...
* feat(vscode): open config files from settings
* fix(vscode): localize config file picker
* chore(kilo-docs): update source links
* fix(vscode): reuse settings translations for config picker
* chore: update kilo-vscode visual regression baselines
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2026-04-27 10:00:14 +00:00
99493f42a7
test(vscode): ensure autocomplete model enum and registry stay in sync
2026-04-27 11:46:53 +02:00
dddc92a01a
Merge pull request #9426 from Kilo-Org/fix/statusbar-kilo-logo
...
fix(vscode): add Kilo logo icon to status bar
2026-04-27 11:25:01 +02:00
a63a27a366
Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.14.22
2026-04-27 11:23:37 +02:00
3f0bf322c1
fix(vscode): allow clearing agent model override by sending null
...
Clearing the Model Override field for native agents (e.g. Explore,
General) sent the patch as `{ model: undefined }`. JSON.stringify drops
undefined, so the backend received an empty patch, the override stayed
in kilo.json, and the next configUpdated push repopulated the field.
Send `null` instead — the backend's patchJsonc already treats null as
a delete sentinel (matches the pattern already used in ModelsTab and
AutoApproveTab). Fixes #9527 .
2026-04-27 09:18:42 +00:00
a5bca011a1
Allow ChatGPT login over OpenAI provider config ( #9549 )
...
* fix: allow ChatGPT login over OpenAI provider config
Let users with inherited or globally configured OpenAI API keys sign in with ChatGPT for Codex without first removing their existing provider setup.
* fix: satisfy provider login ci checks
Annotate Kilo-specific shared CLI changes and apply webview formatting so the existing ChatGPT login flow passes CI.
2026-04-27 11:17:04 +02:00
dbf113524e
fix(cli): guard external directory boundaries ( #9484 )
...
* fix(cli): guard external directory boundaries
* test(cli): move boundary regressions to kilocode tests
* fix(cli): scope root guard to permission prompts
* test(cli): isolate boundary regression fixtures
* test(cli): simplify boundary regression coverage
2026-04-27 11:15:57 +02:00
6965d56918
release: v7.2.25
2026-04-27 08:58:51 +00:00
f067a908a9
docs: add mercury autocomplete changeset
2026-04-27 08:56:03 +00:00
f60cbb9e92
Merge pull request #9546 from Kilo-Org/fix/queued-messages-test
...
test(cli): guard queued prompt request tail
2026-04-27 11:56:01 +03:00
db1227da2c
fix(vscode): validate autocomplete model settings
2026-04-27 08:55:44 +00:00
7ac2a01068
test(vscode): cover autocomplete model selection
2026-04-27 08:54:51 +00:00
1f8d9aac64
Merge branch 'main' into mark/mercury-autocomplete-integration
2026-04-27 08:54:17 +00:00
Alex Alecu