Upstream v0.2.5 merge conflicts #168

Upstream v0.2.5 requires manual conflict resolution

The hourly sync stopped without changing main.

Conflicted paths

• backend/cmd/server/wire_gen.go
• backend/ent/schema/user_platform_quota.go
• backend/internal/handler/admin/account_data.go
• backend/internal/handler/admin/group_handler.go
• backend/internal/handler/admin/group_handler_platform_test.go
• backend/internal/handler/admin/setting_handler_partial_payload_test.go
• backend/internal/handler/admin/user_platform_quota_admin_test.go
• backend/internal/handler/gateway_handler.go
• backend/internal/handler/grok_media.go
• backend/internal/handler/openai_gateway_handler.go
• backend/internal/handler/setting_handler.go
• backend/internal/pkg/apicompat/chatcompletions_responses_bridge.go
• backend/internal/pkg/httputil/body.go
• backend/internal/repository/account_repo_integration_test.go
• backend/internal/repository/scheduler_cache.go
• backend/internal/repository/user_platform_quota_repo.go
• backend/internal/server/api_contract_test.go
• backend/internal/server/routes/gateway.go
• backend/internal/service/account.go
• backend/internal/service/account_test_service.go
• backend/internal/service/composite_platform_test.go
• backend/internal/service/openai_codex_transform.go
• backend/internal/service/openai_gateway_chat_completions.go
• backend/internal/service/openai_gateway_forward.go
• backend/internal/service/openai_gateway_request_body.go
• backend/internal/service/openai_gateway_response_handling.go
• backend/internal/service/openai_gateway_scheduling.go
• backend/internal/service/openai_gateway_usage.go
• backend/internal/service/openai_gpt56_max_test.go
• backend/internal/service/openai_images_responses.go
• backend/internal/service/openai_responses_namespace.go
• backend/internal/service/openai_responses_namespace_test.go
• backend/internal/service/openai_ws_forwarder_ingress.go
• backend/internal/service/openai_ws_session_preemption_test.go
• backend/internal/service/scheduler_snapshot_service.go
• backend/internal/service/setting_public.go
• backend/internal/setup/setup.go
• frontend/src/components/account/AccountUsageCell.vue
• frontend/src/components/account/CreateAccountModal.vue
• frontend/src/components/account/EditAccountModal.vue
• frontend/src/components/account/__tests__/ModelWhitelistSelector.spec.ts
• frontend/src/components/layout/AppSidebar.vue
• frontend/src/components/layout/__tests__/AppSidebar.spec.ts
• frontend/src/constants/__tests__/platforms.spec.ts
• frontend/src/constants/platforms.ts
• frontend/src/router/__tests__/feature-access.spec.ts
• frontend/src/router/index.ts
• frontend/src/stores/app.ts
• frontend/src/types/index.ts
• frontend/src/utils/featureFlags.ts
• frontend/src/views/admin/ChannelsView.vue
• frontend/src/views/admin/__tests__/AccountsView.lite.spec.ts
• frontend/src/views/admin/__tests__/SettingsView.spec.ts
• frontend/src/views/admin/__tests__/channelPlatformOptions.spec.ts