Skip to content

chore(upstream): advance intake baseline to cf1ba3d7da - #547

Merged
incognitojam merged 1 commit into
mainfrom
chore/advance-intake-baseline-cf1ba3d7da
Sep 29, 2026
Merged

incognitojam merged 1 commit into
mainfrom
chore/advance-intake-baseline-cf1ba3d7da

Conversation

@incognitojam

Copy link
Copy Markdown
Owner

The upstream intake queue's baseline was still at 3997b9a3a4, though main has since taken every upstream commit through cf1ba3d7da (the pingdotgg#11346 squash merge). The batch ending there was promoted as f5ff4a372c. This moves the baseline to that boundary, so the next batch starts at pingdotgg#11338.

It also removes four entries from .github/upstream-tracked-prs.json that the last two batches recorded: pingdotgg#9921, pingdotgg#11302, pingdotgg#11103 and pingdotgg#11107. Their follow-ups, such as pingdotgg#8309, stay tracked.

This PR changes only those two state files; it contains no intake commits.

Validation

  • node scripts/upstream-queue.ts advance cf1ba3d7da98357243ee056d2fd358eed8171981 accepted the boundary. The command rejects a boundary with unresolved earlier commits or one inside a multi-commit PR.
  • node scripts/upstream-queue.ts status afterwards: baseline and reconciled-through are both cf1ba3d7da; 317 of 338 commits up to the target are pending, 21 recorded, no exceptions. No tracked PR is listed as recorded.
  • node scripts/upstream-queue.ts next --count 1 now starts at fix: restore provider history and prompts when rewinding pingdotgg/t3code#11338.
  • The queue and tracked-PR script tests pass.

Written by an agent (Claude Code, claude-opus-5-5).

Main has taken every upstream commit through cf1ba3d, the squash
merge that ends the intake/upstream-11176-11346 batch promoted as
f5ff4a3. Move the queue baseline to that boundary and stop tracking
the four PRs the last two batches recorded: 9921, 11302, 11103 and
11107.
@incognitojam
incognitojam merged commit d8dfcd9 into main Sep 29, 2026
28 of 30 checks passed
@incognitojam
incognitojam deleted the chore/advance-intake-baseline-cf1ba3d7da branch September 29, 2026 22:02
incognitojam added a commit that referenced this pull request Sep 29, 2026
The upstream intake baseline advanced to `cf1ba3d7da` in #547, and the
upstream intake runbook calls for regenerating the committed T3 Code
import fixture from the new boundary. This PR regenerates
`apps/server/src/dataImport/testFixtures/t3-code` from `cf1ba3d7da`
(previously `8de9169f07`), so the Fork CI import test uses data from the
upstream version styal is reconciled against.

Between the two boundaries, T3 Code's stored events are unchanged: 171
events of the same types. Upstream's `ProjectionThreadPullRequests`
migration adds a `projection_thread_pull_requests` table, which is empty
for every generated thread, and a new `projection.attachment-cleanup`
projector adds a cursor row to `projection_state`. The import replays
events rather than reading projections. The rest of the diff is new IDs,
timestamps, the attachment file name and the recorded server revision.

## Validation

- Ran `generate-t3-import-fixture.ts` against an upstream checkout at
`cf1ba3d7da`. It built the usual scenario through the server's HTTP API
with the fake Codex CLI: completed (with an image attachment), settled,
unsettled, archived, deleted, failed, worktree, empty and second-project
threads.
- `LegacyImport.fixture.test.ts` passes against the new fixture with no
new expected differences.

---
Written by an agent (Claude Code, claude-opus-5-5).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant