Merge PR #323 with conflicts resolved (macOS shortcuts + UI fixes)#324
Merged
Conversation
Resolves two conflicts vs current master: - crates/jcode-provider-metadata/src/catalog.rs: LOGIN_PROVIDERS array length conflict between master's +4 providers (BigModel, Cohere, GitLab Duo, Vertex AI = 49) and PR #323's +1 (Anthropic API direct = 46). Final length: 50. - src/tui/app/state_ui_input_helpers.rs: Master appended dollar_token_tests module at EOF; PR #323 appended ExternalCliSuggestionCandidate + helpers. Both are end-of-file additions to disjoint scopes, kept both.
This was referenced May 27, 2026
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
2 participants
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
Resolves merge conflicts on #323 and brings the 52 upstream commits from
1jehuang/masteronto currentquangdang46/masterso the original PR can be merged. No new feature changes — only conflict resolution on the merge commit.Closes #323.
Conflicts resolved (2 files):
crates/jcode-provider-metadata/src/catalog.rs—LOGIN_PROVIDERSarray length conflict._LOGIN_PROVIDER,entries in the merged array body).src/tui/app/state_ui_input_helpers.rs— both sides appended disjoint blocks at EOF. master appended#[cfg(test)] mod dollar_token_tests; PR Enhance macOS shortcuts and fix various UI functionalities #323 appendedExternalCliSuggestionCandidate+ helpers. Resolution: keep both blocks.All remaining hunks auto-merged cleanly.
Review & Testing Checklist for Human
Risk: yellow — large merge (52 commits, ~150 files), but conflicts themselves are mechanical/additive.
cargo check --workspace --all-targets --all-featurespasses locally (running on Devin's box; CI will be the source of truth).LOGIN_PROVIDERSlength (50) and contents aroundcrates/jcode-provider-metadata/src/catalog.rs:1135.dollar_token_testsmod is followed immediately byExternalCliSuggestionCandidate+ helpers insrc/tui/app/state_ui_input_helpers.rs.Notes
cargo checkwill be addressed in a separate follow-up PR.