mirror of
https://github.com/Kilo-Org/kilocode.git
synced 2026-09-24 16:02:55 +08:00
refactor: remove merge report
This commit is contained in:
Catriel Müller
@@ -1,358 +0,0 @@
|
||||
# Upstream Merge Conflict Report
|
||||
|
||||
Generated: 2026-02-04T17:43:06.831Z
|
||||
|
||||
## Summary
|
||||
|
||||
- **Upstream Version**: 1.1.48
|
||||
- **Upstream Commit**: `597ae57b`
|
||||
- **Base Branch**: catrielmuller/kilo-opencode-v1.1.47
|
||||
- **Merge Branch**: catrielmuller/kilo-opencode-v1.1.48
|
||||
- **Total Files Changed**: 158
|
||||
|
||||
## Files by Recommendation
|
||||
|
||||
### Take Upstream + Kilo Branding (Auto)
|
||||
|
||||
- `packages/app/e2e/actions.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/app/navigation.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/app/palette.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/app/server-default.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/app/session.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/app/titlebar-history.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/files/file-open.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/files/file-viewer.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/fixtures.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/models/model-picker.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/models/models-visibility.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/projects/project-edit.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/projects/projects-close.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/projects/projects-switch.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/prompt/context.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/prompt/prompt-mention.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/prompt/prompt-slash-open.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/prompt/prompt.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/selectors.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/session/session.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/settings/settings-language.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/settings/settings-providers.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/settings/settings.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/sidebar/sidebar-session-links.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/sidebar/sidebar.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/terminal/terminal-init.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/terminal/terminal.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/thinking-level.spec.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/e2e/utils.ts` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/script/e2e-local.ts` (script)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/src/components/dialog-select-model.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/src/components/prompt-input.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/src/components/session-context-usage.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/src/components/settings-general.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/src/components/settings-keybinds.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/app/src/pages/layout.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/accordion.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/button.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/collapsible.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/cycle-label.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/icon.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/list.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/message-part.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/morph-chevron.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/progress-circle.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/reasoning-icon.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/scroll-fade.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/scroll-reveal.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/select.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/components/session-review.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
- `packages/ui/src/context/dialog.tsx` (code)
|
||||
- Branding-only file: take upstream and apply Kilo branding transforms
|
||||
|
||||
### Tauri Config Transform (Auto)
|
||||
|
||||
- `packages/desktop/src-tauri/src/lib.rs` (tauri)
|
||||
- Tauri config: take upstream and apply Kilo branding transforms
|
||||
|
||||
### Package.json Transform (Auto)
|
||||
|
||||
- `package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/app/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/console/app/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/console/core/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/console/function/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/console/mail/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/desktop/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/enterprise/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/function/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/opencode/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/plugin/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/sdk/js/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/slack/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/ui/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/util/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `packages/web/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
- `sdks/vscode/package.json` (package)
|
||||
- Package.json: take upstream, transform names, inject Kilo deps, preserve version
|
||||
|
||||
### Script Transform (Auto)
|
||||
|
||||
- `packages/opencode/script/build.ts` (script)
|
||||
- Script file: take upstream and transform GitHub references
|
||||
|
||||
### Extension Transform (Auto)
|
||||
|
||||
- `packages/extensions/zed/extension.toml` (extension)
|
||||
- Extension file: take upstream and apply Kilo branding
|
||||
|
||||
### Web/Docs Transform (Auto)
|
||||
|
||||
- `packages/web/src/content/docs/agents.mdx` (web)
|
||||
- Web/docs file: take upstream and apply Kilo branding
|
||||
|
||||
### Keep Kilo Version (Ours)
|
||||
|
||||
- `.github/workflows/publish.yml` (config)
|
||||
- File is Kilo-specific and should not be overwritten
|
||||
- `packages/opencode/src/provider/sdk/copilot/README.md` (markdown)
|
||||
- File is Kilo-specific and should not be overwritten
|
||||
|
||||
### Manual Review Required
|
||||
|
||||
- `.github/workflows/beta.yml` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
- `.github/workflows/test.yml` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
- `bun.lock` (other)
|
||||
- File needs manual review
|
||||
- `nix/hashes.json` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
- `packages/app/e2e/tsconfig.json` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
- `packages/opencode/src/cli/cmd/acp.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/command/index.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/env/index.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/file/ripgrep.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/flag/flag.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/models.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/provider.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/convert-to-openai-compatible-chat-messages.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/get-response-metadata.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/map-openai-compatible-finish-reason.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-api-types.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-chat-language-model.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-chat-options.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-metadata-extractor.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/chat/openai-compatible-prepare-tools.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/copilot-provider.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/index.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/openai-compatible-error.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/convert-to-openai-responses-input.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/map-openai-responses-finish-reason.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/openai-config.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/openai-error.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/openai-responses-api-types.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/openai-responses-language-model.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/openai-responses-prepare-tools.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/openai-responses-settings.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/tool/code-interpreter.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/tool/file-search.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/tool/image-generation.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/tool/local-shell.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/tool/web-search-preview.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/copilot/responses/tool/web-search.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/sdk/openai-compatible/src/index.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/provider/transform.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/session/llm.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/skill/skill.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/tool/bash.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/tool/grep.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/src/tool/skill.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/preload.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/provider/copilot/convert-to-copilot-messages.test.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/provider/copilot/copilot-chat-model.test.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/provider/transform.test.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/session/llm.test.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/tool/bash.test.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/opencode/test/tool/fixtures/models-api.json` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
- `packages/opencode/test/tool/read.test.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/sdk/js/src/v2/gen/types.gen.ts` (code)
|
||||
- Code files need manual review for kilocode_change markers
|
||||
- `packages/sdk/openapi.json` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
- `packages/ui/src/components/accordion.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/button.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/card.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/checkbox.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/collapsible.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/cycle-label.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/dialog.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/dropdown-menu.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/hover-card.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/icon-button.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/icon.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/list.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/logo.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/morph-chevron.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/popover.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/progress-circle.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/radio-group.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/reasoning-icon.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/resize-handle.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/scroll-fade.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/select.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/session-review.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/session-turn.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/switch.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/tabs.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/components/tag.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/styles/index.css` (other)
|
||||
- File needs manual review
|
||||
- `packages/ui/src/styles/utilities.css` (other)
|
||||
- File needs manual review
|
||||
- `turbo.json` (config)
|
||||
- Config files may have Kilo-specific settings
|
||||
|
||||
## Recommendations
|
||||
|
||||
- 2 files will keep Kilo's version
|
||||
- 84 files require manual review
|
||||
Reference in New Issue
Block a user