feat(git): Add Claude as a TextGenerationProvider by keyzou · Pull Request #1323 · pingdotgg/t3code

keyzou · 2026-03-23T01:44:24Z

What Changed

Added Claude as an alternate provider for git operations
Added a dropdown in the settings to choose a provider for Git operations.
Default provider is Claude Haiku 4.5 (changeable), reasoning low (unchangeable)
Tried to keep the feature parity with Codex for git operations, hope I didn't miss anything

I suggest reviewing commit-by-commit :)

I'm also not too familiar with Effect, so there might be some AI slop here and there, don't hesitate to flag it

⚠️ I'm also proposing an optional last commit (c6c833e) to refactor both providers to extract the prompt building logic into shared utilities. This is fairly opinionated, and we should probably discuss this, so I'm totally down to just drop that commit; we might want to tweak the prompts for a specific provider in the future

⚠️ I also couldn't test for regression on the Codex side, so I'll ask for one of you to make sure this all works correctly (tests are passing, I added a few for Claude, but maybe some bug went through, especially with the refactor)

I saw a similar PR at #1222 but since the change was not enough, I wanted to take a stab at the issue myself (not sure about the proper open-source etiquette here though)

Fixes #1221

Why

Pretty straightforward: I don't have Codex, so Git-related operations couldn't work for me :)

UI Changes

Here's the setting page with the Git section using Claude:

Enregistrement.de.l.ecran.2026-03-24.a.09.03.52.mov

Here's a demo of the branch name generation working (not sure I have the right flow) -- old model picker, see the video above for the updated version ^:

Enregistrement.de.l.ecran.2026-03-23.a.02.17.41.mp4

And here's a demo of committing and pushing (thus generating a commit message) -- old model picker, see the video above for the updated version:

Enregistrement.de.l.ecran.2026-03-23.a.02.15.14.mp4

Checklist

This PR is small and focused (not that small actually)
I explained what changed and why
I included before/after screenshots for any UI changes
I included a video for animation/interaction changes

Note

Add Claude as a selectable text generation provider for git content generation

Adds a new ClaudeTextGenerationLive layer in ClaudeTextGeneration.ts that invokes the Claude CLI (claude -p --output-format json) with JSON schema validation to generate commit messages, PR content, and branch names.
Introduces RoutingTextGenerationLive in RoutingTextGeneration.ts to replace the single Codex provider; routes requests to Codex or Claude based on a provider field on each input.
Extracts shared prompt builders and utilities into textGenerationPrompts.ts and textGenerationUtils.ts, consumed by both providers.
Exposes a textGenerationProvider setting ('codex' | 'claudeAgent', default 'codex') in app settings and the GitRunStackedActionInput API contract; the settings UI gains a provider/model picker.
Risk: Claude provider depends on the claude CLI binary being present at runtime; missing binary maps to a TextGenerationError via normalizeCliError.

^{Macroscope summarized ec38c62.}

Note

Medium Risk
Adds a new Claude-backed text generation path and routes git commit/PR/branch generation between two CLIs based on user/config input, touching both server orchestration and web settings. Risk is mainly around provider selection/plumbing, CLI invocation/timeout handling, and keeping Codex behavior unchanged after the shared refactor.

Overview
Adds a new ClaudeTextGeneration layer that runs the claude CLI with JSON-schema–validated structured output (including timeouts/error normalization) for commit message, PR content, and branch name generation.

Introduces RoutingTextGenerationLive and wires it into the server so each text-generation request can select codex vs claudeAgent via a new provider field; GitManager and RPC inputs propagate textGenerationProvider through stacked git actions.

Refactors Codex text generation to reuse shared textGenerationPrompts.ts and textGenerationUtils.ts, adds tests for prompt building/error normalization, and updates contracts + web settings/UI to let users choose a Git writing provider and model (with per-provider default models via DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER).

^{Written by Cursor Bugbot for commit ec38c62. This will update automatically on new commits. Configure here.}

coderabbitai · 2026-03-23T01:44:34Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 1b31008a-4d40-4e47-89a3-d22669013f65

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

juliusmarminge · 2026-03-23T17:25:04Z

can we reuse the model picker from the chat UI? So it's a single select with provider top level, model submenu?

keyzou · 2026-03-23T18:41:35Z

yep, didn't think about that, what do you think ? (updated the screenshot in the PR aswell)

Enregistrement.de.l.ecran.2026-03-23.a.19.37.28.mov

juliusmarminge · 2026-03-24T07:47:07Z

looks good. resolve conflicts pls

keyzou · 2026-03-24T08:03:18Z

done, rebased on main (updated the video to reflect the recent UI changes on main)

cursor · 2026-03-24T08:07:55Z

apps/server/src/git/Layers/ClaudeTextGeneration.ts

+      return {
+        branch: sanitizeBranchFragment(generated.branch),
+      } satisfies BranchNameGenerationResult;
+    });


Claude branch name generation silently drops image attachments

Medium Severity

The Claude generateBranchName implementation doesn't materialize or pass image attachments to the CLI, unlike the Codex implementation which calls materializeImageAttachments and passes imagePaths via --image flags. The prompt still tells the model to "use images as primary context for visual/UI issues," but the actual image files are never sent — only textual metadata about them is included. This means branch name generation with image attachments produces worse results on Claude compared to Codex.

Additional Locations (1)

apps/server/src/git/Layers/CodexTextGeneration.ts#L313-L337

I believe out of scope for this PR ? Do we have cases where we infer the branch name / commit messages from images ?

apps/server/src/git/Layers/textGenerationPrompts.ts

apps/server/src/git/Layers/ClaudeTextGeneration.ts

apps/web/src/appSettings.ts

cursor · 2026-03-24T09:01:21Z

apps/server/src/git/Layers/ClaudeTextGeneration.ts

+            "--effort",
+            CLAUDE_REASONING_EFFORT,
+            "--dangerously-skip-permissions",
+          ],


Claude CLI JSON schema may break on Windows

Medium Severity

The Claude CLI receives the JSON schema as an inline command-line argument via --json-schema jsonSchemaStr, while on Windows shell is set to true. The JSON string contains double quotes and braces that cmd.exe may interpret or mangle. The Codex implementation avoids this by writing the schema to a temp file and passing the file path instead.

I think this can be dismissed: the schema should always be simple enough to never cause issues (for now), there should never be any special character outside the quotes and braces from the json in this case? which should already be properly handled by cmd.exe

apps/web/src/routes/_chat.settings.tsx

keyzou · 2026-03-24T09:30:21Z

Left a few items from bugbot, should be fine if left as-is but leaving the last call to the maintainers

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

There are 3 total unresolved issues (including 2 from previous reviews).

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

Move limitSection, sanitizeCommitSubject, and sanitizePrTitle into a dedicated textGenerationUtils module so they can be reused by multiple text generation providers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Replace the single DEFAULT_GIT_TEXT_GENERATION_MODEL constant with a DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER map keyed by provider kind, enabling per-provider default models. Update all consumers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…nterfaces Introduce a standalone TextGenerationProvider union type and add an optional provider field to all text generation input interfaces, allowing callers to select which backend generates the content. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Add ClaudeTextGeneration layer that spawns `claude -p` with structured JSON output for commit messages, PR content, and branch names. Introduce a RoutingTextGeneration layer that dispatches to Codex or Claude based on the provider field, and wire it into the server DI graph. Thread the provider selection through GitManager to all text generation call sites. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Add a provider selector (Codex/Claude) to the git settings panel with dynamic model options per provider. Pass the selected provider through to the stacked action mutation. Also fix a pre-existing bug where the model field name was incorrect in the RPC call. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Match the pattern already used by Codex (CODEX_REASONING_EFFORT) to make the setting visible and easy to change. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Extract prompt construction logic into buildCommitMessagePrompt, buildPrContentPrompt, and buildBranchNamePrompt in new textGenerationPrompts.ts - Replace duplicate normalizeClaudeError and normalizeCodexError with shared normalizeCliError function parameterized by CLI name - Update Claude and Codex text generation layers to use shared utilities, reducing duplication - Add comprehensive tests for prompt builders and error normalization

- Consolidate provider and model selection into reusable component - Replace getAppModelOptions with getCustomModelOptionsByProvider - Simplifies settings UI and enables reuse across the app

Remove explicit result interfaces with incorrect type annotations (Schema.Struct.Type<any>) and let TypeScript infer return types. Split the ternary schema assignment into separate return branches so TypeScript preserves a proper union instead of widening to any. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Both ClaudeTextGeneration and CodexTextGeneration had identical logic to convert an Effect Schema into a flat JSON Schema object. Move it into textGenerationUtils.ts as a single shared helper. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Pass selectedModel (scoped to the active provider) through to getAppModelOptions so non-built-in models appear in the dropdown. Restore the per-setting reset button on the git writing model row. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Pass input.textGenerationProvider to runFeatureBranchStep so the routing layer respects the user's provider choice instead of always falling back to Codex. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

github-actions bot added size:XXL 1,000+ changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Mar 23, 2026

keyzou force-pushed the feat/claude-text-generation branch from c9d1242 to 66463d1 Compare March 24, 2026 08:02

github-actions bot added size:XL 500-999 changed lines (additions + deletions). and removed size:XXL 1,000+ changed lines (additions + deletions). labels Mar 24, 2026

cursor bot reviewed Mar 24, 2026

View reviewed changes

apps/server/src/git/Layers/ClaudeTextGeneration.ts Outdated Show resolved Hide resolved

cursor bot reviewed Mar 24, 2026

View reviewed changes

keyzou force-pushed the feat/claude-text-generation branch from dbe7e77 to cb76bce Compare March 24, 2026 09:20

keyzou force-pushed the feat/claude-text-generation branch from cb76bce to e30f4b6 Compare March 24, 2026 09:32

cursor bot reviewed Mar 24, 2026

View reviewed changes

apps/server/src/git/Layers/GitManager.ts Show resolved Hide resolved

keyzou and others added 13 commits March 24, 2026 18:56

refactor: extract shared text generation utilities

c14198f

Move limitSection, sanitizeCommitSubject, and sanitizePrTitle into a dedicated textGenerationUtils module so they can be reused by multiple text generation providers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Extract Claude reasoning effort into named constant

9fe39bc

Match the pattern already used by Codex (CODEX_REASONING_EFFORT) to make the setting visible and easy to change. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

chore: remove a bit of comment-slop

71e18bc

Extract provider/model selection to ProviderModelPicker

ba74436

- Consolidate provider and model selection into reusable component - Replace getAppModelOptions with getCustomModelOptionsByProvider - Simplifies settings UI and enables reuse across the app

keyzou force-pushed the feat/claude-text-generation branch from 20a38c2 to b141993 Compare March 24, 2026 18:00

chore: format with oxfmt

ec38c62

Conversation

keyzou commented Mar 23, 2026 • edited by macroscopeapp bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Changed

Why

UI Changes

Checklist

Add Claude as a selectable text generation provider for git content generation

Uh oh!

coderabbitai bot commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

juliusmarminge commented Mar 23, 2026

Uh oh!

keyzou commented Mar 23, 2026

Uh oh!

juliusmarminge commented Mar 24, 2026

Uh oh!

keyzou commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cursor bot Mar 24, 2026

Choose a reason for hiding this comment

Claude branch name generation silently drops image attachments

Uh oh!

keyzou Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor bot Mar 24, 2026

Choose a reason for hiding this comment

Claude CLI JSON schema may break on Windows

Uh oh!

keyzou Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

keyzou commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

keyzou commented Mar 23, 2026 •

edited by macroscopeapp bot

Loading

coderabbitai bot commented Mar 23, 2026 •

edited

Loading

keyzou commented Mar 24, 2026 •

edited

Loading

keyzou Mar 24, 2026 •

edited

Loading

keyzou Mar 24, 2026 •

edited

Loading

keyzou commented Mar 24, 2026 •

edited

Loading