Skip to content

Merge main into dev - #4499

Merged
kixelated merged 39 commits into
devfrom
claude/merge-main-into-dev-e9ef2bf
Sep 29, 2026
Merged

kixelated merged 39 commits into
devfrom
claude/merge-main-into-dev-e9ef2bf

Conversation

@kixelated

Copy link
Copy Markdown
Collaborator

Merges main (through #4497, e9ef2bf, 34 commits since #4428) into dev. dev keeps its breaking changes; main's fixes and features are carried onto them.

Notable conflict resolutions:

Added:

Public API / wire impact: none beyond what the merged main and dev PRs already carry.

Checks: nix develop --command just check origin/dev and quest check pass locally.

Merge with a merge commit, not squash.

(Written by Claude Opus 5.5)

🤖 Generated with Claude Code

kixelated and others added 30 commits September 28, 2026 23:16
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…4420)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tead of racing a rebind (#4408)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
#4432)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ind (#4409)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng (#4421)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…taged (#4431)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…eprice (#4434)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ckets (#4404)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…oses (#4429)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
….decode (#4454)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
kixelated and others added 9 commits September 29, 2026 06:15
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ck leak (#4495)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	js/publish/src/video/encoder.ts
#	quest/m0/wildcard/README.md
#	quest/m1/README.md
#	quest/m1/ffi-shape/net.md
#	rs/moq-cli/src/args.rs
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	quest/m1/ffi-shape/README.md
#	quest/m1/ffi-shape/json.md
#	quest/m2/flate/README.md
#	quest/m2/flate/bindings.md
#	quest/m2/teleop/mavlink.md
#	quest/m2/teleop/robot.md
…vent

Dev's announce stream can yield Live before the relay learns the publisher's
route, so main's import test raced its request into Unroutable.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 29, 2026 •

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-09-29T13:12:14.382040Z 33d5dea 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

Copy link
Copy Markdown
Collaborator Author

VERDICT: MERGE

Solid main→dev sync through #4497. Conflict resolutions match the PR notes and look correct on inspection: dial_only keeps the ls/fetch allow-list split; video encoder keeps both #cut and #failures/settled; quest merges keep dev’s landed flate wording, name moq-c/#4262 where claimed, and drop completed close-codes/drain quests. Live-before-route test adaptations (CLI waits for Start, tokio next_update skips Live, Go expects Live before end) are appropriate. No leftover conflict markers. Merge-commit (not squash) is the right strategy.

CI was still largely pending at review time (Android/Swift/Parse version green). Land once required Check/Test (and the rest of the required suite) pass.

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

@kixelated

Copy link
Copy Markdown
Collaborator Author

Merge summary: syncs main through #4497. Conflicts and the three Live-before-route test fixes are listed in the description. Local just check, just test max-age, and quest check pass; CI is green; Codex reviewed the final head with no findings. Main has since gained #4494 and #4498, left for the next sync. Merging with a merge commit.

(Written by Claude Opus 5.5)

@kixelated
kixelated merged commit 5c373f5 into dev Sep 29, 2026
28 checks passed
@kixelated
kixelated deleted the claude/merge-main-into-dev-e9ef2bf branch September 29, 2026 13:40
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.

3 participants