From af7c06576e06d45701cfca850abda691a7889542 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sun, 23 Aug 2026 21:16:43 +0000 Subject: [PATCH 01/17] feat(workspace): name tonight's first dynamics plan on the map The mounted rehearsal workspace names tonight's first dynamics plan so a part can lock the owned dynamics before rehearsal starts. Open moves to the matching rendered song-structure section. Do not invent that copy from groove, cue, simplification, overlap, range, chord labels, function labels, setup notes, transposition plans, confirmed overrides, harmonic explanations, or confidence notes. Distinct from first-setup-note, first-transposition-plan, and first-tuning-plan. Security Notes: - Attack surface: untrusted rehearsal-song runtime metadata (sections, roles, partGraph, identity accessors) plus DOM navigation against the mounted song-structure renderer. - Trust boundary: only own data properties on dense collections are read. Inherited/accessor/sparse/hostile getters fail closed to null and keep the callout guidance-only. - Navigation authority is the renderer-owned section index, not analysis ids. - Logging/privacy: no path, filename, or rejected-metadata echo. - Test points: inherited-metadata suite, particle-safe Korean copy, reduced-motion scroll, workspace-scope renderer selection, Workspace navigation. Shared-types 20/20 at 100%. Desktop targeted 68/68. --- AGENTS.md | 1 + ARCHITECTURE.md | 3 +- CHANGELOG.md | 1 + CLAUDE.md | 2 +- ...FirstDynamicsPlanCallout.particle.test.tsx | 52 ++++ ...ynamicsPlanCallout.reduced-motion.test.tsx | 43 +++ .../FirstDynamicsPlanCallout.test.tsx | 266 +++++++++++++++++ .../workspace/FirstDynamicsPlanCallout.tsx | 178 +++++++++++ ...namicsPlanCallout.workspace-scope.test.tsx | 54 ++++ .../src/features/workspace/Workspace.test.tsx | 30 ++ .../src/features/workspace/Workspace.tsx | 11 +- ...rstDynamicsPlan.inherited-metadata.test.ts | 94 ++++++ .../workspace/firstDynamicsPlan.test.ts | 277 ++++++++++++++++++ .../features/workspace/firstDynamicsPlan.ts | 274 +++++++++++++++++ apps/desktop/src/i18n/index.test.ts | 49 +++- apps/desktop/src/i18n/index.ts | 34 +++ apps/desktop/src/locales/en/common.json | 7 +- apps/desktop/src/locales/ko/common.json | 7 +- docs/design-system/component-contract.md | 1 + ...d-motion-first-dynamics-plan-navigation.md | 3 + packages/shared-types/src/index.ts | 6 + packages/shared-types/test/index.test.ts | 7 + 22 files changed, 1393 insertions(+), 7 deletions(-) create mode 100644 apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx create mode 100644 apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx create mode 100644 apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx create mode 100644 apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx create mode 100644 apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx create mode 100644 apps/desktop/src/features/workspace/firstDynamicsPlan.inherited-metadata.test.ts create mode 100644 apps/desktop/src/features/workspace/firstDynamicsPlan.test.ts create mode 100644 apps/desktop/src/features/workspace/firstDynamicsPlan.ts create mode 100644 docs/doctoring/reduced-motion-first-dynamics-plan-navigation.md diff --git a/AGENTS.md b/AGENTS.md index fca448ce9..e16db8ef2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -83,6 +83,7 @@ This section applies to any agent (Claude, Codex, Cursor, opencode, ...) working - Keep UI and analysis engine decoupled through shared contracts. - Prefer minimal, test-first changes for production code. - Prefer practical, friendly, rehearsal-first wording over academic or authority-heavy language. +- Name tonight's first dynamics plan with the owning part when an active role is corroborated, the owned `dynamicsPlan` copy, the labeled section, and the time so the next action is obvious. Do not invent that copy from groove, cue, simplification, overlap, range, chord labels, function labels, setup notes, transposition plans, confirmed overrides, harmonic explanations, or confidence notes. - Do not reduce the product to a chord analyzer when form, timing, player coordination, simplification, and setup cues are the real rehearsal blockers. - Do not frame usability as a reason to accept weak analysis quality; BandScope should aim for both easy use and high accuracy. diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 3302a6fc3..b08341a10 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -1,10 +1,11 @@ # ARCHITECTURE.md -Last updated: 2026-03-11 +Last updated: 2026-08-24 ## Brand source - Product identity, UX tone, copy rules, and prioritization tie-breakers live in `docs/brand-story.md`. +- The mounted workspace copy for tonight's first dynamics plan must name the owning part when corroborated, the owned `dynamicsPlan` text, the labeled section, and the time so the next action is obvious. Open moves to the matching rendered map section. Do not invent that copy from groove, cue, simplification, overlap, range, chord labels, function labels, setup notes, transposition plans, confirmed overrides, harmonic explanations, or confidence notes. Distinct from first-setup-note, first-transposition-plan, and first-tuning-plan. - Future PRDs, TRDs, onboarding copy, empty states, error messages, and marketing copy should use that document as the single brand source of truth. ## Security source diff --git a/CHANGELOG.md b/CHANGELOG.md index eea696893..51df7b664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Added +- Name tonight's first dynamics plan in the mounted rehearsal workspace so a part can lock the owned dynamics before rehearsal; the Open action moves to the matching rendered map section, while inherited or accessor-backed runtime metadata remains guidance-only instead of becoming navigation authority. - Display the analyzed song tempo (BPM) as a badge in the rehearsal workspace. - 각 합주 역할(Role)별 개인 연습 진행도를 0~100% 범위로 기록 및 시각화할 수 있는 연습 진척도(`practiceProgress`) 트래커 기능 추가. UI 컨트롤(슬라이더 및 +/- 버튼)과 한/영 다국어 지원 포함. diff --git a/CLAUDE.md b/CLAUDE.md index 82c2c704a..c46d0e9db 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -51,7 +51,7 @@ BandScope is a local-first desktop app for rehearsal prep: it turns a song into Three layers, decoupled through shared contracts: -- `apps/desktop` — Tauri 2 + Vite + React 19 shell (Tailwind 4, Base UI, Storybook). Feature screens live in `src/features/` (home, workspace, chords, ranges, player, settings). `src/lib/analysis.ts` and `src/lib/job_runner.ts` call typed Tauri IPC commands, with a browser fallback that serves demo data when not running inside Tauri. +- `apps/desktop` — Tauri 2 + Vite + React 19 shell (Tailwind 4, Base UI, Storybook). Feature screens live in `src/features/` (home, workspace, chords, ranges, player, settings). The mounted workspace names tonight's first dynamics plan and opens the matching rendered map section. Do not invent that copy from groove, cue, simplification, overlap, range, chord labels, function labels, setup notes, transposition plans, confirmed overrides, harmonic explanations, or confidence notes. Distinct from first-setup-note, first-transposition-plan, and first-tuning-plan. `src/lib/analysis.ts` and `src/lib/job_runner.ts` call typed Tauri IPC commands, with a browser fallback that serves demo data when not running inside Tauri. - `apps/desktop/src-tauri/src/main.rs` — the Rust orchestration boundary. Tauri commands (`start_analysis_job`, `get_analysis_job_status`, `select_local_audio_source`, `import_youtube_url`) validate untrusted input (project IDs, file paths, URLs) and spawn the Python engine as a subprocess. There is no loopback HTTP listener and no network path for local analysis. - `services/analysis-engine` — Python package `bandscope_analysis` (librosa/numpy). Entry point `cli.py` reads a JSON job request on stdin and prints a structured job-status JSON envelope on stdout (`--progress-jsonl` streams progress lines). `api.py` orchestrates the pipeline across the `separation`, `sections`, `roles`, `chords`, `ranges`, `temporal`, `transcription`, and `youtube` modules. diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx new file mode 100644 index 000000000..76c17f9dc --- /dev/null +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx @@ -0,0 +1,52 @@ +import { fireEvent, render, screen } from "@testing-library/react"; +import { createDemoRehearsalSong } from "@bandscope/shared-types"; +import { afterEach, describe, expect, it, vi } from "vitest"; +import { FirstDynamicsPlanCallout } from "./FirstDynamicsPlanCallout"; + +describe("FirstDynamicsPlanCallout Korean role copy", () => { + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it("keeps vowel-ending dynamic role names particle-safe before and after the dynamics action", () => { + vi.stubGlobal("navigator", { language: "ko-KR" }); + const song = createDemoRehearsalSong(); + const seed = song.sections[0]!; + seed.roles = [ + { + ...seed.roles[0]!, + id: "piano", + name: "피아노", + rehearsalPriority: "high", + dynamicsPlan: "Keep the verse under the vocal so the chorus still has somewhere to lift." + } + ]; + seed.partGraph = [{ role_id: "piano", is_active: true, handoff_to: [], handoff_from: [] }]; + + const grid = document.createElement("div"); + grid.dataset.testid = "song-structure-grid"; + grid.setAttribute("role", "region"); + grid.setAttribute("aria-label", "Scrollable song structure timeline"); + const target = document.createElement("div"); + target.dataset.sectionIndex = "0"; + Object.defineProperty(target, "scrollIntoView", { + configurable: true, + value: vi.fn() + }); + grid.appendChild(target); + document.body.appendChild(grid); + + render(); + + expect(screen.getByText("0:10 벌스에서 피아노 파트의 다이내믹 계획이 있습니다.")).toBeTruthy(); + expect(screen.queryByText(/피아노이/)).toBeNull(); + expect(screen.queryByText(/피아노가/)).toBeNull(); + + fireEvent.click(screen.getByRole("button", { name: "0:10 피아노 다이내믹 열기" })); + + expect(screen.getByText("0:10에서 피아노 파트의 다이내믹을 맞춘 다음 합주를 시작하세요.")).toBeTruthy(); + expect(screen.queryByText(/피아노과/)).toBeNull(); + + grid.remove(); + }); +}); diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx new file mode 100644 index 000000000..afc077662 --- /dev/null +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx @@ -0,0 +1,43 @@ +import { fireEvent, render, screen } from "@testing-library/react"; +import { createDemoRehearsalSong } from "@bandscope/shared-types"; +import { afterEach, describe, expect, it, vi } from "vitest"; +import { FirstDynamicsPlanCallout } from "./FirstDynamicsPlanCallout"; + +describe("FirstDynamicsPlanCallout reduced motion", () => { + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it("scrolls immediately when the operating system requests reduced motion", () => { + vi.stubGlobal("matchMedia", (query: string) => ({ + matches: query === "(prefers-reduced-motion: reduce)", + media: query, + onchange: null, + addListener: vi.fn(), + removeListener: vi.fn(), + addEventListener: vi.fn(), + removeEventListener: vi.fn(), + dispatchEvent: vi.fn() + })); + + const grid = document.createElement("div"); + grid.dataset.testid = "song-structure-grid"; + grid.setAttribute("role", "region"); + grid.setAttribute("aria-label", "Scrollable song structure timeline"); + const target = document.createElement("div"); + target.dataset.sectionIndex = "0"; + const scrollIntoView = vi.fn(); + Object.defineProperty(target, "scrollIntoView", { + configurable: true, + value: scrollIntoView + }); + grid.appendChild(target); + document.body.appendChild(grid); + + render(); + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "auto" }); + + grid.remove(); + }); +}); diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx new file mode 100644 index 000000000..2828edb9e --- /dev/null +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx @@ -0,0 +1,266 @@ +import { fireEvent, render, screen } from "@testing-library/react"; +import { createDemoRehearsalSong, type RehearsalSong } from "@bandscope/shared-types"; +import { afterEach, describe, expect, it, vi } from "vitest"; +import { FirstDynamicsPlanCallout } from "./FirstDynamicsPlanCallout"; + +const DEMO_DYNAMICS_PLAN = + "Keep the verse under the vocal so the chorus still has somewhere to lift."; + +function songWithDynamicsPlan() { + return createDemoRehearsalSong(); +} + +function appendSongStructureTarget(ariaLabel = "Scrollable song structure timeline") { + const timeline = document.createElement("div"); + timeline.setAttribute("role", "region"); + timeline.setAttribute("aria-label", ariaLabel); + const grid = document.createElement("div"); + grid.dataset.testid = "song-structure-grid"; + const target = document.createElement("div"); + target.dataset.sectionIndex = "0"; + const scrollIntoView = vi.fn(); + Object.defineProperty(target, "scrollIntoView", { + configurable: true, + value: scrollIntoView + }); + grid.appendChild(target); + timeline.appendChild(grid); + document.body.appendChild(timeline); + return { grid: timeline, scrollIntoView }; +} + +describe("FirstDynamicsPlanCallout", () => { + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it("contains a malformed runtime song root instead of crashing the callout", () => { + render(); + + expect( + screen.getByText( + "Nothing still has a dynamics plan. Stay on tonight's map until a part owns rehearsal-facing dynamics copy." + ) + ).toBeTruthy(); + }); + + it("contains a hostile song identity accessor instead of crashing the callout", () => { + const song = songWithDynamicsPlan(); + Object.defineProperty(song, "id", { + configurable: true, + enumerable: true, + get() { + throw new Error("hostile song id getter"); + } + }); + + expect(() => render()).not.toThrow(); + expect(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })).toBeTruthy(); + }); + + it("resets armed guidance when accessor-id songs change with the same dynamics signature", () => { + const firstSong = songWithDynamicsPlan(); + const nextSong = songWithDynamicsPlan(); + for (const song of [firstSong, nextSong]) { + Object.defineProperty(song, "id", { + configurable: true, + enumerable: true, + get() { + throw new Error("hostile song id getter"); + } + }); + } + const { grid } = appendSongStructureTarget(); + const { rerender } = render(); + + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + + rerender(); + + expect(screen.getByText("Bass Guitar still has a dynamics plan in the verse at 0:10.")).toBeTruthy(); + expect( + screen.queryByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeNull(); + + grid.remove(); + }); + + it("preserves armed guidance across immutable edits of the same owned song", () => { + const song = songWithDynamicsPlan(); + const { grid } = appendSongStructureTarget(); + const { rerender } = render(); + + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + + rerender(); + + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + expect(screen.queryByText("Bass Guitar still has a dynamics plan in the verse at 0:10.")).toBeNull(); + + grid.remove(); + }); + + it("does not show another part's dynamics plan under the named holding part", () => { + const song = songWithDynamicsPlan(); + song.sections[0]!.roles[0]!.dynamicsPlan = ""; + song.sections[0]!.roles[0]!.rehearsalPriority = "low"; + song.sections[0]!.roles[1]!.dynamicsPlan = + "Tune the patch a half step down so the chorus still sits under the vocal."; + song.sections[0]!.roles[2]!.dynamicsPlan = "Keep concert pitch even if the band drops the last chorus."; + + render(); + + expect( + screen.getByText("Keyboard 1 Right Hand still has a dynamics plan in the verse at 0:10.") + ).toBeTruthy(); + expect( + screen.getByText("Tune the patch a half step down so the chorus still sits under the vocal.") + ).toBeTruthy(); + expect(screen.queryByText("Keep concert pitch even if the band drops the last chorus.")).toBeNull(); + expect(screen.queryByText(DEMO_DYNAMICS_PLAN)).toBeNull(); + }); + + it("names the first dynamics plan as map navigation, scrolls to its rendered section, and arms that action", () => { + const { grid, scrollIntoView } = appendSongStructureTarget(); + + render(); + + expect(screen.getByText(DEMO_DYNAMICS_PLAN)).toBeTruthy(); + const action = screen.getByRole("button", { + name: "Open Bass Guitar dynamics at 0:10" + }); + expect(action).toBeTruthy(); + fireEvent.click(action); + expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "smooth" }); + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + + grid.remove(); + }); + + it("keeps map navigation stable when the renderer accessible name is localized", () => { + const { grid, scrollIntoView } = appendSongStructureTarget("스크롤 가능한 곡 구조 타임라인"); + + render(); + + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + + expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "smooth" }); + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + + grid.remove(); + }); + + it("does not claim map navigation completed when the rendered section target is missing", () => { + render(); + + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + + expect(screen.getByText("Bass Guitar still has a dynamics plan in the verse at 0:10.")).toBeTruthy(); + expect( + screen.queryByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeNull(); + }); + + it("navigates by renderer-owned section position instead of untrusted analysis ids", () => { + const song = songWithDynamicsPlan(); + song.sections[0]!.id = "analysis section / duplicate"; + const { grid, scrollIntoView } = appendSongStructureTarget(); + + render(); + + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "smooth" }); + + grid.remove(); + }); + + it("scopes map navigation to the song-structure renderer when another surface reuses an index", () => { + const decoy = document.createElement("div"); + decoy.dataset.sectionIndex = "0"; + const decoyScrollIntoView = vi.fn(); + Object.defineProperty(decoy, "scrollIntoView", { + configurable: true, + value: decoyScrollIntoView + }); + document.body.appendChild(decoy); + const { grid, scrollIntoView } = appendSongStructureTarget(); + + render(); + + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + + expect(decoyScrollIntoView).not.toHaveBeenCalled(); + expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "smooth" }); + + decoy.remove(); + grid.remove(); + }); + + it("shows fresh guidance when the first dynamics plan changes or returns later", () => { + const initialSong = songWithDynamicsPlan(); + const { grid } = appendSongStructureTarget(); + const { rerender } = render(); + fireEvent.click(screen.getByRole("button", { name: "Open Bass Guitar dynamics at 0:10" })); + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + + const nextSong = songWithDynamicsPlan(); + nextSong.id = "next-song"; + nextSong.sections[0]!.timeRange = { start: 20, end: 40 }; + rerender(); + expect(screen.getByText("Bass Guitar still has a dynamics plan in the verse at 0:20.")).toBeTruthy(); + + grid.remove(); + }); + + it("keeps an unavailable dynamics plan guidance-only", () => { + const song = songWithDynamicsPlan(); + for (const role of song.sections[0]!.roles) { + role.dynamicsPlan = ""; + } + render(); + expect(screen.queryByRole("button")).toBeNull(); + expect( + screen.getByRole("complementary", { name: "Tonight's first dynamics plan" }) + ).toBeTruthy(); + expect( + screen.getByText( + "Nothing still has a dynamics plan. Stay on tonight's map until a part owns rehearsal-facing dynamics copy." + ) + ).toBeTruthy(); + }); + + it("localizes the dynamics-plan form label instead of exposing its raw enum in Korean copy", () => { + vi.stubGlobal("navigator", { language: "ko-KR" }); + const song = songWithDynamicsPlan(); + song.sections[0]!.roles[0]!.name = "베이스"; + + render(); + + expect(screen.getByText("0:10 벌스에서 베이스 파트의 다이내믹 계획이 있습니다.")).toBeTruthy(); + expect(screen.queryByText(/verse에서/)).toBeNull(); + }); + + it("renders the owned dynamics plan as a text node instead of template syntax", () => { + const song = songWithDynamicsPlan(); + song.sections[0]!.roles[1]!.dynamicsPlan = ""; + song.sections[0]!.roles[2]!.dynamicsPlan = ""; + song.sections[0]!.roles[0]!.dynamicsPlan = "Check {role} at {at}"; + render(); + expect(screen.getByText("Check {role} at {at}")).toBeTruthy(); + expect(screen.queryByText("Check Bass Guitar at 0:10")).toBeNull(); + }); +}); diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx new file mode 100644 index 000000000..f6bae1c6c --- /dev/null +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx @@ -0,0 +1,178 @@ +import { useEffect, useState } from "react"; +import type { RehearsalSong } from "@bandscope/shared-types"; +import { Button } from "@/components/ui/button"; +import { + createTranslator, + detectPreferredLocale, + translateSectionFormLabel +} from "../../i18n"; +import { formatDynamicsPlanTime, resolveFirstDynamicsPlan } from "./firstDynamicsPlan"; + +/** Props for the first dynamics-plan rehearsal callout. */ +export interface FirstDynamicsPlanCalloutProps { + song: RehearsalSong; +} + +type DynamicsPlanCopyValues = Readonly>; + +type OpenedDynamicsPlan = Readonly<{ + songIdentity: unknown; + sectionId: string; + sectionIndex: number; + holdingRoleId: string; + dynamicsPlan: string; + atSeconds: number; +}>; + +/** Read a stable owned song id, falling back to object identity for untrusted identity metadata. */ +function stableDynamicsPlanSongIdentity(song: RehearsalSong): unknown { + if (song === null || typeof song !== "object" || Array.isArray(song)) { + return song; + } + let descriptor: PropertyDescriptor | undefined; + try { + descriptor = Object.getOwnPropertyDescriptor(song, "id"); + } catch { + return song; + } + return descriptor !== undefined && + Object.prototype.hasOwnProperty.call(descriptor, "value") && + typeof descriptor.value === "string" && + descriptor.value.trim().length > 0 + ? descriptor.value + : song; +} + +/** Interpolate dynamics-plan placeholders once so rehearsal data is never rescanned as template syntax. */ +function formatDynamicsPlanCopy(template: string, values: DynamicsPlanCopyValues): string { + return template.replace(/\{(role|section|at)\}/g, (placeholder) => { + const key = placeholder.slice(1, -1) as keyof DynamicsPlanCopyValues; + return values[key] ?? placeholder; + }); +} + +/** Use immediate scrolling when the operating system requests reduced motion. */ +function preferredDynamicsPlanScrollBehavior(): ScrollBehavior { + return typeof window.matchMedia === "function" && + window.matchMedia("(prefers-reduced-motion: reduce)").matches + ? "auto" + : "smooth"; +} + +/** Resolve the song-structure renderer owned by this workspace, failing closed on ambiguous mounts. */ +function resolveDynamicsPlanRenderer(origin: HTMLElement): HTMLElement | null { + const selector = '[data-testid="song-structure-grid"]'; + const localScope = origin.closest("aside")?.parentElement ?? null; + const localRenderers = localScope?.querySelectorAll(selector) ?? []; + if (localRenderers.length === 1) { + return localRenderers[0] ?? null; + } + if (localRenderers.length > 1) { + return null; + } + + const globalRenderers = document.querySelectorAll(selector); + return globalRenderers.length === 1 ? (globalRenderers[0] ?? null) : null; +} + +/** Name tonight's first dynamics plan and open the matching rendered map section. */ +export function FirstDynamicsPlanCallout({ song }: FirstDynamicsPlanCalloutProps) { + const locale = detectPreferredLocale(); + const t = createTranslator(locale); + const songIdentity = stableDynamicsPlanSongIdentity(song); + const runtimeSong = song as unknown as Partial | null; + const named = resolveFirstDynamicsPlan(song); + const namedSectionIndex = + named && Array.isArray(runtimeSong?.sections) + ? runtimeSong.sections.indexOf(named.section) + : -1; + const [openedDynamicsPlan, setOpenedDynamicsPlan] = useState(null); + + useEffect(() => { + setOpenedDynamicsPlan(null); + }, [ + songIdentity, + namedSectionIndex, + named?.section.id, + named?.holdingRole.id, + named?.dynamicsPlan, + named?.atSeconds + ]); + + if (!named) { + return ( + + ); + } + + const opened = + openedDynamicsPlan !== null && + openedDynamicsPlan.songIdentity === songIdentity && + openedDynamicsPlan.sectionId === named.section.id && + openedDynamicsPlan.sectionIndex === namedSectionIndex && + openedDynamicsPlan.holdingRoleId === named.holdingRole.id && + openedDynamicsPlan.dynamicsPlan === named.dynamicsPlan && + openedDynamicsPlan.atSeconds === named.atSeconds; + const at = formatDynamicsPlanTime(named.atSeconds); + const copyValues: DynamicsPlanCopyValues = { + role: named.holdingRole.name, + section: translateSectionFormLabel(locale, named.section.label), + at + }; + const actionLabel = formatDynamicsPlanCopy(t("firstDynamicsPlanOpenAction"), copyValues); + const body = formatDynamicsPlanCopy(t("firstDynamicsPlanBody"), copyValues); + const armed = formatDynamicsPlanCopy(t("firstDynamicsPlanArmed"), copyValues); + + return ( + + ); +} diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx new file mode 100644 index 000000000..7ebc08397 --- /dev/null +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx @@ -0,0 +1,54 @@ +import { fireEvent, render, screen } from "@testing-library/react"; +import { createDemoRehearsalSong } from "@bandscope/shared-types"; +import { describe, expect, it, vi } from "vitest"; +import { FirstDynamicsPlanCallout } from "./FirstDynamicsPlanCallout"; + +describe("FirstDynamicsPlanCallout workspace scope", () => { + it("opens the song-structure renderer owned by the current workspace", () => { + const firstSong = createDemoRehearsalSong(); + const secondSong = createDemoRehearsalSong(); + secondSong.id = "second-workspace-song"; + + const { container } = render( + <> +
+ +
+
+
+
+
+ +
+
+
+
+ + ); + + const targets = container.querySelectorAll('[data-section-index="0"]'); + expect(targets).toHaveLength(2); + const firstScrollIntoView = vi.fn(); + const secondScrollIntoView = vi.fn(); + Object.defineProperty(targets[0]!, "scrollIntoView", { + configurable: true, + value: firstScrollIntoView + }); + Object.defineProperty(targets[1]!, "scrollIntoView", { + configurable: true, + value: secondScrollIntoView + }); + + const actions = screen.getAllByRole("button", { + name: "Open Bass Guitar dynamics at 0:10" + }); + expect(actions).toHaveLength(2); + fireEvent.click(actions[1]!); + + expect(firstScrollIntoView).not.toHaveBeenCalled(); + expect(secondScrollIntoView).toHaveBeenCalledWith({ + block: "nearest", + behavior: "smooth" + }); + }); +}); diff --git a/apps/desktop/src/features/workspace/Workspace.test.tsx b/apps/desktop/src/features/workspace/Workspace.test.tsx index a3da5ffe6..ee824c5a1 100644 --- a/apps/desktop/src/features/workspace/Workspace.test.tsx +++ b/apps/desktop/src/features/workspace/Workspace.test.tsx @@ -270,4 +270,34 @@ describe("Workspace", () => { expect(screen.getByText("합주 우선순위")).toBeTruthy(); expect(screen.getByText("역할과 화성")).toBeTruthy(); }); + + it("names tonight's first dynamics plan as workspace navigation", () => { + setNavigatorLanguage("en-US"); + const song = createDemoRehearsalSong(); + + render(); + + const target = screen.getByTestId("song-structure-grid").children.item(0); + expect(target).toBeTruthy(); + const scrollIntoView = vi.fn(); + Object.defineProperty(target!, "scrollIntoView", { + configurable: true, + value: scrollIntoView + }); + + expect( + screen.getAllByText( + "Keep the verse under the vocal so the chorus still has somewhere to lift." + ).length + ).toBeGreaterThan(0); + const action = screen.getByRole("button", { + name: "Open Bass Guitar dynamics at 0:10" + }); + expect(action).toBeTruthy(); + fireEvent.click(action); + expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "smooth" }); + expect( + screen.getByText(/Lock that dynamics on Bass Guitar at 0:10 before the room starts./) + ).toBeTruthy(); + }); }); diff --git a/apps/desktop/src/features/workspace/Workspace.tsx b/apps/desktop/src/features/workspace/Workspace.tsx index 71546b524..b617c80ec 100644 --- a/apps/desktop/src/features/workspace/Workspace.tsx +++ b/apps/desktop/src/features/workspace/Workspace.tsx @@ -4,6 +4,7 @@ import { RoleSwitcher } from "./RoleSwitcher"; import { SectionRoadmap } from "./SectionRoadmap"; import { GrooveMap } from "./GrooveMap"; import { PracticeProgress } from "./PracticeProgress"; +import { FirstDynamicsPlanCallout } from "./FirstDynamicsPlanCallout"; import { createTranslator, detectPreferredLocale } from "../../i18n"; import { generateCueSheetCsv, generateChartSummaryJson, generateMetadataHandoffJson, sanitizeFilename } from "../../lib/export"; import { Button } from "@/components/ui/button"; @@ -90,8 +91,12 @@ const SongStructure = memo(function SongStructure({ sections, t }: { sections: R data-testid="song-structure-grid" style={{ gridTemplateColumns: `repeat(${Math.max(1, sections.length)}, minmax(8rem, 1fr))` }} > - {sections.map((section) => ( -
+ {sections.map((section, sectionIndex) => ( +

{section.label} · {formatTimelineTime(section.timeRange.start)}–{formatTimelineTime(section.timeRange.end)}

@@ -331,6 +336,8 @@ export function Workspace({ song, sourceBootstrap = null, onSongUpdate }: Worksp
+ +
diff --git a/apps/desktop/src/features/workspace/firstDynamicsPlan.inherited-metadata.test.ts b/apps/desktop/src/features/workspace/firstDynamicsPlan.inherited-metadata.test.ts new file mode 100644 index 000000000..7fde764be --- /dev/null +++ b/apps/desktop/src/features/workspace/firstDynamicsPlan.inherited-metadata.test.ts @@ -0,0 +1,94 @@ +import { createDemoRehearsalSong } from "@bandscope/shared-types"; +import { describe, expect, it } from "vitest"; +import { resolveFirstDynamicsPlan } from "./firstDynamicsPlan"; + +function songWithDynamicsPlan() { + const song = createDemoRehearsalSong(); + const section = structuredClone(song.sections[0]!); + section.id = "dynamics-own"; + section.roles = [ + { + ...section.roles[0]!, + id: "bass-guitar", + name: "Bass Guitar", + rehearsalPriority: "high", + dynamicsPlan: "Keep the verse under the vocal so the chorus still has somewhere to lift." + } + ]; + section.partGraph = [{ role_id: "bass-guitar", is_active: true, handoff_to: [], handoff_from: [] }]; + song.sections = [section]; + return { song, section }; +} + +describe("resolveFirstDynamicsPlan inherited metadata", () => { + it("rejects a song or section whose required metadata is inherited", () => { + const { song, section } = songWithDynamicsPlan(); + const inheritedSong = Object.create({ sections: song.sections }) as typeof song; + expect(resolveFirstDynamicsPlan(inheritedSong)).toBeNull(); + + const inheritedSection = Object.create(section) as typeof section; + song.sections = [inheritedSection]; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("rejects inherited timing fields", () => { + const { song, section } = songWithDynamicsPlan(); + section.timeRange = Object.create({ start: 10, end: 30 }) as typeof section.timeRange; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("contains exceptions from own runtime accessors instead of trusting them", () => { + const { song, section } = songWithDynamicsPlan(); + Object.defineProperty(section.roles[0]!, "dynamicsPlan", { + configurable: true, + enumerable: true, + get() { + throw new Error("hostile dynamicsPlan getter"); + } + }); + + expect(() => resolveFirstDynamicsPlan(song)).not.toThrow(); + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("does not treat own accessors as stable dynamics-plan identity authority", () => { + const { song, section } = songWithDynamicsPlan(); + Object.defineProperty(section, "id", { + configurable: true, + enumerable: true, + get() { + return "dynamics-own"; + } + }); + + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("does not let inherited dynamics plans establish the named copy", () => { + const { song, section } = songWithDynamicsPlan(); + const inheritedRole = Object.create({ + dynamicsPlan: "Inherited dynamics plan" + }) as (typeof section.roles)[0]; + Object.defineProperties(inheritedRole, { + id: { configurable: true, enumerable: true, value: "bass-guitar" }, + name: { configurable: true, enumerable: true, value: "Bass Guitar" }, + rehearsalPriority: { configurable: true, enumerable: true, value: "high" } + }); + section.roles = [inheritedRole]; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("does not let inherited role or graph metadata establish the holding part", () => { + const { song, section } = songWithDynamicsPlan(); + const node = section.partGraph[0]!; + section.partGraph = [Object.create(node) as typeof node]; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("rejects arrays masquerading as section records", () => { + const { song, section } = songWithDynamicsPlan(); + const arraySection = Object.assign([], section) as unknown as typeof section; + song.sections = [arraySection]; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); +}); diff --git a/apps/desktop/src/features/workspace/firstDynamicsPlan.test.ts b/apps/desktop/src/features/workspace/firstDynamicsPlan.test.ts new file mode 100644 index 000000000..9fec83469 --- /dev/null +++ b/apps/desktop/src/features/workspace/firstDynamicsPlan.test.ts @@ -0,0 +1,277 @@ +import { describe, expect, it } from "vitest"; +import { MAX_SECTION_TIME_SECONDS, createDemoRehearsalSong } from "@bandscope/shared-types"; +import { formatDynamicsPlanTime, resolveFirstDynamicsPlan } from "./firstDynamicsPlan"; + +const DEMO_DYNAMICS_PLAN = + "Keep the verse under the vocal so the chorus still has somewhere to lift."; + +function withDynamicsSection( + overrides: { + id?: string; + start?: number; + end?: number; + dynamicsPlan?: string; + label?: "intro" | "verse" | "pre-chorus" | "chorus" | "bridge" | "outro" | "tag" | "pickup" | "stop" | "handoff"; + roleId?: string; + roleName?: string; + priority?: "low" | "medium" | "high"; + isActive?: boolean; + functionLabel?: string; + } = {} +) { + const song = createDemoRehearsalSong(); + const verse = song.sections[0]!; + const section = structuredClone(verse); + section.id = overrides.id ?? "verse-dynamics"; + section.label = overrides.label ?? "verse"; + section.groove = "Straight eighths with a late snare feel"; + section.timeRange = { start: overrides.start ?? 10, end: overrides.end ?? 30 }; + const roleId = overrides.roleId ?? "lead-vocal"; + section.roles = [ + { + ...verse.roles[2]!, + id: roleId, + name: overrides.roleName ?? "Lead Vocal", + rehearsalPriority: overrides.priority ?? "medium", + cue: { kind: "lyric", value: "city lights" }, + range: { lowestNote: "G#3", highestNote: "C#5" }, + setupNote: "Watch the breath before the last line of the verse.", + simplification: "Keep the sustained note centered; skip the ad-lib on the first pass.", + overlapWarnings: ["Melodic overlap: competing with Keyboard 1 Right Hand."], + harmony: { + chord: "C#m7", + functionLabel: overrides.functionLabel ?? "vi melodic pull", + source: "model" + }, + harmonicExplanation: + "The melody leans on the ninth over vi, so the vocal line should feel like a lift rather than a strict chord-tone outline.", + confidence: { + level: "high", + source: "user", + notes: "Singer confirmed the pickup phrasing in rehearsal notes." + }, + dynamicsPlan: + overrides.dynamicsPlan ?? + "Keep the verse under the vocal so the chorus still has somewhere to lift.", + manualOverrides: [] + } + ]; + section.partGraph = [ + { + role_id: roleId, + is_active: overrides.isActive ?? true, + handoff_to: [], + handoff_from: [] + } + ]; + song.sections = [section]; + return song; +} + +describe("resolveFirstDynamicsPlan", () => { + it("picks the demo song's earliest high-priority dynamics plan and the part that owns it", () => { + const resolved = resolveFirstDynamicsPlan(createDemoRehearsalSong()); + expect(resolved?.section.id).toBe("verse-1"); + expect(resolved?.holdingRole.id).toBe("bass-guitar"); + expect(resolved?.dynamicsPlan).toBe(DEMO_DYNAMICS_PLAN); + expect(resolved?.atSeconds).toBe(10); + expect(formatDynamicsPlanTime(resolved?.atSeconds ?? -1)).toBe("0:10"); + expect(formatDynamicsPlanTime(Number.NaN)).toBe("0:00"); + expect(formatDynamicsPlanTime(-4)).toBe("0:00"); + }); + + it("does not invent a dynamics plan from groove, cue, simplification, overlap, range, chords, function labels, setup notes, transposition plans, confirmed overrides, harmonic explanations, or confidence notes", () => { + const song = withDynamicsSection(); + delete song.sections[0]!.roles[0]!.dynamicsPlan; + song.sections[0]!.groove = "Straight eighths with a late snare feel"; + song.sections[0]!.roles[0]!.simplification = "Keep the sustained note centered."; + song.sections[0]!.roles[0]!.setupNote = + "Keep the verse under the vocal so the chorus still has somewhere to lift."; + song.sections[0]!.roles[0]!.transpositionPlan = + "If the singer drops to B minor, keep the shape a whole step lower."; + (song.sections[0]!.roles[0] as { tuningPlan?: string }).tuningPlan = + "Tune the E string down to D so the verse riff sits on the open fifth."; + song.sections[0]!.roles[0]!.cue = { kind: "lyric", value: "city lights" }; + song.sections[0]!.roles[0]!.range = { lowestNote: "G#3", highestNote: "C#5" }; + song.sections[0]!.roles[0]!.overlapWarnings = ["Melodic overlap: competing with Keyboard 1 Right Hand."]; + song.sections[0]!.roles[0]!.harmony = { + chord: "C#m7", + functionLabel: "vi melodic pull", + source: "user" + }; + song.sections[0]!.roles[0]!.harmonicExplanation = "The ninth is the reason this lift works."; + song.sections[0]!.roles[0]!.manualOverrides = [ + { + field: "harmony", + value: { + chord: "C#m11", + functionLabel: "vi suspended lift", + source: "user" + }, + source: "user" + } + ]; + song.sections[0]!.roles[0]!.confidence = { + level: "high", + source: "user", + notes: "Keep the verse under the vocal so the chorus still has somewhere to lift." + }; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("skips a blank dynamics plan", () => { + expect(resolveFirstDynamicsPlan(withDynamicsSection({ dynamicsPlan: " " }))).toBeNull(); + }); + + it("skips a multi-line dynamics plan", () => { + expect( + resolveFirstDynamicsPlan(withDynamicsSection({ dynamicsPlan: "Drop under the vocal.\nKeep the pickup." })) + ).toBeNull(); + }); + + it("prefers the earlier of two dynamics plans", () => { + const song = withDynamicsSection({ + id: "verse-late", + start: 40, + end: 56, + roleId: "keys-right", + dynamicsPlan: "Late dynamics." + }); + const earlier = structuredClone(song.sections[0]!); + earlier.id = "verse-early"; + earlier.roles = [ + { + ...earlier.roles[0]!, + id: "lead-vocal", + name: "Lead Vocal", + rehearsalPriority: "low", + dynamicsPlan: "Earlier dynamics." + } + ]; + earlier.timeRange = { start: 8, end: 24 }; + earlier.partGraph = [{ role_id: "lead-vocal", is_active: true, handoff_to: [], handoff_from: [] }]; + song.sections = [song.sections[0]!, earlier]; + + const resolved = resolveFirstDynamicsPlan(song); + expect(resolved?.section.id).toBe("verse-early"); + expect(resolved?.holdingRole.id).toBe("lead-vocal"); + expect(resolved?.dynamicsPlan).toBe("Earlier dynamics."); + expect(resolved?.atSeconds).toBe(8); + }); + + it("breaks same-time dynamics-plan ties with locale-independent id ordering", () => { + const song = withDynamicsSection({ id: "ä-dynamics", start: 10, end: 26 }); + const ascii = structuredClone(song.sections[0]!); + ascii.id = "z-dynamics"; + song.sections = [song.sections[0]!, ascii]; + + expect(resolveFirstDynamicsPlan(song)?.section.id).toBe("z-dynamics"); + }); + + it("prefers a high-priority dynamics part over a low-priority part in the same section", () => { + const song = withDynamicsSection({ + roleId: "keys-right", + roleName: "Keys", + priority: "low", + dynamicsPlan: "Low-priority dynamics." + }); + const section = song.sections[0]!; + const highRole = { + ...section.roles[0]!, + id: "lead-vocal", + name: "Lead Vocal", + rehearsalPriority: "high" as const, + dynamicsPlan: "High-priority dynamics." + }; + section.roles = [section.roles[0]!, highRole]; + section.partGraph = [ + { role_id: "keys-right", is_active: true, handoff_to: [], handoff_from: [] }, + { role_id: "lead-vocal", is_active: true, handoff_to: [], handoff_from: [] } + ]; + + expect(resolveFirstDynamicsPlan(song)?.holdingRole.id).toBe("lead-vocal"); + expect(resolveFirstDynamicsPlan(song)?.dynamicsPlan).toBe("High-priority dynamics."); + }); + + it("breaks equal-priority role ties with locale-independent id ordering", () => { + const song = withDynamicsSection({ roleId: "ä-role", roleName: "Umlaut role", priority: "high" }); + const section = song.sections[0]!; + const asciiRole = { + ...section.roles[0]!, + id: "z-role", + name: "ASCII role", + dynamicsPlan: "ASCII dynamics." + }; + section.roles = [section.roles[0]!, asciiRole]; + section.partGraph = [ + { role_id: "ä-role", is_active: true, handoff_to: [], handoff_from: [] }, + { role_id: "z-role", is_active: true, handoff_to: [], handoff_from: [] } + ]; + + expect(resolveFirstDynamicsPlan(song)?.holdingRole.id).toBe("z-role"); + expect(resolveFirstDynamicsPlan(song)?.dynamicsPlan).toBe("ASCII dynamics."); + }); + + it("skips a dynamics plan whose graph node is inactive", () => { + expect(resolveFirstDynamicsPlan(withDynamicsSection({ isActive: false }))).toBeNull(); + }); + + it("skips a dynamics plan whose rehearsal window is unbounded", () => { + expect(resolveFirstDynamicsPlan(withDynamicsSection({ start: Number.NaN, end: 30 }))).toBeNull(); + }); + + it("skips a dynamics plan whose end precedes its start", () => { + expect(resolveFirstDynamicsPlan(withDynamicsSection({ start: 30, end: 10 }))).toBeNull(); + }); + + it("skips a zero-length dynamics-plan window", () => { + expect(resolveFirstDynamicsPlan(withDynamicsSection({ start: 10, end: 10 }))).toBeNull(); + }); + + it("skips a dynamics plan whose endpoint overflows the shared timing bound", () => { + expect( + resolveFirstDynamicsPlan( + withDynamicsSection({ + start: MAX_SECTION_TIME_SECONDS, + end: MAX_SECTION_TIME_SECONDS + 1 + }) + ) + ).toBeNull(); + }); + + it("returns null for a non-object song root", () => { + expect(resolveFirstDynamicsPlan(null as never)).toBeNull(); + }); + + it("returns null when the runtime section collection is sparse", () => { + const song = withDynamicsSection(); + const sparseSections: typeof song.sections = new Array(2); + sparseSections[1] = song.sections[0]!; + song.sections = sparseSections; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("keeps the dynamics plan unnamed when role identities are duplicated", () => { + const song = withDynamicsSection(); + const role = song.sections[0]!.roles[0]!; + song.sections[0]!.roles = [role, { ...role }]; + song.sections[0]!.partGraph = [ + { role_id: role.id, is_active: true, handoff_to: [], handoff_from: [] }, + { role_id: role.id, is_active: true, handoff_to: [], handoff_from: [] } + ]; + expect(resolveFirstDynamicsPlan(song)).toBeNull(); + }); + + it("bounds the dynamics plan to 180 Unicode code points", () => { + const song = withDynamicsSection({ dynamicsPlan: `${"G".repeat(200)}` }); + const resolved = resolveFirstDynamicsPlan(song); + expect(resolved?.dynamicsPlan.length).toBe(180); + }); + + it("does not split a Unicode surrogate pair at the dynamics-plan boundary", () => { + const song = withDynamicsSection({ dynamicsPlan: `${"a".repeat(179)}😀tail` }); + const resolved = resolveFirstDynamicsPlan(song); + expect(Array.from(resolved?.dynamicsPlan ?? "")).toHaveLength(180); + expect(resolved?.dynamicsPlan.endsWith("😀")).toBe(true); + }); +}); diff --git a/apps/desktop/src/features/workspace/firstDynamicsPlan.ts b/apps/desktop/src/features/workspace/firstDynamicsPlan.ts new file mode 100644 index 000000000..faed8d82c --- /dev/null +++ b/apps/desktop/src/features/workspace/firstDynamicsPlan.ts @@ -0,0 +1,274 @@ +import { + MAX_SECTION_TIME_SECONDS, + type RehearsalRole, + type RehearsalSection, + type RehearsalSong +} from "@bandscope/shared-types"; + +const PRIORITY_RANK = { high: 0, medium: 1, low: 2 } as const; +const MAX_DYNAMICS_PLAN_CHARACTERS = 180; + +/** Tonight's first dynamics plan: the earliest labeled section and the part that owns it. */ +export type FirstDynamicsPlan = { + section: RehearsalSection; + holdingRole: RehearsalRole; + dynamicsPlan: string; + atSeconds: number; +}; + +/** Format a non-negative dynamics-plan time as m:ss for rehearsal copy. */ +export function formatDynamicsPlanTime(totalSeconds: number): string { + const safeSeconds = Number.isFinite(totalSeconds) && totalSeconds >= 0 ? totalSeconds : 0; + const minutes = Math.floor(safeSeconds / 60); + const seconds = Math.floor(safeSeconds % 60) + .toString() + .padStart(2, "0"); + return `${minutes}:${seconds}`; +} + +/** Compare opaque ids by Unicode code units so tie-breaking never depends on host locale. */ +function compareStableId(left: string, right: string): number { + if (left < right) { + return -1; + } + if (left > right) { + return 1; + } + return 0; +} + +/** Return whether an untrusted runtime value can be inspected as a record. */ +function isRuntimeObject(value: unknown): value is object { + return value !== null && typeof value === "object" && !Array.isArray(value); +} + +/** Return whether a runtime record owns a stable data property rather than inherited/accessor state. */ +function hasOwnData(value: object, key: PropertyKey): boolean { + const descriptor = Object.getOwnPropertyDescriptor(value, key); + return descriptor !== undefined && Object.prototype.hasOwnProperty.call(descriptor, "value"); +} + +/** Return whether every numeric index is an own data element in a bounded runtime array. */ +function isDenseRuntimeArray(value: unknown): value is unknown[] { + if (!Array.isArray(value)) { + return false; + } + const length = Number(value.length); + if (!Number.isSafeInteger(length) || length < 0 || length > 0xffffffff) { + return false; + } + for (let index = 0; index < length; index += 1) { + if (!hasOwnData(value, index)) { + return false; + } + } + return true; +} + +/** Bound buyer-visible text by Unicode code points without splitting a surrogate pair. */ +function truncateCodePoints(value: string, maximum: number): string { + let codePoints = 0; + let endIndex = 0; + for (const character of value) { + if (codePoints >= maximum) { + break; + } + endIndex += character.length; + codePoints += 1; + } + return endIndex === value.length ? value : value.slice(0, endIndex); +} + +/** Return a bounded own dynamics plan, or null when it cannot be shown. */ +function ownedDynamicsPlan(role: unknown): string | null { + if (!isRuntimeObject(role) || !hasOwnData(role, "dynamicsPlan")) { + return null; + } + const dynamicsPlan = (role as { dynamicsPlan?: unknown }).dynamicsPlan; + if (typeof dynamicsPlan !== "string") { + return null; + } + const trimmed = dynamicsPlan.trim(); + if (trimmed.length === 0 || trimmed.includes("\n") || trimmed.includes("\r")) { + return null; + } + return truncateCodePoints(trimmed, MAX_DYNAMICS_PLAN_CHARACTERS); +} + +/** Return true when the role has safe owned identity/copy and ranked rehearsal priority. */ +function hasRankedPriority(role: RehearsalRole): boolean { + return ( + hasOwnData(role, "id") && + typeof role.id === "string" && + role.id.trim().length > 0 && + hasOwnData(role, "name") && + typeof role.name === "string" && + role.name.trim().length > 0 && + hasOwnData(role, "rehearsalPriority") && + Object.prototype.hasOwnProperty.call(PRIORITY_RANK, role.rehearsalPriority) + ); +} + +/** Return whether a section owns a bounded, positive-length integer rehearsal window. */ +function hasBoundedTimeRange(section: RehearsalSection): boolean { + if (!hasOwnData(section, "timeRange")) { + return false; + } + const timeRange = section.timeRange as Partial | null; + if (!isRuntimeObject(timeRange) || !hasOwnData(timeRange, "start") || !hasOwnData(timeRange, "end")) { + return false; + } + + const start = timeRange.start ?? -1; + const end = timeRange.end ?? -1; + return ( + Number.isInteger(start) && + start >= 0 && + start <= MAX_SECTION_TIME_SECONDS && + Number.isInteger(end) && + end > start && + end <= MAX_SECTION_TIME_SECONDS + ); +} + +/** Return safe identities that appear more than once in one section-local collection. */ +function repeatedIds(ids: string[]): Set { + const seen = new Set(); + const repeated = new Set(); + for (const id of ids) { + if (seen.has(id)) { + repeated.add(id); + } else { + seen.add(id); + } + } + return repeated; +} + +/** Prefer the earlier ranked role, then rehearsal priority, then a locale-independent id. */ +function pickHoldingRole(roles: RehearsalRole[]): RehearsalRole | null { + if (roles.length === 0) { + return null; + } + return ( + [...roles].sort((left, right) => { + const priorityDelta = PRIORITY_RANK[left.rehearsalPriority] - PRIORITY_RANK[right.rehearsalPriority]; + if (priorityDelta !== 0) { + return priorityDelta; + } + return compareStableId(left.id, right.id); + })[0] ?? null + ); +} + +/** Return ranked roles whose unique graph node is explicitly active. */ +function rankedActiveRoles(section: RehearsalSection): RehearsalRole[] { + if ( + !hasOwnData(section, "roles") || + !hasOwnData(section, "partGraph") || + !isDenseRuntimeArray(section.roles) || + !isDenseRuntimeArray(section.partGraph) + ) { + return []; + } + + const safeRoleIds = section.roles + .filter( + (role) => + isRuntimeObject(role) && + hasOwnData(role, "id") && + typeof role.id === "string" && + role.id.trim().length > 0 + ) + .map((role) => role.id); + const safeGraphRoleIds = section.partGraph + .filter( + (node) => + isRuntimeObject(node) && + hasOwnData(node, "role_id") && + typeof node.role_id === "string" && + node.role_id.trim().length > 0 + ) + .map((node) => node.role_id); + const repeatedRoleIds = repeatedIds(safeRoleIds); + const repeatedGraphRoleIds = repeatedIds(safeGraphRoleIds); + const activeIds = new Set( + section.partGraph + .filter( + (node) => + isRuntimeObject(node) && + hasOwnData(node, "is_active") && + node.is_active === true && + hasOwnData(node, "role_id") && + typeof node.role_id === "string" && + node.role_id.trim().length > 0 && + !repeatedGraphRoleIds.has(node.role_id) + ) + .map((node) => node.role_id) + ); + + return section.roles.filter( + (role) => + isRuntimeObject(role) && + hasRankedPriority(role) && + !repeatedRoleIds.has(role.id) && + activeIds.has(role.id) + ); +} + +/** Resolve a dynamics plan after the runtime root has passed its structural boundary checks. */ +function resolveSafeFirstDynamicsPlan(song: RehearsalSong): FirstDynamicsPlan | null { + if (!isRuntimeObject(song) || !hasOwnData(song, "sections") || !isDenseRuntimeArray(song.sections)) { + return null; + } + + const candidates = song.sections + .filter( + (section) => + isRuntimeObject(section) && + hasOwnData(section, "label") && + typeof section.label === "string" && + section.label.trim().length > 0 && + hasOwnData(section, "id") && + typeof section.id === "string" && + section.id.trim().length > 0 && + hasBoundedTimeRange(section) + ) + .flatMap((section) => { + const holdingRole = pickHoldingRole( + rankedActiveRoles(section).filter((role) => ownedDynamicsPlan(role) !== null) + ); + if (!holdingRole) { + return []; + } + const dynamicsPlan = ownedDynamicsPlan(holdingRole); + if (!dynamicsPlan) { + return []; + } + return [ + { + section, + holdingRole, + dynamicsPlan, + atSeconds: section.timeRange.start + } + ]; + }) + .sort((left, right) => { + if (left.atSeconds !== right.atSeconds) { + return left.atSeconds - right.atSeconds; + } + return compareStableId(left.section.id, right.section.id); + }); + + return candidates[0] ?? null; +} + +/** Return the first named dynamics plan, or null when untrusted runtime metadata cannot be read safely. */ +export function resolveFirstDynamicsPlan(song: RehearsalSong): FirstDynamicsPlan | null { + try { + return resolveSafeFirstDynamicsPlan(song); + } catch { + return null; + } +} diff --git a/apps/desktop/src/i18n/index.test.ts b/apps/desktop/src/i18n/index.test.ts index dc49a0a25..039a19fa7 100644 --- a/apps/desktop/src/i18n/index.test.ts +++ b/apps/desktop/src/i18n/index.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, afterEach } from "vitest"; -import { createTranslator, detectPreferredLocale } from "./index"; +import { createTranslator, detectPreferredLocale, translateSectionFormLabel } from "./index"; import koCommon from "../locales/ko/common.json"; describe("i18n", () => { @@ -75,4 +75,51 @@ describe("i18n", () => { } }); }); + + describe("translateSectionFormLabel", () => { + it("localizes every supported Korean section form label", () => { + expect( + [ + "intro", + "verse", + "pre-chorus", + "chorus", + "bridge", + "outro", + "tag", + "pickup", + "stop", + "handoff" + ].map((label) => translateSectionFormLabel("ko", label as never)) + ).toEqual([ + "인트로", + "벌스", + "프리코러스", + "코러스", + "브리지", + "아웃트로", + "태그", + "픽업", + "스톱", + "핸드오프" + ]); + }); + + it("preserves every supported English section form label", () => { + expect(translateSectionFormLabel("en", "verse")).toBe("verse"); + expect(translateSectionFormLabel("en", "outro")).toBe("outro"); + }); + + it("does not treat inherited object keys as localized section labels", () => { + const inheritedKey = "toString" as never; + expect(translateSectionFormLabel("ko", inheritedKey)).toBe("toString"); + }); + + it("keeps Korean first-dynamics-plan next-action copy particle-safe", () => { + const t = createTranslator("ko"); + expect(t("firstDynamicsPlanOpenAction")).toBe("{at} {role} 다이내믹 열기"); + expect(t("firstDynamicsPlanBody")).toBe("{at} {section}에서 {role} 파트의 다이내믹 계획이 있습니다."); + expect(t("firstDynamicsPlanArmed")).toBe("{at}에서 {role} 파트의 다이내믹을 맞춘 다음 합주를 시작하세요."); + }); + }); }); diff --git a/apps/desktop/src/i18n/index.ts b/apps/desktop/src/i18n/index.ts index 1a9f471f0..ff6e218d1 100644 --- a/apps/desktop/src/i18n/index.ts +++ b/apps/desktop/src/i18n/index.ts @@ -1,3 +1,4 @@ +import type { SectionFormLabel } from "@bandscope/shared-types"; import enCommon from "../locales/en/common.json"; import koCommon from "../locales/ko/common.json"; @@ -11,6 +12,33 @@ const dictionaries = { ko: koCommon } as const; +const sectionFormLabels: Readonly>>> = { + en: { + intro: "intro", + verse: "verse", + "pre-chorus": "pre-chorus", + chorus: "chorus", + bridge: "bridge", + outro: "outro", + tag: "tag", + pickup: "pickup", + stop: "stop", + handoff: "handoff" + }, + ko: { + intro: "인트로", + verse: "벌스", + "pre-chorus": "프리코러스", + chorus: "코러스", + bridge: "브리지", + outro: "아웃트로", + tag: "태그", + pickup: "픽업", + stop: "스톱", + handoff: "핸드오프" + } +}; + /** Documented. */ export function createTranslator(locale: Locale = "en") { return function t(key: TranslationKey): string { @@ -18,6 +46,12 @@ export function createTranslator(locale: Locale = "en") { }; } +/** Return the localized display label for a supported rehearsal section form. */ +export function translateSectionFormLabel(locale: Locale, label: SectionFormLabel): string { + const labels = sectionFormLabels[locale] as Readonly>; + return Object.prototype.hasOwnProperty.call(labels, label) ? labels[label] : String(label); +} + /** Documented. */ export function detectPreferredLocale(): Locale { if (typeof navigator !== "undefined" && navigator.language?.toLowerCase().startsWith("ko")) { diff --git a/apps/desktop/src/locales/en/common.json b/apps/desktop/src/locales/en/common.json index 39f716d50..991529564 100644 --- a/apps/desktop/src/locales/en/common.json +++ b/apps/desktop/src/locales/en/common.json @@ -148,5 +148,10 @@ "practiceProgressRegionLabel": "Practice Progress", "practiceProgressLabel": "Practice Progress", "decreasePracticeProgressLabel": "Decrease progress", - "increasePracticeProgressLabel": "Increase progress" + "increasePracticeProgressLabel": "Increase progress", + "firstDynamicsPlanLabel": "Tonight's first dynamics plan", + "firstDynamicsPlanOpenAction": "Open {role} dynamics at {at}", + "firstDynamicsPlanBody": "{role} still has a dynamics plan in the {section} at {at}.", + "firstDynamicsPlanArmed": "Lock that dynamics on {role} at {at} before the room starts.", + "firstDynamicsPlanUnavailable": "Nothing still has a dynamics plan. Stay on tonight's map until a part owns rehearsal-facing dynamics copy." } diff --git a/apps/desktop/src/locales/ko/common.json b/apps/desktop/src/locales/ko/common.json index 371884abb..194625aa0 100644 --- a/apps/desktop/src/locales/ko/common.json +++ b/apps/desktop/src/locales/ko/common.json @@ -148,5 +148,10 @@ "practiceProgressRegionLabel": "연습 진척도", "practiceProgressLabel": "연습 진척도", "decreasePracticeProgressLabel": "진척도 감소", - "increasePracticeProgressLabel": "진척도 증가" + "increasePracticeProgressLabel": "진척도 증가", + "firstDynamicsPlanLabel": "오늘 첫 다이내믹 계획", + "firstDynamicsPlanOpenAction": "{at} {role} 다이내믹 열기", + "firstDynamicsPlanBody": "{at} {section}에서 {role} 파트의 다이내믹 계획이 있습니다.", + "firstDynamicsPlanArmed": "{at}에서 {role} 파트의 다이내믹을 맞춘 다음 합주를 시작하세요.", + "firstDynamicsPlanUnavailable": "다이내믹을 맞춰야 하는 파트가 없습니다. 합주용 다이내믹 카피가 있는 파트가 생길 때까지 오늘 맵에 머무르세요." } diff --git a/docs/design-system/component-contract.md b/docs/design-system/component-contract.md index 22602c313..f82e29bc0 100644 --- a/docs/design-system/component-contract.md +++ b/docs/design-system/component-contract.md @@ -32,6 +32,7 @@ The authoritative Figma view is `31 Component Contract Catalog`. This file mirro | Section Roadmap Card | https://www.figma.com/design/zthWmqfNKUgJBECvv002Qk/Bandscope-Design-System-v1?node-id=19-402 | `apps/desktop/src/features/workspace/SectionRoadmap.tsx` | Use `song`, `activeRole`, and optional `onSongUpdate`; avoid rebuilding its internal card layout. | | Song Structure Timeline | https://www.figma.com/design/zthWmqfNKUgJBECvv002Qk/Bandscope-Design-System-v1?node-id=19-457 | `apps/desktop/src/features/workspace/Workspace.tsx` | Feature-local `SongStructure({ sections, t })` memo component; not exported. | | Groove Map | https://www.figma.com/design/zthWmqfNKUgJBECvv002Qk/Bandscope-Design-System-v1?node-id=19-526 | `apps/desktop/src/features/workspace/GrooveMap.tsx` | Use `notes?: TranscriptionNote[]` and `isLoading?: boolean`; preserve scrollable region semantics and note labels. | +| First Dynamics Plan Callout | workspace next-action pattern | `apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx` | Name the owning part when an active graph node corroborates it, the owned `dynamicsPlan` copy, the labeled section start, and the time. Do not invent that copy from `groove`, cue text, `simplification`, overlap warnings, range copy, `harmony.chord`, `harmony.functionLabel`, `setupNote`, `transpositionPlan`, confirmed overrides, `harmonicExplanation`, or confidence notes. Open scrolls the renderer-owned song-structure section. Keep the unavailable state guidance-only. Distinct from first-setup-note, first-transposition-plan, and first-tuning-plan. | | Source Control Stack | https://www.figma.com/design/zthWmqfNKUgJBECvv002Qk/Bandscope-Design-System-v1?node-id=19-655 | `apps/desktop/src/App.tsx` | Feature-local source controls for local audio, YouTube URL import, project actions, and Start Analysis; keep before metrics at 375px. | | Export Action Group | https://www.figma.com/design/zthWmqfNKUgJBECvv002Qk/Bandscope-Design-System-v1?node-id=19-731 | `apps/desktop/src/features/workspace/Workspace.tsx` | Feature-local export buttons call `handleExportCueSheet`, `handleExportChart`, and `handleExportHandoff`. | | Workspace State Matrix | https://www.figma.com/design/zthWmqfNKUgJBECvv002Qk/Bandscope-Design-System-v1?node-id=99-560 | `apps/desktop/src/features/workspace/WorkspaceStates.tsx`, `apps/desktop/src/App.tsx` | Whole-workspace empty, loading, error, and ready state routing; use before changing `renderWorkspaceState()`. | diff --git a/docs/doctoring/reduced-motion-first-dynamics-plan-navigation.md b/docs/doctoring/reduced-motion-first-dynamics-plan-navigation.md new file mode 100644 index 000000000..448086536 --- /dev/null +++ b/docs/doctoring/reduced-motion-first-dynamics-plan-navigation.md @@ -0,0 +1,3 @@ +# Reduced-motion first dynamics-plan navigation + +Open tonight's first dynamics plan with `behavior: "auto"` when `prefers-reduced-motion: reduce` matches. Do not keep a smooth scroll for that next action. diff --git a/packages/shared-types/src/index.ts b/packages/shared-types/src/index.ts index cba4606a2..1703da167 100644 --- a/packages/shared-types/src/index.ts +++ b/packages/shared-types/src/index.ts @@ -139,6 +139,7 @@ export type RehearsalRole = { simplification: string; setupNote: string; transpositionPlan?: string; + dynamicsPlan?: string; manualOverrides: ManualOverride[]; overlapWarnings: string[]; transcription?: TranscriptionNote[]; @@ -474,6 +475,7 @@ const demoRehearsalSongSeed: RehearsalSong = { simplification: "Stay on roots if the chorus entrance gets muddy.", setupNote: "Keep the attack short so the verse breathes.", transpositionPlan: "If the singer drops to B minor, keep the shape a whole step lower and let keys keep the color tones.", + dynamicsPlan: "Keep the verse under the vocal so the chorus still has somewhere to lift.", manualOverrides: [], overlapWarnings: [ "Density warning: competing with Keyboard Left Hand in low register." @@ -1497,6 +1499,7 @@ function validateRehearsalRole(value: unknown, path: string): string | null { "simplification", "setupNote", "transpositionPlan", + "dynamicsPlan", "manualOverrides", "overlapWarnings", "transcription", @@ -1552,6 +1555,9 @@ function validateRehearsalRole(value: unknown, path: string): string | null { if (value.transpositionPlan !== undefined && typeof value.transpositionPlan !== "string") { return invalidField(`${path}.transpositionPlan`); } + if (value.dynamicsPlan !== undefined && typeof value.dynamicsPlan !== "string") { + return invalidField(`${path}.dynamicsPlan`); + } if (!isDenseArray(value.manualOverrides)) { return invalidField(`${path}.manualOverrides`); } diff --git a/packages/shared-types/test/index.test.ts b/packages/shared-types/test/index.test.ts index 564ee1827..f8db3709c 100644 --- a/packages/shared-types/test/index.test.ts +++ b/packages/shared-types/test/index.test.ts @@ -738,6 +738,7 @@ describe("shared type helpers", () => { expect(song.sections[0]?.roles[2]?.harmony?.source).toBe("model"); expect(song.sections[0]?.roles[0]?.harmonicExplanation).toContain("tonal floor"); expect(song.sections[0]?.roles[0]?.transpositionPlan).toContain("whole step lower"); + expect(song.sections[0]?.roles[0]?.dynamicsPlan).toContain("chorus still has somewhere to lift"); expect(song.collaboration?.assignments).toHaveLength(2); expect(song.collaboration?.comments[0]?.status).toBe("open"); expect(song.sections[0]?.roles[2]?.manualOverrides?.[0]).toMatchObject({ @@ -1257,6 +1258,12 @@ describe("shared type helpers", () => { song.sections[0]!.roles[0]!.transpositionPlan = 2 as never; }) }, + { + message: "sections[0].roles[0].dynamicsPlan", + payload: createInvalidSong((song) => { + song.sections[0]!.roles[0]!.dynamicsPlan = 2 as never; + }) + }, { message: "sections[0].roles[0].practiceProgress", payload: createInvalidSong((song) => { From 5dbaf8fc639af3f95a38ef68be2e7ccf1d13ee59 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sun, 23 Aug 2026 14:25:48 -0700 Subject: [PATCH 02/17] test(workspace): require unique dynamics-plan callout ids --- ...FirstDynamicsPlanCallout.identity.test.tsx | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.identity.test.tsx diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.identity.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.identity.test.tsx new file mode 100644 index 000000000..94de52515 --- /dev/null +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.identity.test.tsx @@ -0,0 +1,21 @@ +import { render, screen } from "@testing-library/react"; +import { createDemoRehearsalSong } from "@bandscope/shared-types"; +import { expect, it } from "vitest"; +import { FirstDynamicsPlanCallout } from "./FirstDynamicsPlanCallout"; + +it("gives co-mounted dynamics-plan callouts distinct DOM identities", () => { + render( + <> + + + + ); + + const callouts = screen.getAllByRole("complementary", { + name: "Tonight's first dynamics plan" + }); + const ids = callouts.map((callout) => callout.id); + + expect(ids.every((id) => id.length > 0)).toBe(true); + expect(new Set(ids).size).toBe(callouts.length); +}); From 389d92982c21b67c5b0f6f0df78acc64dfb15006 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sun, 23 Aug 2026 14:26:13 -0700 Subject: [PATCH 03/17] fix(workspace): give dynamics callouts unique DOM ids --- .../src/features/workspace/FirstDynamicsPlanCallout.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx index f6bae1c6c..bbc71f87b 100644 --- a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useEffect, useId, useState } from "react"; import type { RehearsalSong } from "@bandscope/shared-types"; import { Button } from "@/components/ui/button"; import { @@ -77,6 +77,7 @@ function resolveDynamicsPlanRenderer(origin: HTMLElement): HTMLElement | null { /** Name tonight's first dynamics plan and open the matching rendered map section. */ export function FirstDynamicsPlanCallout({ song }: FirstDynamicsPlanCalloutProps) { + const calloutId = `workspace-surface-dynamics-plan-${useId()}`; const locale = detectPreferredLocale(); const t = createTranslator(locale); const songIdentity = stableDynamicsPlanSongIdentity(song); @@ -102,7 +103,7 @@ export function FirstDynamicsPlanCallout({ song }: FirstDynamicsPlanCalloutProps if (!named) { return ( ); -} \ No newline at end of file +} From 2df325e6dfc2da341be6032eef7a58ad59e854b2 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Mon, 24 Aug 2026 15:52:23 -0700 Subject: [PATCH 15/17] docs(changelog): record dynamics-plan authority snapshots --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51df7b664..9dc692c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Added -- Name tonight's first dynamics plan in the mounted rehearsal workspace so a part can lock the owned dynamics before rehearsal; the Open action moves to the matching rendered map section, while inherited or accessor-backed runtime metadata remains guidance-only instead of becoming navigation authority. +- Name tonight's first dynamics plan in the mounted rehearsal workspace so a part can lock the owned dynamics before rehearsal; the Open action moves to the matching rendered map section, while inherited, accessor-backed, or Proxy-substituted runtime metadata remains guidance-only instead of becoming copy, identity, timing, or navigation authority. - Display the analyzed song tempo (BPM) as a badge in the rehearsal workspace. - 각 합주 역할(Role)별 개인 연습 진행도를 0~100% 범위로 기록 및 시각화할 수 있는 연습 진척도(`practiceProgress`) 트래커 기능 추가. UI 컨트롤(슬라이더 및 +/- 버튼)과 한/영 다국어 지원 포함. @@ -50,8 +50,7 @@ - Issue #38: Added cross-architecture build support (Windows/macOS arm64+amd64) - Issue #40: Enforced 100% Python docstring and test coverage - Issue #32: Implemented local analysis orchestration and secure IPC boundaries -- Issue #33: Implemented secure local audio intake and project bootstrap -- Issue #35: Engineered section, form, and cue anchor extraction pipeline +- Issue #33: Engineered section, form, and cue anchor extraction pipeline - Issue #34: Implemented role extraction targets and part graph - Issue #31: Added role-specific harmony, range, overlap, and confidence metrics - Issue #28: Delivered practical rehearsal workspace UI From f29526511c810a2f1e45c49a90b5975ce1270889 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Mon, 24 Aug 2026 16:01:08 -0700 Subject: [PATCH 16/17] fix(changelog): restore 0.1.0 issue history --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dc692c05..e1b05fdf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,8 @@ - Issue #38: Added cross-architecture build support (Windows/macOS arm64+amd64) - Issue #40: Enforced 100% Python docstring and test coverage - Issue #32: Implemented local analysis orchestration and secure IPC boundaries -- Issue #33: Engineered section, form, and cue anchor extraction pipeline +- Issue #33: Implemented secure local audio intake and project bootstrap +- Issue #35: Engineered section, form, and cue anchor extraction pipeline - Issue #34: Implemented role extraction targets and part graph - Issue #31: Added role-specific harmony, range, overlap, and confidence metrics - Issue #28: Delivered practical rehearsal workspace UI From ecfed4fe0d6b324329e8220d7b13a0f16f6a4f53 Mon Sep 17 00:00:00 2001 From: seonghobae Date: Sat, 29 Aug 2026 02:54:54 +0900 Subject: [PATCH 17/17] fix(workspace): keep dynamics plan contract and navigation stable --- apps/desktop/core/src/lib.rs | 39 ++++++++++++++++++- ...FirstDynamicsPlanCallout.particle.test.tsx | 2 +- ...ynamicsPlanCallout.reduced-motion.test.tsx | 2 +- .../FirstDynamicsPlanCallout.test.tsx | 2 +- .../workspace/FirstDynamicsPlanCallout.tsx | 2 +- ...namicsPlanCallout.workspace-scope.test.tsx | 4 +- .../src/features/workspace/Workspace.tsx | 1 + 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/apps/desktop/core/src/lib.rs b/apps/desktop/core/src/lib.rs index 200726570..2acc750d1 100644 --- a/apps/desktop/core/src/lib.rs +++ b/apps/desktop/core/src/lib.rs @@ -189,6 +189,8 @@ pub struct RehearsalRolePayload { rehearsal_priority: String, simplification: String, setup_note: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + dynamics_plan: Option, manual_overrides: Vec, overlap_warnings: Vec, } @@ -529,7 +531,7 @@ pub fn is_youtube_video_id(value: &str) -> bool { pub fn project_payload_from_content(content: &str) -> Result { if let Ok(parsed) = serde_json::from_str::(content) { - return Ok(parsed); + return validate_dynamics_plan(parsed); } let payload = serde_json::from_str::(content) @@ -547,7 +549,24 @@ pub fn project_payload_from_content(content: &str) -> Result Result { + for section in &payload.sections { + for role in §ion.roles { + if role.dynamics_plan.as_ref().is_some_and(|dynamics_plan| { + dynamics_plan.trim().is_empty() + || dynamics_plan.contains('\n') + || dynamics_plan.contains('\r') + }) { + return Err("Invalid project file format".to_string()); + } + } + } + Ok(payload) } #[derive(Clone, Debug, Serialize)] @@ -752,6 +771,7 @@ mod tests { "rehearsalPriority": "high", "simplification": "Stay on roots if the chorus entrance gets muddy.", "setupNote": "Keep the attack short so the verse breathes.", + "dynamicsPlan": "Keep the verse under the vocal so the chorus still has somewhere to lift.", "manualOverrides": [], "overlapWarnings": [ "Density warning: competing with Keyboard Left Hand in low register." @@ -784,6 +804,10 @@ mod tests { .expect("shared rehearsal song contract should deserialize in Tauri"); assert_eq!(parsed.sections[0].id, "verse-1"); + assert_eq!( + parsed.sections[0].roles[0].dynamics_plan.as_deref(), + Some("Keep the verse under the vocal so the chorus still has somewhere to lift.") + ); } #[test] @@ -894,6 +918,17 @@ mod tests { assert_eq!(error, "Invalid project file format"); } + #[test] + fn project_payload_from_content_rejects_invalid_dynamics_plan() { + for dynamics_plan in ["", " ", "hold here\nthen lift", "hold here\rthen lift"] { + let mut payload = shared_contract_payload(json!({ "start": 10, "end": 30 })); + payload["sections"][0]["roles"][0]["dynamicsPlan"] = json!(dynamics_plan); + let content = serde_json::to_string(&payload).expect("payload should serialize"); + + assert!(project_payload_from_content(&content).is_err()); + } + } + #[test] fn youtube_url_validation_requires_exact_video_ids() { assert!(is_supported_youtube_url( diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx index 76c17f9dc..9837765d2 100644 --- a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.particle.test.tsx @@ -24,7 +24,7 @@ describe("FirstDynamicsPlanCallout Korean role copy", () => { seed.partGraph = [{ role_id: "piano", is_active: true, handoff_to: [], handoff_from: [] }]; const grid = document.createElement("div"); - grid.dataset.testid = "song-structure-grid"; + grid.id = "workspace-song-structure-grid"; grid.setAttribute("role", "region"); grid.setAttribute("aria-label", "Scrollable song structure timeline"); const target = document.createElement("div"); diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx index afc077662..53cf96754 100644 --- a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.reduced-motion.test.tsx @@ -21,7 +21,7 @@ describe("FirstDynamicsPlanCallout reduced motion", () => { })); const grid = document.createElement("div"); - grid.dataset.testid = "song-structure-grid"; + grid.id = "workspace-song-structure-grid"; grid.setAttribute("role", "region"); grid.setAttribute("aria-label", "Scrollable song structure timeline"); const target = document.createElement("div"); diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx index 2828edb9e..d92b68ccf 100644 --- a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.test.tsx @@ -15,7 +15,7 @@ function appendSongStructureTarget(ariaLabel = "Scrollable song structure timeli timeline.setAttribute("role", "region"); timeline.setAttribute("aria-label", ariaLabel); const grid = document.createElement("div"); - grid.dataset.testid = "song-structure-grid"; + grid.id = "workspace-song-structure-grid"; const target = document.createElement("div"); target.dataset.sectionIndex = "0"; const scrollIntoView = vi.fn(); diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx index 9908e7a68..f3b86f515 100644 --- a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.tsx @@ -61,7 +61,7 @@ function preferredDynamicsPlanScrollBehavior(): ScrollBehavior { /** Resolve the song-structure renderer owned by this workspace, failing closed on ambiguous mounts. */ function resolveDynamicsPlanRenderer(origin: HTMLElement): HTMLElement | null { - const selector = '[data-testid="song-structure-grid"]'; + const selector = "#workspace-song-structure-grid"; const localScope = origin.closest("aside")?.parentElement ?? null; const localRenderers = localScope?.querySelectorAll(selector) ?? []; if (localRenderers.length === 1) { diff --git a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx index 7ebc08397..cd356a666 100644 --- a/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx +++ b/apps/desktop/src/features/workspace/FirstDynamicsPlanCallout.workspace-scope.test.tsx @@ -13,13 +13,13 @@ describe("FirstDynamicsPlanCallout workspace scope", () => { <>
-
+
-
+
diff --git a/apps/desktop/src/features/workspace/Workspace.tsx b/apps/desktop/src/features/workspace/Workspace.tsx index ab9ac69e8..cd99288c1 100644 --- a/apps/desktop/src/features/workspace/Workspace.tsx +++ b/apps/desktop/src/features/workspace/Workspace.tsx @@ -89,6 +89,7 @@ const SongStructure = memo(function SongStructure({ sections, t }: { sections: R >