Skip to content

chore: merge release into main - #5176

Merged
moq-bot[bot] merged 14 commits into
mainfrom
merge/release-into-main
Oct 10, 2026
Merged

chore: merge release into main#5176
moq-bot[bot] merged 14 commits into
mainfrom
merge/release-into-main

Conversation

@moq-bot

@moq-bot moq-bot Bot commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

Carries what release published (versions, CHANGELOGs, backports) back to trunk. Opened by the Back-merge workflow.

Check's land job merges it as a merge commit once Check and Test pass. Never squash. A squash leaves the merge base at the last cut, so the next back-merge conflicts. On a conflict, merge main into merge/release-into-main and resolve it there.

kixelated and others added 13 commits October 9, 2026 14:53
@kixelated @claude
fix(net): wake parked reads when stamped successors abort (#4710)
8e684e2 
Co-authored-by: GPT-6 <noreply@openai.com>
(cherry picked from commit 7e6fd81)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated @claude
fix(net): a parked group's expiry no longer walks the backlog (#4892)
1684735 
(cherry picked from commit d70edf6)

Adapted for release: its drift_edge still takes the splice anchors
(outer, successor), so the re-selected successor group is bound as `next`
to avoid shadowing the anchor successor timestamp.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated @claude
fix(net): a capped IETF stream never claims END_OF_GROUP (#5077)
7a378e2 
Backport to release. The Rust regression test decodes the header with
release's GroupHeader::decode form and runs under tokio::test, since
release lacks coding::decode_buf and moq_net_sim. Quest edits dropped.

(cherry picked from commit 9680ca9)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated @codex @claude
fix(hls): retain init decoded from completed segments (#4840)
d2aa386 
Co-authored-by: GPT-6 <noreply@openai.com>
(cherry picked from commit cccf500)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated @claude
test(net): pin a cap at or past a group's end clearing END_OF_GROUP
1aec3e6 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated @claude
fix(net): a parked read watches its local edge abort
1f67f5c 
The narrowed expiry scan skips groups between the successor and the local
edge. An aborted edge hands the edge to one of those groups, and neither the
abort nor that group's first frame touches the track, so the parked read
slept through a verdict change the old backlog walk delivered. Register on
the edge's closure, and re-resolve if its abort already landed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated @claude
chore(net): reflow the parked-read scan comment
5187fed 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated
Merge pull request #5131 from moq-dev/backport/hls-init-retain
a242ef9 
fix(hls): retain init decoded from completed segments (backport #4840)
@kixelated @claude
Merge origin/release into backport/capped-end-of-group
99f092c 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated
Merge pull request #5130 from moq-dev/backport/group-expiry-walk
167214e 
fix(net): parked group expiry no longer walks the backlog (backport #4710, #4892)
@kixelated
Merge pull request #5135 from moq-dev/backport/capped-end-of-group
2940de9 
fix(net): a capped IETF stream never claims END_OF_GROUP (backport #5077)
@kixelated @claude
fix(deps): bump moq-noq to 1.3.5 on release
560d962 
Carries moq-dev/noq#33, the release/1.3 backport of moq-dev/noq#32: reset the PTO backoff when Initial or Handshake keys are discarded (RFC 9002 A.11).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated
Merge pull request #5170 from moq-dev/backport/noq-1.3.5
d0b086e 
fix(deps): bump moq-noq to 1.3.5 on release
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 10, 2026 •
edited
Loading

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-10T04:42:58.794376Z d0b086e PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@kixelated

kixelated commented Oct 10, 2026

Copy link
Copy Markdown
Collaborator

Automated review of head d0b086e7.

This back-merge carries the release backports (#5130, #5131, #5135, #5170: parked-read wakeups, group-expiry walk, capped END_OF_GROUP, HLS init retention) plus the moq-noq / web-transport-moq 1.3.4 → 1.3.5 bump back onto main. The version changes in Cargo.toml and Cargo.lock line up, and nothing looks wrong in the content itself.

Blocking

  • GitHub reports the PR as CONFLICTING with main, so the land job can't merge it. The conflicts probably sit in rs/moq-net/src/model/track.rs and the IETF publisher files, where main has since moved on from the originals that were backported. As the PR body says, merge main into merge/release-into-main and resolve there, and keep main's version wherever the backport was cherry-picked from main. Don't squash it.

Non-blocking

  • After resolving, make sure the moq-noq 1.3.5 pin doesn't downgrade main if main already moved past it.

Verdict: ITERATE (resolve the conflict, then it's fine to land once CI is green).

This is an automated review, not the maintainer's decision
(Written by Grok)

kixelated
kixelated reviewed Oct 10, 2026
View reviewed changes

@kixelated kixelated left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review by review (OpenAI)

Reviewed commit: d0b086e, against main at c39780f.

No additional concrete code defects found in the full diff and surrounding code. The capped END_OF_GROUP and HLS init-cache fixes are already present in current main; its group-expiry implementation has also since been reworked.

Direction: resolve the conflicts before landing, as noted in the existing review, preserving main’s newer implementations. The dependency concern there is confirmed: main’s Cargo.toml lines 157 and 241 already use moq-noq-proto/web-transport-moq 2.0.2, so retain that dependency generation and matching lockfile rather than restoring this release branch’s 1.3.5. Merge main into this branch and ultimately use a merge commit, not squash.

Verification: source review only; no tests or builds run. Rechecked open/non-draft state, unchanged head, reviews, and GitHub’s conflicting merge status immediately before posting. The conflict-resolved tree still needs review and CI.

@kixelated @claude
Merge origin/main into merge/release-into-main
c20466e 
Conflicts are release backports whose originals are already on main
(#4840, #4892, #4710, #5077) and release's noq 1.3.5 pins (#5170);
resolved to main's side. Ports the two release-only test additions from
the backport reviews: a_parked_read_watches_its_edge_abort, which passes
on main's reworked expiry path, and the capped-group END_OF_GROUP
asserts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 10, 2026
Merged
Merged
Merged
@moq-bot
moq-bot Bot merged commit 3a4fe5e into main Oct 10, 2026
8 checks passed
@moq-bot
moq-bot Bot deleted the merge/release-into-main branch October 10, 2026 05:33
@kixelated kixelated mentioned this pull request Oct 10, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kixelated kixelated kixelated left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@kixelated