Skip to content

feat(web): let Show Next Up be turned off - #4503

Open
Rhainland wants to merge 14 commits into
Silo-Server:mainfrom
Rhainland:feat/web-next-up-off
Open

Rhainland wants to merge 14 commits into
Silo-Server:mainfrom
Rhainland:feat/web-next-up-off

Conversation

@Rhainland

@Rhainland Rhainland commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Problem

Related issue: Discussion #4443
Validation tasks: changes #1252 C9 (Next Up on web; the case is not run yet)

Other clients: Apple Silo-Server/silo-apple#1219; Android Silo-Server/silo-android#995; Roku Silo-Server/silo-roku#97

Depends on #4501 (the setting) and #4502 (Next Up from the end of the file). Until they merge, this branch carries their commits; the changes here are the commits from "chore(i18n): sync the settings Off value for web" on.

The web app has no way to turn Next Up off. Turning off Auto-play next only stops the countdown; the Next Up screen still opens at the end of every episode.

Show Next Up on Settings → Playback now offers Off. With Off, the web player opens no Next Up screen, runs no countdown and starts no next episode; when the episode ends the player closes the way its Close button does, back to where playback started.

Approach

  • Off writes playback.next_up_enabled false (feat(settings): add a setting that turns Next Up off #4501) and leaves the stored seconds alone, so picking a time later restores them and turns Next Up back on. Both keys go through the profile writer, which also clears a device override on either.
  • Off is offered only when the server's settings capabilities list the key. Against an older server the picker keeps its earlier choices and never sends the key.
  • The picker stays disabled until capabilities and values have loaded, so a choice cannot skip the Off key or miss a device override it should clear.
  • If Next Up opened before the viewer turned it off, the end of the episode closes it as that screen's own Close does. A minimized or picture-in-picture player does not close; it leaves the page being browsed alone.
  • The row moved into its own component (NextUpPromptSetting) to keep Playback settings within the file size limit.

Validation

  • Go: go build, go vet, make test-go, make lint-changed, make lint-router-recovery pass.
  • Web: pnpm run lint, format:check, build, budget:check and make test-web pass. Tests cover the picker's value and writes and the player's Off decision.
  • Contracts: make verify-settings-bindings-all, the apiv2 checks, verify-local-paths, verify-size-ratchet, verify-migrations pass.
  • Not captured: a recording of playback reaching the end with Off; the player decision is covered by the unit tests.

Evidence

Evidence: https://evidence.siloserver.org/r/silo-server/pr-4503/

Settings → Playback, desktop and 390 px wide: the picker on main and with Off on this branch.

Risks

Checklist

  • I read and can explain the complete diff.
  • This pull request addresses one concern.
  • Each test this pull request adds meets "Decide what to test" in CONTRIBUTING.md.
  • The Evidence section shows every change a user can see, or how I checked a change nobody sees.

AI Disclosure

  • Harness: Claude Code, running in T3 Code
  • Tool(s): Claude Code, GitHub CLI, Codex CLI (review only)
  • Model(s): claude-opus-5-5; reviewers gpt-6.2-sol, gpt-6.2-astra, claude-fable-5-2
  • Involvement: Fully AI-generated, human verified
  • Adversarial review: four independent reviews (gpt-6.2-sol, gpt-6.2-astra, claude-opus-5-5, claude-fable-5-2) of the branch diff for correctness, repository standards and the discussion's request, repeated on later cleanup; the real findings were fixed before opening (a skipped Next Up on write that could leave Off set was reverted)

Note

Add playback.next_up_enabled setting to let Show Next Up be turned off

  • Adds the playback.next_up_enabled boolean remote setting in settings revision 30, allowed at profile and profile-device scopes, defaulting to true (manifest.json, settingsContract.ts)
  • Replaces the old auto-play-next-preview switch on the playback settings page with a Show Next Up picker offering Off or a lead time; Off is shown only when the server supports the new key (PlaybackSettings.tsx, nextUpPicker.ts)
  • Removes the marker-based next-episode countdown overlay from VideoPlayer and the useNextEpisode hook; the next-episode control now targets the adjacent episode from seriesContext (VideoPlayer.tsx)
  • When Next Up is disabled, a non-shuffled series episode no longer opens post-roll early and closes at the end; shuffled playback keeps post-roll behavior (nextUpPrompt.ts)
  • Translates the new Next Up strings across all locale catalogs and removes six environment-managed settings strings (trusted proxies, Redis, search)
  • Behavioral Change: PlayingNextContent does not start the countdown while the settings query is pending; early post-roll is suppressed until capabilities and settings resolve, and failed settings reads fall back to contract defaults

Macroscope summarized 6887c06.

@silo-triage silo-triage Bot added the size/XXXL 3000+ added + deleted lines (all files); change volume, not priority. label Nov 18, 2026
@silo-kody

silo-kody Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

Silo Kody — review complete

Review finished. Check the inline comments for findings and verify each suggestion against the code and tests.

Reviewing changes in Silo
  • Include the related issue, expected behavior, and validation steps in the PR description.
  • For API changes, describe the effect on Apple and Android clients and Jellyfin compatibility.
  • For plugin changes, identify the affected SDK contract, plugin, and catalog entry.
  • Follow this repository's AGENTS.md and CONTRIBUTING.md.
  • Request another review with @kody start-review in a PR comment.
  • React with 👍 or 👎 to give feedback on individual suggestions.
Review settings
Review Options

The following review options are enabled or disabled:

Options Enabled
Bug ✅
Performance ✅
Security ✅
Business Logic ❌

@coderabbitai

coderabbitai Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Explain Change →

Warning

Review limit reached

This organization requires a seat for paid usage-based reviews, including automatic and on-demand reviews. Ask an admin to assign a seat or enable paid usage-based reviews for users without a seat in Billing.

Next included review available in 29 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used all 4 included reviews 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: f3922023-d565-4d3e-993a-d01c2453c6ae
Commits

Reviewing files that changed from the base of the PR and between 7dd2c34 and 6887c06.

Files selected for processing: 70

  • .silo-translations
  • contracts/settings/v1/conformance.json
  • contracts/settings/v1/manifest.json
  • docs/markers-api.md
  • docs/settings-api.md
  • internal/markers/credits_placement.go
  • internal/settingscontract/contract_test.go
  • internal/settingskeys/keys.go
  • web/src/hooks/queries/autoPlayNext.ts
  • web/src/lib/deviceSettingGroups.ts
  • web/src/lib/settingsConformance.json
  • web/src/lib/settingsContract.ts
  • web/src/lib/userSettingsNav.ts
  • web/src/locales/ar-XB.json
  • web/src/locales/ar.json
  • web/src/locales/bg.json
  • web/src/locales/ca.json
  • web/src/locales/cs.json
  • web/src/locales/da.json
  • web/src/locales/de.json
  • web/src/locales/el.json
  • web/src/locales/en-XA.json
  • web/src/locales/en.json
  • web/src/locales/es.json
  • web/src/locales/et.json
  • web/src/locales/fi.json
  • web/src/locales/fr.json
  • web/src/locales/he.json
  • web/src/locales/hi.json
  • web/src/locales/hr.json
  • web/src/locales/hu.json
  • web/src/locales/id.json
  • web/src/locales/it.json
  • web/src/locales/ja.json
  • web/src/locales/keys.ts
  • web/src/locales/ko.json
  • web/src/locales/lt.json
  • web/src/locales/lv.json
  • web/src/locales/ms.json
  • web/src/locales/nb.json
  • web/src/locales/nl.json
  • web/src/locales/pl.json
  • web/src/locales/pt-BR.json
  • web/src/locales/pt-PT.json
  • web/src/locales/ro.json
  • web/src/locales/ru.json
  • web/src/locales/sk.json
  • web/src/locales/sl.json
  • web/src/locales/sv.json
  • web/src/locales/th.json
  • web/src/locales/tr.json
  • web/src/locales/uk.json
  • web/src/locales/vi.json
  • web/src/locales/zh-Hans.json
  • web/src/locales/zh-Hant.json
  • web/src/pages/settings/NextUpPromptSetting.tsx
  • web/src/pages/settings/PlaybackSettings.tsx
  • web/src/pages/settings/nextUpPicker.test.ts
  • web/src/pages/settings/nextUpPicker.ts
  • web/src/pages/watchRouteHelpers.ts
  • web/src/playback/WatchPlaybackChrome.tsx
  • web/src/playback/nextUpPrompt.test.ts
  • web/src/playback/nextUpPrompt.ts
  • web/src/player/components/NextEpisodeOverlay.tsx
  • web/src/player/components/PlayingNextScreen.tsx
  • web/src/player/components/VideoPlayer.tsx
  • web/src/player/components/WatchPage.tsx
  • web/src/player/hooks/useNextEpisode.ts
  • web/src/player/types.ts
  • web/src/player/utils/watchPageMarkers.ts

No actionable comments were generated in the recent review.

Walkthrough

This change adds playback.next_up_enabled and configurable Next Up prompt timing. It replaces the Playback screen’s preview switch with a combined selector and updates playback handling to use the configured prompt window. It also removes the in-player next-episode countdown and overlay.

Changes: Next Up Playback

Layer / File(s) Summary
Define Next Up settings
contracts/settings/v1/*, internal/settingscontract/contract_test.go, internal/settingskeys/keys.go, web/src/lib/settingsContract.ts, web/src/lib/settingsConformance.json, docs/settings-api.md, docs/markers-api.md, internal/markers/credits_placement.go
Manifest revision 30 adds playback.next_up_enabled, a remote boolean that defaults to true. Conformance fixtures and validation cover the setting. The settings documentation describes its scope, resolution, and behavior.
Add the Next Up Playback control
web/src/pages/settings/*, web/src/lib/deviceSettingGroups.ts, web/src/lib/userSettingsNav.ts, web/src/locales/*, .silo-translations
The Playback screen replaces the preview switch with a Next Up selector for Off or a prompt delay. The selector writes the relevant settings. Device settings hide the individual keys, and locale files add translated labels and environment-managed messages.
Apply Next Up policy in playback
web/src/playback/*, web/src/player/components/*, web/src/player/hooks/*, web/src/player/types.ts, web/src/player/utils/watchPageMarkers.ts, web/src/pages/watchRouteHelpers.ts
Playback reads supported Next Up settings and uses the configured prompt interval and end behavior. The in-player countdown overlay and hook are removed. Episode navigation controls use adjacent episode entries.

Estimated code review effort: 4 (Complex) | ~60 minutes

Change: Feature

Sequence Diagram(s)

sequenceDiagram
  participant PlaybackSettings
  participant EffectiveSettings
  participant WatchPlaybackChrome
  participant VideoPlayer
  PlaybackSettings->>EffectiveSettings: Read Next Up settings
  EffectiveSettings->>WatchPlaybackChrome: Return resolved settings and read status
  WatchPlaybackChrome->>WatchPlaybackChrome: Resolve prompt timing and end behavior
  VideoPlayer->>WatchPlaybackChrome: Report playback time and episode end
  WatchPlaybackChrome->>VideoPlayer: Apply post-roll or close behavior
Loading

Possibly related issues

  • Series — Web #1252: The validation case covers Next Up and next-episode autoplay behavior in the web client, which this change updates.

Suggested reviewers: quick104

Merge Risk: Low · previous review 7dd2c

Turning off Show Next Up should work for normal playback. A few narrow edge cases remain: an episode ending before settings load, a failed settings read, and another device changing the setting during a countdown. The translations pin must also be re-synced to a published release before merging.

Security architecture risk: Minimal · up to 7dd2c

The reviewed change retains existing profile and device preference scopes and room-controlled playback. No introduced security or material failure-containment issue was identified. Failed settings reads can restore default Next Up behavior, but this is a playback-preference limitation rather than an access-control bypass.

Retained concerns
No architecture-level concerns identified.

Security review details

Security Blast Radius

  • inferred — The inspected persistent change affects a profile playback preference and its device override, potentially influencing other clients that understand the key. It does not add a new setting scope or administrative authority.

Security Findings and Attack Paths

  • observed — The reviewed media-ended listener receives an event dispatched on the owned video element by the internal HLS ended handler. The new next-episode target comes from the existing series context and is unavailable during active room playback. These paths did not establish a newly exposed attacker-controlled entrypoint; server-side target authorization was outside the focused inspection.

Trust Boundaries and Controls

  • observed — Existing settings caches distinguish profile and device identity. Real-time setting events invalidate reads rather than supplying cached values, and events addressed to a different active profile are ignored. The new preference uses these existing mechanisms.

Resilience and Maintainability Implications

  • observed — The post-roll countdown now waits for the auto-play setting to finish loading and retains the still-watching gate. Its interval is cleared when its conditions stop holding and on effect cleanup, and changing the next-item identity resets the countdown.
Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title "feat(web): let Show Next Up be turned off" matches the main change: a new playback.next_up_enabled setting and a Next Up picker offering Off on the web Playback settings page. The changeset…
Description check Passed The description states the problem (the web app cannot turn Next Up off), the approach (Off writes playback.next_up_enabled false, the picker is gated on server capabilities, and the player closes at …
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 "feat(web): let Show Next Up be turned off" matches the main change: a new playback.next_up_enabled setting and a Next Up picker offering Off on the web Playback settings page. The changeset also covers server contract, manifest, and player behavior, which the title does not mention, but the title names the primary change and is specific.

Full details: Description check

Explanation

The description states the problem (the web app cannot turn Next Up off), the approach (Off writes playback.next_up_enabled false, the picker is gated on server capabilities, and the player closes at episode end), validation steps, and risks. It matches the changeset, including the NextUpPromptSetting component, nextUpPicker module, and removal of the in-player overlay.

Finishing Touches

Generate unit tests (beta)

  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
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: 67c2e092-062f-4fda-8c26-28fc4a29ee64
Commits

Reviewing files that changed from the base of the PR and between bc4e014 and 7dd2c34.

Files selected for processing: 6

  • docs/markers-api.md
  • internal/markers/credits_placement.go
  • web/src/hooks/queries/autoPlayNext.ts
  • web/src/playback/WatchPlaybackChrome.tsx
  • web/src/player/components/PlayingNextScreen.tsx
  • web/src/player/components/VideoPlayer.tsx
Files skipped from review as they are similar to previous changes: 2

  • docs/markers-api.md
  • internal/markers/credits_placement.go

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

choice: string,
offOffered: boolean,
): Array<[SettingKey, unknown]> {
if (choice === NEXT_UP_OFF) return [[SETTING_KEYS.PLAYBACK_NEXT_UP_ENABLED, false]];

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

kody code-review Kody Rules high

Off can write an unsupported setting on older servers

Older servers can receive an unsupported setting if this function receives NEXT_UP_OFF, even though the picker hides it. Guard the write with offOffered.

Kody rule violation: Preserve explicit unlimited settings and apply metered defaults before playback

Prompt for LLM
File web/src/pages/settings/nextUpPicker.ts, line 43:

Off can write an unsupported setting on older servers

Guard the Off write with `offOffered` as well. Although the picker normally hides Off on older servers, this function can still receive that choice and attempt to write a setting the server does not support.

Kody rule violation: [Preserve explicit unlimited settings and apply metered defaults before playback](https://kodus.siloserver.org/settings/code-review/1247142351/kody-rules/3bce653a-d548-44c8-ae10-61099594920c?teamId=ba9922fc-c0ea-4cf8-87bb-9d4f42ffc73e)

Suggested code:

if (choice === NEXT_UP_OFF) return offOffered ? [[SETTING_KEYS.PLAYBACK_NEXT_UP_ENABLED, false]] : [];

Talk to Kody by mentioning @kody

Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.

​

​

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Not reachable. The only caller is NextUpPromptSetting, whose Select lists nextUpPickerChoices(offOffered); that list leaves out Off when the server does not define next_up_enabled, and the value cannot read as Off there either (enabled falls back to the default true). nextUpPickerWrites therefore never receives Off on an older server.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Agreed. Given the described call path, Off is not reachable on an older server: the picker does not offer it, and the value defaults to enabled. The proposed guard would be defensive against future callers, but the current behavior does not substantiate the reported bug.

The cited rule also appears unrelated to this setting. I’d withdraw the suggestion.

Comment on lines +1082 to +1086
if (episodeSeriesId && nextUpAtEndRef.current === "close") {
if (modeRef.current === "foreground" || modeRef.current === "post-roll") {
handlePostRollClose();
}
return;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

kody code-review Bug medium

Off leaves ended minimized playback sessions open

An ended player and its session can remain active indefinitely in minimized or picture-in-picture mode. Stop playback in those modes too, while leaving the current page unchanged.

Prompt for LLM
File web/src/playback/WatchPlaybackChrome.tsx, lines 1082-1086:

Off leaves ended minimized playback sessions open

When an episode ends in minimized or picture-in-picture mode with Next Up off, this branch returns without stopping playback, leaving the ended player and its session active indefinitely. Stop playback in those modes too, while leaving the current page unchanged.

Talk to Kody by mentioning @kody

Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.

​

​

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is how main already behaves: an ended minimized or picture-in-picture player stays in the mini bar, because the reducer ignores post-roll outside the foreground. With Off this PR keeps that on purpose and only closes the foreground player, so it does not navigate away from the page being browsed.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

That makes sense. If the existing behavior intentionally keeps ended minimized and picture-in-picture players in the mini bar, this PR preserves that behavior rather than introducing a new issue. My suggestion overlooked that distinction, so I withdraw it.

Comment on lines +995 to +998
useEffect(() => {
nextUpPromptSecondsRef.current = nextUp.promptSeconds;
nextUpAtEndRef.current = nextUp.atEnd;
}, [nextUp.promptSeconds, nextUp.atEnd]);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

kody code-review Bug medium

Turning Next Up off does not dismiss an already open card

The card can remain visible and navigate to the next episode after the preference changes. Dismiss the active post-roll when the resolved setting changes to Off.

Prompt for LLM
File web/src/playback/WatchPlaybackChrome.tsx, lines 995-998:

Turning Next Up off does not dismiss an already open card

Changing Next Up to Off while its card is open only updates refs, so the card remains visible and can still navigate to the next episode until the video ends. Dismiss the active post-roll when the resolved setting changes to Off.

Talk to Kody by mentioning @kody

Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.

​

​

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No automatic advance can happen here: the countdown only runs after playback has ended, and at the end the Off branch closes the player, also from post-roll (WatchPlaybackChrome, the ended handler). What remains is a card opened before the switch that stays visible until the end, where it closes. Leaving 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.

Understood. The automatic-advance concern does not apply: the countdown starts only after playback ends, and the Off branch closes the player at that point, including from post-roll.

An already-open card can remain visible until playback ends, but you’ve chosen to leave that behavior as-is. I’ll withdraw the suggestion.

readFailed: boolean;
shuffled: boolean;
}): NextUpBehavior {
if (settings === undefined && !readFailed) return { promptSeconds: 0, atEnd: "post-roll" };

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

kody code-review Bug high

Playback ending during settings loading ignores the Off preference

The card and autoplay can start before the saved preference is known. Defer the end-of-playback decision until the settings read settles.

Prompt for LLM
File web/src/playback/nextUpPrompt.ts, line 54:

Playback ending during settings loading ignores the Off preference

If an episode ends before the settings request completes, this returns `post-roll` even when the saved setting is Off, so the card and autoplay can start before the actual preference is known. Defer the end-of-playback decision until the settings read settles.

Talk to Kody by mentioning @kody

Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.

​

​

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It needs the episode to end before the capabilities and settings reads that start when the player opens have answered: a file a few seconds long, or a resume within a second of the end. Not worth extra state for that; leaving 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.

Agreed. The race is possible, but it requires playback to end before the initial settings reads complete. Given that narrow window, accepting the risk and leaving the implementation as-is is reasonable.

@silo-triage silo-triage Bot added enhancement New feature or request needs-review Needs maintainer review to resolve uncertain classification, scope, or changed evidence. priority: P2 Limited scope, workaround exists, or polish stacked Base is another open PR; merge in stack order named in the body labels Nov 18, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 5

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: 1a77d3da-2451-47c3-9c0e-b10450a2df8c
Commits

Reviewing files that changed from the base of the PR and between e8de111 and bc4e014.

Files selected for processing: 69

  • .silo-translations
  • contracts/settings/v1/conformance.json
  • contracts/settings/v1/manifest.json
  • docs/markers-api.md
  • docs/settings-api.md
  • internal/markers/credits_placement.go
  • internal/settingscontract/contract_test.go
  • internal/settingskeys/keys.go
  • web/src/hooks/queries/autoPlayNext.ts
  • web/src/lib/deviceSettingGroups.ts
  • web/src/lib/settingsConformance.json
  • web/src/lib/settingsContract.ts
  • web/src/lib/userSettingsNav.ts
  • web/src/locales/ar-XB.json
  • web/src/locales/ar.json
  • web/src/locales/bg.json
  • web/src/locales/ca.json
  • web/src/locales/cs.json
  • web/src/locales/da.json
  • web/src/locales/de.json
  • web/src/locales/el.json
  • web/src/locales/en-XA.json
  • web/src/locales/en.json
  • web/src/locales/es.json
  • web/src/locales/et.json
  • web/src/locales/fi.json
  • web/src/locales/fr.json
  • web/src/locales/he.json
  • web/src/locales/hi.json
  • web/src/locales/hr.json
  • web/src/locales/hu.json
  • web/src/locales/id.json
  • web/src/locales/it.json
  • web/src/locales/ja.json
  • web/src/locales/keys.ts
  • web/src/locales/ko.json
  • web/src/locales/lt.json
  • web/src/locales/lv.json
  • web/src/locales/ms.json
  • web/src/locales/nb.json
  • web/src/locales/nl.json
  • web/src/locales/pl.json
  • web/src/locales/pt-BR.json
  • web/src/locales/pt-PT.json
  • web/src/locales/ro.json
  • web/src/locales/ru.json
  • web/src/locales/sk.json
  • web/src/locales/sl.json
  • web/src/locales/sv.json
  • web/src/locales/th.json
  • web/src/locales/tr.json
  • web/src/locales/uk.json
  • web/src/locales/vi.json
  • web/src/locales/zh-Hans.json
  • web/src/locales/zh-Hant.json
  • web/src/pages/settings/NextUpPromptSetting.tsx
  • web/src/pages/settings/PlaybackSettings.tsx
  • web/src/pages/settings/nextUpPicker.test.ts
  • web/src/pages/settings/nextUpPicker.ts
  • web/src/pages/watchRouteHelpers.ts
  • web/src/playback/WatchPlaybackChrome.tsx
  • web/src/playback/nextUpPrompt.test.ts
  • web/src/playback/nextUpPrompt.ts
  • web/src/player/components/NextEpisodeOverlay.tsx
  • web/src/player/components/VideoPlayer.tsx
  • web/src/player/components/WatchPage.tsx
  • web/src/player/hooks/useNextEpisode.ts
  • web/src/player/types.ts
  • web/src/player/utils/watchPageMarkers.ts
Files with no reviewable changes: 7

  • web/src/hooks/queries/autoPlayNext.ts
  • web/src/pages/watchRouteHelpers.ts
  • web/src/player/components/NextEpisodeOverlay.tsx
  • web/src/player/components/WatchPage.tsx
  • web/src/player/hooks/useNextEpisode.ts
  • web/src/player/types.ts
  • web/src/player/utils/watchPageMarkers.ts

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

Comment thread .silo-translations Outdated
Comment on lines +2 to +3
version=local-05caaf60fca0
sha256=-

@coderabbitai coderabbitai Bot Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor · Maintainability & Code Quality · Quick win

Re-sync .silo-translations to a published release before merge.

The file pins version=local-05caaf60fca0 with sha256=-. scripts/sync-translations rejects this pin unless --local <checkout> is passed, so a fresh checkout cannot reinstall these translations through the normal sync. AGENTS.md requires re-syncing with --version <release> before pull request merges so that .silo-translations names a published release.

After the translation release that contains these keys is published, re-sync the pin:

scripts/sync-translations --platform web --version <published-release>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Agreed, and already called out in the description: the pin is local until Silo-Server/silo-translations#86 is released, then this branch is re-synced with --version before merge.

enabled={read<boolean>(SETTING_KEYS.PLAYBACK_NEXT_UP_ENABLED)}
seconds={read<number>(SETTING_KEYS.PLAYBACK_NEXT_UP_PROMPT_SECONDS)}
offOffered={supportsNextUpOff}
disabled={pending || capabilities.isPending || effectivePending}

@coderabbitai coderabbitai Bot Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor · Functional Correctness · Quick win

Block the Next Up picker when the effective read fails, or clear the device override when its source is unknown.

If the effective-settings read errors before any data loads, effectivePending becomes false and effective stays undefined. The picker remains enabled. The profile writer then skips the device-override clear, because it can only clear when effective[key].source is profile_device. A device row set to next_up_enabled=true keeps winning on playback after the viewer selects Off. The picker also shows the contract default rather than the device value.

Make the picker reject writes while the override state is unknown. Alternatively, make the writer clear the device row for overridable keys when the source is unknown. The clear already tolerates a missing row, so an extra clear is harmless.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

If the values read fails, the row reads the contract defaults and a choice still writes the profile value; only a device override the screen could not see stays in place, and the next successful read shows it. The same holds for every other row on this screen. Leaving it.

// key would otherwise open Next Up early for a viewer who turned it off.
const capabilitiesPending = settingsCapabilities.isPending;
const nextUp = resolveNextUp({
settings: capabilitiesPending ? undefined : effectivePlaybackSettings,

@coderabbitai coderabbitai Bot Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor · Functional Correctness · Quick win

Defer the episode-end decision until the Next Up policy loads.

While settings are pending, resolveNextUp returns atEnd: "post-roll". If a series episode ends in that window, handleEnded skips the close branch and enters post-roll, even when the stored setting is Off. When the setting loads, the effect at lines 995-998 updates only the refs. No later path reads nextUpAtEndRef after handleEnded has returned, so the Next Up screen stays open instead of closing playback.

The window is narrow. It requires the episode to end before the settings read resolves, such as a short file or a resume near the end on a slow connection. The viewer can still close the screen manually.

Hold the end decision until the settings resolve. Then apply the resolved policy once: close for Off, and keep post-roll for On.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That needs the episode to end before the capabilities and settings reads, which start when the player opens, have answered: a clip a few seconds long, or a resume within a second of the end. Not worth extra state; leaving it.

Comment on lines +995 to +998
useEffect(() => {
nextUpPromptSecondsRef.current = nextUp.promptSeconds;
nextUpAtEndRef.current = nextUp.atEnd;
}, [nextUp.promptSeconds, nextUp.atEnd]);

@coderabbitai coderabbitai Bot Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor · Functional Correctness · Quick win

Cancel an armed Next Up countdown when the viewer turns Next Up off.

When the viewer saves Off after the episode ends but before the countdown finishes, the countdown still runs. PlayingNextScreen gates its countdown only on playback.auto_play_next, and the Off choice writes playback.next_up_enabled. At zero, the automatic callback calls handleNavigateEpisode, which has no policy check. The next episode then starts, although Off is the stored choice.

Once Off is saved, the armed countdown must not start the next episode. The mechanism is open. The screen can receive the resolved Next Up policy and clear its interval. Or the automatic path can check the resolved policy before it starts playback. Either way, the card must stop auto-advancing. The required outcome is not a timer that keeps running with an ignored result.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The countdown runs for 10 seconds on the post-roll screen; changing Show Next Up means leaving that screen for Settings, which closes it. Only a change saved from another device inside those 10 seconds could reach this. Leaving it.

@Rhainland
Rhainland force-pushed the feat/web-next-up-off branch from bc4e014 to 3ce7b9f Compare November 18, 2026 17:33
@silo-kody

silo-kody Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

Silo Kody — review complete

Review finished. Check the inline comments for findings and verify each suggestion against the code and tests.

Reviewing changes in Silo
  • Include the related issue, expected behavior, and validation steps in the PR description.
  • For API changes, describe the effect on Apple and Android clients and Jellyfin compatibility.
  • For plugin changes, identify the affected SDK contract, plugin, and catalog entry.
  • Follow this repository's AGENTS.md and CONTRIBUTING.md.
  • Request another review with @kody start-review in a PR comment.
  • React with 👍 or 👎 to give feedback on individual suggestions.
Review settings
Review Options

The following review options are enabled or disabled:

Options Enabled
Bug ✅
Performance ✅
Security ✅
Business Logic ❌

@Rhainland
Rhainland force-pushed the feat/web-next-up-off branch from 3ce7b9f to eda2ad6 Compare November 18, 2026 17:37
@silo-kody

silo-kody Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

Silo Kody — review complete

Review finished. Check the inline comments for findings and verify each suggestion against the code and tests.

Reviewing changes in Silo
  • Include the related issue, expected behavior, and validation steps in the PR description.
  • For API changes, describe the effect on Apple and Android clients and Jellyfin compatibility.
  • For plugin changes, identify the affected SDK contract, plugin, and catalog entry.
  • Follow this repository's AGENTS.md and CONTRIBUTING.md.
  • Request another review with @kody start-review in a PR comment.
  • React with 👍 or 👎 to give feedback on individual suggestions.
Review settings
Review Options

The following review options are enabled or disabled:

Options Enabled
Bug ✅
Performance ✅
Security ✅
Business Logic ❌

@Rhainland
Rhainland force-pushed the feat/web-next-up-off branch from eda2ad6 to 7dd2c34 Compare November 18, 2026 17:37
The web player opened the post-roll Next Up screen 30 seconds before the
end, whatever the viewer chose, and also showed a separate 10-second card
when the credits (or, with Preview next episode on, the preview) marker
started. The native apps open Next Up only from the viewer's
playback.next_up_prompt_seconds lead time before the end of the file.

- Post-roll opens within playback.next_up_prompt_seconds of the file end;
  0 (At end) opens it on ended only. The existing exclusions stay.
- The credits-marker card and its countdown are gone. Skip Credits stays,
  and a skip to the file end reaches Next Up through the ended path.
- Settings > Playback gets a Show Next Up picker with the native choices
  (At end, 10 s, 30 s, 1 min, 2 min before end).
Until the effective setting loads, the player opens nothing early, so a
viewer who chose At end and resumes near the end does not get Next Up on
the 30-second default. The picker names a value stored off the list
instead of adding it as a choice, and the credits-placement rationale no
longer says players open Up Next at the credits start.
The toggle stores playback.auto_play_next_preview, which no player acts on
any more: the web stopped starting the next episode at a preview marker
when Next Up moved to the end of the file, and Apple and Android never
read it. A control that saves a choice that changes nothing only
misleads.

Remove it from Playback settings and its search entry, and keep the key
off the device settings screen. The server key stays, so other clients
are unaffected.
Playback settings had grown past the file size limit with the new row.
With At end, Next Up opens only when playback ends, which can be before
playback.auto_play_next has loaded. The countdown read the default (on)
meanwhile, so a viewer who turned auto-play off saw it start, and on a slow
read could be moved to the next episode.
hls.js can finish a stream without a native ended event and reports it as a
stalled media end instead. Main opened Next Up 30 seconds before the end in
every case, so that path never mattered; with At end it was the only way in.
Treat it as the end of playback.
Rhainland added 6 commits November 18, 2026 18:40
Viewers who would rather go back to the series page at the end of an
episode cannot turn the Next Up card off: Auto-play Next only stops the
countdown, and the card still opens.

Add playback.next_up_enabled at manifest revision 30, a boolean stored per
profile with a per-device override and default true. False means no card,
no countdown and no automatic next episode; the episode plays out and the
player closes as its Close action does. next_up_prompt_seconds keeps deciding when
the card opens while it is on, and the settings docs now state that it
counts from the end of the file, not from a credits marker. Clients that
predate the key keep showing Next Up.

The web device settings screen hides the key until the web player applies
it.
The Show Next Up picker on Playback settings gets an Off choice, backed by
playback.next_up_enabled. Off writes only that key, so the lead time comes
back when Next Up is turned on again; every other choice writes the lead
time and turns Next Up on. A server below settings revision 30 does not
define the key, so it is never offered Off or sent the key.

With Next Up off the player opens nothing early, and the end of a series
episode closes to where post-roll's Close goes instead of entering
post-roll, so neither the countdown nor auto-play runs. Shuffles, multi-part
items and Watch Together rooms keep their current behaviour.
Review follow-ups. With Next Up off, the end of a series episode now also
closes a card that opened before the viewer turned it off, and a minimized
or picture-in-picture player leaves the page being browsed alone. The Show
Next Up picker waits for the capabilities and values reads, so a choice
knows which keys to write and which device override to clear.
Playback settings was back over the file size limit with the Off choice.
With Next Up off the end of an episode went through post-roll's close,
which opens the episode page and leaves the watch page in history. The
setting promises the player's own Close: back to where playback started,
replacing the watch entry. A card opened before Off was chosen still closes
as its own Close does.
@Rhainland
Rhainland force-pushed the feat/web-next-up-off branch from 7dd2c34 to 6887c06 Compare November 18, 2026 17:49
@silo-kody

ghost commented Nov 18, 2026 •

Copy link
Copy Markdown

Silo Kody — review complete

Review finished. Check the inline comments for findings and verify each suggestion against the code and tests.

Reviewing changes in Silo
  • Include the related issue, expected behavior, and validation steps in the PR description.
  • For API changes, describe the effect on Apple and Android clients and Jellyfin compatibility.
  • For plugin changes, identify the affected SDK contract, plugin, and catalog entry.
  • Follow this repository's AGENTS.md and CONTRIBUTING.md.
  • Request another review with @kody start-review in a PR comment.
  • React with 👍 or 👎 to give feedback on individual suggestions.
Review settings
Review Options

The following review options are enabled or disabled:

Options Enabled
Bug ✅
Performance ✅
Security ✅
Business Logic ❌
⚠️ 4 Kody Rule(s) were not evaluated

These rules declare that they need repository context beyond this diff, and the review could not retrieve it, so they were not judged on this pull request:

  • Preserve optional store capabilities through production wrappers
  • Detach mandatory cleanup from request cancellation and bound its lifetime
  • Preserve durable media identity and share identity-evidence precedence
  • Bound decoder throughput trades and share direct-play eligibility

Comment thread .silo-translations
platform=web
version=2026.11.18-17daa65
sha256=0272d24c1b7f2ec6e2c785e3f5f524d5893bec4792328a81da818e72f5aa60b3
version=local-4dbba2e96d07

ghost Nov 18, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

kody code-review Bug medium

Local translation pin breaks the default sync command

scripts/sync-translations rejects local-* pins in release mode, so it fails when run without arguments. Sync against a published translation release and commit its version and checksum instead.

Prompt for LLM
File .silo-translations, line 2:

Local translation pin breaks the default sync command

The local version pin makes `scripts/sync-translations` fail when run without arguments because the script explicitly rejects `local-*` pins in release mode. Sync against a published translation release and commit its version and checksum instead.

Talk to Kody by mentioning @kody

Was this suggestion helpful? React with 👍 or 👎 to help Kody learn from this interaction.

​

​

ghost Nov 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Known and intended until the catalog change is released: docs/architecture/i18n.md says to sync with --local while the catalog change is unmerged, and --version once it has a release. Silo-Server/silo-translations#86 holds these strings; this branch is re-synced to its release, with version and checksum, before merge. The description lists that under Risks.

ghost Nov 18, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Understood. The local pin is intentional while the translation catalog change is unreleased, and the PR already identifies the release sync as a pre-merge requirement. I’d withdraw the suggestion as a current PR finding.

Before merge, re-sync to the published release with --version and commit its version and checksum as planned.

@Quick104

ghost commented Nov 18, 2026

Copy link
Copy Markdown
Contributor

🤖 Claude Code (claude-opus-5-5)

Review summary · head 6887c06

I reviewed this PR's own five commits, from "chore(i18n): sync the settings Off value for web" on. #4501 and #4502 are reviewed on their own PRs.

Findings: none in this PR's changes, and I haven't pushed anything.

What I checked and left alone:

  • The order in handleEnded: a Watch Together room and the next part of a multi-part file still come before Off. Extras and movies keep their own exit, a last episode with Off closes like any other, and the HLS stall-into-end path reaches the same handler.
  • With Off, a foreground episode ends through handleExit, the player's Close path. The ended exit state never carries a destination, so it returns to where playback started.
  • The effective-settings query keeps no previous data, so when capabilities arrive and the key list changes, the player reads "still loading" and opens nothing early. It never sees an old map without next_up_enabled.
  • A lead-time choice made from Off writes the seconds, then next_up_enabled. If the second write fails, the picker still shows Off, and Off ignores the stored seconds, so nothing the viewer sees goes wrong.

The open Kody and CodeRabbit threads already have answers, and I agree with them.

For the maintainers to settle

Fixed separately: the web player counts settings capabilities as known only while the last fetch succeeded. If a refetch fails after they loaded, for example on a reconnect after the 30-minute cache window, every revision-gated key drops out of the player's settings read. With this PR that includes next_up_enabled, so Next Up would come back for a viewer who chose Off. Main already has the same problem with intro skip mode, cellular quality, buffering mode and the marker keys, so it gets its own PR rather than a change here.

Validated features: I couldn't read the 1.0 validation board from this session, so validation impact is unverified. #1252 lists C9 (Next Up on web) as not run yet, which matches the Validation tasks: line.

Tests: nextUpPicker.test.ts and the resolveNextUp cases cover new modules, so they don't build on the base and can't show a failure there. As the description says, nobody has shown live yet that playback reaching the end with Off closes the player.

User manual: Silo-Server/siloserver.org#409 covers Show Next Up with Off and waits for this stack.

Other clients: Silo-Server/silo-apple#1219, Silo-Server/silo-android#995 and Silo-Server/silo-roku#97 are open, matching the Other clients: line.

Cross-provider review: one round with gpt-6.2-sol on this head. The shuffle wording and the capabilities refetch above came from it, along with my own finders. I left out the rest: a profile switch or a second tab acting within one write's round trip, and a per-device next_up_enabled override that Your Devices hides. The first is too narrow to reach in use. The hidden override comes from #4501's change, not from this PR.

Fit: 8/10 · Readiness: 8/10 · conditional

  • Fit: Discussion Next Up "end" detection should be based on file end and not the credits marker #4443 asked for a way to turn Next Up off, and this gives the web the same picker and end-of-episode behavior as the Apple and Android apps. It stays at 8 because it adds setting surface while the project's focus is QA and polish.
  • Readiness: I found no defects in this PR's changes. It stays at 8 because nobody has shown Off at the end of an episode live, and the translations release and the two PRs below this one have to land first.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request needs-review Needs maintainer review to resolve uncertain classification, scope, or changed evidence. priority: P2 Limited scope, workaround exists, or polish size/XXXL 3000+ added + deleted lines (all files); change volume, not priority. stacked Base is another open PR; merge in stack order named in the body

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants