marius-kilocode aeef0df2f9 resolve merge conflicts

2026-06-02 16:13:31 +02:00

..

account

refactor: remove module barrels (#24554)

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

acp

resolve merge conflicts

2026-06-02 16:13:31 +02:00

agent

resolve merge conflicts

2026-06-02 16:13:31 +02:00

auth

resolve merge conflicts

2026-06-02 16:13:31 +02:00

bus

resolve merge conflicts

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

cli

resolve merge conflicts

2026-06-02 16:13:31 +02:00

command

resolve merge conflicts

2026-06-02 16:13:31 +02:00

config

resolve merge conflicts

2026-06-02 16:13:31 +02:00

control-plane

refactor: kilo compat for v1.14.46

2026-06-02 13:51:23 +02:00

effect

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

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

env

refactor: remove module barrels (#24554)

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

file

resolve merge conflicts

2026-06-02 16:13:31 +02:00

format

refactor: kilo compat for v1.14.46

2026-06-02 13:51:23 +02:00

git

Effect Migration for Kilo callsites (#10572)

2026-05-26 12:51:21 +02:00

id

resolve merge conflicts

2026-05-22 09:01:40 +02:00

ide

refactor: kilo compat for v1.14.33

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

installation

refactor: kilo compat for v1.14.33

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

kilo-sessions

resolve merge conflicts

2026-06-02 16:13:31 +02:00

kilocode

resolve merge conflicts

2026-06-02 16:13:31 +02:00

lsp

resolve merge conflicts

2026-06-02 16:13:31 +02:00

mcp

resolve merge conflicts

2026-06-02 16:13:31 +02:00

patch

refactor(cli): flatten Encoding/EncodedIO namespaces to module exports

2026-05-05 14:12:51 +00:00

permission

resolve merge conflicts

2026-06-02 16:13:31 +02:00

plugin

refactor: merge main

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

project

resolve merge conflicts

2026-06-02 16:13:31 +02:00

provider

resolve merge conflicts

2026-06-02 16:13:31 +02:00

pty

resolve merge conflicts

2026-06-02 16:13:31 +02:00

question

resolve merge conflicts

2026-06-02 16:13:31 +02:00

server

resolve merge conflicts

2026-06-02 16:13:31 +02:00

session

resolve merge conflicts

2026-06-02 16:13:31 +02:00

share

resolve merge conflicts

2026-06-02 16:13:31 +02:00

shell

refactor: kilo compat for v1.14.33

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

skill

resolve merge conflicts

2026-06-02 16:13:31 +02:00

snapshot

resolve merge conflicts

2026-06-02 16:13:31 +02:00

storage

resolve merge conflicts

2026-06-02 16:13:31 +02:00

suggestion

…

sync

refactor: kilo compat for v1.14.46

2026-06-02 13:51:23 +02:00

tool

resolve merge conflicts

2026-06-02 16:13:31 +02:00

util

resolve merge conflicts

2026-06-02 16:13:31 +02:00

v2

refactor: kilo compat for v1.14.46

2026-06-02 13:51:23 +02:00

worktree

resolve merge conflicts

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

audio.d.ts

…

index.ts

Merge branch 'main' into seen-turnip

2026-06-01 22:03:27 -03:00

markdown.d.ts

refactor: kilo compat for v1.14.46

2026-06-02 13:51:23 +02:00

md.d.ts

…

node.ts

refactor: remove module barrels (#24554)

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

sql.d.ts

…

temporary.ts

…