fix: configuration merging for built-in model providers#7173

otterammo wants to merge 1 commit intoopenai:mainopenai/codex:mainfrom

otterammo:fix/merge-config-oss-modelsotterammo/codex:fix/merge-config-oss-modelsCopy head branch name to clipboard