resolve merge conflicts

This commit is contained in:
marius-kilocode
2026-06-01 15:20:54 +02:00
513 changed files with 55040 additions and 16910 deletions
+3 -4
View File
@@ -140,16 +140,13 @@
- <https://opencode.ai/docs/providers/#cloudflare-ai-gateway>
<!-- packages/opencode/src/cli/cmd/providers.ts -->
- <https://opencode.ai/go>
<!-- packages/opencode/src/cli/cmd/tui/component/dialog-go-upsell.tsx -->
<!-- packages/opencode/src/session/retry.ts -->
<!-- packages/opencode/src/cli/cmd/tui/component/dialog-retry-action.tsx -->
- <https://opencode.ai/tui.json>
<!-- packages/opencode/src/cli/cmd/tui/config/tui-migrate.ts -->
- <https://opencode.ai/zen>
<!-- packages/kilo-vscode/webview-ui/src/i18n/en.ts -->
- <https://openrouter.ai/docs/use-cases/usage-accounting>
<!-- packages/opencode/src/kilocode/session/index.ts -->
- <https://opentelemetry.io/blog/2025/how-to-name-your-span-attributes/>
<!-- packages/opencode/src/server/routes/instance/trace.ts -->
- <https://opncd.ai>
<!-- packages/opencode/src/share/share-next.ts -->
- <https://platform.openai.com/docs/api-reference/responses/create>
@@ -160,6 +157,8 @@
<!-- packages/opencode/src/provider/sdk/copilot/responses/openai-responses-language-model.ts -->
- <https://reddit.com/r/kilocode>
<!-- packages/kilo-vscode/webview-ui/src/components/settings/AboutKiloCodeTab.tsx -->
- <https://search.parallel.ai/mcp>
<!-- packages/opencode/src/tool/mcp-websearch.ts -->
- <https://v5.ai-sdk.dev/providers/ai-sdk-providers/amazon-bedrock>
<!-- packages/opencode/src/provider/transform.ts -->
- <https://v5.ai-sdk.dev/providers/ai-sdk-providers/anthropic>