Resolves 5 conflicts by keeping both our additions (MagicForm channel, ResponseMetrics, AllowedTools enforcement) and upstream's (IRC channel, Matrix channel, improved comments). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| bootstrap.go | ||
| 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 | ||