fix: improve member merge suggestions for split git email profiles (CM-1137)#4115
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves member merge-suggestion recall for contributors whose git identities are stored as git/username email addresses (work/personal/local-machine splits), while expanding noreply support (GitLab) and fixing a confidence-score bumping bug so secondary signals can influence similarity scoring.
Changes:
- Add GitLab noreply parsing + provider constants, and expose shared helpers for noreply/local-machine email handling in
@crowd/common. - Relax “clashing username identities” for
git/usernamevalues that are email-like (contain@) when display names indicate a real identity; add local-machine local-part matching as an additional confidence bump. - Keep noreply identities when preparing LLM input; fix noreply dedupe key to include
platformand fixbumpFactorso metadata bumps are applied.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| services/libs/common/src/email.ts | Adds GitLab noreply parsing plus helpers (isNoreplyEmail, isLocalMachineEmail, getEmailLocalPart) and switches GitHub suffix handling to shared constants. |
| services/libs/common/src/constants/email-providers.ts | Introduces noreplyEmailProviders constants used by common email utilities. |
| services/apps/merge_suggestions_worker/src/utils.ts | Preserves noreply identities when stripping email-like identities for LLM input. |
| services/apps/merge_suggestions_worker/src/memberSimilarityCalculator.ts | Adjusts clash logic for git email “usernames”, fixes bumpFactor bug, adds local-machine local-part bump signal, and adds GitLab noreply matching. |
| services/apps/merge_suggestions_worker/src/activities/memberMergeSuggestions.ts | Adds GitLab noreply extraction into candidate generation and fixes dedupe to use platform:value composite key. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 9211dfd. Configure here.
…M-1137) Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Comment on lines
473
to
517
| @@ -409,13 +505,60 @@ class MemberSimilarityCalculator { | |||
| confidenceScore = this.bumpConfidenceScore(confidenceScore, bumpFactor) | |||
| } | |||
|
|
|||
| // Catches contributors whose only identity is commits from an unconfigured machine — | |||
| // same local-part across *.local / *.lan addresses is a strong hint they're the same person. | |||
| if (this.hasSameLocalPartInGitUsername(member, similarMember)) { | |||
| isHighConfidence = true | |||
| confidenceScore = this.bumpConfidenceScore(confidenceScore, bumpFactor) | |||
| } | |||
|
|
|||
| if (!isHighConfidence) { | |||
| return this.LOW_CONFIDENCE_SCORE | |||
| } | |||
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.
Summary
Improves member merge suggestions for contributors split across multiple Git commit emails.
Git ingest stores commit-author emails as
git/username, but merge scoring treated those values like stable platform handles. That caused profiles for the same person to hard-clash and score0.2before noreply, display-name, or metadata checks could run.Changes
git/usernameclashes when both values are email-like, while keeping real platform username clashes intact.*.local/*.lancommit identities.Validation
Note
Medium Risk
Changes core member-merge candidate generation and similarity scoring (clash detection, confidence bumping, new identity heuristics), which can meaningfully alter merge decisions and may cause false merges/splits if edge cases are missed.
Overview
Improves member merge suggestions for contributors split across multiple git commit emails by relaxing clash detection to only consider verified username conflicts and by exempting
git/usernameemail-like clashes when display names look non-placeholder/non-bot.Expands matching and scoring signals: adds
parseGitLabNoreplyEmailsupport and uses noreply→username matches in both OpenSearch candidate queries and similarity checks; fixes noreply deduping to key onplatform:value; fixes confidence bumping (previously no-op) and adds a new boost for shared local-part across local-machine git emails.Tightens LLM merging behavior by preserving noreply emails (while stripping other emails) and updating the prompt to treat display name as a supporting-only signal that cannot alone justify a merge.
Reviewed by Cursor Bugbot for commit 33411ae. Bugbot is set up for automated code reviews on this repo. Configure here.