[juliusmarminge]

Problem

Checkpoint capture decided whether the workspace is an ignored project directory with git check-ignore --no-index .. Git's ignore parser turns a blank CRLF line (or a spaces-only line) in any ignore source into an empty pattern, and that empty pattern matches . because Git normalizes it to "" at the root or sub/ below it. A normal workspace was then treated as ignored:

• at the repository root, capture staged with git add -u, so untracked files were left out of the checkpoint, and restoring that checkpoint (git restore + git clean -fd) deleted them;
• in a subdirectory with no tracked files, capture failed with "The workspace directory is ignored by its Git repository".

Reproduced on Linux with Git 2.43 (the reporter used Git for Windows 2.56 with core.autocrlf=true, which writes such CRLF lines on checkout):

$ printf 'a.txt\r\n\r\nb.txt\r\n' > .gitignore
$ git check-ignore -v --no-index .
.gitignore:2:	.
$ git ls-files --others --exclude-standard
.gitignore
new.txt

Change

resolveCaptureRepository adds --show-prefix to the rev-parse it already runs (its old-Git fallback reads the prefix separately). At the working-tree root the probe is skipped, since the root can never be an ignored directory. Below it, the probe asks about ../<workspace dir>, which Git resolves to the slash-less repo-relative path: an empty pattern cannot match it, while rules that ignore the directory itself (sub/, sub, an ignored parent) still do, so the ignored-project handling from https://git.cafe/pingdotgg/t3code/pulls/14892 keeps working for them.

Two side effects:

• A root workspace in a whitelist-style repository (* followed by ! rules) is no longer classed as ignored, so its new whitelisted files are now captured. Before, they were dropped.
• Rules that ignore only a directory's contents (sub/**, sub/*, or * in sub/.gitignore) no longer make a sub workspace count as ignored. Such a workspace gets normal-repository capture, the same as a workspace with no matching rule. Checkpoint file restore only runs at a worktree root, so this changes the turn diff for in-place subdirectory projects and never what a restore deletes.

Scope and approval

Fixes #32360

Verification

• New it.effect.each in apps/server/src/vcs/GitVcsDriver.test.ts: a blank CRLF line in the root .gitignore, capture at the repository root and in a subdirectory, and assert the untracked notes.md is in the checkpoint tree. On main both fail:

  FAIL  checkpoint capture keeps new files in the repository root when the root .gitignore has a blank CRLF line
  AssertionError: expected [ 'file.txt', '' ] to include 'notes.md'
  FAIL  checkpoint capture keeps new files in a subdirectory when the root .gitignore has a blank CRLF line
  VcsUnsupportedOperationError: ... The workspace directory is ignored by its Git repository.
  

  Three command-sequence assertions were updated: a root capture no longer runs check-ignore, and the old-Git/newline fallback runs one more rev-parse.
• GitVcsDriver.test.ts + GitVcsDriverCore.test.ts on the head merged with main: 319 of 320 pass, including the existing ignored-project tests. lists the fetch and push URLs of a partial clone remote fails with the VM's Git 2.43 on unmodified main too, and passes in CI.
• vp run check:changed: format, lint, knip, graphql and typecheck pass; its test step shows only the partial-clone failure above. CI is green on the head.
• Two independent reviews: no findings except the overstated https://git.cafe/pingdotgg/t3code/pulls/14892 sentence corrected above. One reviewer compared the new probe with git add -A over 672 cases (root and nested workspaces, .gitignore / .git/info/exclude / core.excludesFile, CRLF and spaces-only lines, real directory ignores, negations, unusual names) with no disagreement.

Evidence

Server-only change with nothing on screen, so the evidence is runtime transcripts. The same driver script ran the real GitVcsDriver (capture → agent edit → restore) at main 80e62619f5 and at head 049b1e8e9c. Linux 6.8, Git 2.43.0, Node 26. Before transcript · After transcript · Fixture matrix · Summary

Row	Before (80e62619f5)	After (049b1e8e9c)
F01: root workspace, blank CRLF line in .gitignore	Checkpoint omits notes.md; restore prints Removing notes.md and the file is gone	Checkpoint holds the original notes.md; restore recovers it and removes the later file
F02: sub workspace with no tracked files, same .gitignore	VcsUnsupportedOperationError, no checkpoint ref	Capture and restore succeed; notes.md recovered, later file removed, modified outside sibling preserved
F04: newline in the workspace path, spaces-only line in core.excludesFile	VcsUnsupportedOperationError, no checkpoint ref	The old-Git/newline fallback runs with real Git; capture and restore succeed as in F02

Other differences in the transcripts: the combined lookup adds --show-prefix. Git command counts per capture change from 11 to 8 at F01 (staging -u → -A), 7 to 9 at F02 and 7 to 12 at F04, because capture now completes; F04 also includes three fallback rev-parse calls. Other matrix rows rely on the existing tests. An independent rerun of the after side reproduced the transcript.

Not checked: native Windows or macOS Git, and a real Git older than 2.31 (the fallback ran on Git 2.43 via a newline path).

AI-assisted; verified with the tests and tools listed above.

🤖 Generated with Claude Code

[macroscopeapp]

Approvability

Verdict: Approved at f12a4dd

Macroscope's review found this PR approvable — This corrects checkpoint ignore detection so blank ignore lines no longer exclude new files. The change retains Git ignore filtering and the existing temporary-index capture safeguards.

No code changes detected at 049b1e8. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	21.5 KiB	21.5 KiB	0 B (0.0%)	24.4 KiB	✅
Codex	Live turn messages	1	1	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.9 KiB	21.9 KiB	0 B (0.0%)	24.4 KiB	✅
Claude	Live turn messages	1	1	0 (0.0%)	8	✅

Baseline: 80e6261 · PR result: 049b1e8 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[coderabbitai]

No actionable comments were generated in the recent review.

Walkthrough

Checkpoint repository resolution now returns the working-tree prefix. Checkpoint capture uses that prefix to test whether the workspace is ignored. Tests cover root and subdirectory workspaces with a blank CRLF line in the root .gitignore.

Changes: Checkpoint capture

Layer / File(s)	Summary
Resolve the workspace prefix apps/server/src/vcs/GitVcsDriver.ts	The combined Git path lookup now requests and parses the working-tree prefix. If the combined output is malformed or incompatible, a fallback resolves the common directory and prefix separately; the index path is unavailable in that fallback.
Check workspace ignore status apps/server/src/vcs/GitVcsDriver.ts, apps/server/src/vcs/GitVcsDriver.test.ts	Checkpoint capture passes the prefix to ignored-workspace detection, which probes the containing path without its trailing slash instead of ".". Tests cover blank CRLF lines and updated Git command sequences.

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

Change: Bug fix · Severity of issue fixed: Medium

Possibly related PRs

• pingdotgg/t3code#21315: Both PRs modify the combined rev-parse lookup used for checkpoint repository resolution.
• pingdotgg/t3code#32373: Both PRs address false ignored-workspace classification from empty or whitespace-only ignore patterns during checkpoint capture.

Suggested reviewers: josephv123

Merge Risk: Minimal · up to 049b1

The checkpoint capture change is mergeable after normal checks; no concrete outstanding issue was established.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly summarizes the fix: blank .gitignore lines no longer cause checkpoint capture to omit new files.
Linked Issues check		[#32360] The whole-PR diff adds the repository prefix to checkpoint repository resolution. Capture skips the ignore probe at the repository root and probes a subdirectory without the trailing slash th…
Out of Scope Changes check		The whole-PR changes to GitVcsDriver.ts and its tests support the checkpoint-capture fix in [#32360]. The repository-prefix lookup, fallback, probe adjustment, and command-sequence updates have a di…
Description check		The description includes the required Problem, Change, Scope and approval, and Verification sections. It links the issue, explains the change, reports focused test results, and states what was not che…

Full details: Linked Issues check

Explanation

[#32360] The whole-PR diff adds the repository prefix to checkpoint repository resolution. Capture skips the ignore probe at the repository root and probes a subdirectory without the trailing slash that lets an empty ignore pattern match. The regression tests cover root and subdirectory capture with a blank CRLF line and verify that an untracked file enters the checkpoint. The reported existing ignored-project tests preserve handling for genuinely ignored workspaces. The change addresses the issue’s capture and restore-loss cause.

Full details: Out of Scope Changes check

Explanation

The whole-PR changes to GitVcsDriver.ts and its tests support the checkpoint-capture fix in [#32360]. The repository-prefix lookup, fallback, probe adjustment, and command-sequence updates have a direct connection to that objective. No unrelated changes are evident.

Full details: Description check

Explanation

The description includes the required Problem, Change, Scope and approval, and Verification sections. It links the issue, explains the change, reports focused test results, and states what was not checked. It identifies Claude Code but does not name the model used; this is a minor omission.

Finishing Touches

Generate docstrings

• Commit to this branch
• Create a new PR

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

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

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-32360
• File: .coderabbit.config.ts
• Commit: 049b1e8
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: 58831c50-3f97-4a63-92f0-c59da945c8ec

Commits

Reviewing files that changed from the base of the PR and between f12a4dd and 049b1e8.

Files selected for processing: 1

• apps/server/src/vcs/GitVcsDriver.ts

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