Skip to content

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

Merged
kixelated merged 4 commits into
mainfrom
chore/upgrade-moq-timed-catalog
Nov 19, 2026
Merged

kixelated merged 4 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.
  • CI's pin check failed every run with fatal: shallow file has changed since we read it, which was not a flake. actions/checkout disables gc only in the superproject, so the moq submodule's checkout fetch leaves a detached git maintenance run --auto that rewrites moq's shallow file while sh/check-moq-main.sh unshallows it. The Check job now sets maintenance.auto=false (through GIT_CONFIG_*), since the checkout is thrown away.

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

Decisions

Maintainer, 2026-11-18, in the /quest-run pick round:

  • ✅ Land this pin at 81e43217c now (rejected: hold for moq's tip). It unblocks moq-dev/studio#146.
  • ✅ Add a follow-up studio pin quest for catching up to moq's tip (see Follow-ups).

Follow-ups

  • quest/m0/pin-moq-tip.md [M]: the studio catches up to moq's main, absorbing the tip's breaks listed in Alternatives. Its ## Waiting names the two moq changes it needs first: hang::health public again (moq's quest/m3/stats/health-consumers.md), and a public lite::Version instance query, whose quest is pending planning in moq's m1 so it does not gate moq's 0.22.0 cut. Answers recorded in its Plan; no open decisions.

Caused by

  • No single PR: the pin check from moq-dev/studio#166 passed on moq-dev/studio#173; the runner now has git 2.56.1, whose detached auto maintenance in the submodule races it, likely an upstream change (found by check).

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 CI fix, replaying CI's checkout and pin step locally with git 2.56.1 built from source (the runner's version): the step failed with the same fatal on every run; pgrep showed git maintenance run --auto --detach alive in moq/ right after checkout, and moq/.git/shallow's mtime moved ~3 s later. With maintenance.auto=false in the environment, no maintenance ran and two replays passed.
  • 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.

Models

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

🤖 Generated with Claude Code

Review

Rewritten by quest review after each round.

  • Head: 576698d

  • Base: origin/main at fa87036

  • Risk: high, it changes .github/workflows/check.yml, which is always high: workflows run with the repository's secrets and decide what merges and ships

  • Classified: high by the always-high paths

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

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

  • Score: 8/10, The incremental source review found no actionable regressions; builds and tests were not run under the review constraints.

  • Rounds: 2; 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

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

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

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The moq subproject reference now points to a new commit. The check job disables automatic Git maintenance. Scene and studio code and tests use updated timestamp-based group APIs and finish methods. Catalog mirroring and related tests use the sync field. The Linux ashpd dependency enables async-io.

Merge Risk: Minimal · up to 57669

This updates the moq pin and adapts studio code and tests to the new group, catalog and claims APIs. It also moves the Linux portal dependency to async-io and stabilizes the CI pin check. No concrete merge-blocking risk was found.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title names a dependency bump to moq with catalog updates at their timestamp. The changeset updates the moq pin from 6c726f455 to 81e43217c, and the description says the pin brings timestamped cat…
Description check Passed The description explains the problem (the composition PR waits on timestamped catalog application), the chosen pin and why it was chosen over moq's tip, the API adaptations, the CI shallow-file fix, v…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Title check

Explanation

The title names a dependency bump to moq with catalog updates at their timestamp. The changeset updates the moq pin from 6c726f455 to 81e43217c, and the description says the pin brings timestamped catalog updates. The title does not mention the adapted group APIs, the CI maintenance change, or the ashpd change, but it covers the primary intent. It uses the conventional 'chore:' prefix and is specific enough for a teammate to understand the main change.

Full details: Description check

Explanation

The description explains the problem (the composition PR waits on timestamped catalog application), the chosen pin and why it was chosen over moq's tip, the API adaptations, the CI shallow-file fix, validation runs, and follow-ups. It is directly related to the changeset, so it passes this lenient check.

Finishing Touches

Simplify code

  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Warning

Some tools did not complete. Review the errors below.

Clippy (1.99.1)

Clippy execution failed

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

Recent review info

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: d97a10c7-7d45-4bd8-975e-ab64934a6d26
Commits

Reviewing files that changed from the base of the PR and between fa87036 and 576698d.

Files ignored due to path filters: 2

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

  • .github/workflows/check.yml
  • moq
  • quest/m0/pin-moq-tip.md
  • 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

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

pullfrog[bot]
pullfrog Bot previously approved these changes Nov 18, 2026

@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 | 𝕏

@kixelated

Copy link
Copy Markdown
Contributor Author

Maintainer decision (2026-11-18, /quest-run pick round). Pick: /quest-merge.

  • Pin now or hold for the tip: ✅ land this pin at 81e43217c now, since it unblocks feat(scene)!: the studio publishes a composition #146 (rejected: holding this PR until moq re-exports hang::health and a Version instance query).
  • Catching up to moq's tip: ✅ plan both sides: a studio pin quest on this PR for the tip catch-up (encode::Producer → Publisher, ladder::Joins on the new refresh API, and the rest of the breaks in Alternatives), waiting on moq re-exporting hang::health (moq's quest/m3/stats/health-consumers.md) and a public lite::Version instance query; and a moq quest for that query, planned in moq's tree by /quest-plan (rejected: the studio pin only; dropping it).

(Written by Claude Opus 5.5)

kixelated and others added 2 commits November 18, 2026 17:06
actions/checkout disables gc only in the superproject, so the moq
submodule's checkout fetch leaves a detached git maintenance that
rewrites moq's shallow file while sh/check-moq-main.sh unshallows it,
failing with 'shallow file has changed since we read it'.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated

Copy link
Copy Markdown
Contributor Author

Applied the maintainer's answers on 576698d: the pin stays at 81e43217c and the body's ## Waiting item is gone (recorded under ## Decisions), and the follow-up quest/m0/pin-moq-tip.md [M] catches up to moq's tip, waiting on hang::health republished and a public lite::Version instance query (pending planning in moq's m1).

The Check failure was not a flake: it reproduced on every run locally with the runner's git 2.56.1. The submodule's checkout fetch leaves a detached git maintenance run --auto that rewrites moq/.git/shallow while the pin check unshallows it; the job now sets maintenance.auto=false.

(Written by Claude Opus 5.5 with medium effort)

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

Reviewed changes

Reviewed the two commits added since the prior pullfrog review (23149c0).

  • Pin check race fix: check.yml sets maintenance.auto=false through job-level GIT_CONFIG_* env, so the checkout action's submodule fetch no longer leaves a detached git maintenance that rewrites moq's shallow file during the unshallow. Job-level env reaches both the checkout step and sh/check-moq-main.sh, and nothing else in the repo uses GIT_CONFIG_*.
  • Follow-up quest: added quest/m0/pin-moq-tip.md, a docs-only quest for catching up to moq's tip.

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

@kixelated
kixelated merged commit 2b03255 into main Nov 19, 2026
3 checks passed
@kixelated
kixelated deleted the chore/upgrade-moq-timed-catalog branch November 19, 2026 02:17
kixelated added a commit that referenced this pull request Nov 19, 2026
Main carries #208's timed catalogs, so the composition moves from its
interim JSON snapshot track into a `live.kixel.studio.composition`
section of the composition broadcast's hang catalog, each catalog
stamped with the program frame it applies on. The catalog also lists
the program's renditions with `"broadcast": "."`, so a player that
knows no compositions plays the program from it. The watcher reads it
with hang's catalog consumer and refuses an untimed one.

Deletes quest/m2/compose/pin-timed-catalog.md, satisfied by #208, and
the layout quest this PR completes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kixelated added a commit that referenced this pull request Nov 19, 2026
Brings in #194 (keep out of the way), #207 (command palette), and #208
(moq pin bump). A layer keeping clear places only the landscape picture:
the compositor's keepers read and place the landscape view alone, and
BUILD's keep helpers take the picture edited, holding or grabbing nothing
in portrait.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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