Skip to content

chore(upstream): track the hand-ported Stop fix for upstream #23886 - #1120

Merged
incognitojam merged 1 commit into
mainfrom
chore/track-upstream-23886-hand-port
Oct 28, 2026
Merged

incognitojam merged 1 commit into
mainfrom
chore/track-upstream-23886-hand-port

Conversation

@incognitojam

Copy link
Copy Markdown
Owner

Fork #1116 hand-ported the Stop fix from pingdotgg#23886 without an Upstream-PR trailer, because that PR depends on 23 earlier upstream commits the fork had not taken in. The queue therefore still lists pingdotgg#23886 as pending, and nothing told whoever runs intake that its code is already in place.

This adds a tracked entry for pingdotgg#23886 in .github/upstream-tracked-prs.json. Its reason says that when chronological intake reaches the PR, the cherry-pick should change no code (to be checked, not assumed), and that the fork keeps #1116's correction to the Stop paragraph in docs/orchestration-v2/feature-lifecycles.md, which upstream still describes as sending run.interrupt with holdQueue.

Validation: node scripts/upstream/queue.ts status --fork-ref HEAD decodes the file and lists pingdotgg#23886 as pending (beyond the current target) with this reason. A comparison of fork commit 1dc42d7 with upstream commit fbc6a08 found that their code and test changes match apart from indentation.


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

…g#23886

Fork #1116 ported the fix ahead of the upstream commits it depends on,
without an Upstream-PR trailer. Track it so chronological intake checks
that the cherry-pick changes no code and keeps the fork's corrected Stop
paragraph in the orchestration lifecycle doc.
@github-actions

Copy link
Copy Markdown

Upstream divergence

Both sides are compared with upstream at the in-order tip fb990765a4. Excludes .repos/ and pnpm-lock.yaml.

Measure Base This PR Change
Upstream files the fork changes 1,727 1,727 0
Lines changed in them 95,018 95,018 0
Upstream files the fork removes 49 49 0
Fork-only files 683 683 0
Fork-only lines 122,674 122,678 +4

No upstream file changes how much it differs from upstream.

@github-actions

Copy link
Copy Markdown

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 20.9 KiB 20.9 KiB 0 B (0.0%) 29.3 KiB ✅
Codex Live turn messages 2 2 0 (0.0%) 8 ✅
Claude Total thread wire 5.0 KiB 5.0 KiB +7 B (+0.1%) 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 +7 B (+0.6%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 21.2 KiB 21.2 KiB 0 B (0.0%) 29.3 KiB ✅
Claude Live turn messages 2 2 0 (0.0%) 8 ✅

Baseline: 67439ca · PR result: 5008ea0 · 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.

@incognitojam
incognitojam merged commit e6c5659 into main Oct 28, 2026
33 checks passed
@incognitojam
incognitojam deleted the chore/track-upstream-23886-hand-port branch October 28, 2026 22:27
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