kirillk f6083176b1 Merge remote-tracking branch 'origin/main' into tidy-antlion ...

# Conflicts:
#	packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/profile/LoggedOutProfileUi.kt

2026-06-17 09:16:29 -04:00

..

account

chore(cli): normalize upstream annotations

2026-06-08 12:45:47 +02:00

acp

fix: complete OpenCode v1.14.51 integration

2026-06-09 11:53:08 +02:00

agent

fix: complete OpenCode v1.14.51 integration

2026-06-09 11:53:08 +02:00

auth

…

background

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

bun

…

bus

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

cli

refactor: regenerate sdk

2026-06-15 21:42:35 -03:00

config

fix(cli): keep bundled plugin initialization silent

2026-06-16 09:43:09 +00:00

control-plane

refactor: kilo compat for v1.15.4

2026-06-10 17:38:09 +02:00

effect

refactor: kilo compat for v1.15.4

2026-06-10 17:38:09 +02:00

fake

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

file

resolve merge conflicts

2026-06-10 20:03:42 +02:00

filesystem

…

fixture

fix(cli): prevent tests from deleting session database

2026-06-16 19:02:20 +02:00

format

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

git

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

ide

refactor: kilo compat for v1.14.33

2026-05-06 12:13:06 +02:00

image

resolve merge conflicts

2026-06-09 10:17:21 +02:00

installation

fix(cli): use Kilo packages for upgrades

2026-06-15 12:53:05 -03:00

kilocode

Merge remote-tracking branch 'origin/main' into tidy-antlion

2026-06-17 09:16:29 -04:00

lib

resolve merge conflicts

2026-06-09 10:17:21 +02:00

lsp

resolve merge conflicts

2026-06-10 20:03:42 +02:00

mcp

resolve merge conflicts

2026-06-09 10:17:21 +02:00

patch

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

permission

fix: complete OpenCode v1.14.51 integration

2026-06-09 11:53:08 +02:00

plugin

resolve merge conflicts

2026-06-10 20:03:42 +02:00

project

fix: resolve OpenCode v1.15.4 merge regressions

2026-06-12 19:45:14 +02:00

provider

Merge branch 'main' into feat/minimax-m3-thinking-toggle

2026-06-15 12:03:11 +02:00

pty

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

question

fix: resolve OpenCode v1.15.4 merge regressions

2026-06-12 19:45:14 +02:00

reference

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

server

fix: kilo markers

2026-06-16 00:45:53 -03:00

session

Merge remote-tracking branch 'origin/main' into tidy-antlion

2026-06-17 09:16:29 -04:00

share

refactor: regenerate sdk

2026-06-15 21:42:35 -03:00

shell

…

skill

resolve merge conflicts

2026-06-10 20:03:42 +02:00

snapshot

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

storage

fix(cli): prevent unsafe console worktree actions

2026-06-15 21:08:16 -03:00

suggestion

…

sync

refactor: kilo compat for v1.15.4

2026-06-10 17:38:09 +02:00

tool

fix: resolve OpenCode v1.15.4 merge regressions

2026-06-12 19:45:14 +02:00

util

fix: complete OpenCode v1.14.51 integration

2026-06-09 11:53:08 +02:00

v2

refactor: kilo compat for v1.15.4

2026-06-10 17:38:09 +02:00

AGENTS.md

refactor: kilo compat for v1.15.4

2026-06-10 17:38:09 +02:00

EFFECT_TEST_MIGRATION.md

refactor: kilo compat for v1.15.4

2026-06-10 17:38:09 +02:00

permission-task.test.ts

refactor: kilo compat for v1.14.51

2026-06-09 08:29:02 +02:00

preload.ts

resolve merge conflicts

2026-06-09 10:17:21 +02:00