bmiddle1.backend.zhangfucheng 12e67d823b Merge remote-tracking branch 'upstream/main' into codex-overdraft ...

# Conflicts:
#	DEV_GUIDE.md
#	backend/internal/service/openai_gateway_scheduling.go

2026-08-19 09:36:51 +08:00

..

admin

Merge pull request #5761 from Randark-JMT/feat/channel-monitor-quota-mode

2026-08-18 17:36:27 +08:00

dto

feat(settings): channel_monitor_show_quota public setting (default off)

2026-08-18 04:06:18 +00:00

quotaview

feat(quota): 用户 × 平台 USD 配额

2026-05-26 10:49:20 +08:00

announcement_handler.go

…

api_key_handler_validation_test.go

fix(api-key): validate quota and expiry inputs

2026-08-09 22:42:51 +08:00

api_key_handler.go

fix(api-key): validate quota and expiry inputs

2026-08-09 22:42:51 +08:00

auth_captcha_request_test.go

fix: 完善腾讯验证码区域适配与 CSP 白名单

2026-08-06 20:34:37 +08:00

auth_current_user_test.go

fix(profile): stabilize identity binding management

2026-04-22 13:19:28 +08:00

auth_dingtalk_client_test.go

feat(dingtalk): 钉钉 OAuth 登录接入与 internal_only 用户属性同步

2026-05-19 15:27:47 +08:00

auth_dingtalk_client.go

feat(dingtalk): 钉钉 OAuth 登录接入与 internal_only 用户属性同步

2026-05-19 15:27:47 +08:00

auth_dingtalk_oauth_test.go

feat(dingtalk): 钉钉 OAuth 登录接入与 internal_only 用户属性同步

2026-05-19 15:27:47 +08:00

auth_dingtalk_oauth.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

auth_email_oauth_test.go

fix(auth): apply promo codes to oauth signups

2026-06-11 18:55:27 +08:00

auth_email_oauth.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

auth_handler.go

新增腾讯天御验证码认证门禁

2026-08-04 15:09:29 +08:00

auth_linuxdo_oauth_test.go

feat(security): 操作审计日志 + 会话IP/UA绑定 + 敏感操作 step-up 2FA

2026-07-16 13:47:50 +08:00

auth_linuxdo_oauth.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

auth_oauth_captcha_start_test.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

auth_oauth_captcha_start.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

auth_oauth_logout_test.go

fix(auth): harden pending oauth and backend mode flows

2026-04-22 12:30:00 +08:00

auth_oauth_pending_flow_test.go

feat: add default-off switch for email domain registration quota

2026-08-09 15:53:40 +08:00

auth_oauth_pending_flow.go

fix(security): block OAuth account takeover via pending exchange

2026-08-07 03:09:57 +08:00

auth_oauth_test_helpers_test.go

fix(oidc): harden verified-email fast path

2026-05-21 15:19:29 +08:00

auth_oidc_oauth_test.go

fix(oidc): harden verified-email fast path

2026-05-21 15:19:29 +08:00

auth_oidc_oauth.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

auth_session_revocation_test.go

refactor(repository): scope user/api-key updates to declared columns

2026-07-28 17:21:32 +08:00

auth_wechat_oauth_test.go

feat(quota): 用户 × 平台 USD 配额

2026-05-26 10:49:20 +08:00

auth_wechat_oauth.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

available_channel_handler_test.go

fix(channels): show composite models by platform

2026-07-29 12:32:44 +08:00

available_channel_handler.go

fix(channels): show composite models by platform

2026-07-29 12:32:44 +08:00

batch_image_handler.go

feat(usage): persist client session identifiers

2026-07-24 01:22:34 +08:00

channel_monitor_user_handler.go

feat(monitor): wire quota fetcher & expose check_mode in handlers

2026-08-18 04:14:15 +00:00

channel_monitor_v2_handler_test.go

feat(channel-monitor-v2): 实现被动聚合、分层保留与只读 API

2026-08-07 11:05:32 +08:00

channel_monitor_v2_handler.go

feat(channel-monitor-v2): 实现被动聚合、分层保留与只读 API

2026-08-07 11:05:32 +08:00

chat_completions_image_model_test.go

fix(openai): reject image models on chat completions

2026-07-15 22:22:51 +08:00

composite_platform_test.go

feat(composite): enforce reasoning effort policy

2026-08-01 21:15:44 +08:00

composite_platform.go

feat(composite): enforce reasoning effort policy

2026-08-01 21:15:44 +08:00

concurrency_error_response_test.go

fix: classify concurrency acquire failures

2026-05-28 10:03:41 +00:00

concurrency_error_response.go

fix: move user wait queue accounting off hot path

2026-06-16 11:41:54 +08:00

content_moderation_helper.go

Fix composite route alias attribution

2026-07-23 09:20:52 +08:00

endpoint_test.go

fix(antigravity):

2026-07-26 20:23:50 +09:00

endpoint.go

fix(antigravity):

2026-07-26 20:23:50 +09:00

failover_loop_profit_veto_test.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

failover_loop_test.go

fix(openai): preserve exponential capacity backoff

2026-08-08 01:02:02 +08:00

failover_loop.go

fix(openai): preserve exponential capacity backoff

2026-08-08 01:02:02 +08:00

gateway_handler_billing_error_test.go

feat(quota): 用户 × 平台 USD 配额

2026-05-26 10:49:20 +08:00

gateway_handler_cancellation_test.go

test: align composite route contracts after rebase

2026-07-23 09:20:52 +08:00

gateway_handler_chat_completions.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

gateway_handler_error_fallback_test.go

fix(antigravity):

2026-07-26 20:23:50 +09:00

gateway_handler_intercept_test.go

fix(gateway): 修复模拟响应使用 Bedrock msg_bdrk_ 格式，改为正宗 Anthropic msg_01 格式

2026-07-27 15:20:03 +00:00

gateway_handler_responses.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

gateway_handler_stream_failover_test.go

…

gateway_handler_usage_test.go

Keep usage ranges consistent across API and dashboards

2026-07-13 11:35:46 +08:00

gateway_handler_warmup_intercept_unit_test.go

fix(gateway): 修复模拟响应使用 Bedrock msg_bdrk_ 格式，改为正宗 Anthropic msg_01 格式

2026-07-27 15:20:03 +00:00

gateway_handler.go

feat: 新增 grok-4.6 目录、官方定价与请求路径支持

2026-08-13 01:23:45 +08:00

gateway_helper_backoff_test.go

…

gateway_helper_fastpath_test.go

fix(openai-ws): bound ingress session lifecycle

2026-07-13 15:32:42 +08:00

gateway_helper_hotpath_test.go

Merge pull request #3645 from bestony/worktree/lucky-harbor-dbe4

2026-07-06 16:45:15 +08:00

gateway_helper_test.go

fix(grok): fail over OAuth credential errors safely

2026-07-14 14:55:30 +08:00

gateway_helper.go

fix(grok): fail over OAuth credential errors safely

2026-07-14 14:55:30 +08:00

gateway_key_billing_test.go

test: align composite route contracts after rebase

2026-07-23 09:20:52 +08:00

gateway_key_billing.go

feat: 增加 API Key 计费倍率自省接口

2026-07-15 22:42:53 +08:00

gateway_models_test.go

Fix composite model defaults for linked platforms

2026-07-23 09:20:52 +08:00

gateway_web_search.go

feat: 新增独立 /x_search，走原生 x_search 并沿用搜索计费

2026-08-13 07:49:19 +08:00

gemini_cli_session_test.go

…

gemini_v1beta_handler_test.go

…

gemini_v1beta_handler.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

grok_audio_billing_test.go

fix: Realtime 仅在观察到音频后计费，并修正标志位求值顺序

2026-08-13 08:38:10 +08:00

grok_audio.go

fix: Realtime 仅在观察到音频后计费，并修正标志位求值顺序

2026-08-13 08:38:10 +08:00

grok_media_test.go

fix(grok): 视频在 status 返回 video.url 后再按上游参数计费

2026-08-07 16:29:57 +08:00

grok_media.go

fix(grok): harden voice request ids, video pending, and search pricing alerts

2026-08-08 09:45:12 +08:00

handler.go

feat: 国产供应商一等支持（Kimi/Zhipu/DeepSeek 多协议 + 配额/余额监控）

2026-08-15 10:37:51 +00:00

idempotency_helper_test.go

…

idempotency_helper.go

…

image_concurrency_limiter_test.go

feat(quota): 用户 × 平台 USD 配额

2026-05-26 10:49:20 +08:00

image_concurrency_limiter.go

feat: add OpenAI image generation controls

2026-05-05 03:26:54 +08:00

image_task_admin_toggle_test.go

fix(backup): 拒绝用自动生成的临时密钥持久化 S3 SecretAccessKey

2026-07-20 15:20:51 +08:00

image_task_handler_test.go

feat: 异步图片任务结果落对象存储

2026-07-15 19:57:37 -07:00

image_task_handler.go

feat(image-storage): 异步生图对象存储改为后台配置，保存即生效

2026-07-19 00:56:21 -07:00

logging.go

…

model_plaza_handler_test.go

修复模型广场图片模型价格展示与实收口径不一致

2026-08-04 13:48:19 +08:00

model_plaza_handler.go

修复模型广场图片模型价格展示与实收口径不一致

2026-08-04 13:48:19 +08:00

no_account_error_test.go

fix: classify transient account exhaustion as 503 instead of 404

2026-07-17 22:10:18 +08:00

no_account_error.go

Add composite group routing

2026-07-23 09:19:24 +08:00

openai_alpha_search.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

openai_body_limit_failover_test.go

test(openai): validate body-limit error envelope

2026-07-16 00:52:26 +08:00

openai_chat_completions.go

Merge remote-tracking branch 'upstream/main' into codex-overdraft

2026-08-19 09:36:51 +08:00

openai_codex_models_handler_test.go

避免无效模型清单破坏 Codex 能力发现

2026-07-16 17:10:44 +08:00

openai_codex_models_handler.go

fix(openai): preserve web search for API-key Codex clients

2026-07-27 18:42:34 +08:00

openai_embeddings.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

openai_gateway_cn_dispatch_test.go

fix(cn-providers): 修复 CN 分组五项功能缺陷(调度闸门/计费/断开漏记/count_tokens/403)

2026-08-17 17:28:53 +08:00

openai_gateway_compact_body_signal_test.go

merge: sync upstream v0.1.177

2026-08-15 22:53:29 +08:00

openai_gateway_compact_log_test.go

fix(openai): separate native and legacy compaction routing

2026-08-14 18:18:53 +08:00

openai_gateway_count_tokens.go

fix(cn-providers): 修复 CN 分组五项功能缺陷(调度闸门/计费/断开漏记/count_tokens/403)

2026-08-17 17:28:53 +08:00

openai_gateway_credential_failover_loop_test.go

fix(grok): cool down accounts after 402

2026-07-23 00:06:04 +08:00

openai_gateway_credential_failover_test.go

fix(antigravity):

2026-07-26 20:23:50 +09:00

openai_gateway_cyber_test.go

feat(openai): cyber_policy 硬阻断全链路透传、审计与计费

2026-06-12 01:47:01 +08:00

openai_gateway_endpoint_normalization_test.go

…

openai_gateway_first_output_timeout_test.go

fix(openai): bound native responses first output wait

2026-07-15 13:01:16 +08:00

openai_gateway_handler_test.go

Merge branch 'main' into fix/issue-5029-openai-passthrough-pool-auth-retry

2026-08-11 14:09:07 +08:00

openai_gateway_handler.go

Merge remote-tracking branch 'upstream/main' into codex-overdraft

2026-08-19 09:36:51 +08:00

openai_gateway_reasoning_failover_test.go

fix(openai): strip foreign reasoning on account failover

2026-07-26 13:33:56 +08:00

openai_gateway_reasoning_failover.go

fix(openai): strip foreign reasoning on account failover

2026-07-26 13:33:56 +08:00

openai_gateway_usage_context_test.go

Preserve usage request context

2026-05-28 22:44:25 +08:00

openai_grok_image_intent_gate_test.go

test: 更新 image permission 测试适配 explicit intent 检查

2026-07-17 15:29:14 +08:00

openai_image_intent_hint_test.go

复用请求级图片生成意图判断

2026-07-15 04:20:11 +08:00

openai_images_controls_test.go

feat: add OpenAI image generation controls

2026-05-05 03:26:54 +08:00

openai_images_failover_test.go

fix(images): log requested quality and size

2026-07-23 23:04:00 +08:00

openai_images.go

fix(ratelimit): 守卫按端点来源门控，并与冷却键对齐模型口径

2026-08-07 20:49:39 +08:00

openai_live_test.go

feat(openai): add macOS Live attestation

2026-07-25 12:50:46 +08:00

openai_live.go

fix(openai): satisfy Live CI checks

2026-07-25 12:51:20 +08:00

openai_profit_slot_recheck_test.go

fix(openai): preserve remote compaction v2 responses endpoint

2026-08-14 16:23:52 +08:00

openai_profit_veto_budget_test.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

openai_quota_platform_contract_test.go

fix(openai): preserve quota platform in usage billing

2026-06-28 11:13:09 +08:00

openai_responses_failover_cancel_test.go

fix(gateway): 客户端断开后 failover 静默终止，不再误报 502 账号耗尽

2026-07-15 09:29:05 +08:00

openai_responses_image_intent_benchmark_test.go

优化 Responses 生图意图复用

2026-07-19 18:49:08 +08:00

openai_stream_validation_test.go

fix: validate stream field type

2026-06-03 14:18:12 +08:00

openai_stream_validation.go

fix: validate stream field type

2026-06-03 14:18:12 +08:00

openai_ws_turn_pricing_test.go

功能：支持渠道模型分时倍率定价

2026-08-17 19:45:07 +08:00

openai_x_search_test.go

feat: Chat 与 Responses 往返保留 x_search，并补 sources 抽取

2026-08-13 08:37:57 +08:00

openai_x_search.go

feat: Chat 与 Responses 往返保留 x_search，并补 sources 抽取

2026-08-13 08:37:57 +08:00

ops_capture_writer_nil_test.go

修复 compact 心跳 writer 生命周期

2026-07-12 04:53:41 +08:00

ops_error_logger_attribution_test.go

fix: 过滤入口拒绝日志并强化鉴权边界

2026-07-18 00:11:18 +08:00

ops_error_logger_cyber_test.go

feat(openai): cyber_policy 硬阻断全链路透传、审计与计费

2026-06-12 01:47:01 +08:00

ops_error_logger_test.go

Merge pull request #4515 from BenjaminAaron196/feat/filter-noise-rejected-requests

2026-07-18 20:46:50 +08:00

ops_error_logger.go

Add composite group route registry

2026-07-23 09:20:18 +08:00

ops_ingress_reject_capture_test.go

fix: 过滤入口拒绝日志并强化鉴权边界

2026-07-18 00:11:18 +08:00

ops_platform_test.go

Harden composite group product surfaces

2026-07-23 09:19:25 +08:00

page_handler_test.go

Fix image billing size normalization

2026-05-12 15:21:31 +08:00

page_handler.go

Add admin compliance acknowledgement gate

2026-06-10 14:16:51 +08:00

passkey_handler_test.go

新增腾讯天御验证码认证门禁

2026-08-04 15:09:29 +08:00

passkey_handler.go

人机验证增加阿里云验证码 2.0

2026-08-04 20:57:15 +08:00

payment_handler_resume_test.go

fix(payment): 删除泄露内部 AI 渠道配置的废弃接口

2026-07-13 15:22:39 +08:00

payment_handler.go

feat(payment): add mobile Alipay precreate deep link

2026-07-22 19:18:04 +08:00

payment_webhook_handler_test.go

feat: add Airwallex payments and multi-currency support

2026-05-11 11:17:26 +08:00

payment_webhook_handler.go

feat: add Airwallex payments and multi-currency support

2026-05-11 11:17:26 +08:00

redeem_handler.go

…

request_body_limit_test.go

…

request_body_limit.go

fix(gateway): cap lenient json normalization

2026-07-09 11:15:52 +08:00

request_body_parse_log_test.go

fix(gateway): 记录请求体解析失败的真实原因，不再吞错

2026-07-07 13:53:39 +08:00

request_body_parse_log.go

fix(gateway): 记录请求体解析失败的真实原因，不再吞错

2026-07-07 13:53:39 +08:00

security_audit_errors_test.go

feat(security-audit): add OpenAI-compatible prompt auditing

2026-07-17 00:39:39 +08:00

security_audit_errors.go

feat(security-audit): add OpenAI-compatible prompt auditing

2026-07-17 00:39:39 +08:00

security_audit_helper_test.go

fix(security-audit): restore websocket audit logs

2026-08-11 11:56:46 +08:00

security_audit_helper.go

fix(security-audit): restore websocket audit logs

2026-08-11 11:56:46 +08:00

security_audit_media_submit_test.go

feat(security-audit): add OpenAI-compatible prompt auditing

2026-07-17 00:39:39 +08:00

security_audit_order_test.go

feat(security-audit): add OpenAI-compatible prompt auditing

2026-07-17 00:39:39 +08:00

setting_handler_public_test.go

fix: 完善腾讯验证码区域适配与 CSP 白名单

2026-08-06 20:34:37 +08:00

setting_handler.go

feat(settings): channel_monitor_show_quota public setting (default off)

2026-08-18 04:06:18 +00:00

stream_error_event_test.go

style: fix lint errors in response.failed SSE writer

2026-05-25 18:16:46 +08:00

stream_error_event.go

test: cover endpoint wildcard edge cases

2026-07-07 10:20:23 +08:00

subscription_handler.go

…

totp_handler.go

feat(security): gate admin role promotion behind step-up 2FA and harden admin TOTP verification

2026-07-16 16:49:08 +08:00

usage_handler_daily_test.go

feat(usage): 记录并展示失败请求(用户端+管理端)

2026-06-05 14:00:57 +08:00

usage_handler_request_type_test.go

feat(usage): audit upstream response models

2026-08-07 09:40:11 -04:00

usage_handler_sort_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

usage_handler.go

fix: split Grok image and video pricing

2026-07-08 13:50:49 +08:00

usage_record_submit_task_test.go

fix(grok): 三轮评审 — 流式 Search 去重与调度/计费加固

2026-08-07 17:58:23 +08:00

usage_record_task_fallback_test.go

fix(gateway): record observed usage when anthropic stream is interrupted

2026-08-01 11:29:58 +08:00

user_handler_test.go

refactor(repository): scope user/api-key updates to declared columns

2026-07-28 17:21:32 +08:00

user_handler.go

feat(quota): 用户 × 平台 USD 配额

2026-05-26 10:49:20 +08:00

user_msg_queue_helper.go

…

user_platform_quotas_handler_test.go

feat(quota): 用户 × 平台 USD 配额

2026-05-26 10:49:20 +08:00

wire.go

feat: 国产供应商一等支持（Kimi/Zhipu/DeepSeek 多协议 + 配额/余额监控）

2026-08-15 10:37:51 +00:00