Repository navigation
feat(upstream): survey flags later upstream fixes to batch commits - #1121
Merged
Merged
Conversation
The intake survey now lists later upstream fix and revert commits, up to upstream/main, whose message or PR description names a surveyed commit by PR number or reverted SHA, quoting the sentence that names it. Fixes the fork already imported are left out, and tracked ones show their reason.
Upstream divergenceBoth sides are compared with upstream at the in-order tip
No upstream file changes how much it differs from upstream. |
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: Scenario and decoded snapshot size10 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.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Intake batch 30 ended at pingdotgg#22052, which broke Stop for running subagents. Upstream fixed it four days later in pingdotgg#23886, 719 commits further down the queue, so the fork carried the bug until fork #1116 ported the fix by hand. Nothing in the survey pointed at it.
intake-run.ts surveynow also lists later upstream fix and revert commits, up to fetchedupstream/main, that name a surveyed commit. A later commit counts when its PR title (or subject, for a direct commit) is afixorrevert, and its message or PR description names a surveyed commit by#N,pingdotgg/t3code#N, apingdotgg/t3code/pull/Nlink, or "reverts commit ". The text output shows each flagged fix under the commit it names and quotes the sentence that names it. In--json, each survey entry has alaterFixesarray. Fixes the surveyed base already imported, going byUpstream-PR/Upstream-Committrailers, are left out. When the fork tracks a flagged fix in.github/upstream-tracked-prs.json, the output shows its reason. PR descriptions are read withgh api graphql, 100 per query.Precision matters more than recall here, so the check needs an explicit reference. I tried a second signal, a fix whose title says "again", "restore", or "no longer" and that touches a file a batch commit changed. On batch 30 it matched about 45 later fixes, and none of them fixed a batch commit. SHAs other than in "reverts commit" are ignored because takeover PRs often cite the
mainSHA they tested against. Links and qualified references to other repositories are ignored too.The runbook gets one paragraph: check each flagged fix before the batch lands, and when it fixes a regression the batch introduces, extend the batch, import it early, or port it by hand and track the upstream PR.
Validation
I ran
survey --base 9a69b6c2ba --through fb990765a4for the real batch-30 range: 55 commits, with 1,424 later upstream commits checked. It flags 9 later fixes:thread.stop…")That is two regression fixes, five useful follow-ups and two harmless mentions, a short list to read for a 55-commit batch. Unit tests cover PR references, reverts by title and SHA, merge commits classified by PR title, references to other repositories, code fences, mirror links, and choosing the quoted sentence.
Written by an agent (Claude Code, claude-opus-5-5).