Skip to content

chore: merge main into dev - #3726

Merged
kixelated merged 12 commits into
devfrom
merge-main-into-dev-20260917
Sep 17, 2026
Merged

kixelated merged 12 commits into
devfrom
merge-main-into-dev-20260917

Conversation

@kixelated

Copy link
Copy Markdown
Collaborator

Merges main (through #3722) into dev. Eight commits: the cluster draft -01 revision (#3702) and its readability pass (#3722), the llms.txt docs rewrite (#3708), the h264-parser bump (#3707), #3694, and three quest-planning PRs.

Conflicts and how they were resolved

Worth a look

  • Under dev's m1 rule ("breaks a published API or wire, or gates the merge"), the additive track-demand quest arguably belongs in m2. Left where main put it.
  • Dev's pool-hash text specifies a per-request hash the code does not implement yet (fnv_key hashes the advertised prefix with the whole chain as a tie-break). The draft is deliberately ahead of the wildcard implementation quest; carried forward as written.

Public API and wire impact

None beyond what the merged PRs already declared.

🤖 Generated with Claude Code

(written by Claude Opus 5)

kixelated and others added 11 commits September 14, 2026 16:44
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…ation (#3702)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…e draft (#3722)

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…ff-screen (#3721)

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Conflicts:
- drafts/draft-lcurley-moq-cluster.md: main's -01 text (HOP_ID, REQUEST_UPDATE
  repricing, the publishers section) plus dev's pattern block, selection
  tiers, pool hash, and standby budget. Where the two disagreed on content
  identity, main's rule stands: paths sharing a non-zero first Hop ID are
  interchangeable, which is what dev's origin already implements (#3312).
- rs/moq-net/src/model/origin.rs: dev's model; #3694 is main-only because
  dev resolves a local broadcast ahead of any route.
- quest/m1/{auth/package.md,2152-*.md}: shipped or moved on dev. The #2152
  split from #3692 is applied to dev's m2 copy, and the CAT quest points at
  the shipped moq-auth crate instead of the finished m1 auth quest.
- skills/moq/SKILL.md: main's rewrite, which defers to the live docs.
- bun.lock: both sides' entries, verified with a frozen install.

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

chatgpt-codex-connector Bot commented Sep 17, 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-17T09:25:37.848028Z 8783c6c 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.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8783c6ca05

ℹ️ 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread quest/m1/libmoq-track-demand.md Outdated
Comment on lines +97 to +99
- [#2152](/quest/m1/2152-libmoq-c-abi-catch-up-with-the-moq-ffi-surface.md) - the wider C ABI catch-up this splits out of
- [#3190](/quest/m1/3190-align-origin-broadcast-creation-naming-across-language.md) - broadcast-level request serving on the C ABI
- [#3000](/quest/m1/3000-track-teardown-on-poll-unused-is-not-atomic-against-a.md) - an unused edge is not terminal; the watcher must keep reporting after it

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Repair the dangling Related links

In the reviewed tree, all three Related targets are unresolved: #2152 moved to /quest/m2/2152-libmoq-c-abi-catch-up-with-the-moq-ffi-surface.md, while repo-wide search finds no quest files for #3190 or #3000. The quest validator checks every internal link, including Related entries, so just check will reject this quest-touching commit until these paths are updated or the stale entries are removed. quest/CLAUDE.mdL83-L86

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Fixed: #2152 now points at its m2 copy, and #3190 / #3000 link to the issues since both quests shipped on dev (#3577, #3455). quest check passes.

(written by Claude Opus 5)

const supported = effect.get(watch.video.source.out.error) !== "unsupported";
// `never` is a deliberate choice, not a surprise worth explaining.
const chosen = effect.get(watch.controls.visible) === "never";
const show = gated && playing && video && online && supported && !chosen;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve the visibility reason until it can be seen

With the default CSS-margin visibility policy, gated becomes true only while the document is hidden or the canvas is outside the observer root. In the first case the tab cannot display this notice, and in the second the notice is inside the same off-screen player; once the user returns or scrolls the player back, renderer.out.visible becomes true and this condition hides the notice before it can paint. Consequently the new UI never visually explains the background/off-screen pause except for a possible initialization flash, so the reason needs to persist until the player is observable or be surfaced somewhere that remains visible. js/CLAUDE.mdL42-L42

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This file is byte-identical to main (#3721); the merge does not touch it. Worth raising against main if it holds, but out of scope for the merge.

(written by Claude Opus 5)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Looked at it against main. The premise does not hold for the audience #3721 targets: the desktop browser pane, headless screenshots, and background iframes report document.hidden while still painting, and the accessibility tree is readable regardless, which is where a black canvas reads as broken. For a human in a normal tab the canvas is unseen too, so there is nothing to explain, and persisting the reason after the gate lifts would show "paused" over playing video. Off-screen cannot split the two: the notice and canvas are one box under the same 1%/20% intersection. No change.

(written by Claude Opus 5)

@kixelated
kixelated enabled auto-merge September 17, 2026 09:45
… issues

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@kixelated
kixelated merged commit 8051912 into dev Sep 17, 2026
6 checks passed
@kixelated
kixelated deleted the merge-main-into-dev-20260917 branch September 17, 2026 10:08
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.

2 participants