fix: address review feedback on macOS Keychain fallback (stderr deadlock, cancellation, log message)#15
Merged
JerrettDavis merged 2 commits intofix/macos-keychain-auth-fallbackfrom Mar 2, 2026
Conversation
12 tasks
- Fix log message: 'Credentials file not found' → 'Credentials unavailable from file; trying macOS Keychain...' - Set RedirectStandardError = false to avoid stderr buffer deadlock - Wire ct to kill process in NETSTANDARD2_0 branch for reliable cancellation Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix macOS Keychain fallback for Claude Code authentication
fix: address review feedback on macOS Keychain fallback (stderr deadlock, cancellation, log message)
Mar 2, 2026
JerrettDavis
approved these changes
Mar 2, 2026
JerrettDavis
merged commit f335a43
into
fix/macos-keychain-auth-fallback
2 checks passed
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.
Three correctness issues in the
DefaultMacOsKeychainReaderimplementation flagged during review.Changes
RedirectStandardError = false— redirecting stderr without draining it can deadlock if thesecurityCLI writes enough output to fill the pipe bufferTask.Run(..., ct)only cancels before the delegate starts; replaced withct.Register(() => process.Kill())so cancellation reliably terminates the process mid-WaitForExit(), and addedct.ThrowIfCancellationRequested()after exit to surface it to callers"Credentials file not found"was misleading;ReadCredentialsFileAsyncreturnsnullfor I/O errors and malformed JSON too, not just missing files →"Credentials unavailable from file; trying macOS Keychain service..."Type of Change
Checklist
.editorconfig)dotnet test)dotnet build)Testing
Existing unit tests pass. The stderr deadlock and cancellation paths are not exercised by the current test suite (they require a live process or a hung process), but the logic follows the standard
CancellationToken.Register+Process.Killpattern.Screenshots / Logs
🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.