Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
21ede49253 | ||
|
|
d04769ccdb | ||
|
|
439272b405 | ||
|
|
b564545ff7 |
@@ -274,8 +274,8 @@ jobs:
|
||||
done
|
||||
echo " FAIL $path (no 2xx containing '$needle' within timeout)"; return 1
|
||||
}
|
||||
if check "/iptv/channels.m3u" "#EXTM3U" && check "/iptv/xmltv.xml" "<tv"; then
|
||||
echo "Smoke + IPTV E2E passed: channels.m3u + xmltv.xml serve a valid playlist + guide"
|
||||
if check "/iptv/channels.m3u" "#EXTM3U" && check "/iptv/xmltv.xml" "<tv" && check "/app/" "ChicoryTV"; then
|
||||
echo "Smoke + IPTV E2E passed: channels.m3u + xmltv.xml serve a valid playlist + guide; /app/ serves the ChicoryTV SPA"
|
||||
else
|
||||
echo "===== container logs (tail) ====="; docker logs "$NAME" 2>&1 | tail -n 40 || true
|
||||
exit 1
|
||||
|
||||
@@ -4,7 +4,8 @@ Custom IPTV channel server for Jellyfin. Forked from [ErsatzTV/ErsatzTV](https:/
|
||||
|
||||
## Architecture
|
||||
|
||||
- **Language**: C# / .NET 10, Blazor Server UI (MudBlazor)
|
||||
- **Language**: C# / .NET 10
|
||||
- **UI**: ChicoryTV React SPA (`web/`, Vite, served at `/app`) over the REST API — the default UI; root `/` and migrated legacy routes 302 there (`ErsatzTV/LegacyUiRedirects.cs`). The legacy Blazor Server UI (MudBlazor) still serves un-migrated admin screens (collections, media browse, trakt, filler, watermarks, ffmpeg profiles, blocks/decos/templates, playout editors, logs, troubleshooting; Blazor home = `/system/health`); its removal is #91 phase (b), gated on parity issues #140–#147
|
||||
- **Pattern**: CQRS via MediatR — queries/commands in `ErsatzTV.Application/`
|
||||
- **Database**: EF Core (SQLite default, MySQL optional) — context in `ErsatzTV.Infrastructure/Data/TvContext.cs`
|
||||
- **Media**: FFmpeg via CliWrap, SkiaSharp for logo generation
|
||||
@@ -14,7 +15,8 @@ Custom IPTV channel server for Jellyfin. Forked from [ErsatzTV/ErsatzTV](https:/
|
||||
|
||||
| Project | Role |
|
||||
|---------|------|
|
||||
| `ErsatzTV/` | ASP.NET Core host, Blazor pages, API controllers, DI setup |
|
||||
| `ErsatzTV/` | ASP.NET Core host, API controllers, SPA static hosting, legacy Blazor pages, DI setup |
|
||||
| `web/` | ChicoryTV React SPA (Vite + TypeScript; builds into `ErsatzTV/wwwroot/app`) |
|
||||
| `ErsatzTV.Application/` | MediatR handlers (business logic) |
|
||||
| `ErsatzTV.Core/` | Domain entities, interfaces, no infrastructure deps |
|
||||
| `ErsatzTV.Infrastructure/` | EF Core repos, data access |
|
||||
@@ -56,7 +58,7 @@ docker build -f docker/Dockerfile -t ersatztv:dev .
|
||||
- **Read [`docs/contributing.md`](docs/contributing.md)** before non-trivial changes — it documents the established patterns (layering, CQRS handlers, LanguageExt, Blazor/MudBlazor, EF Core + dual-provider migrations, the FFmpeg pipeline, analyzers, testing) and the **deviation policy**: match the established style; diverge only with a concrete, stated reason.
|
||||
- Follow existing MediatR CQRS pattern for new features
|
||||
- Domain logic in `ErsatzTV.Core`, infrastructure in `ErsatzTV.Infrastructure`
|
||||
- Keep Blazor pages thin — delegate to MediatR handlers
|
||||
- Keep UI thin: the SPA talks to `/api/*` only; legacy Blazor pages delegate to MediatR handlers. New screens go in the SPA (`web/`), never in Blazor
|
||||
- Test with **NUnit** + Shouldly + NSubstitute (the existing `*.Tests` projects); xUnit is **not** used here
|
||||
- **Dependencies use Central Package Management**: versions live in the repo-root `Directory.Packages.props`; csproj reference packages by name only. Add/upgrade by editing the central `<PackageVersion>` — never put `Version=` back on a `<PackageReference>` (trips `NU1008`). See `docs/ci-cd.md` → Dependency management.
|
||||
- **DB migrations target BOTH providers**: a `TvContext` model change needs a migration in `ErsatzTV.Infrastructure.Sqlite` **and** `ErsatzTV.Infrastructure.MySql` — run `scripts/add-migration.sh <Name>` (does both). CI's `migrations` job enforces model-drift + apply-to-fresh-DB per provider. See `docs/ci-cd.md` → Migration integrity.
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using NUnit.Framework;
|
||||
using Shouldly;
|
||||
|
||||
namespace ErsatzTV.Tests;
|
||||
|
||||
[TestFixture]
|
||||
public class LegacyUiRedirectsTests
|
||||
{
|
||||
private static readonly string StartupSource = File.ReadAllText(FindStartupPath());
|
||||
|
||||
[Test]
|
||||
public void Every_Mapping_Should_Resolve()
|
||||
{
|
||||
foreach ((string from, string to) in LegacyUiRedirects.Map)
|
||||
{
|
||||
LegacyUiRedirects.TryGetRedirect(new PathString(from), out string target).ShouldBeTrue();
|
||||
target.ShouldBe(to);
|
||||
}
|
||||
}
|
||||
|
||||
[TestCase("/", "/app")]
|
||||
[TestCase("/channels", "/app/channels")]
|
||||
[TestCase("/channels/add", "/app/new-channel")]
|
||||
[TestCase("/schedules", "/app/schedules")]
|
||||
[TestCase("/playouts", "/app/playouts")]
|
||||
[TestCase("/media/libraries", "/app/libraries")]
|
||||
[TestCase("/settings/ffmpeg", "/app/settings/streaming")]
|
||||
[TestCase("/settings/hdhr", "/app/settings/system")]
|
||||
[TestCase("/settings/logging", "/app/settings/logging")]
|
||||
[TestCase("/settings/playout", "/app/settings/playout")]
|
||||
[TestCase("/settings/scanner", "/app/settings/scanner")]
|
||||
[TestCase("/settings/ui", "/app/settings/general")]
|
||||
[TestCase("/settings/xmltv", "/app/settings/xmltv")]
|
||||
public void Known_Route_Should_Redirect(string path, string expected)
|
||||
{
|
||||
LegacyUiRedirects.TryGetRedirect(new PathString(path), out string target).ShouldBeTrue();
|
||||
target.ShouldBe(expected);
|
||||
}
|
||||
|
||||
[TestCase("/channels/", "/app/channels")]
|
||||
[TestCase("/schedules/", "/app/schedules")]
|
||||
[TestCase("/settings/ffmpeg/", "/app/settings/streaming")]
|
||||
public void Trailing_Slash_Should_Match(string path, string expected)
|
||||
{
|
||||
LegacyUiRedirects.TryGetRedirect(new PathString(path), out string target).ShouldBeTrue();
|
||||
target.ShouldBe(expected);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Lookup_Should_Be_Case_Insensitive()
|
||||
{
|
||||
LegacyUiRedirects.TryGetRedirect(new PathString("/Channels"), out string target).ShouldBeTrue();
|
||||
target.ShouldBe("/app/channels");
|
||||
}
|
||||
|
||||
[TestCase("/channels/5")] // channel edit (Blazor-only)
|
||||
[TestCase("/channels/numbers")] // Blazor-only
|
||||
[TestCase("/system/health")] // Blazor home escape hatch
|
||||
[TestCase("/media/collections")] // Blazor-only media page
|
||||
[TestCase("/ffmpeg")] // Blazor-only
|
||||
[TestCase("/watermarks")] // Blazor-only
|
||||
[TestCase("/app")] // already the SPA
|
||||
[TestCase("/app/channels")] // already the SPA
|
||||
[TestCase("/iptv/channels.m3u")] // IPTV surface
|
||||
[TestCase("/api/health")] // API surface
|
||||
[TestCase("")] // empty
|
||||
[TestCase("//")] // all-slash path must not collapse to root "/"
|
||||
[TestCase("/channels//")] // double trailing slash is not normalized to a match
|
||||
public void Non_Migrated_Route_Should_Not_Redirect(string path)
|
||||
{
|
||||
LegacyUiRedirects.TryGetRedirect(new PathString(path), out string target).ShouldBeFalse();
|
||||
target.ShouldBe(string.Empty);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Startup_Should_Redirect_Legacy_Routes_In_Blazor_Branch_Before_Routing()
|
||||
{
|
||||
// The redirect middleware must be wired inside the blazor branch and run
|
||||
// before UseRouting so migrated routes never reach the Blazor fallback.
|
||||
int redirectIndex = StartupSource.IndexOf("LegacyUiRedirects.TryGetRedirect", StringComparison.Ordinal);
|
||||
redirectIndex.ShouldBeGreaterThan(-1);
|
||||
|
||||
// The Blazor branch's UseRouting call that follows the redirect middleware.
|
||||
int routingIndex = StartupSource.IndexOf("blazor.UseRouting()", StringComparison.Ordinal);
|
||||
routingIndex.ShouldBeGreaterThan(-1);
|
||||
|
||||
redirectIndex.ShouldBeLessThan(routingIndex);
|
||||
|
||||
// 302 (temporary), not a permanent redirect.
|
||||
StartupSource.ShouldContain("context.Request.PathBase + target");
|
||||
StartupSource.ShouldNotContain("RedirectPermanent(target");
|
||||
}
|
||||
|
||||
private static string FindStartupPath()
|
||||
{
|
||||
DirectoryInfo? directory = new(TestContext.CurrentContext.TestDirectory);
|
||||
|
||||
while (directory is not null)
|
||||
{
|
||||
string candidate = Path.Combine(directory.FullName, "ErsatzTV", "Startup.cs");
|
||||
if (File.Exists(candidate))
|
||||
{
|
||||
return candidate;
|
||||
}
|
||||
|
||||
directory = directory.Parent;
|
||||
}
|
||||
|
||||
throw new FileNotFoundException("Could not find ErsatzTV/Startup.cs");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace ErsatzTV;
|
||||
|
||||
// Phase (a) of the Blazor -> ChicoryTV SPA cutover (ersatztv#91).
|
||||
//
|
||||
// The React SPA (served under /app) is now the default UI: the legacy Blazor
|
||||
// routes below 302-redirect to their SPA equivalents. Only routes that already
|
||||
// have SPA parity are listed here. Blazor pages WITHOUT a SPA equivalent are
|
||||
// deliberately left reachable (no redirect) so their functionality stays
|
||||
// available while the SPA catches up:
|
||||
// /system/health (Blazor home escape hatch; Index.razor also lives here),
|
||||
// /channels/{id} edit, /channels/numbers, /media/* (collections etc.),
|
||||
// /ffmpeg, /watermarks, /blocks, /decos, /templates, /deco-templates,
|
||||
// schedule/playout detail editors, /system/logs, /system/troubleshooting.
|
||||
//
|
||||
// Phase (b) removes the redirected Blazor pages entirely, but that is GATED on
|
||||
// full SPA parity for every route in this map. Until then this map is the
|
||||
// single source of truth for "what has migrated" and is expected to grow.
|
||||
public static class LegacyUiRedirects
|
||||
{
|
||||
// Blazor route -> SPA route. EXACT paths only (no prefix matching); a single
|
||||
// trailing slash on the request is normalized away before lookup.
|
||||
public static readonly IReadOnlyDictionary<string, string> Map =
|
||||
new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
["/"] = "/app",
|
||||
["/channels"] = "/app/channels",
|
||||
["/channels/add"] = "/app/new-channel",
|
||||
["/schedules"] = "/app/schedules",
|
||||
["/playouts"] = "/app/playouts",
|
||||
["/media/libraries"] = "/app/libraries",
|
||||
["/settings/ffmpeg"] = "/app/settings/streaming",
|
||||
["/settings/hdhr"] = "/app/settings/system",
|
||||
["/settings/logging"] = "/app/settings/logging",
|
||||
["/settings/playout"] = "/app/settings/playout",
|
||||
["/settings/scanner"] = "/app/settings/scanner",
|
||||
["/settings/ui"] = "/app/settings/general",
|
||||
["/settings/xmltv"] = "/app/settings/xmltv"
|
||||
};
|
||||
|
||||
public static bool TryGetRedirect(PathString path, out string target)
|
||||
{
|
||||
target = string.Empty;
|
||||
|
||||
string value = path.Value;
|
||||
if (string.IsNullOrEmpty(value))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Normalize a single trailing slash so "/channels/" matches "/channels"
|
||||
// (but keep root "/" intact). Guard against a path of all slashes (e.g.
|
||||
// "//") collapsing down to "/" and falsely matching the root entry.
|
||||
if (value.Length > 1 && value.EndsWith('/'))
|
||||
{
|
||||
string trimmed = value[..^1];
|
||||
if (trimmed == "/")
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
value = trimmed;
|
||||
}
|
||||
|
||||
if (Map.TryGetValue(value, out string mapped))
|
||||
{
|
||||
target = mapped;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -726,6 +726,28 @@ public class Startup
|
||||
ctx => !IsIptvPath(ctx.Request.Path) && !IsSpaPath(ctx.Request.Path),
|
||||
blazor =>
|
||||
{
|
||||
// ersatztv#91 phase (a): make the ChicoryTV SPA the default UI by
|
||||
// redirecting migrated legacy Blazor routes to their /app equivalents.
|
||||
// 302 (not 301): this map grows as pages migrate, and permanent-redirect
|
||||
// browser caching would make rollback painful. UsePathBase (ETV_BASE_URL)
|
||||
// only rewrites the request side (Request.Path/PathBase); it never touches
|
||||
// redirect Location headers, so the PathBase prefix must be re-applied here.
|
||||
blazor.Use(async (context, next) =>
|
||||
{
|
||||
if (HttpMethods.IsGet(context.Request.Method) ||
|
||||
HttpMethods.IsHead(context.Request.Method))
|
||||
{
|
||||
if (LegacyUiRedirects.TryGetRedirect(context.Request.Path, out string target))
|
||||
{
|
||||
context.Response.Redirect(
|
||||
context.Request.PathBase + target + context.Request.QueryString);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
await next(context);
|
||||
});
|
||||
|
||||
blazor.UseRouting();
|
||||
|
||||
if (OidcHelper.IsEnabled)
|
||||
|
||||
@@ -8,9 +8,12 @@ builds are limited to 2–3 concurrent, never wide fan-outs. Backend gaps all la
|
||||
2026-07-04 (PRs #113–#119); merge pass PR #120; live-data screens: #109 Dashboard (PR #123),
|
||||
#84 Channels (PR #124), #86 Schedule editor (PR #125), #87 Playouts (PR #127), #88 Libraries
|
||||
(PR #128), #85 Guide/EPG (PR #129); #62 prerequisites: #65 (PR #130), #64 (PR #133), #63
|
||||
(PR #134) — epic #62 COMPLETE; #89 Channel Builder (PR #136); **#93 Settings (PR #138) —
|
||||
(PR #134) — epic #62 COMPLETE; #89 Channel Builder (PR #136); #93 Settings (PR #138) —
|
||||
first screen through the full design-first workflow; #92 design-sync round-trip verified and
|
||||
documented (`docs/design-sync.md`)**.
|
||||
documented (`docs/design-sync.md`); **#90 rebrand (PR #139) — SPA fully presents as
|
||||
ChicoryTV; v26.4.0 tagged at this merge (first app-change release → prod)**; **#91 phase (a)
|
||||
root flip (PR #148) — SPA is the default UI; phase (b) Blazor removal blocked on parity
|
||||
#140–#147**.
|
||||
|
||||
**PROCESS (2026-07-06, binding — supersedes 07-05)**: Claude Code ONLY — Codex is retired
|
||||
(usage exhausted). Fable is the orchestrator in the main session and is EXPENSIVE — use it
|
||||
@@ -31,32 +34,46 @@ can't see (see Lessons: local-run recipe).
|
||||
**RELEASE CHECKPOINT (standing, added 2026-07-06)**: prod cutover to the fork is DONE —
|
||||
prod container `ersatztv` on bumblebee runs `192.168.1.95:3000/timothy/ersatztv:prod`
|
||||
(= v26.3.1, app-identical to upstream 26.3.0); `ersatztv-test` tracks `:latest` (main).
|
||||
Prod only advances on `v*` tags. At every milestone merge, FLAG THE USER: is this slice
|
||||
worth tagging **v26.4.0** (reserved for the first app-change release)? Latest sensible tag
|
||||
point is #91 (cutover); earlier if a stable API slice should reach prod sooner. Tagging
|
||||
needs explicit user consent; NEVER `[skip ci]` a commit you'll tag. (Flagged again at the
|
||||
#93 merge, 2026-07-07 — builder + settings + full API is a very plausible v26.4.0 slice;
|
||||
#90 rebrand would make it present as ChicoryTV.)
|
||||
Prod only advances on `v*` tags. **v26.4.0 TAGGED 2026-07-07** on 65b1a5e3 (the #90 merge,
|
||||
user-consented) — first app-change release; prod image = full API + all SPA screens +
|
||||
ChicoryTV branding. At future milestone merges, flag the user for the NEXT tag
|
||||
(v26.4.1/v26.5.0 — #91 cutover is the obvious next tag point). Tagging needs explicit user
|
||||
consent; NEVER `[skip ci]` a commit you'll tag.
|
||||
|
||||
**Session state (2026-07-07, post-#93)**: main = 17f49304 (PR #138 merged): **Settings** is
|
||||
live at `/app/settings/<section>` — backend `GET/PUT /api/settings/{ffmpeg,playout,xmltv,
|
||||
scanner,logging,ui,hdhr}` + `/api/settings/resolutions` CRUD (`SettingsController`, DTOs in
|
||||
`ErsatzTV.Core/Api/Settings`), frontend `web/src/screens/SettingsScreen.tsx` +
|
||||
`web/src/api/settings.ts` (tiered loader: settings groups gate the screen, reference data
|
||||
via allSettled with per-resource failure notes). App.tsx `ScreenRoute` gained an opt-in
|
||||
`allowSubPaths` flag (settings only); the screen parses its own URL suffix. Design-first
|
||||
workflow proven end-to-end: prototype `design-system/templates/chicorytv-admin/Settings.jsx`
|
||||
+ handoff bundle `design-system/design_handoff_settings/` synced both directions with the
|
||||
DesignSync MCP (main session only) — workflow documented in `docs/design-sync.md`, #92
|
||||
CLOSED. Also this session: **PR #137** — Scriban.Signed 6.5.2→7.2.5 (GHSA-5wr9-m6jw-xx44
|
||||
sandbox escape; the fresh advisory made NuGetAudit fail EVERY CI restore, merged first to
|
||||
unblock); media-sources fresh-DB 500 fixed (Dapper→EF, see Lessons). Review: 3 lenses →
|
||||
11 findings (2 backend contract clusters + frontend silent-failure/partial-save cluster),
|
||||
fixed by 2 parallel subagents, fork-verified SHIP. Baselines: ErsatzTV.Tests **495**,
|
||||
Core.Tests **493** (+1 skip), **web tests 145** (was 112). All #93 worktrees removed;
|
||||
main checkout still sits on docs/59-ui-redesign-brief — do NOT touch it.
|
||||
**Session state (2026-07-07, post-#91 phase a)**: main = **d04769cc** (PR #148 merged).
|
||||
**#91 phase (a) LANDED**: root `/` + 12 legacy Blazor routes with SPA equivalents 302 to
|
||||
`/app/...` via `ErsatzTV/LegacyUiRedirects.cs` (exact-match map, single source of truth for
|
||||
"what has migrated") + middleware in Startup's blazor branch before UseRouting; query strings
|
||||
+ `ETV_BASE_URL` PathBase preserved (302 NOT 301 — deliberate, rollback-safe); docker smoke
|
||||
now asserts `/app/` serves ChicoryTV. **#91 stays OPEN — phase (b) (delete Blazor/MudBlazor)
|
||||
is BLOCKED on SPA parity**: recon found ~55 Blazor-only routes; gaps filed as **#140
|
||||
(collections — /app/collections is a placeholder!), #141 (media browse/search/trash), #142
|
||||
(trakt), #143 (ffmpeg profiles/filler/watermarks), #144 (blocks/decos/templates + playout
|
||||
detail editors), #145 (logs/troubleshooting), #146 (channel edit + numbers), #147 (SPA
|
||||
escape-hatch link to legacy UI)**. Blazor home escape hatch = `/system/health` (deliberately
|
||||
un-redirected). OIDC note (correctness fork): default landing changes from challenged-Blazor
|
||||
to open SPA — no NEW exposure (GET /api/* + /app were already unauthenticated), but SPA auth
|
||||
is a phase-(b) design gap. Baselines: **ErsatzTV.Tests 527** (495 + 32 redirect tests),
|
||||
Core.Tests **493** (+1 skip), **web tests 145** (web/ untouched this session). CLAUDE.md
|
||||
architecture/conventions updated for the SPA-default reality (Blazor sections of
|
||||
docs/contributing.md left for phase (b)). Worktree .worktrees/issue-91-cutover now sits on
|
||||
main (doc commit); issue-90-rebrand worktree removed. Main checkout still sits on
|
||||
docs/59-ui-redesign-brief — do NOT touch it.
|
||||
|
||||
**Lessons for all remaining prompts** (accumulated):
|
||||
- NEW (#91) — `UsePathBase` only rewrites the REQUEST side (Request.Path/PathBase); it never
|
||||
touches redirect `Location` headers — any `Response.Redirect` to an absolute path must
|
||||
prepend `context.Request.PathBase` (precedent: IptvController.cs:56,69,305).
|
||||
- NEW (#91) — Blazor's MainLayout has a not-ready gate (`MainLayout.razor:391`): while the
|
||||
DB/search index initializes, EVERY non-root Blazor page prerender 302s to `/`. Live-E2E
|
||||
probes must wait for FULL readiness (log line "Done migrating search index"), not just
|
||||
`/api/health` 200 — probing early produces phantom `302 → /` results.
|
||||
- NEW (#91) — the local-run host guard (`Startup.cs:679`) matches `Host.StartsWith("localhost")`;
|
||||
curling `127.0.0.1:8409` 404s everything except IPTV — always curl `localhost` in the #93
|
||||
live-E2E recipe.
|
||||
- NEW (#91) — SPA channel edit is a DEAD END: the Channels pencil navigates to
|
||||
`/app/new-channel?edit={id}` but ChannelBuilderScreen never reads `edit` (noted on #146);
|
||||
PlayoutsScreen has no path to playout creation/detail editors (noted on #144).
|
||||
- NEW (#93) — Local live-E2E recipe: `npm run build` (outputs to gitignored
|
||||
`ErsatzTV/wwwroot/app/`), then `ln -sfn <worktree>/ErsatzTV/wwwroot/app
|
||||
ErsatzTV/bin/Debug/net10.0/wwwroot/app` (Program.cs sets ContentRoot to the ASSEMBLY dir,
|
||||
@@ -193,61 +210,60 @@ main checkout still sits on docs/59-ui-redesign-brief — do NOT touch it.
|
||||
|
||||
---
|
||||
|
||||
# PROMPT — #90: ChicoryTV rebrand (assets + naming)
|
||||
# PROMPT — Post-cutover housekeeping + parity kickoff
|
||||
|
||||
You are Fable, the ORCHESTRATOR in the main Claude Code session (Codex is retired — Claude
|
||||
Code only). Fable is EXPENSIVE: delegate implementation to fitting subagents (this issue is
|
||||
mostly mechanical — haiku/sonnet territory; fable only for the review fork). Read CLAUDE.md
|
||||
and the PROCESS + Lessons sections of this file first.
|
||||
You are Fable, the ORCHESTRATOR in the main Claude Code session (Claude Code only). Fable is
|
||||
EXPENSIVE: delegate to fitting subagents (recon → Explore/haiku; mechanical work → sonnet;
|
||||
judgment-heavy code → opus; fable for the hardest calls + review forks). Read CLAUDE.md and
|
||||
the PROCESS + Lessons sections of this file first.
|
||||
|
||||
HARD CONSTRAINTS:
|
||||
- `git worktree add .worktrees/issue-90-rebrand -b feat/90-rebrand origin/main`; never touch
|
||||
the main checkout (it sits on docs/59-ui-redesign-brief). `cd web && npm ci` first.
|
||||
- Max 2–3 concurrent builds; ONE dotnet build at a time. Frontend-only expected — if backend
|
||||
strings turn out to be in scope, they're NOT (deeper product rebrand is epic #59).
|
||||
- NEVER set ETV_UPDATE_GOLDENS.
|
||||
- Review before PR: this is a small mechanical issue — a single fable correctness/design fork
|
||||
over the diff suffices (skip the 3-lens panel unless the diff grows); fixes via subagents.
|
||||
Merge needs an in-conversation consent question.
|
||||
- Work in a worktree off origin/main (`git worktree add .worktrees/<name> -b <branch>
|
||||
origin/main`); never touch the main checkout (docs/59-ui-redesign-brief). Remove the
|
||||
now-merged .worktrees/issue-91-cutover worktree first (it sits on main after the doc
|
||||
commit). `cd web && npm ci` in fresh worktrees before web verification.
|
||||
- Max 2–3 concurrent builds; ONE dotnet build at a time. NEVER set ETV_UPDATE_GOLDENS.
|
||||
- Merge consent in-conversation per PR. Live-E2E new screens per the #93 recipe (curl
|
||||
`localhost`, NOT 127.0.0.1 — host guard; wait for "Done migrating search index").
|
||||
|
||||
## Task
|
||||
Issue #90: apply the ChicoryTV rebrand across the SPA surface. Naming (ErsatzTV → ChicoryTV
|
||||
in user-facing UI copy), favicon/app icon/wordmark from `design-system/assets/`
|
||||
(chicory-mark.svg, chicorytv-icon.svg, chicorytv-wordmark.svg), page title/meta.
|
||||
Acceptance: the SPA presents consistently as ChicoryTV. (Product-wide rebrand = epic #59.)
|
||||
|
||||
## Approach notes
|
||||
1. Inventory first (delegate to Explore): every user-facing "ErsatzTV" in web/ (index.html
|
||||
title/meta/favicon, shell header, empty states, aria-labels, App.test.tsx copy
|
||||
assertions), what web/index.html currently ships as favicon, how the shell renders the
|
||||
brand mark today (the admin template uses chicory-mark.svg + "Chicory<accent>TV</accent>"
|
||||
— mirror that), and whether vite needs assets in web/public/ vs imported.
|
||||
2. Do NOT rename API strings, C# namespaces, Docker images, or docs — SPA surface only.
|
||||
The legacy Blazor UI stays ErsatzTV.
|
||||
3. Favicon: derive from chicorytv-icon.svg (SVG favicon is fine for modern browsers; add a
|
||||
PNG fallback only if trivial).
|
||||
4. Tests: update copy assertions; baseline 145 web tests must stay green (some assert brand
|
||||
strings). dotnet suites should be untouched (frontend-only): ErsatzTV.Tests 495,
|
||||
Core.Tests 493 (+1 skip).
|
||||
5. PR → main: "feat(web): ChicoryTV rebrand (#90)", `closes #90`; poll CI by head SHA; ask
|
||||
"merge?"; verify main post-merge run.
|
||||
6. RELEASE CHECKPOINT: after #90 merges, the SPA is feature-complete-enough AND branded —
|
||||
this is the strongest v26.4.0 tag point before #91. Ask the user explicitly whether to
|
||||
tag v26.4.0 now (never `[skip ci]` the tagged commit).
|
||||
7. Update THIS handoff: pop #90, next = #91 cutover; record PR + main SHA + baselines.
|
||||
Commit to main. Print the next prompt in a fenced block.
|
||||
## Task (in order; each item is small — batch several into this session)
|
||||
1. RELEASE CHECK: if the user hasn't tagged yet, ask about tagging **v26.5.0** on main
|
||||
(root-route flip = the UI swap release; d04769cc or later). Verify prod/test containers
|
||||
on bumblebee after any tag (infra side = server-management).
|
||||
2. Dep-PR batch pass: open Renovate/dep PRs (#21, #48, #49, #61, #131 security, #132) —
|
||||
check freshness, rebase/retrigger, merge the green ones (consent per PR).
|
||||
3. MCP PR #76 (#58): rebase/refresh onto current main (post-cutover); it predates the full
|
||||
API surface.
|
||||
4. Then START PARITY (unblocks #91 phase b — work top-down by user value): #147 (SPA
|
||||
escape-hatch link — tiny web/ change, do first), #146 (channel edit dead-end — the
|
||||
Channels pencil sends `edit=` that ChannelBuilderScreen ignores), then #140 (collections
|
||||
screen — biggest gap, /app/collections is a placeholder).
|
||||
5. Update THIS handoff: record what merged (PRs + main SHA + baselines), pop done items,
|
||||
write the next prompt (likely: continue parity queue #140–#145). Commit to main. Print
|
||||
the next prompt in a fenced block.
|
||||
|
||||
---
|
||||
|
||||
## Issue queue (work top-down)
|
||||
0. HOUSEKEEPING: #99 stays open for the final /api/channels/state onAir wiring; #126 (OpenAPI
|
||||
polymorphism) + #135 (advanced clear-to-none) are backend slot-fillers between screens.
|
||||
Renovate/dep PRs (#21, #48, #49, #61, #131 security, #132) — cheap batch-merge pass when
|
||||
convenient (note: Scriban already bumped to 7.2.5 by PR #137). MCP PR #76 (#58) still
|
||||
needs its rebase/refresh pass — good parallel track.
|
||||
1. #90 rebrand ← PROMPT above (small, mechanical; strongest v26.4.0 tag point at its merge).
|
||||
2. #91 cutover (+ tag v26.4.0 at the latest here — see RELEASE CHECKPOINT).
|
||||
Cross-refs: #66/#67 remain open image-pipeline nice-to-haves; #68 unblocked-independent.
|
||||
Done recently: PR #136 (#89 Channel Builder), **PR #138 (#93 Settings — closed 2026-07-07,
|
||||
main 17f49304; web tests 112 → 145, ErsatzTV.Tests 447 → 495), PR #137 (Scriban GHSA
|
||||
CI-unblock), #92 design-sync round-trip closed (docs/design-sync.md)**.
|
||||
0. HOUSEKEEPING ← PROMPT above (v26.5.0 tag check; dep PRs #21/#48/#49/#61/#131/#132; MCP
|
||||
PR #76 refresh; #99 stays open for /api/channels/state onAir wiring; #126 + #135 remain
|
||||
backend slot-fillers).
|
||||
1. SPA parity for #91 phase (b) — order: #147 (escape hatch, tiny) → #146 (channel edit) →
|
||||
#140 (collections) → #144 (blocks/decos/templates + playout editors) → #143 (ffmpeg
|
||||
profiles/filler/watermarks) → #141 (media browse/search/trash) → #145 (logs/
|
||||
troubleshooting) → #142 (trakt). Each: SPA screen over existing/gap-filling API,
|
||||
then REMOVE the now-covered routes from Blazor-only status by ADDING them to
|
||||
`ErsatzTV/LegacyUiRedirects.cs` (the map = the single source of truth for migration).
|
||||
2. #91 phase (b): delete Blazor/MudBlazor once #140–#146 are covered (recon report is in
|
||||
the 2026-07-07 session; key facts: delete Startup.cs:368-381 service regs +
|
||||
MapBlazorHub/MapFallbackToPage only, KEEP MapControllers/MapOpenApi/MapScalarApiReference
|
||||
/OIDC//callback/AccountController/hosted services; drop MudBlazor+BlazorSortable+
|
||||
Blazored.FluentValidation+Heron.MudCalendar pkg refs, RequiresAspNetWebAssets, razor
|
||||
NoWarn block, Locals/ resx, wwwroot css/lib Blazor assets; update
|
||||
StartupSpaHostingTests + docs/contributing.md Blazor sections; goldens must NOT change).
|
||||
Closes #91; then flag next release tag.
|
||||
Cross-refs: #66/#67 image-pipeline nice-to-haves; #68 independent; #25 (razor Sonar
|
||||
burn-down) becomes MOOT at phase (b) — close it then.
|
||||
Done recently: **PR #148 (#91 phase a root flip — merged 2026-07-07, main d04769cc; #91
|
||||
stays open for phase b)**, PR #139 (#90 rebrand, TAGGED v26.4.0), PR #138 (#93 Settings),
|
||||
PR #137 (Scriban GHSA CI-unblock).
|
||||
|
||||
Reference in New Issue
Block a user