Johnny Eric Amancio c9861e9548 resolve merge conflicts

2026-08-24 15:08:20 +02:00

..

account

fix: address post-merge validation findings

2026-08-05 21:08:55 +02:00

acp

fix(acp): correlate idle events with current turn

2026-08-19 16:34:37 +02:00

agent

fix(cli): stop read-only agent bash denies from blocking delegated subagents (#12373)

2026-08-13 21:15:36 +02:00

auth

…

background

…

bun

…

cli

fix(cli): accept JWT share tokens when importing sessions (#13183)

2026-08-18 11:43:31 +02:00

config

resolve merge conflicts

2026-08-24 15:08:20 +02:00

control-plane

…

effect

chore: checkpoint before merging main

2026-08-19 14:50:11 +02:00

fake

…

filesystem

…

fixture

Merge remote-tracking branch 'origin/main' into johnnyeric/kilo-opencode-v1.18.0

2026-08-06 14:02:04 +02:00

fixtures/recordings

…

format

…

git

…

ide

…

image

…

installation

…

kilocode

resolve merge conflicts

2026-08-24 15:08:20 +02:00

lib

…

lsp

fix: address merge review findings and CI guards

2026-08-10 14:48:08 +02:00

mcp

merge: upstream v1.18.13

2026-08-06 00:31:20 +02:00

patch

…

permission

…

plugin

resolve merge conflicts

2026-08-24 15:08:20 +02:00

project

…

provider

resolve merge conflicts

2026-08-24 15:08:20 +02:00

question

…

server

resolve merge conflicts

2026-08-24 15:08:20 +02:00

session

resolve merge conflicts

2026-08-24 15:08:20 +02:00

share

…

skill

…

snapshot

…

storage

fix(ci): satisfy PR-only checks — typecheck narrowing and kilocode_change markers

2026-08-13 22:04:23 -06:00

suggestion

…

tool

Merge branch 'main' into feat/mcp-apps-experimental

2026-08-20 18:19:10 +02:00

util

fix: address merge review findings and CI guards

2026-08-10 14:48:08 +02:00

v2

…

AGENTS.md

…

EFFECT_TEST_MIGRATION.md

…

event-manifest.test.ts

refactor(cli): tighten tui-worktree, log exclude-write failures, fix event count

2026-08-05 11:56:33 +02:00

permission-task.test.ts

…

preload.ts

test: keep the database file name out of the preload comment

2026-08-13 14:11:01 -06:00