diff --git a/Assets/brb-backdrop.jpg b/Assets/brb-backdrop.jpg new file mode 100644 index 0000000..0026563 Binary files /dev/null and b/Assets/brb-backdrop.jpg differ diff --git a/HANDOFF.md b/HANDOFF.md index cb71b73..55799f8 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -1,21 +1,25 @@ # HANDOFF — Session State ## Branch -`main` — dirty (social slot lock removal + doc updates) +`main` — dirty (BRB backdrop + Polar org ID + doc updates, uncommitted) ## What shipped this session -- **Branding palette + assets recorded** — `ai.md` Brand section (references `MARCOM.md`), `MARCOM.md` gets the full hex palette and asset inventory -- **AI transparency statement** — `ai.md` Brand section documents AI-assisted pair-programming -- **Monetization model updated** — `ai.md` Monetization section rewritten: no feature lock, only watermark difference; all features free for everyone -- **TASKS.md updated** — TASK 10 re-scoped (Polar billing, watermark-only), tasks 15-18 added (stock bg images, infinity display fix, web source WebView2, local recording) -- **TASK 10c shipped** — social slot locks removed: `SocialsDialogViewModel` no longer takes `isPremium` parameter, slots 3-6 always available, tests updated -- **v1 feature completeness** — competitive gap analysis completed; 5 new tasks added (19-23) for table-stakes features: scene transitions, hotkeys, media source, audio sync offset, studio mode -- **MONETIZATION.md updated** — v1 feature completeness section added with competitive context -- **ai.md updated** — v1 task queue documented in Current limitations/TODOs section +- **BRB backdrop seeded on every load** — `Assets/brb-backdrop.jpg` (user-provided image, Gemini-generated), + added as `` in csproj; `SeedBrbBackdrop()` in MainViewModel mirrors the Starting pattern + (idempotent, skips if Background already exists). Runs on every startup outside the + `Scenes.Count == 0` guard. +- **UI rename: Screens → Layers → Properties** — 16 UI text changes across MainWindow.xaml + MainViewModel.cs + (section headers, tooltips, context menus, empty hints, onboarding text, fallback display name). + Code identifiers unchanged. +- **Polar org ID obtained** — `c05fb364-b967-4f6c-adf2-8a144e46d085` (Llama Chile Shop, slug: llamacasty). + Organization Access Token (OAT) stored in `Downloads/llamacasty-polar-code.txt`. + OATs are org-scoped — `organization_id` can be omitted from API calls. +- **CREDENTIALS.md updated** — Polar org ID + validate endpoint + key prefix (`LCYT-`) recorded. -## Polar.sh resources (from earlier session) +## Polar.sh resources | Resource | ID | |---|---| +| Org ID | `c05fb364-b967-4f6c-adf2-8a144e46d085` | | Product | `d105dfa1-497e-423b-8cd4-e0ee2e3abbc0` | | Price | `7c1b6f70-cf8c-46df-9bc8-6703f9fa64d0` | | Benefit | `80f66bc1-d5a3-44a1-b9ea-1709ae508535` | @@ -23,6 +27,8 @@ | LLAMAFOUNDER | `01a8c29f-9bb8-4e96-9cbe-417a6a5cec9b` | | LLAMA50 | `8cff803e-053f-49b4-8d12-d74d468f2943` | | Checkout URL | `https://buy.polar.sh/polar_cl_ueMy8AyAClO0o0yo19IroZwKTbD587gzUsjEW3bFapw` | +| Customer-portal validate | `POST https://api.polar.sh/v1/customer-portal/license-keys/validate` | +| Key prefix | `LCYT-` | ## Build ```bash @@ -31,18 +37,25 @@ taskkill.exe /F /IM ytLive.exe # if running "/mnt/c/Program Files/dotnet/dotnet.exe" vstest "C:\Users\gramp\Documents\Code\projects\ytLive\ytLive.Tests\bin\Debug\net8.0-windows10.0.19041.0\ytLive.Tests.dll" ``` +## Known issues +- `Mix_HonorsProviderGains_AndGameMute_KillsTheLoopback` integration test is flaky — hangs when + run via `vstest` (likely tries to acquire WASAPI devices in headless CI). Exclude with + `--TestCaseFilter:"FullyQualifiedName!~Mix_HonorsProviderGains"` if needed. +- Build often fails when ytLive.exe is running — `taskkill.exe /F /IM ytLive.exe` first. + ## Next steps -1. **Build + test** — verify social slot lock removal compiles and tests pass -2. **TASK 9 item 4** — live chat (poll + render + badges) — already coded, just needs wiring -3. **TASK 20** — hotkeys (global keyboard shortcuts) — small scope, huge UX impact -4. **TASK 19** — scene transitions (Cut/Fade/Move/Custom) — already scoped -5. **TASK 17** — web source WebView2 (enables alert ecosystem) -6. **TASK 18** — local recording (independent) -7. **TASK 21** — media source (video file playback) — pairs with TRAX for non-Live scenes -8. **TASK 22** — audio sync offset — small, quality-of-life -9. **TASK 23** — studio mode (lightweight preview) -10. **TASK 15** — wait for user to provide stock scene background images -11. **TASK 16** — kill infinity display (depends on TASK 15) +1. **TASK 10 + Velopack** — license validation + auto-updates (1 full session). Polar org ID + OAT + now available; all infra ready. Phases: LicenseService, license key UI, brand flash gating, + Velopack integration, tests. +2. **TASK 20** — hotkeys (global keyboard shortcuts) — small scope, huge UX impact +3. **TASK 19** — scene transitions (Cut/Fade/Move/Custom) — already scoped +4. **TASK 17** — web source WebView2 (enables alert ecosystem) +5. **TASK 18** — local recording (independent) +6. **TASK 21** — media source (video file playback) — pairs with TRAX for non-Live scenes +7. **TASK 22** — audio sync offset — small, quality-of-life +8. **TASK 23** — studio mode (lightweight preview) +9. **TASK 15** — stock bg images — Starting and BRB seeded; Live, Chat, Ending still waiting on user images +10. **TASK 16** — kill infinity display (depends on TASK 15 for Live/Chat/Ending images) ## v1 vision > A streaming tool that's intuitive and ready to go out-the-gate with nothing held back. @@ -52,3 +65,4 @@ taskkill.exe /F /IM ytLive.exe # if running - Polar checkout page ~80% configured — needs logo upload via dashboard - Logo upload API was broken (Polar server 500 on `/v1/files/{id}/uploaded`) — upload via dashboard instead - Full codebase rename (ytLlive → LlamaCasty) still pending +- BRB backdrop image is user-provided (Gemini-generated) — may need replacement with branded image diff --git a/TASKS.md b/TASKS.md index 4ec9a80..e2167c1 100644 --- a/TASKS.md +++ b/TASKS.md @@ -704,17 +704,20 @@ free — the only difference between free and paid is the watermark. **Polar product:** `d105dfa1-497e-423b-8cd4-e0ee2e3abbc0` (LlamaCasty, $99/yr, currently `private`) **Checkout:** `llamacasty.com` → Polar hosted page (~80% configured) **Discounts:** `LLAMAFOUNDER` (100% off, 50 uses, `once`), `LLAMA50` (50% off, 12 months, unlimited) +**Org ID:** `c05fb364-b967-4f6c-adf2-8a144e46d085` (org-scoped OAT — `organization_id` can be omitted from API calls) +**Key prefix:** `LCYT-` +**Validate endpoint:** `POST https://api.polar.sh/v1/customer-portal/license-keys/validate` (no auth required for client-side validation) -### Status: 🔶 Scoped — Polar infra live, in-app plumbing not built +### Status: 🔶 Ready to execute — Polar infra live, org ID obtained, in-app plumbing not built 1. ✅ **Billing provider** — Polar (polar.sh) chosen and configured. Product, price, license key benefit, discounts, checkout link all created. 2. ☐ **License key entry + verification UI** — About overlay or dedicated dialog; key entry field + validate against Polar API 3. ☐ **Offline entitlement** — cached license state in `LayoutStore` (schema bump); online check at startup, offline grace period 4. ☐ **BrandFlash → watermark toggle** — `BrandFlashEnabled = false` when licensed; the flash asset image needs to be created (the XAML `TextBlock` is preview-only, the compositor needs a `VideoFrame`) -5. ☐ **Remove social slot locks** — all 6 social bar slots open to everyone (no `IsPremium` gating on slots 3-6) +5. ✅ **Remove social slot locks** — all 6 social bar slots open to everyone (no `IsPremium` gating on slots 3-6) — shipped as TASK 10c 6. ☐ **"Unlock Premium" button** — `PremiumUrl` set to `llamacasty.com` checkout; `IsPremiumAvailable` becomes true 7. ☐ **Renewal/lapse handling** — key expiry check, grace period, re-prompt -8. ☐ **In-app bug-report → git issues** — built-in report control; good error codes first, optional log attachment +8. ☐ **Velopack auto-updates** — NuGet packages + UpdateManager shim + GitHub Releases (`gramps/ytLlive`) --- @@ -845,12 +848,14 @@ No changes to `MusicPlayer`, the 0.20 cap, the ducker, or the meter zones. Build **Goal:** branded background images for each canonical scene (Starting, Live, BRB, Chat, Ending) that both provide working hints to creators and self-promote LlamaCasty. -### Status: ☐ Waiting on user to provide images +### Status: 🔶 2/5 seeded — Starting and BRB done; Live, Chat, Ending waiting on user images -1. ☐ User provides 5 background images (one per canonical scene), PNG format, 1920×1080 -2. ☐ Wire images as default `Background` sources, auto-populated on DB seed (empty DB → each scene gets its branded bg) -3. ☐ Assets stored in DB via `Asset` table (BLOB, SHA-256 keyed) — survives file deletion -4. ☐ Used by TASK 16 (infinity display fix) as the static fallback when no game is detected +1. ✅ **Starting backdrop** — `Assets/starting-backdrop.jpg` (embedded resource), `SeedStartingBackdrop()` in MainViewModel, idempotent +2. ✅ **BRB backdrop** — `Assets/brb-backdrop.jpg` (user-provided Gemini image), `SeedBrbBackdrop()` in MainViewModel, idempotent +3. ☐ User provides 3 more background images (Live, Chat, Ending), PNG/JPG format, 1920×1080 +4. ☐ Wire images as default `Background` sources, auto-populated on DB seed +5. ☐ Assets stored in DB via `Asset` table (BLOB, SHA-256 keyed) — survives file deletion +6. ☐ Used by TASK 16 (infinity display fix) as the static fallback when no game is detected ### Design decisions @@ -939,18 +944,18 @@ capturing the primary display (which causes the infinity mirror effect). The tasks below are ordered by dependency and risk. Each task builds on the previous. -1. **TASK 9.4** — Live chat (right panel) — wire `YouTubeChatService.Start()`, parse messages, render in panel. Foundation for chat box source. -2. **TASK 20** — Hotkeys — global keyboard shortcuts. Small scope, huge UX impact. -3. **TASK 19** — Scene transitions — Cut/Fade/Move/Custom. Depends on compositor. -4. **TASK 17** — Web source (WebView2) — enables alert ecosystem. -5. **TASK 18** — Local recording — independent, but pairs with stream. -6. **TASK 21** — Media source — video file playback for non-Live scenes. -7. **TASK 22** — Audio sync offset — small, quality-of-life. -8. **TASK 23** — Studio mode — lightweight preview before live. -9. ✅ **TASK 3.18** — Chat box source — renders chat ON the stream. Depends on TASK 9.4 (same message parsing). -10. **TASK 15** — Stock bg images — waiting on user. -11. **TASK 16** — Infinity display fix — depends on TASK 15. -12. **TASK 10** — Polar billing — in-app license key entry + watermark toggle. +1. ✅ **TASK 9.4** — Live chat (right panel) — wire `YouTubeChatService.Start()`, parse messages, render in panel. Foundation for chat box source. +2. ✅ **TASK 3.18** — Chat box source — renders chat ON the stream. Depends on TASK 9.4 (same message parsing). +3. **TASK 10** — Polar billing — in-app license key entry + watermark toggle + Velopack auto-updates. +4. **TASK 20** — Hotkeys — global keyboard shortcuts. Small scope, huge UX impact. +5. **TASK 19** — Scene transitions — Cut/Fade/Move/Custom. Depends on compositor. +6. **TASK 17** — Web source (WebView2) — enables alert ecosystem. +7. **TASK 18** — Local recording — independent, but pairs with stream. +8. **TASK 21** — Media source — video file playback for non-Live scenes. +9. **TASK 22** — Audio sync offset — small, quality-of-life. +10. **TASK 23** — Studio mode — lightweight preview before live. +11. **TASK 15** — Stock bg images — Starting and BRB seeded; Live, Chat, Ending still waiting on user. +12. **TASK 16** — Infinity display fix — depends on TASK 15. 13. **TASK 13** — Social media launch kit — after all v1 features ship. --- diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs index 122626e..0bd7af9 100644 --- a/ViewModels/MainViewModel.cs +++ b/ViewModels/MainViewModel.cs @@ -1356,6 +1356,7 @@ public class MainViewModel : ViewModelBase AddScene(name); } SeedStartingBackdrop(); + SeedBrbBackdrop(); // The live backdrop belongs to Live only; a pre-policy DB may have // backdrops lingering in other scenes — drop them, then @@ -1764,6 +1765,34 @@ public class MainViewModel : ViewModelBase catch { /* non-critical — stream works fine without a default bg */ } } + private void SeedBrbBackdrop() + { + try + { + var brb = Scenes.FirstOrDefault(s => SceneCatalog.Is(s.Name, "BRB")); + if (brb == null) return; + if (brb.Elements.OfType().Any(s => s.Type == SourceType.Background)) return; + + var uri = new Uri("pack://application:,,,/Assets/brb-backdrop.jpg", UriKind.Absolute); + using var stream = Application.GetResourceStream(uri)?.Stream; + if (stream == null) return; + using var ms = new MemoryStream(); + stream.CopyTo(ms); + var bytes = ms.ToArray(); + var assetId = AddAsset(bytes); + if (assetId == null) return; + brb.Elements.Add(new Source + { + Name = "Background", + Type = SourceType.Background, + AssetId = assetId, + Width = 1920, + Height = 1080, + }); + } + catch { /* non-critical — stream works fine without a default bg */ } + } + private void BeginEditElement(SceneElement? element) { if (element == null) return; diff --git a/ai.md b/ai.md index 79c64ec..ee693d2 100644 --- a/ai.md +++ b/ai.md @@ -132,7 +132,8 @@ C# / WPF (.NET 8) following MVVM: - `YouTubeStreamService` manages the **variable reusable stream** (shipped 2026-08-16): `GetOrCreateReusableStreamAsync` lists `liveStreams?mine=true` and reuses the existing `cdn.isReusable` stream, creating it only on first use (`resolution=variable`, `frameRate=variable`); the stream is cached via `LayoutStore` (`SaveReusableStream`/`LoadReusableStream`, Settings table) and bound at broadcast insert (`boundStreamId`). Health (shipped 2026-08-16): `GetStreamHealthAsync(streamId)` polls `liveStreams?part=status` for `healthStatus` + `configurationIssues[]` → `StreamHealth`; banner decision in pure `StreamHealthReporter` - Webcam capture is shipped (milestone 1); the live desktop/game backdrop is shipped (ship task #1); **the output compositor (TASK 4 ship step 1) is SHIPPED**, **the FFmpeg locator (TASK 4 ship step 2) is SHIPPED**, **the encoder + RTMP push (TASK 4 ship step 3) is SHIPPED**, **WASAPI audio capture (TASK 4 ship step 4) is SHIPPED** — full plan in `TASKS.md`; the frame-pipeline wiring follows (its own PR) - `StreamConfig` defaults (`TargetBitrate=6000`, `Resolution="1920x1080"`) are stale — the live dropdown drives `StreamHealth.CurrentBitrate`/`FPS` instead -- **v1 task queue (2026-08-19):** 5 new tasks added for v1 feature completeness: +- **v1 task queue (2026-08-19):** tasks 19-23 added for v1 feature completeness; TASK 3.18 (chat box) shipped; TASK 10 (Polar billing) ready to execute (org ID obtained): + - TASK 10: Polar billing — license key entry, offline entitlement, brand flash gating, Velopack auto-updates - TASK 19: Scene transitions (Cut/Fade/Move/Custom) — required for professional polish - TASK 20: Hotkeys (global keyboard shortcuts) — the single biggest UX gap - TASK 21: Media source (video file playback) — starting soon videos, BRB loops @@ -637,7 +638,8 @@ crooked. - **Billing:** **Polar (polar.sh)** — open-source MoR (Apache 2.0), handles payments, subscriptions, license keys, and global tax compliance. Startup Program gives Scale plan free for 12 months. Product: `d105dfa1-497e-423b-8cd4-e0ee2e3abbc0`. Checkout: `llamacasty.com` → Polar hosted page. - Discounts: `LLAMAFOUNDER` (100% off, 50 uses), `LLAMA50` (50% off, 12 months). Details in `MONETIZATION.md`. + Org ID: `c05fb364-b967-4f6c-adf2-8a144e46d085` (org-scoped OAT — `organization_id` omitted from API calls). + Key prefix: `LCYT-`. Discounts: `LLAMAFOUNDER` (100% off, 50 uses), `LLAMA50` (50% off, 12 months). Details in `MONETIZATION.md`. - **Support (creator's model):** in-app bug-reporting mechanism → issues into git; most queries are how-tos / feature requests / manual-skimmers. Maintenance cadence = "when I get around to it" with emergency patches; not a 24/7 service promise. diff --git a/ytLive.csproj b/ytLive.csproj index 5d10a34..890047a 100644 --- a/ytLive.csproj +++ b/ytLive.csproj @@ -23,6 +23,7 @@ +