huangzhenpc 4971ac4cbe Merge remote-tracking branch 'upstream/main' ...

Resolves conflicts in config/config.go and proxy/kiro.go while preserving
local proxy/auth/logger/pool enhancements.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

2026-05-14 18:43:01 +08:00

..

config.go

Merge remote-tracking branch 'upstream/main'

2026-05-14 18:43:01 +08:00