[only21mil]

Problem

Generated commit messages can describe a configured text converter's output instead of the source change being committed. prepareCommitContext disables external diff tools with --no-ext-diff, but Git still applies diff.<driver>.textconv. GitManager passes that converted patch to the commit-message generator.

To reproduce, set *.doc diff=probe in .gitattributes, configure diff.probe.textconv to replace source labels, commit notes.doc, then edit it and leave the commit message blank. The generator receives the converted labels.

Change

Add --no-textconv to the staged patch command in prepareCommitContext. Git supplies the source patch without invoking the converter, which matches the review diff arguments in the same file. A binary file that was readable only through its converter now shows as a binary change. The temporary-index handling and no-patch path for user-written messages stay unchanged.

One real-Git regression test checks both source sides of a modified document, its summary entry, and the absence of converter output and its marker file.

Scope and approval

This qualifies as a very small, focused fix for an obvious bug without a prior issue. One Git argument corrects the input to an existing generator. It adds no setting or workflow.

Prior PRs: #22503 by @only21mil is open and fixes the same textconv cause for generated PR text in readRangeContext. This PR applies that source-patch pattern to the separate commit-message path. #2352 by @avshyz addressed external diff tools and was closed as superseded by #2553 by @stromseng, which supplied the existing --no-ext-diff flag. #19605 by @Microck skipped unused patches for custom messages; this fix preserves that path.

Verification

Linux x64, Node 24.22.0. From apps/server:

vp test run src/vcs/GitVcsDriverCore.test.ts -t 'prepares source patches without running textconv'
vp test run src/vcs/GitVcsDriverCore.test.ts -t 'commit context'

• Base 05696c636e plus the new test: 1 failed, 155 skipped. The patch lacked -original source and contained converter output.
• Candidate a4a00b57da: all 8 commit-context tests passed, including the regression and index-preservation cases.
• Focused formatting passed. Focused lint exited 0 with two warnings on unchanged lines. pnpm run typecheck in apps/server passed.
• vp run --filter t3 build passed before and after the fix, producing the web client and server used below.

The same real Git command returned converted labels before the flag and source lines after it.

Real production-build app checks used isolated repositories and state on Linux in Chromium. In each build, I opened Git action options, chose Commit, left the message blank, and confirmed Commit. A no-credential ACP test provider derived its reply from the actual patch it received. It returned "Update converted document" for converted lines and "Update source document" for source lines. The captured prompts and resulting Git commits matched. This proves the app's generation path with a deterministic mock; no real model was called. The composer model shown in the background was unused.

Before, the app displayed the mock-generated converted-document subject.

After, the app displayed the mock-generated source-document subject.

Not checked:

• macOS or Windows execution.
• Real-provider message quality.
• Repo-wide tests or typechecks.

Generated with GPT-6.1 Sol in T3 Code Nightly

[coderabbitai]

No actionable comments were generated in the recent review.

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: main
• File: .coderabbit.config.ts
• Commit: 0a3b561
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Advanced
• Run ID: efa51a8c-5706-47db-998a-8e49a9ae7765

Commits

Reviewing files that changed from the base of the PR and between 0a3b561 and 40660b9.

Files selected for processing: 2

• apps/server/src/vcs/GitVcsDriverCore.test.ts
• apps/server/src/vcs/GitVcsDriverCore.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 0 remain after this review.

Walkthrough

The commit-context staged-patch command now passes --no-textconv. A test checks that the patch contains source-text changes, the summary includes the filename, and the configured textconv command does not run.

Changes: Commit context patch

Layer / File(s)	Summary
Generate and verify source-text patch apps/server/src/vcs/GitVcsDriverCore.ts, apps/server/src/vcs/GitVcsDriverCore.test.ts	The staged-patch diff disables text conversion. The test checks source text, filename summary, and that the configured textconv command does not run.

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Bug fix

Suggested labels: bugfix

Suggested reviewers: macroscopeapp

Merge Risk: Minimal · up to 40660

The change correctly prevents textconv output from entering generated commit messages, with focused regression coverage.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly identifies the server fix: generated commit messages now use source patches.
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.
Description check		The description follows the required template. It explains the problem, change, scope rationale, verification commands and results, limitations, and agent details. It also includes focused regression …

Full details: Description check

Explanation

The description follows the required template. It explains the problem, change, scope rationale, verification commands and results, limitations, and agent details. It also includes focused regression evidence and production-build checks.

Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

[maria-rcks]

Note

Written by gpt-6.1-sol on behalf of Maria

preserved @only21mil's commit and merged current main (0a3b561bc090) into this writable head. the original implementation is already the smallest correct fix: one --no-textconv flag and one real-git regression in the existing test file. nothing was dropped or expanded. the diff against main remains two files, +24/-1.

verification at 40660b97d79fb2d1631f77bf00f1da4ae9949f34:

• reproduced the regression against current main's production command: the test fails because the patch lacks -original source.
• blacksmith: all 267 git driver and git manager tests pass. vp run check:changed FETCH_HEAD against the exact main base passes format, lint, both knip passes, graphql generation checks, affected typechecks and all 164 driver tests. lint reports one warning on an unchanged line.
• real server-driver runtime transcript: both all-file and selected-file contexts contain source additions/deletions; the converter never runs, the real index is preserved, and custom messages keep their empty-patch path.
• ci is green on this head; github reports CLEAN and MERGEABLE. coderabbit reviewed this head with no actionable findings. two independent read-only reviews also found no actionable issues.

unverified: live provider/client generation (no provider login on this vm), macos/windows and native clients. this is a server patch-input correction with no changed ui components; no new visual evidence is claimed. the original pr's captures remain its author's evidence. maintainer approval remains for maria; this takeover does not supply or bypass it.

[maria-rcks]

Note

Written by gpt-6.1-sol on behalf of Maria

Verified in a real dev environment

verified as-is at 40660b97d79fb2d1631f77bf00f1da4ae9949f34. no source changes or pushes.

• ran vp i and the real dev app on Linux, first in a separate github/main worktree (f120c51134), then at the exact pr head. stopped main's server before starting the pr server. drove the web client with repository Playwright and /usr/bin/google-chrome.
• created real projects and repositories through the app. real Codex turns prepared the changes. selected codex / gpt-6.1-sol as the source control writer in Settings for both builds. no mock provider, fixtures, or demo data.
• reproduced main's bug: a configured *.doc converter hid a timeout change from 10 to 30 seconds. the web commit action invoked the converter twice and generated only update neighbor text, while git actually committed the timeout change too.
• repeated the same source edits on the pr through Git action options → Commit → blank message → Commit. real Codex generated Increase service request timeout to 30 seconds; git committed both intended files and the converter marker never appeared.
• selected-file generation also produced Increase service request timeout to 45 seconds, committed only notes.doc, and retained the excluded neighboring edit. the selected-file commit unstaged that excluded file, matching the existing stageCommitChanges reset path; its contents were retained.
• a custom-message commit preserved the exact subject and body, committed the intended edits, and never ran the converter. the repository ended clean.
• Blacksmith: cd apps/server && vp test run src/vcs/GitVcsDriverCore.test.ts -t "commit context" passed all 8 selected tests. existing CI on this head has no failing or pending checks.

command transcript with actual commits, source patches, and converter checks

inspected the captures and checked uploaded video playback through the end and seeking in T3's browser.

Not verified

native iOS/Android, the Electron shell, macOS/Windows, remote/relay/tunnel connections, other providers, and binary-only converter inputs were not exercised on this Linux VM. no UI components changed, so these captures document the runtime flow rather than a visual redesign. dev servers were stopped after verification.