@devries-cameron20 / t3code Mirror · read-only / commits / 8ab427c607
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 00:45 UTC

fix(web): settings say custom instructions cover pull request descriptions (#33113)

maria committed Nov 9, 2026 at 20:48 UTC 8ab427c6077f1e8b75ea608a363006ccb697f5f6
4 files changed +24 -21
apps/web/src/components/settings/SourceControlWritingSettings.browser.test.tsx
+2 -2
@@ -102,8 +102,8 @@ describe("mixed source control instructions", () => {
102 await userEvent.click(page.getByRole("button", { name: "Advanced" }));
103 // Mid-open, Playwright scrolls the clipped panel to reach the button, then the growing panel
104 // shifts it between press and release and the click misses. Wait until the panel shows it.
105 - await expect.element(resetButton("change request templates")).toBeInViewport({ ratio: 1 });
106 - await userEvent.click(resetButton("change request templates"));
105 + await expect.element(resetButton("pull request templates")).toBeInViewport({ ratio: 1 });
106 + await userEvent.click(resetButton("pull request templates"));
107
108 expect(state.updateSettings).toHaveBeenCalledTimes(1);
109 expect(state.styles.map((style) => style.followChangeRequestTemplates)).toEqual([
apps/web/src/components/settings/SourceControlWritingSettings.tsx
+14 -13
@@ -49,16 +49,17 @@ const MODE_OPTIONS: Record<SourceControlWritingStyleMode, { label: string; descr
49 {
50 repo_conventions: {
51 label: "Repository conventions",
52 - description: "In each project, matches recent change descriptions and change request titles.",
52 + description:
53 + "Commit messages and pull request titles and descriptions match each project's history.",
54 },
55 conventional_commits: {
56 label: "Conventional Commits",
56 - description: "Use Conventional Commit prefixes and keep change request text concise.",
57 + description: "Conventional Commit prefixes, with short pull request titles and descriptions.",
58 },
59 custom: {
60 label: "Custom instructions",
61 description:
61 - "Use your instructions for change descriptions and change requests in every project.",
62 + "Your instructions shape commit messages and pull request titles and descriptions.",
63 },
64 };
65
@@ -193,7 +194,7 @@ export function SourceControlWritingSettingsSection() {
194 );
195
196 return (
196 - <SettingsSection id="source-control-text-generation" title="Writing & review">
197 + <SettingsSection id="source-control-text-generation" title="Commits & pull requests">
198 <SettingsRow
199 serverScoped
200 settingKeys={["sourceControlWritingStyle"]}
@@ -203,7 +204,7 @@ export function SourceControlWritingSettingsSection() {
204 resetAction={
205 isSourceControlWritingStyleDirty ? (
206 <SettingResetButton
206 - label="source control writing style"
207 + label="commit and pull request writing"
208 onClick={() =>
209 updateSettings({
210 sourceControlWritingStyle: {
@@ -231,7 +232,7 @@ export function SourceControlWritingSettingsSection() {
232 <SelectTrigger
233 size="sm"
234 className="w-full sm:w-56"
234 - aria-label="Source control writing style"
235 + aria-label="Commit and pull request writing"
236 >
237 <SelectValue>
238 {(value: SourceControlWritingStyleMode | null) =>
@@ -257,7 +258,7 @@ export function SourceControlWritingSettingsSection() {
258 value={allInstructions ?? ""}
259 onChange={(event) => setAllInstructions(event.target.value)}
260 rows={4}
260 - aria-label="Custom source control instructions for all selected environments"
261 + aria-label="Custom commit and pull request instructions for all selected environments"
262 placeholder="Write the instructions each selected environment should use."
263 />
264 <Button
@@ -304,8 +305,8 @@ export function SourceControlWritingSettingsSection() {
305 }
306 }}
307 rows={4}
307 - placeholder="Keep titles concise. Use short bullet points in descriptions."
308 - aria-label="Custom source control writing instructions"
308 + placeholder="Keep commit subjects under 60 characters. Keep pull request descriptions short and plain."
309 + aria-label="Custom commit and pull request instructions"
310 />
311 </div>
312 ) : null}
@@ -481,12 +482,12 @@ export function SourceControlWritingSettingsSection() {
482 settingKeys={["sourceControlWritingStyle"]}
483 mixed={templatesMixed}
484 {...searchableSetting("follow-change-request-templates")}
484 - description="Use the repository's template for change request descriptions when available."
485 + description="Use the repository's pull request template when it has one."
486 resetAction={
487 templatesMixed ||
488 style.followChangeRequestTemplates !== defaults.followChangeRequestTemplates ? (
489 <SettingResetButton
489 - label="change request templates"
490 + label="pull request templates"
491 onClick={() =>
492 updateSettings({
493 sourceControlWritingStyle: {
@@ -508,7 +509,7 @@ export function SourceControlWritingSettingsSection() {
509 },
510 })
511 }
511 - aria-label="Follow change request templates"
512 + aria-label="Follow pull request templates"
513 />
514 }
515 />
@@ -517,7 +518,7 @@ export function SourceControlWritingSettingsSection() {
518 serverScoped
519 settingKeys={["sourceControlWriterModelSelection"]}
520 {...searchableSetting("source-control-writer-model")}
520 - description="Model for source control text and branch or bookmark names. When disabled, use the text generation model configured for this environment."
521 + description="Model for commit messages, pull request text, and branch or bookmark names. When disabled, use the text generation model configured for this environment."
522 control={
523 !hasServerTargets ? (
524 <span className="text-sm text-muted-foreground">
apps/web/src/components/settings/settingsSearch.ts
+4 -4
@@ -1133,18 +1133,18 @@ export const SETTINGS_SEARCH_ITEMS = [
1133 ...sourceControlHostSearchItems(sourceControlClients.definitions),
1134 {
1135 id: "source-control-writing-style",
1136 - title: "Source control writing style",
1136 + title: "Commit and pull request writing",
1137 to: "/settings/source-control",
1138 searchTerms: [
1139 - "repository conventions conventional commits custom instructions change descriptions request titles",
1139 + "repository conventions conventional commits custom instructions commit messages change pr pull request merge request titles descriptions body style prompt write my own",
1140 ],
1141 environmentOnly: true,
1142 },
1143 {
1144 id: "follow-change-request-templates",
1145 - title: "Follow change request templates",
1145 + title: "Follow pull request templates",
1146 to: "/settings/source-control",
1147 - searchTerms: ["repository pr pull request description structure"],
1147 + searchTerms: ["repository pr pull request merge request change request description structure"],
1148 environmentOnly: true,
1149 },
1150 {
docs/user/source-control.md
+4 -2
@@ -181,8 +181,10 @@ An existing fork PR can appear beside the branch even if you pushed without sett
181 If its badge is missing because several remotes hold that branch, set the branch's upstream to
182 the intended remote with `git branch --set-upstream-to=<remote>/<branch>`.
183
184 -Choose the writing style and model in **Settings → Source control**. **Repository conventions**
185 -uses the project's instructions and recent commit subjects.
184 +Choose how commit messages and pull request titles and descriptions are written in
185 +**Settings → Source control → Commits & pull requests**. **Repository conventions** uses the
186 +project's instructions and recent commit subjects. **Custom instructions** applies your own
187 +instructions to commits and pull requests.
188
189 ## Review and merge
190