Upstream v0.2.2 merge conflicts #137

Upstream v0.2.2 requires manual conflict resolution

The hourly sync stopped without changing main.

Conflicted paths

• backend/cmd/server/wire_gen.go
• backend/ent/runtime/runtime.go
• backend/internal/handler/admin/account_handler.go
• backend/internal/handler/admin/grok_import_probe.go
• backend/internal/handler/admin/group_handler.go
• backend/internal/handler/gateway_handler.go
• backend/internal/handler/openai_codex_models_handler.go
• backend/internal/handler/openai_codex_models_handler_test.go
• backend/internal/handler/openai_gateway_handler.go
• backend/internal/pkg/apicompat/responses_to_chatcompletions.go
• backend/internal/server/api_contract_test.go
• backend/internal/server/routes/gateway.go
• backend/internal/service/account_test_service.go
• backend/internal/service/admin_account.go
• backend/internal/service/admin_group.go
• backend/internal/service/admin_service.go
• backend/internal/service/api_key_auth_cache_impl.go
• backend/internal/service/openai_alpha_search.go
• backend/internal/service/openai_codex_models_pinned.go
• backend/internal/service/openai_codex_models_service.go
• backend/internal/service/openai_codex_models_service_test.go
• backend/internal/service/openai_embeddings.go
• backend/internal/service/openai_gateway_cc_pipeline.go
• backend/internal/service/openai_gateway_forward.go
• backend/internal/service/openai_gateway_passthrough.go
• backend/internal/service/openai_gateway_request_body.go
• backend/internal/service/openai_gateway_response_handling.go
• backend/internal/service/openai_gateway_upstream_errors.go
• backend/internal/service/openai_images.go
• backend/internal/service/openai_images_responses.go
• backend/internal/service/openai_live.go
• backend/internal/service/openai_responses_input_compat.go
• backend/internal/service/openai_responses_input_compat_test.go
• backend/internal/service/openai_ws_forwarder_ingress.go
• backend/internal/service/openai_ws_http_bridge.go
• backend/internal/service/openai_ws_v2_passthrough_adapter.go
• backend/internal/service/wire.go
• frontend/src/components/account/CreateAccountModal.vue
• frontend/src/components/account/EditAccountModal.vue
• frontend/src/components/account/__tests__/EditAccountModal.spec.ts
• frontend/src/i18n/locales/en/admin/overview.ts
• frontend/src/i18n/locales/zh/admin/overview.ts
• frontend/src/views/admin/GroupsView.vue
• frontend/src/views/admin/__tests__/GroupsView.duplicate.spec.ts