Resolve conflicts in loop.go, config.go, config_test.go, spawn.go, and subagent.go. Integrate upstream ToolResult/AsyncTool pattern with multi-agent routing features. Rename mockProvider to mockRegistryProvider in registry_test.go to avoid redeclaration with upstream's loop_test.go. |
||
|---|---|---|
| .. | ||
| config.go | ||
| config_test.go | ||