merge upstream/main

7319122e · LLLLLLiulei · 029994a8 · 4809fa4f · 7319122e · 7319122e
Commit 7319122e authored Feb 06, 2026 by LLLLLLiulei
--- a/backend/internal/service/error_passthrough_service_test.go
+++ b/backend/internal/service/error_passthrough_service_test.go
--- a/backend/internal/service/gateway_cached_tokens_test.go
+++ b/backend/internal/service/gateway_cached_tokens_test.go
--- a/backend/internal/service/gateway_service.go
+++ b/backend/internal/service/gateway_service.go
--- a/backend/internal/service/gemini_messages_compat_service.go
+++ b/backend/internal/service/gemini_messages_compat_service.go
--- a/backend/internal/service/gemini_oauth_service.go
+++ b/backend/internal/service/gemini_oauth_service.go
--- a/backend/internal/service/openai_codex_transform.go
+++ b/backend/internal/service/openai_codex_transform.go
--- a/backend/internal/service/openai_codex_transform_test.go
+++ b/backend/internal/service/openai_codex_transform_test.go
--- a/backend/internal/service/openai_gateway_service.go
+++ b/backend/internal/service/openai_gateway_service.go
--- a/backend/internal/service/pricing_service.go
+++ b/backend/internal/service/pricing_service.go
--- a/backend/internal/service/user.go
+++ b/backend/internal/service/user.go
--- a/backend/internal/service/user_group_rate.go
+++ b/backend/internal/service/user_group_rate.go
--- a/backend/internal/service/wire.go
+++ b/backend/internal/service/wire.go
@@ -274,4 +274,5 @@ var ProviderSet = wire.NewSet(
 	NewUserAttributeService,
 	NewUsageCache,
 	NewTotpService,
+	NewErrorPassthroughService,
 )
--- a/backend/migrations/047_add_user_group_rate_multipliers.sql
+++ b/backend/migrations/047_add_user_group_rate_multipliers.sql
--- a/backend/migrations/048_add_error_passthrough_rules.sql
+++ b/backend/migrations/048_add_error_passthrough_rules.sql
--- a/backend/resources/model-pricing/model_prices_and_context_window.json
+++ b/backend/resources/model-pricing/model_prices_and_context_window.json
--- a/frontend/src/api/admin/errorPassthrough.ts
+++ b/frontend/src/api/admin/errorPassthrough.ts
--- a/frontend/src/api/admin/index.ts
+++ b/frontend/src/api/admin/index.ts
--- a/frontend/src/api/groups.ts
+++ b/frontend/src/api/groups.ts
--- a/frontend/src/components/account/BulkEditAccountModal.vue
+++ b/frontend/src/components/account/BulkEditAccountModal.vue
--- a/frontend/src/components/admin/ErrorPassthroughRulesModal.vue
+++ b/frontend/src/components/admin/ErrorPassthroughRulesModal.vue