opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-08-28 19:11:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserve latest main state after merge

Browse Source
This commit is contained in:
marius-kilocode
2026-06-12 20:02:44 +02:00
parent 390b0c3eb7
commit 6880928994
25 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bun.lock
+20 -20
View File
@@ -33,7 +33,7 @@
},
"packages/core": {
"name": "@opencode-ai/core",
"version": "7.3.44",
"version": "7.3.45",
"bin": {
"opencode": "./bin/opencode",
},
@@ -96,7 +96,7 @@
},
"packages/http-recorder": {
"name": "@opencode-ai/http-recorder",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@effect/platform-node": "catalog:",
"effect": "catalog:",
@@ -109,7 +109,7 @@
},
"packages/kilo-console": {
"name": "@kilocode/kilo-console",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/kilo-web-ui": "workspace:*",
"@kilocode/sdk": "workspace:*",
@@ -131,7 +131,7 @@
},
"packages/kilo-docs": {
"name": "@kilocode/kilo-docs",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@docsearch/css": "^4",
"@docsearch/js": "^4",
@@ -161,7 +161,7 @@
},
"packages/kilo-gateway": {
"name": "@kilocode/kilo-gateway",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@ai-sdk/alibaba": "1.0.17",
"@ai-sdk/anthropic": "3.0.71",
@@ -198,7 +198,7 @@
},
"packages/kilo-i18n": {
"name": "@kilocode/kilo-i18n",
"version": "7.3.44",
"version": "7.3.45",
"devDependencies": {
"@tsconfig/node22": "catalog:",
"@types/bun": "catalog:",
@@ -208,7 +208,7 @@
},
"packages/kilo-indexing": {
"name": "@kilocode/kilo-indexing",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@aws-sdk/client-bedrock-runtime": "3.1005.0",
"@aws-sdk/credential-provider-ini": "3.972.31",
@@ -240,11 +240,11 @@
},
"packages/kilo-jetbrains": {
"name": "@kilocode/kilo-jetbrains",
"version": "7.3.44",
"version": "7.3.45",
},
"packages/kilo-telemetry": {
"name": "@kilocode/kilo-telemetry",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/kilo-gateway": "workspace:*",
"posthog-node": "4.4.0",
@@ -258,7 +258,7 @@
},
"packages/kilo-ui": {
"name": "@kilocode/kilo-ui",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/sdk": "workspace:*",
"@kobalte/core": "0.13.11",
@@ -295,7 +295,7 @@
},
"packages/kilo-vscode": {
"name": "kilo-code",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@anthropic-ai/sdk": "^0.39.0",
"@kilocode/kilo-gateway": "workspace:*",
@@ -361,7 +361,7 @@
},
"packages/kilo-web-ui": {
"name": "@kilocode/kilo-web-ui",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/kilo-ui": "workspace:*",
"@kobalte/core": "catalog:",
@@ -376,7 +376,7 @@
},
"packages/llm": {
"name": "@opencode-ai/llm",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@smithy/eventstream-codec": "4.2.14",
"@smithy/util-utf8": "4.2.2",
@@ -394,7 +394,7 @@
},
"packages/opencode": {
"name": "@kilocode/cli",
"version": "7.3.44",
"version": "7.3.45",
"bin": {
"kilo": "./bin/kilo",
"kilocode": "./bin/kilo",
@@ -562,7 +562,7 @@
},
"packages/plugin": {
"name": "@kilocode/plugin",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/sdk": "workspace:*",
"effect": "catalog:",
@@ -590,7 +590,7 @@
},
"packages/plugin-atomic-chat": {
"name": "@kilocode/plugin-atomic-chat",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/plugin": "workspace:*",
},
@@ -604,7 +604,7 @@
},
"packages/script": {
"name": "@opencode-ai/script",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"semver": "^7.6.3",
},
@@ -615,7 +615,7 @@
},
"packages/sdk/js": {
"name": "@kilocode/sdk",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"cross-spawn": "catalog:",
},
@@ -630,7 +630,7 @@
},
"packages/storybook": {
"name": "@opencode-ai/storybook",
"version": "7.3.44",
"version": "7.3.45",
"devDependencies": {
"@opencode-ai/ui": "workspace:*",
"@solidjs/meta": "catalog:",
@@ -653,7 +653,7 @@
},
"packages/ui": {
"name": "@opencode-ai/ui",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {
"@kilocode/sdk": "workspace:*",
"@kobalte/core": "catalog:",
package.json
+1 -1
View File
@@ -153,6 +153,6 @@
"solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
"mammoth@1.12.0": "patches/mammoth@1.12.0.patch"
},
"version": "7.3.44",
"version": "7.3.45",
"peerDependencies": {}
}
packages/core/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
"version": "7.3.44",
"version": "7.3.45",
"name": "@opencode-ai/core",
"type": "module",
"license": "MIT",
packages/http-recorder/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
"version": "7.3.44",
"version": "7.3.45",
"name": "@opencode-ai/http-recorder",
"type": "module",
"license": "MIT",
packages/kilo-console/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@kilocode/kilo-console",
"version": "7.3.44",
"version": "7.3.45",
"private": true,
"type": "module",
"scripts": {
packages/kilo-docs/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@kilocode/kilo-docs",
"version": "7.3.44",
"version": "7.3.45",
"private": true,
"scripts": {
"dev": "next dev --webpack --port 3002",
packages/kilo-gateway/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/kilo-gateway",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration",
packages/kilo-i18n/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/kilo-i18n",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"description": "Kilo-specific i18n translations and overrides",
packages/kilo-indexing/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/kilo-indexing",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"description": "Standalone indexing engine and host helpers for Kilo Code",
packages/kilo-jetbrains/package.json
+1 -1
View File
@@ -8,7 +8,7 @@
"test": "./gradlew test",
"test:ci": "bun script/test-ci.ts"
},
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {},
"devDependencies": {},
"peerDependencies": {}
packages/kilo-telemetry/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/kilo-telemetry",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"description": "Telemetry for Kilo CLI - PostHog analytics integration",
packages/kilo-ui/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@kilocode/kilo-ui",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"exports": {
packages/kilo-vscode/package.json
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "kilo-code",
"displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete",
"description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.",
"version": "7.3.44",
"version": "7.3.45",
"icon": "assets/icons/logo-outline-black.png",
"galleryBanner": {
"color": "#FFFFFF",
packages/kilo-vscode/tests/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"type": "module",
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {},
"devDependencies": {},
"peerDependencies": {}
packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
-5
View File
@@ -1,8 +1,3 @@
export interface TerminalFont {
fontFamily: string
fontSize: number
}
export type WorktreeErrorCode = "git_not_found" | "not_git_repo" | "lfs_missing"
export interface TerminalFont {
packages/kilo-web-ui/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@kilocode/kilo-web-ui",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"exports": {
packages/llm/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
"version": "7.3.44",
"version": "7.3.45",
"name": "@opencode-ai/llm",
"type": "module",
"license": "MIT",
packages/opencode/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
"version": "7.3.44",
"version": "7.3.45",
"name": "@kilocode/cli",
"type": "module",
"license": "MIT",
packages/plugin-atomic-chat/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/plugin-atomic-chat",
"version": "7.3.44",
"version": "7.3.45",
"description": "Kilo Code plugin for Atomic Chat: auto-detection and dynamic model discovery (OpenAI-compatible local API)",
"type": "module",
"license": "MIT",
packages/plugin/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/plugin",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"scripts": {
packages/script/package.json
+1 -1
View File
@@ -12,6 +12,6 @@
"exports": {
".": "./src/index.ts"
},
"version": "7.3.44",
"version": "7.3.45",
"peerDependencies": {}
}
packages/sdk/js/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@kilocode/sdk",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"scripts": {
packages/storybook/package.json
+1 -1
View File
@@ -26,7 +26,7 @@
"typescript": "catalog:",
"vite": "catalog:"
},
"version": "7.3.44",
"version": "7.3.45",
"dependencies": {},
"peerDependencies": {}
}
packages/ui/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/ui",
"version": "7.3.44",
"version": "7.3.45",
"type": "module",
"license": "MIT",
"exports": {
script/upstream/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@kilocode/upstream-merge",
"version": "7.3.44",
"version": "7.3.45",
"private": true,
"type": "module",
"description": "Scripts for automating upstream opencode merges into Kilo",