@@ -122,22 +122,27 @@ export function prepareContext(
122122
123123 // Extract trigger username and comment data based on event type
124124 let triggerUsername : string | undefined ;
125+ let triggerUserId : number | undefined ;
125126 let commentId : string | undefined ;
126127 let commentBody : string | undefined ;
127128
128129 if ( isIssueCommentEvent ( context ) ) {
129130 commentId = context . payload . comment . id . toString ( ) ;
130131 commentBody = context . payload . comment . body ;
131132 triggerUsername = context . payload . comment . user . login ;
133+ triggerUserId = context . payload . comment . user . id ;
132134 } else if ( isPullRequestReviewEvent ( context ) ) {
133135 commentBody = context . payload . review . body ?? "" ;
134136 triggerUsername = context . payload . review . user . login ;
137+ triggerUserId = context . payload . review . user . id ;
135138 } else if ( isPullRequestReviewCommentEvent ( context ) ) {
136139 commentId = context . payload . comment . id . toString ( ) ;
137140 commentBody = context . payload . comment . body ;
138141 triggerUsername = context . payload . comment . user . login ;
142+ triggerUserId = context . payload . comment . user . id ;
139143 } else if ( isIssuesEvent ( context ) ) {
140144 triggerUsername = context . payload . issue . user . login ;
145+ triggerUserId = context . payload . issue . user . id ;
141146 }
142147
143148 // Create infrastructure fields object
@@ -146,6 +151,7 @@ export function prepareContext(
146151 claudeCommentId,
147152 triggerPhrase,
148153 ...( triggerUsername && { triggerUsername } ) ,
154+ ...( triggerUserId && { triggerUserId } ) ,
149155 ...( prompt && { prompt } ) ,
150156 ...( claudeBranch && { claudeBranch } ) ,
151157 } ;
@@ -394,9 +400,16 @@ function getCommitInstructions(
394400 context : PreparedContext ,
395401 useCommitSigning : boolean ,
396402) : string {
403+ const triggerName = githubData . triggerDisplayName ?? context . triggerUsername ;
404+ const triggerEmail =
405+ context . triggerUserId && context . triggerUsername
406+ ? `${ context . triggerUserId } +${ context . triggerUsername } @users.noreply.github.com`
407+ : context . triggerUsername
408+ ? `${ context . triggerUsername } @users.noreply.github.com`
409+ : undefined ;
397410 const coAuthorLine =
398- ( githubData . triggerDisplayName ?? context . triggerUsername ) !== "Unknown"
399- ? `Co-authored-by: ${ githubData . triggerDisplayName ?? context . triggerUsername } <${ context . triggerUsername } @users.noreply.github.com >`
411+ triggerName && triggerName !== "Unknown" && triggerEmail
412+ ? `Co-authored-by: ${ triggerName } <${ triggerEmail } >`
400413 : "" ;
401414
402415 if ( useCommitSigning ) {
0 commit comments