@@ -28,7 +28,7 @@ import {
2828 type VcsStatusRemoteResult ,
2929 VcsStatusResult ,
3030 ModelSelection ,
31- type TextGenerationStyleSettings ,
31+ type SourceControlWritingStyleSettings ,
3232} from "@t3tools/contracts" ;
3333import {
3434 detectSourceControlProviderFromGitRemoteUrl ,
@@ -51,6 +51,7 @@ import {
5151 repositoryConventionsTextGenerationPolicy ,
5252} from "../textGeneration/TextGenerationPresets.ts" ;
5353import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts" ;
54+ import * as ProviderRegistry from "../provider/Services/ProviderRegistry.ts" ;
5455import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts" ;
5556import * as ServerSettings from "../serverSettings.ts" ;
5657import type { GitManagerServiceError } from "@t3tools/contracts" ;
@@ -68,9 +69,9 @@ export interface GitRunStackedActionOptions {
6869 readonly progressReporter ?: GitActionProgressReporter ;
6970}
7071
71- interface GitTextGenerationSettings {
72+ interface SourceControlTextGenerationSettings {
7273 readonly modelSelection : ModelSelection ;
73- readonly style : TextGenerationStyleSettings ;
74+ readonly style : SourceControlWritingStyleSettings ;
7475}
7576
7677export class GitManager extends Context . Service <
@@ -577,6 +578,7 @@ export const make = Effect.gen(function* () {
577578 const gitCore = yield * GitVcsDriver . GitVcsDriver ;
578579 const sourceControlProviders = yield * SourceControlProviderRegistry . SourceControlProviderRegistry ;
579580 const textGeneration = yield * TextGeneration . TextGeneration ;
581+ const providerRegistry = yield * ProviderRegistry . ProviderRegistry ;
580582 const projectSetupScriptRunner = yield * ProjectSetupScriptRunner . ProjectSetupScriptRunner ;
581583 const crypto = yield * Crypto . Crypto ;
582584
@@ -600,7 +602,7 @@ export const make = Effect.gen(function* () {
600602 Effect . orElseSucceed ( ( ) => [ ] ) ,
601603 ) ;
602604
603- const resolveStylePolicy = ( cwd : string , style : TextGenerationStyleSettings ) =>
605+ const resolveStylePolicy = ( cwd : string , style : SourceControlWritingStyleSettings ) =>
604606 Effect . gen ( function * ( ) {
605607 switch ( style . mode ) {
606608 case "conventional_commits" :
@@ -1388,7 +1390,7 @@ export const make = Effect.gen(function* () {
13881390 /** When true, also produce a semantic feature branch name. */
13891391 includeBranch ?: boolean ;
13901392 filePaths ?: readonly string [ ] ;
1391- settings : GitTextGenerationSettings ;
1393+ settings : SourceControlTextGenerationSettings ;
13921394 } ) {
13931395 const context = yield * gitCore . prepareCommitContext ( input . cwd , input . filePaths ) ;
13941396 if ( ! context ) {
@@ -1431,7 +1433,7 @@ export const make = Effect.gen(function* () {
14311433 ) ;
14321434
14331435 const runCommitStep = Effect . fn ( "runCommitStep" ) ( function * (
1434- settings : GitTextGenerationSettings ,
1436+ settings : SourceControlTextGenerationSettings ,
14351437 cwd : string ,
14361438 action : "commit" | "commit_push" | "commit_push_pr" ,
14371439 branch : string | null ,
@@ -1544,7 +1546,7 @@ export const make = Effect.gen(function* () {
15441546 } ) ;
15451547
15461548 const runPrStep = Effect . fn ( "runPrStep" ) ( function * (
1547- settings : GitTextGenerationSettings ,
1549+ settings : SourceControlTextGenerationSettings ,
15481550 cwd : string ,
15491551 fallbackBranch : string | null ,
15501552 emit : GitActionProgressEmitter ,
@@ -1594,8 +1596,8 @@ export const make = Effect.gen(function* () {
15941596 const baseRangeRef = yield * resolveBaseRangeRef ( cwd , baseBranch ) ;
15951597 const rangeContext = yield * gitCore . readRangeContext ( cwd , baseRangeRef ) ;
15961598 const policy = yield * resolveStylePolicy ( cwd , settings . style ) ;
1597- const prTemplate =
1598- settings . style . followPrTemplates && provider . kind === "github"
1599+ const changeRequestTemplate =
1600+ settings . style . followChangeRequestTemplates && provider . kind === "github"
15991601 ? Option . getOrUndefined ( yield * detectPrTemplate ( cwd , baseRangeRef , gitCore . execute ) )
16001602 : undefined ;
16011603
@@ -1606,7 +1608,7 @@ export const make = Effect.gen(function* () {
16061608 commitSummary : limitContext ( rangeContext . commitSummary , 20_000 ) ,
16071609 diffSummary : limitContext ( rangeContext . diffSummary , 20_000 ) ,
16081610 diffPatch : limitContext ( rangeContext . diffPatch , 60_000 ) ,
1609- ...( prTemplate ? { prTemplate } : { } ) ,
1611+ ...( changeRequestTemplate ? { changeRequestTemplate } : { } ) ,
16101612 ...( policy ? { policy } : { } ) ,
16111613 modelSelection : settings . modelSelection ,
16121614 } ) ;
@@ -1888,7 +1890,7 @@ export const make = Effect.gen(function* () {
18881890 } ) ;
18891891
18901892 const runFeatureBranchStep = Effect . fn ( "runFeatureBranchStep" ) ( function * (
1891- settings : GitTextGenerationSettings ,
1893+ settings : SourceControlTextGenerationSettings ,
18921894 cwd : string ,
18931895 branch : string | null ,
18941896 commitMessage ?: string ,
@@ -1990,10 +1992,22 @@ export const make = Effect.gen(function* () {
19901992 let preResolvedCommitSuggestion : CommitAndBranchSuggestion | undefined = undefined ;
19911993
19921994 const textGenerationSettings = yield * serverSettingsService . getSettings . pipe (
1993- Effect . map ( ( settings ) => ( {
1994- modelSelection : ServerSettings . resolveGitWriterModelSelection ( settings ) ,
1995- style : settings . textGenerationStyle ,
1996- } ) ) ,
1995+ Effect . flatMap ( ( settings ) =>
1996+ settings . sourceControlWriterModelSelection === null
1997+ ? Effect . succeed ( {
1998+ modelSelection : settings . textGenerationModelSelection ,
1999+ style : settings . sourceControlWritingStyle ,
2000+ } )
2001+ : providerRegistry . getProviders . pipe (
2002+ Effect . map ( ( providers ) => ( {
2003+ modelSelection : ServerSettings . resolveSourceControlWriterModelSelection (
2004+ settings ,
2005+ providers ,
2006+ ) ,
2007+ style : settings . sourceControlWritingStyle ,
2008+ } ) ) ,
2009+ ) ,
2010+ ) ,
19972011 Effect . mapError (
19982012 ( cause ) =>
19992013 new GitManagerError ( {
0 commit comments