github/sub2api
4
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-10-20 08:19:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,356 Commits 49 Branches 63 Tags
fix/api-key-create-limits
Commit Graph
2365 Commits
Author SHA1 Message Date
Wesley Liddick 2f3fed2fdb Merge pull request #7678 from PMExtra/feat/claude-code-only-client-tabs 
feat: Claude Code 专用分组仅展示受支持的客户端入口
 2026-09-29 15:53:58 +08:00
Wesley Liddick fe9dadfc7d Merge pull request #7679 from PMExtra/feat/risk-control-allowlist 
feat: 新增可信用户风控白名单，保留审计并免除本地自动处罚
 2026-09-29 15:53:18 +08:00
Wesley Liddick 41dcfec489 Merge pull request #7680 from PMExtra/fix/openai-model-catalog 
fix: 移除 OpenAI 分组 Codex 配置中的模型目录依赖
 2026-09-29 15:52:51 +08:00
Wesley Liddick 052e08e764 Merge pull request #7684 from william-drakemond/feat/claude-reset-credits-ui 
feat(claude): 查询 Claude 重置次数（只读），UI 复用 Codex 次数按钮 / Read-only Claude reset credit count, reusing Codex count UI
 2026-09-29 15:50:53 +08:00
Wesley Liddick f50b99b66c Merge pull request #7542 from wucm667/fix/model-whitelist-mapping-conflict 
fix(accounts): warn when whitelist model conflicts with mapping
 2026-09-29 15:43:33 +08:00
Wesley Liddick b35a611538 Merge pull request #7646 from wucm667/feat/issue-7642-dashboard-spending-trend 
feat(dashboard): toggle recent usage between tokens and spending
 2026-09-29 15:43:07 +08:00
William DrakeandClaude Opus 5.5 860782e6fb fix(claude): harden reset credit projection and cell state (review R2) 
- Drop selection_token (unsalted hash of a short grant ID, reversible) and
  claudeGrantSelection from the read-only DTO; assert it never serializes.
- query() returns only the projected result; no raw upstream block escapes.
- Clear a cooldown_until that is already past, using the same `now` as the
  redeemable check; the cell also shows the cooldown only when in the future.
- Invalidate in-flight queries when account id, platform or type changes.
- Sort the earliest-expiry fallback by parsed timestamp, invalid/missing last.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
 2026-09-28 20:59:39 -04:00
William DrakeandClaude Opus 5.5 35232c3949 fix(accounts): address review of Claude reset credit count 
- Show resets held (sum of resets_left) on the count button, matching the
  Codex count; flag "not usable now" when none is redeemable yet, instead
  of showing 0 while a grant exists.
- Pick the redeemable (next) grant for the expiry chip, falling back to
  the earliest expiry, rather than assuming credits[0] is next.
- Render a single ClaudeResetCreditsCell across usage states so a query
  started while usage loads is not lost on remount.
- Drop an unrelated google/subcommands go.sum entry.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
 2026-09-28 19:03:47 -04:00
William DrakeandClaude Opus 5.5 421da3f0d4 feat(accounts): align Claude reset credit query with Codex reset count button 
The Claude reset credit query rendered as a bare "Claude 重置额度" link,
which reads like a redeem action, and dumped raw ISO timestamps and
window keys. Render it like OpenAIQuotaResetCell instead: a read-only
"次数 N" button sharing one row with the local query button via a
#pre-actions slot, plus an expiry chip whose tooltip carries the grant
label, cleared windows and limit requirement.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
 2026-09-28 18:06:23 -04:00
korkin25 f8984b8a93 feat(accounts): show Claude reset credit status on demand 2026-09-28 18:04:13 -04:00
haruka 8490a81867 feat: support Claude Sonnet 5.5 2026-09-29 04:55:07 +08:00
PMExtra 6073704fd7 fix: omit Codex model catalog for OpenAI groups 2026-09-29 01:50:43 +08:00
PMExtra 6a69dd051a feat: add risk control user allowlist 2026-09-29 01:50:21 +08:00
PMExtra 2840cdeced feat(frontend): hide unsupported clients for Claude Code-only groups 2026-09-29 01:48:23 +08:00
wucm667 aa3a3ea787 feat(dashboard): toggle recent usage between tokens and spending 2026-09-28 14:48:42 +08:00
Wesley Liddick f592b336a3 Merge pull request #7595 from wucm667/feat/issue-7587-allowlist-glob 
feat(groups): support wildcards anywhere in model allowlists
 2026-09-28 09:55:55 +08:00
Wesley Liddick 37f35b12ea Merge pull request #7524 from Achordchan/fix/plaza-video-rate 
fix(model-plaza): apply independent video billing multipliers
 2026-09-28 09:55:34 +08:00
Wesley Liddick 66f07efd26 Merge pull request #7549 from helianthus1/fix/ccswitch-usage-v1-path 
fix(ccswitch): stop usage query from requesting /v1/v1/usage
 2026-09-28 09:49:47 +08:00
Wesley Liddick 89e9976950 Merge pull request #7497 from ouchihao/codex/bug-group-modal-cleanup 
fix(groups): clean up modal listeners and pending searches
 2026-09-28 09:42:09 +08:00
Wesley Liddick 99d86e41ac Merge pull request #7611 from ZeroClover/fix/usage-bar-idle-reset-time 
fix(ui): show reset countdown for idle usage windows with known reset time
 2026-09-28 09:41:52 +08:00
Wesley Liddick ec334fda2c Merge pull request #7628 from Sterbennicht/fix/codex-windows-catalog-path 
fix(keys): use ~/ for the Codex model catalog path on Windows
 2026-09-28 09:41:35 +08:00
Sterbennicht f652d0ed38 fix(keys): use ~/ for the Codex model catalog path on Windows 
Codex expands a leading ~/ in config.toml paths on every platform but
does not expand %userprofile%. The Windows config generated by the Use
Key dialog wrote model_catalog_json = "%userprofile%\.codex\codex-models.json",
which Codex resolves relative to the config directory
(C:\Users\<user>\.codex\%userprofile%\.codex\codex-models.json), so it
fails to load the config with "The system cannot find the path
specified (os error 3)".

Always write ~/.codex/codex-models.json into config.toml. The download
hint still shows the Windows location to save the file.
 2026-09-27 22:58:44 +08:00
anti 14483c9254 fix(ccswitch): preserve Codex provider root endpoint 2026-09-27 13:48:39 +08:00
Zero Clover 994048e6a4 fix(ui): show reset countdown for idle usage windows with known reset time 
UsageProgressBar returned 'now' whenever showNowWhenIdle was set and
utilization was 0%, ignoring resetsAt. OpenAI Codex 7d windows at 0%
usage still carry a future reset time, so the admin account list hid it.
Only fall back to 'now' when no reset time is known.
 2026-09-26 18:49:51 +08:00
Achord Chan 510b680fca Merge upstream main and retain upstream scheduler test fix 2026-09-26 15:47:52 +08:00
wucm667 f0ebc183e1 feat(groups): allow wildcard positions in model allowlist 2026-09-25 09:12:09 +08:00
helianthus1 00f6f4e4a8 fix(ccswitch): stop usage query from requesting /v1/v1/usage 
#7395 made Codex (and Grok) imports store a base URL ending in /v1, but the
usage script still appends a hard-coded /v1/usage, so CC Switch requests
/v1/v1/usage, gets a 404 and shows "query failed" for every newly imported
Codex/Grok provider. Move the script into ccswitchImport.ts and strip an
existing trailing /v1 from {{baseUrl}} before appending /v1/usage, which
covers both the imported value and base URLs users edit either way later.
 2026-09-23 04:24:52 -07:00
wucm667 e2c35cf394 fix(account): prevent whitelist model mapping conflicts 2026-09-23 17:47:47 +08:00
alfadb a2e1618700 fix(opencode): 纠正 CASE 求值顺序注释并补齐 mode 语义护栏 2026-09-23 15:26:44 +08:00
alfadb 31635849e0 fix(opencode): 用量单元格与 CN 子单元格互斥，避免重复渲染 2026-09-23 15:26:44 +08:00
alfadb 0c860e81e1 fix(i18n): merge duplicate opencodeGo locale blocks after upstream rebase 2026-09-23 15:26:44 +08:00
alfadb daf6cbb5d9 feat(opencode): 用量单元格支持主动查询并将周/月徽章改为 7d/1m 2026-09-23 15:26:44 +08:00
alfadb 912e1c414c fix(opencode): remove stray conflict-marker text from usage cell imports 2026-09-23 15:26:35 +08:00
alfadb ae2735cdb6 feat(opencode): 用量窗口支持同 Key 组共享、活动防抖与超窗强刷 
与 Ollama Cloud usage 对齐：OpenCode Go 作为同 Key 聚合订阅，
多个 openai/apikey/base_url=opencode.ai/zen/go/v1 账号共享同一份
用量状态与刷新节奏：

- 组共享：组指纹 sha256("opencode.ai\0"+api_key)；auto_refresh 开关
  与 snapshot 按组写（事务 + FOR NO KEY UPDATE + 锚点 CAS + 纯合并，
  写 snapshot 不会抹掉开关）；列表/详情经 ResolveAccounts 组内共享；
  账号换 Key → IdentityChanged → 组级关闭 auto_refresh 并清快照
- 活动防抖 + 超窗强刷：settings 新增 debounce_minutes（默认 1，
  1-60，必须小于 interval_minutes）；模型请求活动经网关 5 处调用点
  驱动刷新，due = min(lastUsed+debounce, fetchedAt+maxWait)，
  成功路径有 5 分钟最小抓取间隔，失败路径退避优先
- 手动刷新限频 10s→30s 且按组；singleflight/RunDue 按组去重；
  ListDue 在 SQL 内按组算 due（CTE 分组取组内 MAX(last_used_at)）

验证：go build + 五包回归 OK；新增组共享/三态 due/组单飞/
IdentityChanged/debounce 校验单测全绿；vitest 11 例全绿；
vue-tsc 零错误。
 2026-09-23 15:26:35 +08:00
alfadb 6624947b62 feat(opencode): 支持 OpenCode Go 官方用量窗口查询与自动刷新 
OpenCode Go 上游（https://opencode.ai/zen/go/v1）官方提供用量端点
GET /zen/go/v1/usage（Bearer 复用消费 key），返回 rolling(5h)/weekly/monthly
三窗口的 percent 与 resetsAt。本提交为 openai apikey 账号（base_url 为
opencode.ai/zen/go/v1）接入该用量窗口：

- 后端：OpenCodeGoUsageService——手动刷新（每账号 10s 节流）、
  周期自动刷新（全局开关 + 账号开关双开启，interval 5-1440 分钟，
  leader lock + 每轮 20 账号 + 并发 4）、失败指数退避（上限 24h）、
  Retry-After 尊重；401→unauthorized、403→failed；snapshot 持久化于
  accounts.extra（单账号写入，无分组 CAS、无会话加密）
- admin API：settings GET/PUT、/:id/opencode-go-usage GET、
  auto-refresh PUT、refresh POST（与 Ollama Cloud usage 同构）
- 前端：账号列表行内三窗口进度条（复用 UsageProgressBar）、
  编辑弹窗内配置面板（详情+手动刷新+auto-refresh）、全局设置卡片、
  en/zh i18n

验证：
- 上游端点已用生产真实 Go key 实测 200，响应
  {"usage":{"rolling":{"status":"ok","percent":6,...},...}}（2026-08-13）
- go build ./... OK；service/handler/repo/dto/cmd 全量回归 OK
- 新增单测 20 例（解析 401/403/畸形 JSON、退避、节流等）全绿
- frontend vitest 新增 7 例 + Ollama 回归 4 例全绿；vue-tsc 零错误
 2026-09-23 15:26:35 +08:00
Wesley Liddick afd069b169 Merge pull request #7532 from alfadb/feature/claude-cli-version-sync 
feat(claude): 自动同步 Claude Code 客户端版本号，无需改代码跟随官方版本
 2026-09-23 14:54:36 +08:00
shaw 6452aeffa1 fix(claude): 修复版本同步契约测试和缓存刷新 2026-09-23 14:39:29 +08:00
alfadb ca08825935 feat(claude): 自动同步 Claude Code 客户端版本号 
出站伪装用的 Claude Code 版本号此前硬编码在 claude.CLICurrentVersion，
只能靠环境变量 SUB2API_CLAUDE_CLI_VERSION 覆盖且需重启；Anthropic 抬高
版本下限时（如 Opus 5.5 要求 >= 2.1.280）必须改代码发版才能跟上。

改为每小时从官方 GitHub Releases 同步最新稳定版，无需重启也无需发版。

- 新增 ClaudeCodeVersionSyncService：1 小时间隔，数据源 anthropics/claude-code
  的 releases/latest，失败回退最近 30 条列表；过滤 draft/prerelease；
  只向前推进，拉取失败保留上次值不降级；面板可关闭
- 新增三个设置项：claude_code_client_version（管理员手动固定）、
  claude_code_client_version_synced（同步服务独占写）、
  claude_code_version_auto_sync_enabled（开关，默认开）
- 取值优先级：面板手动值 -> 同步值 -> SUB2API_CLAUDE_CLI_VERSION -> 内置基线，
  每层经 IsSupportedCLIVersion 校验，含 60s 缓存与 singleflight
- 版本号运行期化：claude.DefaultHeaders 由包级 var 改为函数，新增
  EffectiveCLIVersion/DefaultUserAgent 与 SetCLIVersionResolver（未注入时
  与 CLIVersion() 等价）；identity 的 defaultFingerprint 不再在包 init 固化，
  指纹下限与主版本超前校验改用运行期值
- 守住一致性铁律：buildUpstreamRequest 与 count_tokens 各取一次 UA 字符串，
  同时喂给出站 User-Agent 头与请求体 billing 的 cc_version，避免缓存翻转
  瞬间头体版本不一致被判非正版客户端
- 管理后台设置页新增配置区块，含中英文案与「当前同步到」只读展示
 2026-09-23 13:35:44 +08:00
Achord Chan b5b5f1f94b fix(model-plaza): apply independent video billing multipliers 2026-09-23 11:28:41 +08:00
lyy0709 c4c2e66070 feat(models): support GPT-6 Sol, Luna and Claude Opus 5.5 2026-09-23 11:27:49 +08:00
Wesley Liddick d8d5e1dd35 Merge pull request #7282 from feeeei/feat/affiliate-offline-withdrawal 
feat(affiliate): 提取记录支持登记线下提现
 2026-09-23 11:20:32 +08:00
Wesley Liddick b2d6b954a1 Merge pull request #7090 from Brisbanehuang/codex/scheduling-rate-account-fallback 
fix(scheduler): 无有效探测时回退账号倍率，支持 OAuth 参考倍率留空
 2026-09-23 11:18:37 +08:00
Wesley Liddick 1947add842 Merge pull request #7288 from feeeei/feat/backup-monthly-archive 
feat(backup): 支持月度归档与独立保留策略
 2026-09-23 11:18:08 +08:00
Wesley Liddick f53252e292 Merge pull request #6844 from ouchihao/codex/issue-6837-groups-manifest-test-pinia 
test(groups): initialize Pinia in Codex manifest regression
 2026-09-23 11:17:41 +08:00
Wesley Liddick 61e7d31605 Merge pull request #7513 from Achordchan/fix/channel-video-pricing-preview 
fix(channels): display video pricing per second
 2026-09-23 11:17:27 +08:00
Wesley Liddick 7c0a2a556c Merge pull request #7160 from StarryKira/codex/log-retention-upstream 
feat: 支持运维与请求日志的滚动保留设置
 2026-09-23 10:07:25 +08:00
Wesley Liddick 24872fda7c Merge pull request #7493 from ouchihao/codex/bug-temp-unsched-race 
fix(accounts): keep temporary unschedulable status scoped to the current account
 2026-09-23 10:03:22 +08:00
Wesley Liddick 7d5615998c Merge pull request #7492 from ouchihao/codex/bug-monitor-detail-race 
fix(channel-monitor): ignore stale detail requests
 2026-09-23 10:00:49 +08:00
Wesley Liddick d7e4bba0e7 Merge pull request #7494 from ouchihao/codex/bug-balance-error-message 
fix(users): show normalized API errors in the balance dialog
 2026-09-23 10:00:30 +08:00
Wesley Liddick d3d0f653e5 Merge pull request #7495 from ouchihao/codex/bug-subscription-expiry-label 
fix(subscriptions): use calendar dates for expiry labels
 2026-09-23 09:59:49 +08:00