1+ import { removeAgentCredits } from "@t3tools/source-control-core/server/mergeMessage" ;
12import { isCommitSha } from "@t3tools/source-control-core/server/pullRequestUtils" ;
23import * as Context from "effect/Context" ;
34import * as Effect from "effect/Effect" ;
@@ -35,6 +36,7 @@ import {
3536 decodeCommitsJson ,
3637 decodeDiffRefsJson ,
3738 decodeDiscussionsJson ,
39+ decodeMergeMessagesJson ,
3840 decodeMergeRequestDetailJson ,
3941 decodeMergeRequestDiffsJson ,
4042 decodeMergeRequestChangesJson ,
@@ -51,6 +53,7 @@ import {
5153 decodeTriggerJobChecksJson ,
5254 decodeViewerJson ,
5355 gitLabAwardName ,
56+ MERGE_MESSAGES_GRAPHQL_QUERY ,
5457 MERGE_REQUEST_FILE_STATS_GRAPHQL_QUERY ,
5558 MERGE_REQUEST_STATS_GRAPHQL_QUERY ,
5659 REPOSITORY_BLOBS_GRAPHQL_QUERY ,
@@ -386,6 +389,7 @@ export class GitLabPullRequestCli extends Context.Service<
386389 readonly number : number ;
387390 readonly action : PullRequestAction ;
388391 readonly mergeMethod ?: PullRequestMergeMethod ;
392+ readonly removeAgentCreditsOnMerge ?: boolean ;
389393 } ) => Effect . Effect < void , GitLabPullRequestCliError > ;
390394
391395 readonly updateMergeRequest : ( input : {
@@ -1672,6 +1676,32 @@ export const make = Effect.gen(function* () {
16721676 }
16731677 const refs = yield * getDiffRefs ( input ) ;
16741678 flags . push ( "--sha" , refs . headSha ) ;
1679+ if ( input . removeAgentCreditsOnMerge === true ) {
1680+ // Read after the SHA guard, so a push since then fails the merge instead of
1681+ // merging commits whose credits these messages don't cover.
1682+ const messages = yield * graphqlRead ( {
1683+ cwd : input . cwd ,
1684+ host : input . host ,
1685+ operation : "getMergeMessages" ,
1686+ query : MERGE_MESSAGES_GRAPHQL_QUERY ,
1687+ variables : { fullPath : input . repository , iid : String ( input . number ) } ,
1688+ decode : decodeMergeMessagesJson ,
1689+ } ) ;
1690+ // glab drops an empty message, which would bring the credits back.
1691+ const clean = ( message : string ) => {
1692+ const cleaned = removeAgentCredits ( message ) ;
1693+ return cleaned . trim ( ) === "" ? ( messages . title ?? message ) : cleaned ;
1694+ } ;
1695+ const merge = messages . merge === null ? null : clean ( messages . merge ) ;
1696+ if ( merge !== null && merge !== messages . merge ) flags . push ( "--message" , merge ) ;
1697+ const squashes = input . mergeMethod === "squash" || messages . squashOnMerge ;
1698+ const squash = messages . squash === null || ! squashes ? null : clean ( messages . squash ) ;
1699+ if ( squash !== null && squash !== messages . squash ) {
1700+ // glab takes a squash message only alongside --squash, which changes nothing here.
1701+ if ( ! flags . includes ( "--squash" ) ) flags . push ( "--squash" ) ;
1702+ flags . push ( "--squash-message" , squash ) ;
1703+ }
1704+ }
16751705 }
16761706 yield * executeMr ( subcommand ! , ...flags ) ;
16771707 } ,
0 commit comments