Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit 10bca3f

Browse files
maria-rcksclaudejuliusmarmingecodex
authored
feat: add configurable source control writing settings (pingdotgg#4204)
Co-authored-by: Claude <[email protected]> Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]>
1 parent e77f42c commit 10bca3f

27 files changed

Lines changed: 1335 additions & 125 deletions

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

Lines changed: 171 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ import { expect } from "vite-plus/test";
1616
import type {
1717
GitActionProgressEvent,
1818
GitPreparePullRequestThreadInput,
19-
ModelSelection,
2019
ThreadId,
2120
} from "@t3tools/contracts";
2221

23-
import { GitCommandError, TextGenerationError } from "@t3tools/contracts";
22+
import {
23+
DEFAULT_SERVER_SETTINGS,
24+
GitCommandError,
25+
ProviderDriverKind,
26+
ProviderInstanceId,
27+
TextGenerationError,
28+
} from "@t3tools/contracts";
2429
import * as GitHubCli from "../sourceControl/GitHubCli.ts";
2530
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
2631
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
@@ -29,6 +34,7 @@ import * as GitHubSourceControlProvider from "../sourceControl/GitHubSourceContr
2934
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
3035
import * as ServerConfig from "../config.ts";
3136
import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
37+
import * as ProviderRegistry from "../provider/Services/ProviderRegistry.ts";
3238
import * as ServerSettings from "../serverSettings.ts";
3339
import * as GitManager from "./GitManager.ts";
3440

@@ -65,38 +71,7 @@ function fakeGhOutput(stdout: string): VcsProcess.VcsProcessOutput {
6571
};
6672
}
6773

68-
interface FakeGitTextGeneration {
69-
generateCommitMessage: (input: {
70-
cwd: string;
71-
branch: string | null;
72-
stagedSummary: string;
73-
stagedPatch: string;
74-
includeBranch?: boolean;
75-
modelSelection: ModelSelection;
76-
}) => Effect.Effect<
77-
{ subject: string; body: string; branch?: string | undefined },
78-
TextGenerationError
79-
>;
80-
generatePrContent: (input: {
81-
cwd: string;
82-
baseBranch: string;
83-
headBranch: string;
84-
commitSummary: string;
85-
diffSummary: string;
86-
diffPatch: string;
87-
modelSelection: ModelSelection;
88-
}) => Effect.Effect<{ title: string; body: string }, TextGenerationError>;
89-
generateBranchName: (input: {
90-
cwd: string;
91-
message: string;
92-
modelSelection: ModelSelection;
93-
}) => Effect.Effect<{ branch: string }, TextGenerationError>;
94-
generateThreadTitle: (input: {
95-
cwd: string;
96-
message: string;
97-
modelSelection: ModelSelection;
98-
}) => Effect.Effect<{ title: string }, TextGenerationError>;
99-
}
74+
type FakeGitTextGeneration = TextGeneration.TextGeneration["Service"];
10075

10176
type FakePullRequest = NonNullable<FakeGhScenario["pullRequest"]>;
10277

@@ -640,6 +615,7 @@ function preparePullRequestThread(
640615
function makeManager(input?: {
641616
ghScenario?: FakeGhScenario;
642617
textGeneration?: Partial<FakeGitTextGeneration>;
618+
serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
643619
setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
644620
}) {
645621
const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
@@ -648,7 +624,7 @@ function makeManager(input?: {
648624
prefix: "t3-git-manager-test-",
649625
});
650626

651-
const serverSettingsLayer = ServerSettings.ServerSettingsService.layerTest();
627+
const serverSettingsLayer = ServerSettings.ServerSettingsService.layerTest(input?.serverSettings);
652628

653629
const vcsDriverLayer = GitVcsDriver.layer.pipe(
654630
Layer.provideMerge(VcsProcess.layer),
@@ -672,6 +648,9 @@ function makeManager(input?: {
672648

673649
const managerLayer = Layer.mergeAll(
674650
Layer.succeed(TextGeneration.TextGeneration, textGeneration),
651+
Layer.mock(ProviderRegistry.ProviderRegistry)({
652+
getProviders: Effect.succeed([]),
653+
}),
675654
Layer.succeed(
676655
ProjectSetupScriptRunner.ProjectSetupScriptRunner,
677656
input?.setupScriptRunner ?? {
@@ -1568,8 +1547,22 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
15681547
const repoDir = yield* makeTempDir("t3code-git-manager-");
15691548
yield* initRepo(repoDir);
15701549
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\nworld\n");
1550+
let generatedPolicy: TextGeneration.CommitMessageGenerationInput["policy"] = undefined;
15711551

1572-
const { manager } = yield* makeManager();
1552+
const { manager } = yield* makeManager({
1553+
serverSettings: {
1554+
sourceControlWritingStyle: {
1555+
mode: "custom" as const,
1556+
customInstructions: "Use a direct tone.",
1557+
},
1558+
},
1559+
textGeneration: {
1560+
generateCommitMessage: (input) => {
1561+
generatedPolicy = input.policy;
1562+
return Effect.succeed({ subject: "Implement stacked git actions", body: "" });
1563+
},
1564+
},
1565+
});
15731566
const result = yield* runStackedAction(manager, {
15741567
cwd: repoDir,
15751568
action: "commit",
@@ -1579,6 +1572,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
15791572
expect(result.commit.status).toBe("created");
15801573
expect(result.push.status).toBe("skipped_not_requested");
15811574
expect(result.pr.status).toBe("skipped_not_requested");
1575+
expect(generatedPolicy).toMatchObject({ commitInstructions: "Use a direct tone." });
15821576
expect(result.toast).toMatchObject({
15831577
description: "Implement stacked git actions",
15841578
cta: {
@@ -1598,6 +1592,118 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
15981592
}),
15991593
);
16001594

1595+
it.effect("preserves custom style when instructions are empty", () =>
1596+
Effect.gen(function* () {
1597+
const repoDir = yield* makeTempDir("t3code-git-manager-");
1598+
yield* initRepo(repoDir);
1599+
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\nworld\n");
1600+
let generatedPolicy: TextGeneration.CommitMessageGenerationInput["policy"] = undefined;
1601+
1602+
const { manager } = yield* makeManager({
1603+
serverSettings: {
1604+
sourceControlWritingStyle: {
1605+
mode: "custom" as const,
1606+
customInstructions: "",
1607+
},
1608+
},
1609+
textGeneration: {
1610+
generateCommitMessage: (input) => {
1611+
generatedPolicy = input.policy;
1612+
return Effect.succeed({ subject: "Preserve custom style", body: "" });
1613+
},
1614+
},
1615+
});
1616+
yield* runStackedAction(manager, {
1617+
cwd: repoDir,
1618+
action: "commit",
1619+
});
1620+
1621+
expect(generatedPolicy).toEqual({
1622+
kind: "custom",
1623+
inferRepositoryConventions: false,
1624+
});
1625+
}),
1626+
);
1627+
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+
1668+
it.effect("preserves repository conventions style when recent history is empty", () =>
1669+
Effect.gen(function* () {
1670+
const repoDir = yield* makeTempDir("t3code-git-manager-");
1671+
yield* runGit(repoDir, ["init", "--initial-branch=main"]);
1672+
yield* runGit(repoDir, ["config", "user.email", "[email protected]"]);
1673+
yield* runGit(repoDir, ["config", "user.name", "Test User"]);
1674+
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\n");
1675+
yield* runGit(repoDir, ["add", "README.md"]);
1676+
let generatedPolicy: TextGeneration.CommitMessageGenerationInput["policy"] = undefined;
1677+
1678+
const { manager } = yield* makeManager({
1679+
serverSettings: {
1680+
sourceControlWritingStyle: {
1681+
mode: "repo_conventions" as const,
1682+
},
1683+
},
1684+
textGeneration: {
1685+
generateCommitMessage: (input) => {
1686+
generatedPolicy = input.policy;
1687+
return Effect.succeed({ subject: "Create initial commit", body: "" });
1688+
},
1689+
},
1690+
});
1691+
yield* runStackedAction(manager, {
1692+
cwd: repoDir,
1693+
action: "commit",
1694+
});
1695+
1696+
expect(generatedPolicy).toEqual({
1697+
kind: "repo_conventions",
1698+
commitInstructions:
1699+
"Follow the repository's established commit message style when examples are available.",
1700+
changeRequestInstructions:
1701+
"Follow the repository's established change request title and body style when examples are available.",
1702+
inferRepositoryConventions: true,
1703+
});
1704+
}),
1705+
);
1706+
16011707
it.effect("uses custom commit message when provided", () =>
16021708
Effect.gen(function* () {
16031709
const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -2535,6 +2641,13 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
25352641
Effect.gen(function* () {
25362642
const repoDir = yield* makeTempDir("t3code-git-manager-");
25372643
yield* initRepo(repoDir);
2644+
NodeFS.mkdirSync(NodePath.join(repoDir, ".github"));
2645+
NodeFS.writeFileSync(
2646+
NodePath.join(repoDir, ".github", "pull_request_template.md"),
2647+
"## What changed?\n\n## Verification",
2648+
);
2649+
yield* runGit(repoDir, ["add", ".github/pull_request_template.md"]);
2650+
yield* runGit(repoDir, ["commit", "-m", "Add pull request template"]);
25382651
yield* runGit(repoDir, ["checkout", "-b", "feature-create-pr"]);
25392652
const remoteDir = yield* createBareRemote();
25402653
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
@@ -2543,8 +2656,26 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
25432656
yield* runGit(repoDir, ["commit", "-m", "Feature commit"]);
25442657
yield* runGit(repoDir, ["push", "-u", "origin", "feature-create-pr"]);
25452658
yield* runGit(repoDir, ["config", "branch.feature-create-pr.gh-merge-base", "main"]);
2659+
let generatedPolicy: TextGeneration.PrContentGenerationInput["policy"] = undefined;
2660+
let generatedChangeRequestTemplate: string | undefined;
25462661

25472662
const { manager, ghCalls } = yield* makeManager({
2663+
serverSettings: {
2664+
sourceControlWritingStyle: {
2665+
mode: "custom" as const,
2666+
customInstructions: "Lead with user impact.",
2667+
},
2668+
},
2669+
textGeneration: {
2670+
generatePrContent: (input) => {
2671+
generatedPolicy = input.policy;
2672+
generatedChangeRequestTemplate = input.changeRequestTemplate;
2673+
return Effect.succeed({
2674+
title: "Add stacked git actions",
2675+
body: "## What changed?\nAdded stacked git actions.",
2676+
});
2677+
},
2678+
},
25482679
ghScenario: {
25492680
prListSequence: [
25502681
"[]",
@@ -2569,6 +2700,10 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
25692700
expect(result.branch.status).toBe("skipped_not_requested");
25702701
expect(result.pr.status).toBe("created");
25712702
expect(result.pr.number).toBe(88);
2703+
expect(generatedPolicy).toMatchObject({
2704+
changeRequestInstructions: "Lead with user impact.",
2705+
});
2706+
expect(generatedChangeRequestTemplate).toBe("## What changed?\n\n## Verification");
25722707
expect(ghCalls.filter((call) => call.startsWith("pr list "))).toHaveLength(2);
25732708
expect(
25742709
ghCalls.some((call) => call.includes("pr create --base main --head feature-create-pr")),

0 commit comments

Comments
 (0)