Repository navigation
Closed
Labels
upstream-review-requiredManual upstream review is requiredManual upstream review is required
Description
Upstream v0.2.8 requires manual conflict resolution
The hourly sync stopped without changing main.
Conflicted paths
.github/workflows/release.ymlbackend/cmd/server/wire.gobackend/cmd/server/wire_gen.gobackend/cmd/server/wire_gen_test.gobackend/internal/config/config_test.gobackend/internal/handler/admin/account_handler.gobackend/internal/handler/dto/mappers.gobackend/internal/handler/dto/types.gobackend/internal/handler/openai_gateway_handler.gobackend/internal/handler/openai_images.gobackend/internal/handler/wire.gobackend/internal/pkg/apicompat/types.gobackend/internal/repository/account_repo.gobackend/internal/repository/account_repo_upstream_billing_probe_update_test.gobackend/internal/repository/http_upstream.gobackend/internal/server/routes/admin.gobackend/internal/service/admin_account.gobackend/internal/service/billing_service.gobackend/internal/service/domain_constants.gobackend/internal/service/gateway_service.gobackend/internal/service/gateway_usage_billing.gobackend/internal/service/openai_account_scheduler.gobackend/internal/service/openai_codex_models_service.gobackend/internal/service/openai_codex_models_service_test.gobackend/internal/service/openai_gateway_chat_completions_raw.gobackend/internal/service/openai_gateway_forward.gobackend/internal/service/openai_gateway_messages.gobackend/internal/service/openai_gateway_messages_chat_fallback.gobackend/internal/service/openai_gateway_passthrough.gobackend/internal/service/openai_gateway_request_body.gobackend/internal/service/openai_gateway_response_handling.gobackend/internal/service/openai_gateway_scheduling.gobackend/internal/service/openai_gateway_service_hotpath_test.gobackend/internal/service/openai_gateway_usage.gobackend/internal/service/openai_images.gobackend/internal/service/openai_passthrough_normalization_test.gobackend/internal/service/openai_responses_tool_schema_test.gobackend/internal/service/openai_ws_http_bridge.gobackend/internal/service/plugin_host_services.gobackend/internal/service/plugin_host_services_broker_test.gobackend/internal/service/plugin_manager.gobackend/internal/service/pricing_service.gobackend/internal/service/wire.gofrontend/src/api/admin/accounts.tsfrontend/src/api/admin/users.tsfrontend/src/components/account/AccountUsageCell.vuefrontend/src/components/account/EditAccountModal.vuefrontend/src/components/account/OpenAIQuotaResetCell.vuefrontend/src/components/account/TempUnschedStatusModal.vuefrontend/src/components/admin/user/UserPlatformQuotaModal.vuefrontend/src/components/admin/user/__tests__/UserPlatformQuotaModal.spec.tsfrontend/src/components/common/BaseDialog.vuefrontend/src/components/common/Select.vuefrontend/src/components/keys/__tests__/UseKeyModal.spec.tsfrontend/src/types/index.tsfrontend/src/views/admin/GroupsView.vuefrontend/src/views/admin/RiskControlView.vue
Metadata
Metadata
Assignees
Labels
upstream-review-requiredManual upstream review is requiredManual upstream review is required
Activity
HTExplicit commentedon Sep 23, 2026
Resolved by #196: upstream v0.2.8 merged into main as 071f25c (merge commit, upstream parent kept). Conflict decisions are in .downstream/upstream-review-v0.2.8.md.