sync: merge upstream/main@51614621 into feat/trae-dollar-usage (32 commits) by claude[bot] · Pull Request #10 · LeoLin990405/CodexBar

claude · 2026-05-14T19:55:37Z

Summary

Resolves upstream sync conflict from issue #9.

Merges 32 commits from steipete/CodexBar@51614621 into feat/trae-dollar-usage, including:

feat(zai): hourly usage chart
feat(kilo): organization usage selection
feat(kiro): menu bar display value picker + credits display
feat(antigravity): multi-account switching (Google OAuth)
fix(cost): clarify local estimate labels (cost_header_estimated)
feat: Tahoe menu bar visibility guidance (MenuBarVisibilityWatcher)
fix(codex): Codex CLI launch throttle + priority cost pricing
fix(claude): Claude enterprise web accounts, peak hours labels

Conflict resolutions

File	Resolution
`CostHistoryChartMenuView.swift`	Keep Chinese "估算总计（30 天）："
`MenuCardView.swift` (×2 + placeholder)	Use upstream `cost_header_estimated` key; use `Self.placeholder(input:)`
`FactoryProviderImplementation.swift`	Keep Chinese; update `manual` for Authorization header
`TokenAccountSupportCatalog+Data.swift`	Keep Chinese; update Factory subtitle/placeholder for Authorization

New zh-Hans.lproj strings added

"CodexBar can't show its menu bar icon" → "CodexBar 无法显示其菜单栏图标"
"Dismiss" → "关闭"
"Open Menu Bar Settings" → "打开菜单栏设置"
macOS Tahoe guidance string → Chinese
"placeholder_no_usage_yet" → "暂无用量"
"placeholder_limits_not_available" → "限额数据不可用"
"Historical tracking" → "历史记录追踪"

New provider strings localized inline

Kilo settingsOrganizations: "组织" / "个人账户"
Kiro settingsPickers: "Kiro 菜单栏显示值"
Antigravity settingsActions: "添加 Google 账户" / "使用 Google 登录"
Copilot enterprise host subtitle → Chinese (also fixes pre-existing lint violation)

Reviewer checklist

make check — 0 violations (confirmed locally)
swift test — run to verify no regressions
Spot-check zh-Hans strings render correctly in the app menu
Verify Factory Cookie/Authorization token entry works with new placeholder

Closes #9

🤖 Generated with Claude Code

Fixes Claude Enterprise/organization web accounts by tolerating null session-window usage and exposing an optional organization ID field for Claude token accounts. Local verification: - swift test --filter 'ClaudeWebEnterpriseUsageTests|ProvidersPaneCoverageTests|ClaudeUsageTests' - make check Co-authored-by: Claude <noreply@anthropic.com>

Co-authored-by: Piotr Durlej <pdurlej@users.noreply.github.com>

Co-authored-by: zhulijin1991 <zhulijin1991@users.noreply.github.com>

Co-authored-by: Bryan Font <bfont@me.com>

Fixes steipete#944. Refs steipete#946. Co-authored-by: Jakub Hašek <kubahasek@users.noreply.github.com>

Co-authored-by: Radek Sienkiewicz <mail@velvetshark.com>

* Add Antigravity account switching * Force Antigravity account chooser * Persist Antigravity selected account updates

* Improve Kiro credits UX * Add provider changelog links * Fix changelog menu test * feat: gate provider changelog links behind setting * Address Kiro review feedback * Polish Kiro credit detail styling * fix: repair stale managed Codex account removal * fix: handle Claude enterprise web accounts (steipete#941) Fixes Claude Enterprise/organization web accounts by tolerating null session-window usage and exposing an optional organization ID field for Claude token accounts. Local verification: - swift test --filter 'ClaudeWebEnterpriseUsageTests|ProvidersPaneCoverageTests|ClaudeUsageTests' - make check Co-authored-by: Claude <noreply@anthropic.com> * docs: update changelog for Claude enterprise fix * fix: handle quota and usage edge cases * Rebalance Kimi provider icon (steipete#912) * Add zh-Hans translations for Claude peak hour labels (steipete#921) * docs: update changelog for recent contributor fixes * Add Tahoe menu bar visibility guidance Co-authored-by: Piotr Durlej <pdurlej@users.noreply.github.com> * Coalesce historical pace reset buckets Co-authored-by: zhulijin1991 <zhulijin1991@users.noreply.github.com> * Add Codex priority cost pricing Co-authored-by: Bryan Font <bfont@me.com> * fix: parse Claude web spend limits * fix: refresh Gemini credentials without access token * refactor: split Claude web extra usage helpers * fix: defer account switcher menu rebuilds Fixes steipete#944. Refs steipete#946. Co-authored-by: Jakub Hašek <kubahasek@users.noreply.github.com> * docs: fix changelog spacing * fix: handle unavailable Codex limits gracefully * docs: update unreleased changelog * fix: repair update and account menu paths Co-authored-by: Radek Sienkiewicz <mail@velvetshark.com> * fix: handle account-scoped usage and menu login bugs * Add Antigravity account switching (steipete#937) * Add Antigravity account switching * Force Antigravity account chooser * Persist Antigravity selected account updates * docs: add Antigravity account switching changelog --------- Co-authored-by: thiagocaltoe <thiago12_fera@hotmail.com> Co-authored-by: Peter Steinberger <steipete@gmail.com> Co-authored-by: Clint Andrew Hall <clint@clintandrewhall.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Giuseppe Bisemi <giuseppe.bisemi@gmail.com> Co-authored-by: HaiTao Wu <whtis@users.noreply.github.com> Co-authored-by: Piotr Durlej <pdurlej@users.noreply.github.com> Co-authored-by: zhulijin1991 <167979819+zhulijin1991@users.noreply.github.com> Co-authored-by: zhulijin1991 <zhulijin1991@users.noreply.github.com> Co-authored-by: iam-brain <94809115+iam-brain@users.noreply.github.com> Co-authored-by: Bryan Font <bfont@me.com> Co-authored-by: Jakub Hašek <kubahasek@users.noreply.github.com> Co-authored-by: Radek Sienkiewicz <mail@velvetshark.com> Co-authored-by: Larry Hao（郝卓远） <107194248+hhh2210@users.noreply.github.com>

Co-authored-by: Yashiel Sookdeo <yashiel@skyner.co.za>

Co-authored-by: Noe <nfbr.9819@gmail.com>

Co-authored-by: Benjamin <benjamin-liang@outlook.com>

# Conflicts: # Sources/CodexBar/CostHistoryChartMenuView.swift # Sources/CodexBar/MenuCardView.swift # Sources/CodexBar/Providers/Factory/FactoryProviderImplementation.swift # Sources/CodexBarCore/TokenAccountSupportCatalog+Data.swift

- Add zh-Hans translations for new Tahoe menu bar guidance strings - Add zh-Hans translations for cost estimation keys and placeholder states - Localize Kilo organization section, Kiro menu bar picker, and Antigravity account-switching strings to Chinese - Use String(localized:) for placeholder_no_usage_yet / placeholder_limits_not_available - Fix line-length violation in AntigravityProviderImplementation (Chinese subtitle) - Fix pre-existing line-length violation in CopilotProviderImplementation by localizing subtitle Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

clintandrewhall and others added 30 commits May 14, 2026 06:47

docs: update changelog for Claude enterprise fix

100e32f

fix: handle quota and usage edge cases

36db0c6

Rebalance Kimi provider icon (steipete#912)

ac5de84

Add zh-Hans translations for Claude peak hour labels (steipete#921)

6423275

docs: update changelog for recent contributor fixes

e48a4bc

Add Tahoe menu bar visibility guidance

e6ea0ae

Co-authored-by: Piotr Durlej <pdurlej@users.noreply.github.com>

Coalesce historical pace reset buckets

4abfbb6

Co-authored-by: zhulijin1991 <zhulijin1991@users.noreply.github.com>

Add Codex priority cost pricing

2f6a31c

Co-authored-by: Bryan Font <bfont@me.com>

fix: parse Claude web spend limits

9d7a24e

fix: refresh Gemini credentials without access token

24d67e5

refactor: split Claude web extra usage helpers

8c3e254

fix: defer account switcher menu rebuilds

aebe1c9

Fixes steipete#944. Refs steipete#946. Co-authored-by: Jakub Hašek <kubahasek@users.noreply.github.com>

docs: fix changelog spacing

6e68613

fix: handle unavailable Codex limits gracefully

32fd0ec

docs: update unreleased changelog

0776680

fix: repair update and account menu paths

837cdb9

Co-authored-by: Radek Sienkiewicz <mail@velvetshark.com>

fix: handle account-scoped usage and menu login bugs

eba4b6f

Add Antigravity account switching (steipete#937)

a15df5c

* Add Antigravity account switching * Force Antigravity account chooser * Persist Antigravity selected account updates

docs: add Antigravity account switching changelog

9902384

docs: add Kiro credits changelog

1880c90

fix: avoid stale Cursor login sessions

be9f8d5

fix: refresh codex cost cache without roots

bb78426

test(cli): cover Claude all-account source routing

29386fe

fix(codex): throttle blocked CLI background launches

19671e0

fix(cost): clarify local estimate labels

73c8209

Co-authored-by: Yashiel Sookdeo <yashiel@skyner.co.za>

feat(kilo): add organization usage selection

d624297

Co-authored-by: Noe <nfbr.9819@gmail.com>

docs: update changelog for landed fixes

629ac5f

fix(opencodego): scan browser cookies in automatic mode

c42bdeb

steipete and others added 4 commits May 14, 2026 20:36

feat(zai): add hourly usage chart

22a5524

Co-authored-by: Benjamin <benjamin-liang@outlook.com>

docs: update changelog for provider fixes

5161462

claude Bot mentioned this pull request May 14, 2026

Upstream sync conflict at 0776680b #9

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync: merge upstream/main@51614621 into feat/trae-dollar-usage (32 commits) - #10

sync: merge upstream/main@51614621 into feat/trae-dollar-usage (32 commits)#10
claude[bot] wants to merge 34 commits into
feat/trae-dollar-usagefrom
auto/claude-51614621

claude Bot commented May 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

claude Bot commented May 14, 2026

Summary

Conflict resolutions

New zh-Hans.lproj strings added

New provider strings localized inline

Reviewer checklist

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants