authorgravatar for julius0216@outlook.comJulius Marminge <julius0216@outlook.com> 2026-02-12 14:42:15-08:00
committergravatar for julius0216@outlook.comJulius Marminge <julius0216@outlook.com> 2026-02-12 14:42:15-08:00
log8f6cd244e79913b4b55daf8ed14c7573726dfe62
tree9bccf01aa9988cb71992bcd49f9e684af854275f
parent95c8463706b26e76701d78f8e3ce9e1eb0622e0f

Use gpt-5.3-codex-spark for git text generation

- Add `gpt-5.3-codex-spark` with medium reasoning effort to commit/PR generation calls - Inject process runner into `CodexTextGenerator` and add tests for model selection and failure passthrough - Update PR modal to use status/result PR URLs and keep a single Open PR action path

3 files changed, 162 insertions(+), 21 deletions(-)

apps/server/src/codexTextGenerator.test.ts created+123
......@@ -0,0 +1,123 @@
1import fs from "node:fs/promises";
2
3import { describe, expect, it } from "vitest";
4
5import { CodexTextGenerator } from "./codexTextGenerator";
6import type { ProcessRunOptions, ProcessRunResult } from "./processRunner";
7
8type ProcessRunner = (
9 command: string,
10 args: readonly string[],
11 options?: ProcessRunOptions,
12) => Promise<ProcessRunResult>;
13
14function getArgValue(args: readonly string[], flag: string): string {
15 const index = args.indexOf(flag);
16 if (index < 0 || index + 1 >= args.length) {
17 throw new Error(`Missing argument value for ${flag}`);
18 }
19 const value = args[index + 1];
20 if (!value) {
21 throw new Error(`Missing argument value for ${flag}`);
22 }
23 return value;
24}
25
26function okResult(): ProcessRunResult {
27 return {
28 stdout: "",
29 stderr: "",
30 code: 0,
31 signal: null,
32 timedOut: false,
33 };
34}
35
36function commitInput() {
37 return {
38 cwd: process.cwd(),
39 branch: "feat/example",
40 stagedSummary: "M apps/server/src/gitManager.ts",
41 stagedPatch: "diff --git a/file b/file",
42 };
43}
44
45describe("CodexTextGenerator", () => {
46 it("uses gpt-5.3-codex-spark when available with medium reasoning effort", async () => {
47 const models: string[] = [];
48 const configs: string[] = [];
49
50 const runner: ProcessRunner = async (command, args) => {
51 expect(command).toBe("codex");
52 models.push(getArgValue(args, "--model"));
53 configs.push(getArgValue(args, "--config"));
54
55 const outputPath = getArgValue(args, "--output-last-message");
56 await fs.writeFile(
57 outputPath,
58 JSON.stringify({
59 subject: "Add stacked git actions menu behavior",
60 body: "- Keep menu actions visible\n- Improve disabled states",
61 }),
62 "utf8",
63 );
64 return okResult();
65 };
66
67 const generator = new CodexTextGenerator({ runProcess: runner });
68 const result = await generator.generateCommitMessage(commitInput());
69
70 expect(result.subject).toBe("Add stacked git actions menu behavior");
71 expect(models).toEqual(["gpt-5.3-codex-spark"]);
72 expect(configs).toEqual(['model_reasoning_effort="medium"']);
73 });
74
75 it("uses gpt-5.3-codex-spark for PR content generation", async () => {
76 const models: string[] = [];
77
78 const runner: ProcessRunner = async (command, args) => {
79 expect(command).toBe("codex");
80 models.push(getArgValue(args, "--model"));
81
82 const outputPath = getArgValue(args, "--output-last-message");
83 await fs.writeFile(
84 outputPath,
85 JSON.stringify({
86 title: "Improve Git action modal behavior",
87 body: "## Summary\n- Update PR generation model\n\n## Testing\n- Not run",
88 }),
89 "utf8",
90 );
91 return okResult();
92 };
93
94 const generator = new CodexTextGenerator({ runProcess: runner });
95 const result = await generator.generatePrContent({
96 cwd: process.cwd(),
97 baseBranch: "main",
98 headBranch: "feat/example",
99 commitSummary: "abc123 Update model",
100 diffSummary: "1 file changed",
101 diffPatch: "diff --git a/file b/file",
102 });
103
104 expect(result.title).toBe("Improve Git action modal behavior");
105 expect(models).toEqual(["gpt-5.3-codex-spark"]);
106 });
107
108 it("propagates generation failures without retrying a second model", async () => {
109 const models: string[] = [];
110
111 const runner: ProcessRunner = async (_command, args) => {
112 models.push(getArgValue(args, "--model"));
113 throw new Error("Request timed out while contacting Codex.");
114 };
115
116 const generator = new CodexTextGenerator({ runProcess: runner });
117
118 await expect(generator.generateCommitMessage(commitInput())).rejects.toThrow(
119 "Request timed out while contacting Codex.",
120 );
121 expect(models).toEqual(["gpt-5.3-codex-spark"]);
122 });
123});
apps/server/src/codexTextGenerator.ts+33-3
......@@ -10,7 +10,20 @@ import type {
1010 PrContentGenerationResult,
1111 TextGenerationService,
1212} from "./coreServices";
13import { runProcess } from "./processRunner";
13import {
14 type ProcessRunOptions,
15 type ProcessRunResult,
16 runProcess,
17} from "./processRunner";
18
19type ProcessRunner = (
20 command: string,
21 args: readonly string[],
22 options?: ProcessRunOptions,
23) => Promise<ProcessRunResult>;
24
25const CODEX_MODEL = "gpt-5.3-codex-spark";
26const CODEX_REASONING_EFFORT = "medium";
1427
1528const COMMIT_OUTPUT_SCHEMA_JSON = {
1629 type: "object",
......@@ -107,11 +120,13 @@ async function runCodexJson<T>({
107120 prompt,
108121 outputSchemaJson,
109122 parse,
123 run,
110124}: {
111125 cwd: string;
112126 prompt: string;
113127 outputSchemaJson: object;
114128 parse: (raw: unknown) => T;
129 run: ProcessRunner;
115130}): Promise<T> {
116131 const schemaPath = await writeTempFile(
117132 "codex-schema",
......@@ -121,14 +136,17 @@ async function runCodexJson<T>({
121136
122137 try {
123138 outputPath = await writeTempFile("codex-output", "");
124
125 await runProcess(
139 await run(
126140 "codex",
127141 [
128142 "exec",
129143 "--ephemeral",
130144 "-s",
131145 "read-only",
146 "--model",
147 CODEX_MODEL,
148 "--config",
149 `model_reasoning_effort="${CODEX_REASONING_EFFORT}"`,
132150 "--output-schema",
133151 schemaPath,
134152 "--output-last-message",
......@@ -163,7 +181,17 @@ async function runCodexJson<T>({
163181 }
164182}
165183
184interface CodexTextGeneratorDeps {
185 runProcess?: ProcessRunner;
186}
187
166188export class CodexTextGenerator implements TextGenerationService {
189 private readonly run: ProcessRunner;
190
191 constructor(deps: CodexTextGeneratorDeps = {}) {
192 this.run = deps.runProcess ?? runProcess;
193 }
194
167195 async generateCommitMessage(
168196 input: CommitMessageGenerationInput,
169197 ): Promise<CommitMessageGenerationResult> {
......@@ -189,6 +217,7 @@ export class CodexTextGenerator implements TextGenerationService {
189217 prompt,
190218 outputSchemaJson: COMMIT_OUTPUT_SCHEMA_JSON,
191219 parse: (raw) => parseCommitOutput(raw),
220 run: this.run,
192221 });
193222
194223 return {
......@@ -227,6 +256,7 @@ export class CodexTextGenerator implements TextGenerationService {
227256 prompt,
228257 outputSchemaJson: PR_OUTPUT_SCHEMA_JSON,
229258 parse: (raw) => parsePrOutput(raw),
259 run: this.run,
230260 });
231261
232262 return {
apps/web/src/components/GitActionsControl.tsx+6-18
......@@ -291,6 +291,7 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
291291 [gitModalActionOptions, gitModalSelectedAction],
292292 );
293293 const visibleGitActionError = gitActionError ?? gitStatusError?.message;
294 const gitModalOpenPrUrl = gitModalResult?.pr.url ?? gitStatus?.openPr?.url ?? null;
294295 const gitModalHasProgress = gitModalProgress.length > 0;
295296 const gitModalSelectionMode = !gitModalHasProgress && gitModalResult === null;
296297 const gitModalSteps = gitModalProgress;
......@@ -348,19 +349,19 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
348349 });
349350 }, [api, gitStatus?.openPr?.url]);
350351
351 const openPrFromResult = useCallback(() => {
352 const openPrFromModal = useCallback(() => {
352353 if (!api) {
353354 setGitModalError("Link opening is unavailable.");
354355 return;
355356 }
356357
357 const prUrl = gitModalResult?.pr.url ?? null;
358 const prUrl = gitModalOpenPrUrl;
358359 if (!prUrl) return;
359360
360361 void api.shell.openExternal(prUrl).catch((error) => {
361362 setGitModalError(error instanceof Error ? error.message : "Unable to open PR link.");
362363 });
363 }, [api, gitModalResult?.pr.url]);
364 }, [api, gitModalOpenPrUrl]);
364365
365366 const runGitAction = useCallback(async () => {
366367 if (!api || !gitCwd || !isGitModalOpen) return;
......@@ -784,25 +785,12 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
784785 {gitModalError ?? visibleGitActionError}
785786 </div>
786787 )}
787 {gitModalResult?.pr.url && (
788 <div className="mt-4 rounded-lg border border-border bg-card/40 px-3 py-2 text-xs text-muted-foreground/80">
789 PR:{" "}
790 <a
791 href={gitModalResult.pr.url}
792 target="_blank"
793 rel="noreferrer"
794 className="text-foreground underline underline-offset-2"
795 >
796 {gitModalResult.pr.url}
797 </a>
798 </div>
799 )}
800788 <div className="mt-6 flex justify-end gap-2">
801 {gitModalResult?.pr.url && (
789 {gitModalResult && gitModalOpenPrUrl && (
802790 <button
803791 type="button"
804792 className="rounded-xl border border-border px-4 py-2 text-sm text-foreground transition-colors duration-150 hover:bg-accent disabled:cursor-not-allowed disabled:opacity-60"
805 onClick={openPrFromResult}
793 onClick={openPrFromModal}
806794 disabled={isGitActionRunning}
807795 >
808796 Open PR