Catriel Müller d997abd5ef Merge remote-tracking branch 'origin/main' into shy-tellurium ...

# Conflicts:
#	bun.lock
#	packages/opencode/src/cli/cmd/run/footer.ts
#	packages/opencode/src/cli/cmd/run/footer.view.tsx
#	packages/opencode/src/cli/cmd/tui/context/sync.tsx
#	packages/opencode/src/kilocode/tool/registry.ts
#	packages/opencode/src/session/session.ts
#	packages/opencode/src/tool/shell.ts
#	packages/opencode/test/kilocode/task-nesting.test.ts
#	packages/opencode/test/kilocode/tool-registry-indexing.test.ts
#	packages/opencode/test/session/prompt.test.ts

2026-06-29 14:18:08 -03:00

..

account

resolve merge conflicts

2026-06-17 10:42:43 +02:00

acp

refactor: kilo compat for v1.15.13

2026-06-18 13:41:13 +02:00

agent

Merge remote-tracking branch 'origin/main' into shy-tellurium

2026-06-29 14:18:08 -03: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.15.9

2026-06-15 14:48:05 +02:00

cli

Merge remote-tracking branch 'origin/main' into shy-tellurium

2026-06-29 14:18:08 -03:00

config

fix(cli): stop loading .opencode config directories

2026-06-24 17:01:32 +02:00

control-plane

refactor: kilo compat for v1.15.9

2026-06-15 14:48:05 +02:00

effect

refactor: kilo compat for v1.15.13

2026-06-18 13:41:13 +02:00

fake

refactor: kilo compat for v1.14.51

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

file

refactor: kilo compat for v1.15.9

2026-06-15 14:48:05 +02:00

filesystem

…

fixture

Merge remote-tracking branch 'origin/main' into rainbow-bagel

2026-06-29 09:10:46 -03:00

fixtures/recordings

fix(core): correct listener routes, test expectations, and comment markers post-merge

2026-06-19 13:17:38 +02:00

format

refactor: kilo compat for v1.15.9

2026-06-15 14:48:05 +02:00

git

refactor: kilo compat for v1.14.51

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

ide

…

image

resolve merge conflicts

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

installation

Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.15.9

2026-06-17 14:03:20 +02:00

kilocode

Merge remote-tracking branch 'origin/main' into shy-tellurium

2026-06-29 14:18:08 -03:00

lib

resolve merge conflicts

2026-06-17 10:42:43 +02:00

lsp

resolve merge conflicts

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

mcp

test(sandbox): cover production network classification

2026-06-23 21:14:33 +02:00

patch

refactor: kilo compat for v1.14.51

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

permission

resolve merge conflicts

2026-06-17 10:42:43 +02:00

plugin

Merge pull request #11638 from Kilo-Org/cottony-fan

2026-06-29 13:24:05 +02:00

project

resolve merge conflicts

2026-06-19 09:57:42 +02:00

provider

Merge pull request #11638 from Kilo-Org/cottony-fan

2026-06-29 13:24:05 +02:00

pty

refactor: kilo compat for v1.15.13

2026-06-18 13:41:13 +02:00

question

resolve merge conflicts

2026-06-17 10:42:43 +02:00

reference

refactor: kilo compat for v1.15.9

2026-06-15 14:48:05 +02:00

server

Merge pull request #11638 from Kilo-Org/cottony-fan

2026-06-29 13:24:05 +02:00

session

feat(cli): show routed step models

2026-06-22 23:39:14 +03:00

share

Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.15.9

2026-06-17 14:03:20 +02:00

shell

…

skill

fix(cli): stop loading .opencode config directories

2026-06-24 17:01:32 +02:00

snapshot

refactor: kilo compat for v1.15.9

2026-06-15 14:48:05 +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.9

2026-06-15 14:48:05 +02:00

tool

Merge remote-tracking branch 'origin/main' into shy-tellurium

2026-06-29 14:18:08 -03:00

util

refactor: kilo compat for v1.15.9

2026-06-15 14:48:05 +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.15.9

2026-06-15 14:48:05 +02:00

preload.ts

resolve merge conflicts

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