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> |
||
|---|---|---|
| .. | ||
| config.go | ||
| config_test.go | ||
| defaults.go | ||
| migration.go | ||
| migration_test.go | ||
| model_config_test.go | ||