marius-kilocode ece920c1cc Merge remote-tracking branch 'origin/main' into trial/kilo-opencode-v1.14.42 ...

# Conflicts:
#	bun.lock
#	packages/opencode/src/cli/cmd/run.ts
#	packages/opencode/src/cli/cmd/tui/context/tui-config.tsx
#	packages/opencode/src/cli/cmd/tui/thread.ts
#	packages/opencode/src/cli/cmd/tui/ui/dialog-alert.tsx
#	packages/opencode/src/kilocode/server/httpapi/instance.ts
#	packages/opencode/src/kilocode/server/instance.ts
#	packages/opencode/src/server/routes/global.ts
#	packages/opencode/src/server/routes/instance/index.ts
#	packages/opencode/src/server/routes/ui.ts
#	packages/opencode/test/kilocode/global-config-refresh.test.ts
#	packages/opencode/test/kilocode/server/httpapi-public.test.ts

2026-06-02 10:42:14 +02:00

..

account

refactor: remove module barrels (#24554)

2026-04-27 14:33:33 -04:00

acp

refactor: merge main

2026-06-01 13:54:53 -03:00

agent

resolve merge conflicts

2026-06-01 15:20:54 +02:00

auth

core: move cross-spawn-spawner to root and remove unused types

2026-04-25 14:30:16 -04:00

bun

refactor: fix typechecks

2026-04-11 13:25:06 -03:00

bus

fix(opencode): migrate Instance.provide calls to WithInstance.provide

2026-05-18 18:32:30 +02:00

cli

fix: preserve Kilo identity after upstream merge

2026-06-01 16:58:26 +02:00

config

resolve merge conflicts

2026-06-01 15:20:54 +02:00

control-plane

refactor: merge main

2026-06-01 13:54:53 -03:00

effect

refactor: kilo compat for v1.14.34

2026-05-15 09:25:13 +02:00

fake

refactor: remove module barrels (#24554)

2026-04-27 14:33:33 -04:00

file

resolve merge conflicts

2026-05-15 13:13:17 +02:00

filesystem

refactor: rename shared package to core (#24309)

2026-04-25 10:59:17 -04:00

fixture

resolve merge conflicts

2026-06-01 15:20:54 +02:00

format

core: move cross-spawn-spawner to root and remove unused types

2026-04-25 14:30:16 -04:00

git

refactor: kilo compat for v1.14.34

2026-05-15 09:25:13 +02:00

ide

refactor: kilo compat for v1.14.33

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

installation

resolve merge conflicts

2026-04-30 16:25:46 +02:00

kilocode

Merge remote-tracking branch 'origin/main' into trial/kilo-opencode-v1.14.42

2026-06-02 10:42:14 +02:00

lib

resolve merge conflicts

2026-05-15 13:13:17 +02:00

lsp

fix(opencode): migrate Instance.provide calls to WithInstance.provide

2026-05-18 18:32:30 +02:00

mcp

resolve merge conflicts

2026-05-15 13:13:17 +02:00

memory

refactor: enabled skiped test

2026-05-05 14:44:11 -03:00

patch

…

permission

Effect Migration for Kilo callsites (follow-up) (#10587)

2026-05-27 11:43:32 +02:00

plugin

refactor: merge main

2026-06-01 13:54:53 -03:00

project

resolve merge conflicts

2026-06-01 15:20:54 +02:00

provider

resolve merge conflicts

2026-06-01 15:20:54 +02:00

pty

resolve merge conflicts

2026-05-15 13:13:17 +02:00

question

test(cli): annotate Question migration coverage

2026-05-29 12:18:05 +02:00

server

refactor: merge main

2026-06-01 13:54:53 -03:00

session

resolve merge conflicts

2026-06-01 15:20:54 +02:00

share

refactor: remove module barrels (#24554)

2026-04-27 14:33:33 -04:00

shell

refactor: remove module barrels (#24554)

2026-04-27 14:33:33 -04:00

skill

resolve merge conflicts

2026-06-01 15:20:54 +02:00

snapshot

refactor: kilo compat for v1.14.34

2026-05-15 09:25:13 +02:00

storage

refactor: kilo compat for v1.14.33

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

suggestion

feat: restore suggest code review tool

2026-04-16 09:22:18 +03:00

sync

refactor: kilo compat for v1.14.41

2026-05-21 14:48:36 +02:00

tool

resolve merge conflicts

2026-06-01 15:20:54 +02:00

util

resolve merge conflicts

2026-05-15 13:13:17 +02:00

v2

refactor: kilo compat for v1.14.41

2026-05-21 14:48:36 +02:00

AGENTS.md

refactor: kilo compat for v1.14.42

2026-06-01 12:51:31 +02:00

permission-task.test.ts

refactor: kilo compat for v1.14.34

2026-05-15 09:25:13 +02:00

preload.ts

resolve merge conflicts

2026-05-15 13:13:17 +02:00