fix: support hash-suffixed macOS Keychain service name#16
Merged
Conversation
Claude Code now stores credentials under a hash-suffixed keychain service name (e.g. "Claude Code-credentials-697375ae") instead of the previous "Claude Code-credentials". This caused 401 Unauthorized errors when fetching usage data. Dynamically discovers the correct keychain service name by searching for all matching entries and preferring the most specific (longest) match, with a fallback to the legacy name. Based on the approach from #14 by @xicv.
3 tasks
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
1 participant
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.
Summary
Claude Code-credentials-697375ae) instead of the legacyClaude Code-credentials401 Unauthorizederrors when fetching usage data, since the tool was reading stale tokens from the old entryBased on the approach from #14 by @xicv — extracted as a focused single-concern fix without the unrelated feature additions.
Changes
findKeychainServiceName()— searches the Keychain for allClaude Code-credentials*entries and returns the longest matchextractTokenFromKeychainContent()— shared helper for parsing OAuth tokens from Keychain contentgetOAuthTokenMacOS()— now tries the discovered service name first, then falls back to the legacy nameTest plan
Claude Code-credentialsif no suffixed entry exists