Skip to content

fix(server): generate PR diffs from branch changes - #53

Merged
nullStack65 merged 1 commit into
mainfrom
fix/pr-branch-diff-699-h4
Nov 13, 2026
Merged

nullStack65 merged 1 commit into
mainfrom
fix/pr-branch-diff-699-h4

Conversation

@nullStack65

Copy link
Copy Markdown
Owner

When the PR base advances independently, generated PR content includes unrelated base changes as deletions. Use the common ancestor for diff statistics and patches while retaining the two-dot commit log.

Ports upstream pingdotgg/t3code commit f223312 (pingdotgg#13170), preserving its implementation and regression test. No architecture migration. Issue699 Handoff4; parent owns integration and the single review round.

Validation: focused regression passes with the fix and fails on original fork main because later-main.txt leaks into the diff. Targeted lint and git diff --check pass. Local Node 25.6.0 differs from required Node 24; CI remains pending. No review requested.

Model: gpt-6.1-sol (Codex harness, included subscription)
Task: bugfix

Port upstream f223312 (pingdotgg#13170). Keep commit logs two-dot and compute PR patches from the common ancestor.

Model: gpt-6.1-sol
Task: bugfix
Agent: issue699-handoff4
@nullStack65

Copy link
Copy Markdown
Owner Author

CHECKPOINT

Single independent technical review at2526c2d4f65f1581e01fc03ef1428e5010941972. Reviewer parent gpt-6.1-sol; implementer separate delegated gpt-6.1-sol; same family, independent session, no human approval.

No blocking semantic finding in the two-file port. readRangeContext has one production caller generating PR content. Keeping base..HEAD for commit selection while using base...HEAD for diff/stat correctly excludes unrelated changes added to the base after the branch point. The integration fixture advances the remote base after pushing the feature and checks both summaries and patch, including the unrelated file exclusion. Existing truncation/output bounds remain intact. Implementation matches attributed upstream fix f223312; no usage-reader paths overlap CLO801.

Parent reran focused GitManager regression:1passed/112skipped. Implementer demonstrated before-fix failure and final pass plus targeted lint. Server-scoped typecheck is still being collected. Local Node25 differs from required24; no supported-version or runtime deployment claim. No CI checks are currently reported; required gate/eligibility must be resolved before merge. One review round total; no additional review requested.

@nullStack65
nullStack65 marked this pull request as ready for review November 13, 2026 17:36
@nullStack65
nullStack65 merged commit 05993d8 into main Nov 13, 2026
@coderabbitai

coderabbitai Bot commented Nov 13, 2026

Copy link
Copy Markdown

Important

  • Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

Run configuration

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant