Repository navigation
chore: sync fork with upstream (resolve codex binary bundled inside ChatGPT.app) - #52
Merged
Merged
Conversation
…splay (chattymin#262) Codex usage is parsed from ~/.codex/sessions logs, but limits are fetched by spawning the codex CLI (app-server account/rateLimits/read). Users who run Codex through the ChatGPT desktop app have no standalone codex install, so limit fetch was skipped ("codex binary not found") while usage still showed. Add the ChatGPT.app bundled CLI path as the last candidate so dedicated installs keep precedence. Co-authored-by: Claude Fable 5 <noreply@anthropic.com> (cherry picked from commit 5f1ef52)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Sync
Catches the fork up with
chattymin/PokeTokenBar@main(now at5f1ef52).git rev-listreports 23 upstream commits not inorigin/main, but that is the squash-merge ancestry break already described in #45: the content of 22 of them was applied by #38, #43, and #45. Verified by diffing content rather than the commit list — the remaining differences between the two branches are all fork divergence (iOS companion, widget, Antigravity refresh-token work, phone payload server).Only one upstream commit is genuinely new, cherry-picked with
-x:5f1ef52— fix: resolve the codex binary bundled inside ChatGPT.app for limit display (upstream fix: resolve the codex binary bundled inside ChatGPT.app for limit display chattymin/PokeTokenBar#262). Adds/Applications/ChatGPT.app/Contents/Resources/codexas the last binary candidate so users who run Codex only through the desktop app get limits instead of a "codex binary not found" skip. Dedicated installs keep precedence.No conflicts; the fork's
CodexRateLimitsProvidercandidate list matches upstream at that point.Verification
./scripts/test-gate.sh— 1074 tests, 0 failures (12 skipped); logic-core line coverage 91.77% ≥ 75%.🤖 Generated with Claude Code
https://claude.ai/code/session_01Q7ExQdXA9rxRQEEqv7YC9c