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

# Conflicts:
#	bun.lock
#	packages/core/src/v1/permission.ts
#	packages/opencode/src/acp/permission.ts
#	packages/opencode/src/cli/cmd/tui.ts
#	packages/opencode/src/skill/discovery.ts
#	packages/opencode/src/skill/index.ts
#	packages/opencode/test/cli/run/run-process.test.ts
#	packages/opencode/test/skill/discovery.test.ts
#	packages/opencode/test/tool/registry.test.ts
#	packages/sdk/openapi.json
#	packages/server/src/handlers/pty.ts
This commit is contained in:
Johnny Amancio
2026-07-30 16:32:39 +02:00
367 changed files with 13545 additions and 2068 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@kilocode/upstream-merge",
"version": "7.4.16",
"version": "7.4.17",
"private": true,
"type": "module",
"description": "Scripts for automating upstream opencode merges into Kilo",