Merge remote-tracking branch 'upstream/main'

7b83d6e7 · 陈曦 · daa2e6df · dbb248df · 7b83d6e7 · 7b83d6e7
Commit 7b83d6e7 authored Apr 05, 2026 by 陈曦
--- a/backend/internal/service/openai_gateway_chat_completions.go
+++ b/backend/internal/service/openai_gateway_chat_completions.go
@@ -46,7 +46,7 @@ func (s *OpenAIGatewayService) ForwardAsChatCompletions(
 	// 2. Resolve model mapping early so compat prompt_cache_key injection can
 	// derive a stable seed from the final upstream model family.
 	billingModel := resolveOpenAIForwardModel(account, originalModel, defaultMappedModel)
-	upstreamModel := resolveOpenAIUpstreamModel(billingModel)
+	upstreamModel := normalizeCodexModel(billingModel)
 	promptCacheKey = strings.TrimSpace(promptCacheKey)
 	compatPromptCacheInjected := false

--- a/backend/internal/service/openai_gateway_messages.go
+++ b/backend/internal/service/openai_gateway_messages.go
--- a/backend/internal/service/openai_gateway_record_usage_test.go
+++ b/backend/internal/service/openai_gateway_record_usage_test.go
--- a/backend/internal/service/openai_gateway_service.go
+++ b/backend/internal/service/openai_gateway_service.go
--- a/backend/internal/service/openai_model_mapping.go
+++ b/backend/internal/service/openai_model_mapping.go
--- a/backend/internal/service/openai_model_mapping_test.go
+++ b/backend/internal/service/openai_model_mapping_test.go
--- a/backend/internal/service/openai_ws_forwarder.go
+++ b/backend/internal/service/openai_ws_forwarder.go
--- a/backend/internal/service/openai_ws_protocol_forward_test.go
+++ b/backend/internal/service/openai_ws_protocol_forward_test.go
--- a/backend/internal/service/ops_retry.go
+++ b/backend/internal/service/ops_retry.go
--- a/backend/internal/service/pricing_service.go
+++ b/backend/internal/service/pricing_service.go
--- a/backend/internal/service/redeem_service.go
+++ b/backend/internal/service/redeem_service.go
--- a/backend/internal/service/testhelpers_test.go
+++ b/backend/internal/service/testhelpers_test.go
--- a/backend/internal/service/usage_log.go
+++ b/backend/internal/service/usage_log.go
--- a/backend/internal/service/usage_log_helpers.go
+++ b/backend/internal/service/usage_log_helpers.go
--- a/backend/internal/service/wire.go
+++ b/backend/internal/service/wire.go
--- a/backend/migrations/081_create_channels.sql
+++ b/backend/migrations/081_create_channels.sql
--- a/backend/migrations/082_refactor_channel_pricing.sql
+++ b/backend/migrations/082_refactor_channel_pricing.sql
--- a/backend/migrations/083_channel_model_mapping.sql
+++ b/backend/migrations/083_channel_model_mapping.sql
--- a/backend/migrations/084_channel_billing_model_source.sql
+++ b/backend/migrations/084_channel_billing_model_source.sql
--- a/backend/migrations/085_channel_restrict_and_per_request_price.sql
+++ b/backend/migrations/085_channel_restrict_and_per_request_price.sql