wushenghua/sub2api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,667 Commits 1 Branch 0 Tags
a0593b0bf84d2c778af05abeb0f34945452ec6c4
Commit Graph
1146 Commits
Author SHA1 Message Date
shaw a0593b0bf8 fix(gateway): 客户端断开后 failover 静默终止，不再误报 502 账号耗尽 
上游请求经 detachUpstreamContext(WithoutCancel) 有意脱离客户端取消（保
计费），但 failover 循环仍用原始 c.Request.Context() 重新选号：客户端
断开后上游返回 520 等可 failover 错误时，重新选号必然得到 context
canceled，被误判为账号耗尽，记录并返回通用 502。

修复：客户端已断开 ⇒ failover 静默终止。

- 新增 failoverClientGone(c)：请求 ctx 已取消时先停 compact 心跳
  （建立 happens-before，对齐其它终结路径），响应未提交则标 499
  （statusClientClosedRequest，与并发槽取消路径同惯例）
- 7 个 OpenAI 内联 failover 循环（Responses/Messages/chat_completions/
  embeddings/images/grok_media/alpha_search）加双 guard：换号前 +
  选号失败分支入口；guard 位于 ReportOpenAIAccountScheduleResult(false)
  之后、RecordOpenAIAccountSwitch/池模式重试之前，账号健康副作用
  （service 层 detached ctx）不受影响
- FailoverState.HandleFailoverError/HandleSelectionExhausted 入口加
  ctx.Err() 检查返回 FailoverCanceled，取消不再改动 failover 状态；
  全部 10 个 FailoverCanceled 分支统一调用 failoverClientGone 归类 499
- 上游 detach 与计费设计不变；真实上游 520 事件仍完整落 ops
  （面板显示码 COALESCE(upstream_status_code,status_code)=520，
  错误率/告警口径不变）

测试：新增 openai_responses_failover_cancel_test.go 复现 issue 场景
（520+取消 ⇒ 不切号、499、无 502 终态）+ 在线客户端对照（正常切换、
耗尽 502）；failover_loop_test.go 补入口取消用例并修正取消语义断言。

Fixes #4257
 2026-07-15 09:29:05 +08:00
Heatherm Huang b32b815e46 fix(grok): harden OAuth pool recovery 2026-07-14 14:55:30 +08:00
Heatherm Huang 343390057d fix(grok): fail over OAuth credential errors safely 2026-07-14 14:55:30 +08:00
superman2003 16d1fbfd4e fix(ci): keep probe scheduler snapshots test-only 2026-07-14 12:45:03 +08:00
superman2003 0a64a6d8ce feat(monitor): support Grok channel health checks 2026-07-14 12:24:42 +08:00
superman2003 a1b5c75ca3 feat(grok): probe newly imported OAuth accounts 2026-07-14 12:24:42 +08:00
Wesley LiddickandGitHub c361b0606d Merge pull request #4219 from zh239ns/codex/fix-openai-images-nonstream-keepalive 
fix(images): add opt-in non-stream JSON keepalive
 2026-07-14 11:30:28 +08:00
shaw d41a10111d Merge remote-tracking branch 'origin/main' into feat/grok-sso-device-oauth 
# Conflicts:
#	frontend/src/api/admin/grok.ts
 2026-07-14 10:19:16 +08:00
Wesley LiddickandGitHub 93f2ccf3a5 Merge pull request #4188 from superman2003/fix/grok-free-quota-429-20260713 
feat(grok): improve free quota probing and usage display
 2026-07-14 10:14:41 +08:00
Wesley LiddickandGitHub a8927d8ec7 Merge pull request #4214 from bestony/agent/devbox-coding/25c66071-1783957460 
feat: add opt-in Server-Timing for Admin UI APIs
 2026-07-14 10:14:17 +08:00
Wesley LiddickandGitHub 623a9647c0 Merge pull request #4110 from gebdalaoli-arch/agent/fix-codex-models-apikey-upstream 
fix: proxy Codex model manifests through API key upstreams
 2026-07-14 10:13:56 +08:00
Wesley LiddickandGitHub 41c71a1528 Merge pull request #4216 from bestony/agent/devbox-coding/3ff3c99d 
feat(ops): add Host filtering to system logs
 2026-07-14 10:13:40 +08:00
Wesley LiddickandGitHub 1847bdf9fd Merge pull request #4179 from scientist-blockchian/fix/messages-exact-model-mapping 
fix(openai): preserve exact messages dispatch mappings
 2026-07-14 10:13:27 +08:00
zh239ns 002c0b9fda fix(images): keep non-stream requests alive 2026-07-14 07:39:21 +08:00
bestonyandmultica-agent 2c2e50ba58 feat(ops): add host filtering to system logs 
Co-authored-by: multica-agent <github@multica.ai>
 2026-07-14 01:29:46 +08:00
bestonyandmultica-agent 54d228dda5 feat(admin): add opt-in server timing metrics 
Co-authored-by: multica-agent <github@multica.ai>
 2026-07-14 01:29:30 +08:00
jinfeijie bot ad4bf5c60d feat(grok): 支持 Web SSO 批量导入并转换为 Build OAuth 
新增 Grok Web SSO → xAI Device Flow → Grok Build OAuth 导入链路，
支持管理员批量粘贴 SSO key 创建 OAuth 账号。

- 后端：ConvertSSOToBuild、ConvertFromSSO、POST /admin/grok/sso-to-oauth
- 批量：3 worker 并发，失败跳过并汇总 created/failed，worker panic recover
- 无 refresh_token 时写入 expires_at 并强制 auto_pause_on_expired
- 前端：SSO Cookie 导入入口、动态超时、中英文案、部分成功不关弹窗
- 测试：pkg/service/handler/前端超时单测；本地 Docker 真实 SSO e2e 通过
 2026-07-14 01:09:07 +08:00
benjamin e9fb5983cd fix(billing): 默认关闭 OpenAI 长上下文计费 2026-07-13 23:32:16 +08:00
gebdalaoli-arch 3c68b2e369 fix: fail over Codex manifest accounts 2026-07-13 20:36:37 +08:00
superman2003 c896cacf6d feat(grok): improve free quota probing and usage 2026-07-13 19:49:56 +08:00
gebdalaoli-arch ed31a52424 fix: stabilize API key Codex manifest refreshes 2026-07-13 19:31:38 +08:00
benjamin 3e4d48e010 Merge remote-tracking branch 'upstream/main' into fix/api-double-billing 
# Conflicts:
#	frontend/src/components/account/EditAccountModal.vue
 2026-07-13 18:06:44 +08:00
zz80900 40ec74b9fc fix(openai): preserve exact messages dispatch mappings 
Treat a non-empty messages dispatch model as a caller-approved fallback after account-level mapping, without reclassifying the requested Claude family.\n\nAdd Fable forwarding and endpoint boundary regression coverage.\n\nFixes #4177
 2026-07-13 17:57:08 +08:00
benjamin a0ac5e0240 fix(billing): 默认开启 OpenAI 长上下文计费 2026-07-13 17:55:01 +08:00
Wesley LiddickandGitHub a2bc133747 Merge pull request #4163 from bestony/fix/openai-ws-ingress-lifecycle 
fix(openai-ws): bound ingress session lifecycle
 2026-07-13 16:07:53 +08:00
Wesley LiddickandGitHub 4bc7486c3b Merge pull request #4161 from fengshao1227/fix/remove-payment-channels-endpoint 
fix(payment): 删除泄露内部 AI 渠道配置的废弃接口
 2026-07-13 15:39:32 +08:00
Bestony@Homelab c8cfc93632 fix(openai-ws): bound ingress session lifecycle 2026-07-13 15:32:42 +08:00
Wesley LiddickandGitHub b4aa3eb023 Merge pull request #4148 from feeeei/fix/retry_count 
fix: 池模式同账号重试次数配置对 Anthropic/Gemini/通用转发路径生效
 2026-07-13 15:32:40 +08:00
li 03ccb2a08e fix(payment): 删除泄露内部 AI 渠道配置的废弃接口 
Fixes #4160
 2026-07-13 15:22:39 +08:00
shaw 8315defe8e Merge branch 'main' into feat/grok-video-edit-extension 2026-07-13 14:50:18 +08:00
feeeei c7c933776d fix: 池模式同账号重试次数配置对 Anthropic/Gemini/通用转发路径生效 
e643fc38 引入 pool_mode_retry_count 账号配置时,只覆盖了 OpenAI 族
handler 的内联重试循环;走 HandleFailoverError 的 Anthropic/
Antigravity/Gemini/通用转发路径仍硬编码同账号重试 3 次,配置不生效。

为 HandleFailoverError 增加 retryLimit 参数,由调用方传入
account.GetPoolModeRetryCount();未配置账号默认仍为 3 次,行为不变。
 2026-07-13 12:57:00 +08:00
yan9651688 3605a316af Keep usage ranges consistent across API and dashboards 
Expose the active weekly subscription window through /v1/usage, calculate offsets with the same normalized page size used by queries, and keep user-facing date ranges on the browser's local calendar date.

Constraint: Preserve existing response fields and avoid new dependencies
Rejected: Keep duplicate inline date formatters | a shared local-date utility prevents the same UTC regression in both views
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Keep Offset and Limit based on the same normalized page size
Tested: go test ./internal/pkg/pagination ./internal/handler; go vet ./internal/pkg/pagination ./internal/handler; frontend 923 tests; pnpm typecheck; pnpm lint:check; pnpm build
Not-tested: Live API request against a deployed subscription
Related: #4121
 2026-07-13 11:35:46 +08:00
benjamin 0d9c140bc2 Merge upstream/main into fix/api-double-billing 2026-07-13 11:10:33 +08:00
chenjian 909b96edd2 feat: support Grok video edits and extensions 2026-07-13 10:50:42 +08:00
Wesley LiddickandGitHub b73d8c3efe Merge pull request #4009 from heathermhuang/codex/fix-recent-grok-issues 
fix: expand Grok API, CLI, billing, and setup support
 2026-07-13 10:36:11 +08:00
Heatherm Huang 8a22dc7347 fix(grok): diagnose unavailable models by platform 2026-07-13 10:11:34 +08:00
Heatherm Huang 3375b4ed2b fix(grok): route OAuth subscriptions through CLI proxy 2026-07-13 10:11:33 +08:00
shaw 7cbb36f278 feat(billing): Codex alpha/search 网页搜索按次计费 
- alpha/search 成功请求（上游 2xx）按次计费落 usage_logs（billing_mode=per_request），
  上游错误透传/failover 不计费；使用 mandatory 池提交，池满同步兜底不丢扣费
- 单价默认 0.01 USD/次（官方 $10/1000 次），分组新增 web_search_price_per_call
  覆盖价（0=免费，负数/留空=默认价），实际扣费叠加分组费率倍数（与 token 口径一致）
- 分组字段全链路：ent schema + 迁移 174 + 端口快照 v15 + admin 创建/更新 + DTO
- 前端分组表单（openai 平台）新增单次价格配置，实时预览应用当前倍率后的单次价格
- 该端点鉴权维持仅 OpenAI 分组（非 OpenAI 分组 404）
 2026-07-13 09:54:51 +08:00
benjamin 92dcfb5ebc fix(billing): 按账号控制 OpenAI 长上下文计费 2026-07-13 09:47:19 +08:00
shaw 8d51364c3d Merge remote-tracking branch 'origin/main' into feat/grok-prompt-cache-identity 
# Conflicts:
#	backend/internal/handler/endpoint.go
#	backend/internal/service/openai_gateway_grok_test.go
 2026-07-13 09:12:44 +08:00
Wesley LiddickandGitHub 33b1d772f7 Merge pull request #4063 from yardbirds0/fix/codex-alpha-search 
fix: 转发 Codex alpha/search 独立搜索端点
 2026-07-13 08:58:01 +08:00
Wesley LiddickandGitHub 841481e051 Merge pull request #3971 from yardbirds0/codex/fix-remote-compaction-v2 
fix: 保留 remote_compaction_v2 原生 Responses 请求链路
 2026-07-13 08:54:53 +08:00
gebdalaoli-arch 0dce07ee8b fix: proxy Codex models through API key upstreams 2026-07-13 03:47:39 +08:00
superman2003 7050070aa3 fix(grok): route cacheable chat requests via responses 2026-07-12 11:50:56 +08:00
jjaw 06af8115f7 修复 compact 心跳 writer 生命周期 2026-07-12 04:53:41 +08:00
Tian Lee 52071d391b fix(openai): 转发 Codex alpha/search 独立搜索端点 2026-07-11 20:31:33 +08:00
Tian Lee 84bb7d0709 fix: 保留 remote_compaction_v2 原生 Responses 链路 2026-07-11 12:51:53 +08:00
li bc3cb29027 fix(handler): 补齐 opsCaptureWriter 全部委托方法的 nil 守卫 2026-07-10 21:03:40 +08:00
li 89a551b964 fix(handler): opsCaptureWriter 释放后访问 nil panic 
Fixes #3961
 2026-07-10 20:56:31 +08:00
Lyonle f2966530c5 feat(openai): 支持用户级 Fast/Flex 策略 2026-07-10 15:16:09 +08:00