Skip to content

chore: bump moq to catalog updates at their timestamp - #208

Open
kixelated wants to merge 2 commits into
mainfrom
chore/upgrade-moq-timed-catalog
Open

kixelated wants to merge 2 commits into
mainfrom
chore/upgrade-moq-timed-catalog

Conversation

@kixelated

@kixelated kixelated commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Problem

moq-dev/studio#146 (the composition) waits on hang applying each catalog update at its timestamp: the quest quest/m2/compose/pin-timed-catalog.md, which exists only on #146's branch. That landed upstream as moq-dev/moq#8907, but the studio's gitlink (moq 6c726f455) predates it.

Approach

just upgrade-moq 81e43217c, not moq's tip. The quest's condition holds at that pin: rs/hang/src/catalog/consumer.rs returns each catalog as a moq_json::Timed<Catalog> with its timestamp, and quest/m2/catalog-at-timestamp.md is gone.

Moq's tip (4c8af4c8f) can't build here yet. Its "no API without a caller" sweeps counted only callers inside moq, so they made private two APIs the studio uses:

  • moq-dev/moq#8931 made lite::Version::has_instance crate-private. Stream::check_failover (rs/moq-studio/src/stream.rs) needs it.
  • moq-dev/moq#8956 made hang::health private. The health grade (rs/moq-studio/src/health.rs, engine/air.rs, setup.rs, fx.rs) is built on it. Moq's own quest quest/m3/stats/health-consumers.md plans to publish it again.

81e43217c is the last main commit before #8931, 94 commits past the old pin. It passes sh/check-moq-main.sh.

What the bump broke, and the fixes:

  • moq-video drives the portal through ashpd's async-io backend (moq-dev/moq#8891), and ashpd refuses to build with both backends. The studio's ashpd now takes async-io too. zbus-secret-service-keyring-store's rt-tokio still turns on zbus's tokio feature, which zbus prefers, so the portals still run on tokio as before.
  • Group ends (moq-dev/moq#8961): finish(end) is now finish_at(end), and close() is now finish(). append_group takes a Timestamp: unscaled on untimed tracks, and the track's own unit on timed ones.
  • The catalog's media section is now sync (moq-dev/moq#8977).
  • Token claims carry an Access (moq-dev/moq#8933), so the guest tests compare its path.
  • The new toolchain's clippy asks for next_back() over last() in health.rs.

Impact

  • None for users. The studio's public API and wire are unchanged except for what moq's wire changes in this range bring.

Alternatives

Follow-ups

  • Catching the studio up to moq's tip needs the two re-exports above to land in moq first. See Waiting.

Validation

  • just ci: lints, plus 423 tests passed.
  • just render-sw on Mesa lavapipe, which composites, encodes, publishes, and reaches a PipeWire camera: 67 + 18 + 14 + 1 tests passed.
  • cargo tree -e features -i zbus --features moq-studio/pipewire: zbus has tokio (from secret-service/rt-tokio), and ashpd has only async-io, so the portal runtime is unchanged.
  • The pin quests on main (quest/m*/pin-*.md) still wait. Each upstream quest they name still exists at this pin, and moq_audio::playback::Device reports no output kind, so none is deleted.

Waiting

  • Pin to 81e43217c rather than moq's tip, as the brief asked. Recommendation: land this pin now, since it unblocks feat(scene)!: the studio publishes a composition #146, and catch up to the tip once moq publishes hang::health and a Version instance query again. The alternative is to hold this PR for those two moq PRs.

Models

Size: S
Implementer: Claude Code, claude-opus-5-5, medium effort

🤖 Generated with Claude Code

Review

Rewritten by quest review after each round.

  • Head: 23149c0

  • Base: origin/main at fa87036

  • Risk: medium, the base has no RISK.md to name what is always high or customer-facing, so every change is medium

  • Classified: medium by default

  • Reviewer: Codex, gpt-6.1-sol, medium effort

  • Session: 01a1f0e7-7756-7b81-ac52-51718bf9b224, round 1

  • Score: 8/10, Source review found no actionable regressions in the specified range, but builds and tests were not run under the review constraints.

  • Rounds: 1; first round 0; findings 0: fixed 0, refuted 0, open 0

  • Findings: none

  • Reviewer: Codex, gpt-6.1-sol, low effort, shadow

  • Session: 01a1f0e7-7754-7d31-b35e-2922927ada13, round 1

  • Score: 8/10, No actionable defects were identified in the submodule bump and API adaptations, but builds, tests, and runtime behavior were not verified.

  • Rounds: 1; first round 0; findings 0: fixed 0, refuted 0, open 0

  • Findings: none

kixelated and others added 2 commits November 18, 2026 14:54
Pins moq at 81e43217c, the last main commit before moq-dev/moq#8931 made
APIs the studio reads crate-private. Follows the group API rename
(finish_at/finish), timestamped append_group, the catalog's sync section,
and moq-video's ashpd async-io backend.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated
kixelated marked this pull request as ready for review November 18, 2026 23:06
@coderabbitai

coderabbitai Bot commented Nov 18, 2026

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 53 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: c1720976-5907-4bf3-b60b-b0c6e10b2040
Commits

Reviewing files that changed from the base of the PR and between fa87036 and 23149c0.

Files ignored due to path filters: 2

  • Cargo.lock is excluded by !**/*.lock
  • bun.lock is excluded by !**/*.lock
Files selected for processing: 10

  • moq
  • rs/moq-scene/src/publish.rs
  • rs/moq-scene/src/replay.rs
  • rs/moq-studio/Cargo.toml
  • rs/moq-studio/src/engine.rs
  • rs/moq-studio/src/guests.rs
  • rs/moq-studio/src/health.rs
  • rs/moq-studio/src/ladder.rs
  • rs/moq-studio/src/record.rs
  • rs/moq-studio/src/uplink.rs
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@pullfrog pullfrog 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.

✅ No new issues found.

Approach: sound. Pinning to 81e43217c, the last moq main commit before has_instance went crate-private, gets #146 its timed catalog without the rest of the tip's API churn. I checked the pin against the GitHub compare API: it is on moq's main, 116 commits behind the tip.

Reviewed changes

I checked the submodule bump and each port against the new pin's moq-net, moq-mux, and hang source.

  • Group ends: I read group.rs at the new pin. The new finish() (end unknown) behaves like the old close(), and finish_at(end) behaves like the old finish(end). So the ends that publish.rs copy and replay.rs copy_held forward are unchanged.
  • append_group(Timestamp): Info::rescale converts a scaled timestamp into the track's timescale and rejects a scale mismatch. That makes unscaled correct on the untimed uplink probe and the health.rs test track. The ts()/from_micros values on the hang (µs) tracks also equal the old raw keys.
  • Catalog media → sync: This is a rename in Listing::mirror and the tests. moq_mux::catalog::Consumer::next still yields a plain Catalog<E>, not Timed, so the studio's catalog readers keep reading at the live edge.
  • ashpd async-io: This is forced by moq-video's ashpd backend. zbus keeps tokio through the keyring store's rt-tokio, so the portals' runtime does not change.
  • Test-only ports: Claims Access.path in guests.rs, and next_back() in health::echo.

ℹ️ CI's Check job failed on a git race, not on this change

The The moq pin is on moq's main step exited with fatal: shallow file has changed since we read it from its git fetch, after 18 s. Because of that, just ci never ran on this head. Re-run the job to get a real CI signal before merging. I confirmed the pin-on-main condition separately.

Pullfrog  | View workflow run | Using claude-opus-5-5 | 𝕏

This branch has not been deployed

No deployments
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.

1 participant