Skip to content

Commit 8463ada

Browse files
juliusmarmingecodex
andcommitted
refactor: use source control writing terminology
Co-authored-by: codex <[email protected]>
1 parent 238acad commit 8463ada

22 files changed

Lines changed: 359 additions & 217 deletions

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ import type {
1919
ThreadId,
2020
} from "@t3tools/contracts";
2121

22-
import { GitCommandError, TextGenerationError } from "@t3tools/contracts";
22+
import {
23+
DEFAULT_SERVER_SETTINGS,
24+
GitCommandError,
25+
ProviderDriverKind,
26+
ProviderInstanceId,
27+
TextGenerationError,
28+
} from "@t3tools/contracts";
2329
import * as GitHubCli from "../sourceControl/GitHubCli.ts";
2430
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
2531
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
@@ -28,6 +34,7 @@ import * as GitHubSourceControlProvider from "../sourceControl/GitHubSourceContr
2834
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
2935
import * as ServerConfig from "../config.ts";
3036
import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
37+
import * as ProviderRegistry from "../provider/Services/ProviderRegistry.ts";
3138
import * as ServerSettings from "../serverSettings.ts";
3239
import * as GitManager from "./GitManager.ts";
3340

@@ -641,6 +648,9 @@ function makeManager(input?: {
641648

642649
const managerLayer = Layer.mergeAll(
643650
Layer.succeed(TextGeneration.TextGeneration, textGeneration),
651+
Layer.mock(ProviderRegistry.ProviderRegistry)({
652+
getProviders: Effect.succeed([]),
653+
}),
644654
Layer.succeed(
645655
ProjectSetupScriptRunner.ProjectSetupScriptRunner,
646656
input?.setupScriptRunner ?? {
@@ -1541,7 +1551,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
15411551

15421552
const { manager } = yield* makeManager({
15431553
serverSettings: {
1544-
textGenerationStyle: {
1554+
sourceControlWritingStyle: {
15451555
mode: "custom" as const,
15461556
customInstructions: "Use a direct tone.",
15471557
},
@@ -1591,7 +1601,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
15911601

15921602
const { manager } = yield* makeManager({
15931603
serverSettings: {
1594-
textGenerationStyle: {
1604+
sourceControlWritingStyle: {
15951605
mode: "custom" as const,
15961606
customInstructions: "",
15971607
},
@@ -1615,6 +1625,46 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
16151625
}),
16161626
);
16171627

1628+
it.effect("falls back when the dedicated source control writer is unavailable", () =>
1629+
Effect.gen(function* () {
1630+
const repoDir = yield* makeTempDir("t3code-git-manager-");
1631+
yield* initRepo(repoDir);
1632+
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\nworld\n");
1633+
const missingInstanceId = ProviderInstanceId.make("missing_writer");
1634+
let generatedModelSelection:
1635+
| TextGeneration.CommitMessageGenerationInput["modelSelection"]
1636+
| undefined;
1637+
1638+
const { manager } = yield* makeManager({
1639+
serverSettings: {
1640+
providerInstances: {
1641+
[missingInstanceId]: {
1642+
driver: ProviderDriverKind.make("missing-driver"),
1643+
config: {},
1644+
},
1645+
},
1646+
sourceControlWriterModelSelection: {
1647+
instanceId: missingInstanceId,
1648+
model: "missing-model",
1649+
},
1650+
},
1651+
textGeneration: {
1652+
generateCommitMessage: (input) => {
1653+
generatedModelSelection = input.modelSelection;
1654+
return Effect.succeed({ subject: "Use the available writer", body: "" });
1655+
},
1656+
},
1657+
});
1658+
1659+
yield* runStackedAction(manager, {
1660+
cwd: repoDir,
1661+
action: "commit",
1662+
});
1663+
1664+
expect(generatedModelSelection).toEqual(DEFAULT_SERVER_SETTINGS.textGenerationModelSelection);
1665+
}),
1666+
);
1667+
16181668
it.effect("preserves repository conventions style when recent history is empty", () =>
16191669
Effect.gen(function* () {
16201670
const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -1627,7 +1677,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
16271677

16281678
const { manager } = yield* makeManager({
16291679
serverSettings: {
1630-
textGenerationStyle: {
1680+
sourceControlWritingStyle: {
16311681
mode: "repo_conventions" as const,
16321682
},
16331683
},
@@ -2607,19 +2657,19 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
26072657
yield* runGit(repoDir, ["push", "-u", "origin", "feature-create-pr"]);
26082658
yield* runGit(repoDir, ["config", "branch.feature-create-pr.gh-merge-base", "main"]);
26092659
let generatedPolicy: TextGeneration.PrContentGenerationInput["policy"] = undefined;
2610-
let generatedPrTemplate: string | undefined;
2660+
let generatedChangeRequestTemplate: string | undefined;
26112661

26122662
const { manager, ghCalls } = yield* makeManager({
26132663
serverSettings: {
2614-
textGenerationStyle: {
2664+
sourceControlWritingStyle: {
26152665
mode: "custom" as const,
26162666
customInstructions: "Lead with user impact.",
26172667
},
26182668
},
26192669
textGeneration: {
26202670
generatePrContent: (input) => {
26212671
generatedPolicy = input.policy;
2622-
generatedPrTemplate = input.prTemplate;
2672+
generatedChangeRequestTemplate = input.changeRequestTemplate;
26232673
return Effect.succeed({
26242674
title: "Add stacked git actions",
26252675
body: "## What changed?\nAdded stacked git actions.",
@@ -2653,7 +2703,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
26532703
expect(generatedPolicy).toMatchObject({
26542704
changeRequestInstructions: "Lead with user impact.",
26552705
});
2656-
expect(generatedPrTemplate).toBe("## What changed?\n\n## Verification");
2706+
expect(generatedChangeRequestTemplate).toBe("## What changed?\n\n## Verification");
26572707
expect(ghCalls.filter((call) => call.startsWith("pr list "))).toHaveLength(2);
26582708
expect(
26592709
ghCalls.some((call) => call.includes("pr create --base main --head feature-create-pr")),

‎apps/server/src/git/GitManager.ts‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
type VcsStatusRemoteResult,
2929
VcsStatusResult,
3030
ModelSelection,
31-
type TextGenerationStyleSettings,
31+
type SourceControlWritingStyleSettings,
3232
} from "@t3tools/contracts";
3333
import {
3434
detectSourceControlProviderFromGitRemoteUrl,
@@ -51,6 +51,7 @@ import {
5151
repositoryConventionsTextGenerationPolicy,
5252
} from "../textGeneration/TextGenerationPresets.ts";
5353
import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
54+
import * as ProviderRegistry from "../provider/Services/ProviderRegistry.ts";
5455
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
5556
import * as ServerSettings from "../serverSettings.ts";
5657
import 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

7677
export 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({

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ import {
3838
ProviderCommandReactor,
3939
type ProviderCommandReactorShape,
4040
} from "../Services/ProviderCommandReactor.ts";
41-
import { resolveGitWriterModelSelection, ServerSettingsService } from "../../serverSettings.ts";
41+
import {
42+
resolveSourceControlWriterModelSelection,
43+
ServerSettingsService,
44+
} from "../../serverSettings.ts";
4245
import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
4346
import { GitWorkflowService } from "../../git/GitWorkflowService.ts";
4447
const isProviderAdapterRequestError = Schema.is(ProviderAdapterRequestError);
@@ -689,7 +692,13 @@ const make = Effect.gen(function* () {
689692
const attachments = input.attachments ?? [];
690693
yield* Effect.gen(function* () {
691694
const settings = yield* serverSettingsService.getSettings;
692-
const modelSelection = resolveGitWriterModelSelection(settings);
695+
const modelSelection =
696+
settings.sourceControlWriterModelSelection === null
697+
? settings.textGenerationModelSelection
698+
: resolveSourceControlWriterModelSelection(
699+
settings,
700+
yield* providerRegistry.getProviders,
701+
);
693702

694703
const generated = yield* textGeneration.generateBranchName({
695704
cwd,

0 commit comments

Comments
 (0)