Skip to content

feat(studio): markers on REVIEW, with a clip around each - #209

Merged
kixelated merged 10 commits into
mainfrom
quest/m2/markers
Nov 20, 2026
Merged

kixelated merged 10 commits into
mainfrom
quest/m2/markers

Conversation

@kixelated

@kixelated kixelated commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Works on quest/m2/markers.md: markers and a clip around each land here; chapters wait on moq-mux, and the quest now holds that work.

Problem

An operator has no way to mark a moment as the show runs and come back to it: Save clip takes only what just happened, as long as the stretch REVIEW picked.

Approach

  • Drop a marker is an action in the table (controls.rs): one variant and one row, so it shows in Hotkeys and the palette. The flag beside the panic key's scissors fires it too.
  • markers.rs holds the session's markers: a number counted from 1 and never reused, the moment on the clock that stamps the program and every source's past, the wall time, and an optional name. Each change rewrites <show> <stamp>.markers.toml in the recordings folder on a thread of its own, the latest list each time, through a temp file and a rename, so a slow disk never holds up the window or a hotkey; the file goes once no marker is left. A session holds at most 255 markers, names at most 60 characters.
  • REVIEW lists them over the recordings, newest first: the number, a name to type, how long ago, scissors that clip around it, and removal. The scissors are off, saying why, when the marker is older than 30 s or REVIEW's pick holds no past, such as the program off air, with the reason Save clip gives. Each marker still in the last 30 seconds is a numbered flag on the strip.
  • A clip around a marker is Stretch::around (replay.rs): from 10 s before to 5 s after, cut at now, fed to Save clip's own copy (Controls::take), so nothing is re-encoded and the same keyframe limits apply.

Views (just shots), hosted at 486ede3; no mock-up frame covers markers, so the page follows REVIEW's mock-up for type and spacing:

View
review_markers: three markers, two on the strip, one named, the oldest too old to clip
review: none yet, saying how to drop one
live: the flag beside the scissors
live_portrait: the same in the tall arrangement
settings_hotkeys: Drop a marker under Review

Impact

  • New hotkey and palette action Drop a marker, unbound by default, saved as Marker.
  • New flag button beside the panic key's Save clip scissors.
  • REVIEW's right column shows Markers over Recordings.
  • New file in the recordings folder: <show> <stamp>.markers.toml, named for when the studio opened the show.
  • README: a Markers section, the hotkey list, the page table, and the recording's .unfinished file is now called a sidecar, so "marker" means one thing.
  • No public API or wire change; the scene file is untouched.

Alternatives

  • Chapters here, by editing the finished moov with mp4-atom: the studio cannot tell where the movie starts on the program clock, which only moq-mux's export knows, and on moq's main Finish is opaque, so the edit would break at the next bump. Rejected for a moq-mux change, as AGENTS.md asks.
  • A marker clip as long as the picked stretch: ties a marker's clip to whatever was last dragged on the strip. Fixed seconds read the same every time.
  • Reloading the last session's markers at launch: the clock they were dropped on restarts, so neither the strip nor a clip could use them; the file keeps them.

Decisions

Taken while the maintainer was away; each is easy to change in review:

  1. Chapters split out (see Alternatives): the quest is rewritten to chapters alone, requiring a new pin quest for moq-mux chapters. Recommended over holding this PR for an upstream change and a moq bump.
  2. A clip around a marker spans 10 s before to 5 s after, cut at now. Recommended, since a marker is dropped once something happened.
  3. A marker older than 30 s has no clip: its scissors are disabled and say why. Clips from a recording are a follow-up below.
  4. A session is one opening of the show; markers are not reloaded at the next launch.
  5. A marker the folder refuses to save is kept for the session, and REVIEW says why until a write succeeds, rather than refusing the marker and losing the moment.
  6. At most 255 markers per session (bounded, since the phone remote may fire actions over the network), names at most 60 characters.
  7. The file is TOML, like the show's other files beside it, holding the number, the UTC moment to the millisecond, and the name; no program-clock reading until the chapters quest needs one.
  8. Drop a marker sits in the Review group of Hotkeys and the palette.
  9. A marker's scissors clip REVIEW's pick, as Save clip does, so they refuse with Save clip's reason when the pick holds no past (Pullfrog's finding), and that reason wins over the marker's age. Markers still drop off air, for the session's record.
  10. origin/main is merged (#194 keep out of the way, #200 landscape and portrait at once), as the iterate brief asked; it merged without conflicts.
  11. A strip that cannot decode the pick's pictures no longer refuses Replay, Save clip, or the scissors: past::View::pictures carries its own error, like sound, and held fails only when the take does, since a replay or a clip copies the past without decoding it there. Found by the local review once the scissors followed held; it was already true of Save clip and Replay on main. At that review's design checkpoint (its third round with findings), the approach was kept: the scissors refuse exactly when Save clip does, and the one cause that should not refuse either is fixed at its source.

Caused by

  • moq-dev/studio#177 - REVIEW's strip turned a failure to decode its pictures into "nothing held", which refused Replay and Save clip though both copy the past undecoded (found by reviewer)

Follow-ups

  • quest/m2/markers.md (rewritten): recordings carry markers as chapters, once moq-mux can write them. Its Plan recommends how a crash-repaired recording finds its session's markers.
  • quest/m2/pin-mp4-chapters.md (new, XS): pin moq-mux's MP4 chapters, after the catch-up to moq's main.
  • quest/m3/marker-clips.md (new, M): a clip around a marker older than 30 s, cut from the recording, after moq-mux's regular MP4 import is pinned.
  • quest/m2/try-markers.md (new, XS): the maintainer tries markers.
  • For /quest-plan in moq-dev/moq: moq-mux's regular MP4 finish (Export::finish, repair) takes chapters, each a moment on the broadcast's timeline and a title, written into the moov (mp4-atom's chpl).

Validation

  • just ci: passed on the merged head (492 tests).
  • just shots, every view and window test on the merged head: passed (88); live, live_portrait, and review_markers checked by eye after the merge.
  • just shots for the views above and the window tests a_click_takes_and_the_panic_key_cuts and the_palette_finds_and_runs_anything: passed.
  • New window test shots::a_marker_is_clipped_around (nightly, with just shots, about 20 s): goes live to a local relay, clicks the flag, waits, clicks the scissors on REVIEW, and reads the clip. Checked independently with ffprobe on a copy of that run's clip: video 16.200 s (h264, from the keyframe 1.19 s before the span), sound 15.02 s (opus) against the 15 s span; the markers file held number = 1 and the UTC moment.
  • New window test shots::a_marker_is_named_where_it_is_typed (nightly): a name typed into one row survives clicking another row's name, and a marker dropped by the hotkey path mid-typing leaves the typing on its marker; it fails with the field's stable id removed. Off air, it also waits for all three rows' scissors to turn off; with the held-past refusal removed from clip_refusal, it times out and fails, as does the unit test a_marker_is_clipped_only_while_its_past_is_held.
  • Unit test past::tests::pictures_it_cannot_decode_leave_the_past_held: a take whose avc1 description is no avcC stays held, its pictures an error; it fails with the old early return put back.
  • engine::tests::the_program_reaches_a_relay, past::tests, and the review, review_picked, and review_markers views: passed after that change, and just ci again (493 tests).
  • Unit tests: the markers file across mark, rename, remove, and the bound, a folder that refuses it and then takes it, the last change written before closing, and the span around a marker against the window.
  • The merge gate is not slower: the new window test is ignored there, like the others.

Models

Size: M
Implementer: Claude Code, claude-opus-5-5, high effort (arm B)
Implementer: Claude Code, claude-opus-5-5, high effort (iterate, S, arm B)

Review

Rewritten by quest review after each round.

  • Head: 4d998bf

  • Base: origin/main at 5ae83b0

  • 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, high effort

  • Session: 01a1f22d-da60-7540-8aa8-c3afebee9da8, round 4

  • Score: 10/10, The preview-failure finding is fixed, and the incremental code review found no new issues; builds and tests were not run as instructed.

  • Rounds: 4; first round 3 (high 1, medium 2); findings 4 (high 1, medium 3): fixed 4, refuted 0, open 0

  • Findings: none

  • The last round's findings, at c02b8a0:

    • Fixed: medium, rs/moq-studio/src/ui/review.rs:877: Separate preview failures from clip availability; In rs/moq-studio/src/past.rs, Decoding::read now records preview failures in pictures while preserving held as successful, so they no longer disable marker clips; REVIEW displays those preview errors separately.
  • Reviewer: Codex, gpt-6.1-sol, medium effort, shadow

  • Session: 01a1f22d-da66-7732-8c71-cec3ef562108

  • Rounds: 2; first round 2 (high 1, medium 1); findings 2 (high 1, medium 1): fixed 2, refuted 0, open 0

kixelated and others added 4 commits November 18, 2026 20:17
Quest-Claim: aab052a34eb3b900
… each

A key or the flag beside the panic key drops a marker. REVIEW lists the
session's markers to name, clip around, or remove, and shows those in the
last 30 seconds on its strip. They are kept beside the recordings in
<show> <stamp>.markers.toml. Chapters wait on moq-mux; the quest now holds
that work.

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>
@kixelated kixelated changed the title Markers and clips feat(studio): markers on REVIEW, with a clip around each Nov 19, 2026
…in the background

A name typed into a marker's row is kept when another row's name takes
the focus, and a field keeps its marker when a new one is dropped above
it. The markers file is written on a thread of its own, the latest list
each time, so a slow disk never holds up the window or a hotkey; REVIEW
says why a write failed until one succeeds.

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

coderabbitai Bot commented Nov 19, 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 56 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: ec49eb75-4f5a-469f-854d-6bcaed3365dd
Commits

Reviewing files that changed from the base of the PR and between bd11e15 and d6bf81d.

Files ignored due to path filters: 1

  • rs/moq-studio/assets/icons/flag.svg is excluded by !**/*.svg
Files selected for processing: 15

  • README.md
  • quest/m2/markers.md
  • quest/m2/pin-mp4-chapters.md
  • quest/m2/try-markers.md
  • quest/m3/marker-clips.md
  • rs/moq-studio/src/controls.rs
  • rs/moq-studio/src/engine.rs
  • rs/moq-studio/src/kit/icon.rs
  • rs/moq-studio/src/main.rs
  • rs/moq-studio/src/markers.rs
  • rs/moq-studio/src/past.rs
  • rs/moq-studio/src/replay.rs
  • rs/moq-studio/src/shots.rs
  • rs/moq-studio/src/ui/review.rs
  • rs/moq-studio/src/ui/shell.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 critical issues — one rough edge inline.

Approach: sound. Markers are one row in the action table, so Hotkeys, the palette, and the portal pick them up for free. A clip around a marker goes through the same Controls::take copy that Save clip uses, and the file is written as a whole snapshot on a background thread. Splitting chapters out to moq-mux follows AGENTS.md's Upstream rule.

Reviewed changes — the full PR at 22f880f: the new action, the markers store and writer, the stretch around a marker, the REVIEW list and strip pennants, the shell flag, the window tests, and the quest and README updates.

  • Action::Marker: "Drop a marker" sits in the Review group. It fires Markers::mark with the clock's now and is refused once 255 markers are held.
  • markers.rs: numbers are never reused. Each change queues a whole-file TOML write, and only the latest waiting one is kept. The writer thread uses a temp file and a rename, removes the file when the list is empty, and keeps showing the last failure until a write succeeds. Drop waits for the final write.
  • Stretch::around: a clip runs from 10 s before the marker to 5 s after it, stopping at now. A marker older than the 30 s window is refused. take now takes the stretch directly.
  • REVIEW: marker rows show newest first, each with a name field whose ID and draft are keyed by marker number. A draft is saved when its field loses focus. Numbered pennants mark the strip.
  • Shell: a flag button sits beside the panic key's scissors in both layouts.

Pullfrog  | Fix all ➔ | Fix 👍s ➔ | View workflow run | Using claude-opus-5-5 | 𝕏

Comment thread rs/moq-studio/src/ui/review.rs Resolved
kixelated and others added 4 commits November 19, 2026 07:26
Save clip already refused off air, when the program keeps no past; the
scissors on a marker's row checked only its age, so they failed with a
toast on click instead of saying why.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Save clip, Replay, and a marker's scissors refused whenever REVIEW's strip
could not decode the pick's pictures, though a replay or a clip copies the
past without decoding it there. The pictures now carry their own error.

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

@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. The marker scissors now refuse exactly when Save clip does.

Reviewed changes: the commits since 22f880f. They fix the open scissors finding, merge main, and move the strip's decode failure off held.

  • Scissors follow the held past: refusals() now keeps held on Refusals, and replays() returns it. clip_refusal puts that reason ahead of the marker's age, so marker scissors are disabled off air with Save clip's message.
  • Decode failure no longer means "nothing held": past::View::pictures is now a Result, so Decoding::read records a picture-decode error there and still reports held as Ok. Replay, Save clip, and the scissors copy the take without decoding it, so they are no longer refused. The large picture and the strip show the decode error in place of "No pictures held".
  • Tests: added the unit tests a_marker_is_clipped_only_while_its_past_is_held and pictures_it_cannot_decode_leave_the_past_held. The window test a_marker_is_named_where_it_is_typed now waits off air until every row's scissors turn off. The engine.rs test is adapted to the Result.

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

@kixelated

Copy link
Copy Markdown
Contributor Author

Maintainer decision (/quest-complete): /quest-merge. Keep quest/m2/pin-mp4-chapters.md, quest/m3/marker-clips.md and quest/m2/try-markers.md as planned, and the moq-mux chapters follow-up for /quest-plan in moq-dev/moq.

(Written by Claude Opus 5.5)

@kixelated
kixelated enabled auto-merge (squash) November 20, 2026 01:04
@kixelated
kixelated merged commit bc3396e into main Nov 20, 2026
4 checks passed
@kixelated
kixelated deleted the quest/m2/markers branch November 20, 2026 01:23
kixelated added a commit that referenced this pull request Nov 20, 2026
Markers (#209) added Action::Marker; a remote keeps to scene pads, mutes,
TAKE and AUTO, so it joins Replay, Save clip and Record as desktop-only.

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