Resolved conflicts in 3 files: - config/config.example.json: keep both searxng and glm_search configs - pkg/agent/loop.go: adopt upstream's IsToolEnabled guard + keep searxng fields - pkg/config/config.go: adopt upstream's ToolConfig embed + keep SearXNG field Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| context.go | ||
| context_cache_test.go | ||
| context_test.go | ||
| instance.go | ||
| instance_test.go | ||
| loop.go | ||
| loop_media.go | ||
| loop_test.go | ||
| memory.go | ||
| mock_provider_test.go | ||
| registry.go | ||
| registry_test.go | ||
| thinking.go | ||
| thinking_test.go | ||