@audiofool/moondog 0.2.0-beta.6 → 0.2.0

package/src/surfaces/cli/first-run-view.mjs

@@ -0,0 +1,138 @@
+import { getKeybindings, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+
+import { sanitizeTerminalText } from "./format-output.mjs";
+import { screenTranslator } from "../../i18n/index.mjs";
+
+// NetEase plays through its own command line tool and mpv, set up from a terminal as the window shows it.
+export const NETEASE_SETUP = "npm install -g @music163/ncm-cli && brew install mpv && ncm-cli login";
+
+/** The command that makes NetEase ready, from ncm-cli's state: missing installs it, signed out signs in. */
+export function neteaseSetupCommand(state) {
+  return state === "signed_out" ? "ncm-cli login" : NETEASE_SETUP;
+}
+
+export function playbackServiceName(service, tr) {
+  return service === "netease" ? tr("NetEase Music") : service === "apple_music" ? "Apple Music" : "Spotify";
+}
+
+/**
+ * The music services the first run and /service offer, as the window does: Spotify and Apple Music,
+ * and NetEase once ncm-cli is installed, signed in or not. Choosing NetEase before it is signed in
+ * shows how to set it up.
+ */
+export function playbackServiceChoices(tr, { netease = "unavailable", current = null } = {}) {
+  const neteaseOffered = ["ready", "signed_out", "missing"].includes(netease) || current === "netease";
+  return [
+    { value: "spotify", label: "Spotify", description: tr("Whole songs on your Spotify devices") },
+    { value: "apple_music", label: "Apple Music", description: tr("30-second previews, played here") },
+    ...(neteaseOffered ? [{
+      value: "netease", label: tr("NetEase Music"),
+      description: netease === "ready" ? tr("Whole songs through ncm-cli") : tr("Set up ncm-cli first"),
+    }] : []),
+  ];
+}
+
+function clean(value) {
+  return sanitizeTerminalText(String(value ?? "")).replace(/\s+/gu, " ").trim();
+}
+
+function paint(value, width, theme) {
+  const clipped = truncateToWidth(value, width, "");
+  const line = clipped + " ".repeat(Math.max(0, width - visibleWidth(clipped)));
+  return theme.plain ? line.replace(/\u001b\[[\d;:]*m/g, "") : theme.background(theme.text(line));
+}
+
+/**
+ * The one-time first run: where music plays, then the model. It draws the step it is given and
+ * reports the listener's choice; the room saves it and runs Pi's own model picker and sign-in.
+ */
+export class FirstRunView {
+  constructor({ getTheme, getRows, onAction, getText = () => screenTranslator("en") }) {
+    this.getTheme = getTheme;
+    this.getRows = getRows;
+    this.getText = getText;
+    this.onAction = onAction;
+    this.state = { step: "service", steps: 2, services: [], model: {} };
+    this.selected = 0;
+    this.focused = false;
+  }
+
+  invalidate() {}
+
+  setState(state) {
+    if (state.step !== this.state.step) this.selected = 0;
+    this.state = { ...this.state, ...state };
+  }
+
+  actions() {
+    const tr = this.getText();
+    if (this.state.step === "service") return this.state.services.map((choice) => ({ type: "service", ...choice }));
+    const { provider, signIn } = this.state.model ?? {};
+    return signIn ? [
+      { type: "auth", label: tr("Sign in to {provider}", { provider }), description: provider === "openai" ? tr("ChatGPT sign-in or API key") : tr("API key") },
+      { type: "model", label: tr("Choose another model") },
+    ] : [{ type: "model", label: tr("Choose a model"), description: tr("Pick a provider and model, then sign in") }];
+  }
+
+  handleInput(data) {
+    const keys = getKeybindings();
+    const actions = this.actions();
+    if (keys.matches(data, "tui.select.cancel")) {
+      this.onAction?.({ type: "skip" });
+    } else if (keys.matches(data, "tui.select.up") || keys.matches(data, "tui.select.down")) {
+      if (actions.length) this.selected = (this.selected + (keys.matches(data, "tui.select.up") ? -1 : 1) + actions.length) % actions.length;
+    } else if (keys.matches(data, "tui.select.confirm") && actions.length) {
+      const { type, value } = actions[Math.min(this.selected, actions.length - 1)];
+      this.onAction?.({ type, value });
+    }
+  }
+
+  render(width) {
+    const columns = Math.max(1, Math.floor(width));
+    const rows = Number(this.getRows());
+    const height = Number.isFinite(rows) ? Math.max(0, Math.floor(rows)) : 0;
+    if (!height) return [];
+    const theme = this.getTheme();
+    const tr = this.getText();
+    const inset = columns >= 8 ? 1 : 0;
+    const inner = Math.max(1, columns - inset * 2);
+    const wrap = (text, ink) => wrapTextWithAnsi(clean(text), inner).map(ink);
+    const { step, steps, note, setup, model = {} } = this.state;
+    const intro = steps > 1 ? tr("Two things before we start: where I play your music, and the model I talk through.")
+      : step === "service" ? tr("One thing before we start: where I play your music.") : tr("One thing before we start: the model I talk through.");
+    const question = step === "service" ? tr("Where should I play music?") : tr("Which model should I talk through?");
+    const help = step === "service" ? tr("/service changes it any time.")
+      : model.signIn ? tr("{model} is saved, but you're not signed in to {provider} yet.", { model: `${model.provider}/${model.model}`, provider: model.provider })
+        : tr("Sign in with ChatGPT, or use an API key from another provider. Your profile works without one.");
+    const notice = [
+      ...(note?.text ? wrap(note.text, note.tone === "error" ? theme.error : theme.accent) : []),
+      ...(setup ? [...wrap(tr("NetEase plays through its own command line tool. Run this in another terminal, then choose it again:"), theme.muted),
+        ...wrap(setup, theme.text)] : []),
+    ];
+    const actions = this.actions();
+    this.selected = Math.min(this.selected, Math.max(0, actions.length - 1));
+    const labelWidth = Math.max(0, ...actions.map(({ label }) => visibleWidth(clean(label)))) + 4;
+    const items = actions.map(({ label, description }, index) => {
+      const selected = index === this.selected;
+      const name = (selected ? "◉ " : "  ") + clean(label);
+      const room = inner - labelWidth;
+      const line = description && room >= 12
+        ? name + " ".repeat(Math.max(1, labelWidth - visibleWidth(name))) + theme.muted(truncateToWidth(clean(description), room, "…"))
+        : name;
+      return selected ? theme.selected(truncateToWidth(name, inner, "")) + line.slice(name.length) : theme.text(line);
+    });
+    // The choices always show. On a short screen the blank rows go first, then the introduction,
+    // then the line under the question; what happened last stays longest.
+    const title = theme.bold(tr("Welcome to the machine."));
+    const parts = (gaps, introduced, helped) => [
+      title, ...(introduced ? wrap(intro, theme.muted) : []), ...(gaps ? [""] : []),
+      ...(notice.length ? [...notice, ...(gaps ? [""] : [])] : []),
+      theme.bold(question), ...(helped ? wrap(help, theme.muted) : []), ...(gaps ? [""] : []),
+    ];
+    const space = height - items.length;
+    const above = [parts(true, true, true), parts(false, true, true), parts(false, false, true), parts(false, false, false)]
+      .find((candidate) => candidate.length <= space) ?? (space > 0 ? parts(false, false, false).slice(-space) : []);
+    const lines = [...above, ...items];
+    return Array.from({ length: height }, (_, row) => paint(" ".repeat(inset) + (lines[row] ?? ""), columns, theme));
+  }
+}

package/src/surfaces/cli/format-output.mjs

@@ -557,5 +557,5 @@ export function formatLocalResult(command, value, tr = screenTranslator("en")) {
 }
 
 export function helpText(tr = screenTranslator("en")) {
-  return tr("# Every command\n\nFrom your shell:\n\n- `moondog --version` - show the installed version\n- `moondog update [--check] [--channel latest|beta]` - check for or install a published release\n- `moondog web status|search|read [arguments] [--json]` - look things up on public music sites through DeepSeek, Brave Search or the Codex CLI\n- `moondog demo-history --output <absolute-file.zip> [--json]` - make a fictional Spotify history ZIP to try the importer with\n- `moondog auth login <provider>` - sign in to a model provider; the key is typed out of sight, and openai-codex uses your ChatGPT sign-in\n- `moondog auth status [provider]` - see which sign-ins are saved\n- `moondog auth logout <provider>` - sign out of a provider\n- `moondog spotify help` - set up and control Spotify\n- `moondog spotify login [client-id]` - connect Spotify in your browser\n- `moondog spotify now|devices|queue` - see what Spotify is playing, where, and what's next\n- `moondog spotify recent` - see what you played lately\n- `moondog spotify sync-recent` - add your latest plays to your profile\n- `moondog spotify sync-library` - add your Spotify library to your profile\n- `moondog spotify play|pause|next|previous` - control Spotify playback\n- `moondog listenbrainz import-history <listen-history.json>` - add a ListenBrainz listens file to your profile\n- `moondog catalog latest-single --artist <name> [--known-release <title> | --from <spotify-history.zip>]` - find an artist's latest single on Apple Music (US), no model needed\n- `moondog status [--json]` - see where things stand\n- `moondog taste [--json]` - your listening report\n- `moondog taste --html [--output <file.html>]` - save your report as a web page that works offline\n- `moondog taste --card [--output <file.html>]` - save a short recap you can check before sharing\n- `moondog taste --from <spotify-history.zip> --html` - a one-off report from a Spotify ZIP, without saving it\n- `moondog taste --from <account-data.zip> --from <extended-history.zip> --html` - a one-off report from both Spotify exports together\n- `moondog taste --from <spotify-history.zip> --save --html` - save the Spotify history, then show your full report\n- `moondog data inspect --scope <listening|apple|profile>` - see what's stored, and get the code needed to reset it\n- `moondog data export --scope <listening|apple|profile> --output <directory>` - export a copy, leaving the original alone\n- `moondog data reset --scope <listening|apple|profile> --confirm <token>` - set stored data aside (it is archived, not deleted)\n- `moondog profile build [--force]` - build or resume a saved profile with your connected model\n- `moondog profile saved [offset]` - read your saved profile\n- `moondog profile explain <number>` - trace a saved finding to its evidence\n- `moondog profile corrections [--all]` - everything you've told me, including earlier choices\n- `moondog profile correct --artist <name> (--like|--avoid)` - like an artist, or keep them out\n- `moondog profile correct --track <title> --by <artist> (--like|--avoid)` - like a track, or keep it out\n- `moondog profile retract <correction-id>` - undo one of your choices\n- `moondog demo --offline [--json]` - a demo with made-up data, no sign-in needed\n- `moondog demo [prompt] [--json]` - the same demo, talking through your model\n- `moondog ask <prompt>` - ask one question and exit\n- `moondog remember <text>` - ask me to remember something\n- `moondog forget <memory-id>` - forget something\n- `moondog memory reflect [--dry-run] [--json]` - let me think over recent conversations now\n- `moondog` - open the listening room\n\nInside the listening room:\n\n- `/update [--check] [--channel latest|beta]` - check for updates, or save and close this session to install one\n- `/status` or `/sources` - see where things stand\n- `/profile` or `/taste` - your profile, and why each song or artist is there\n- `/taste report` - the whole report on one page\n- `/profile build [--force]` - build or resume a saved reading; Ctrl+C keeps progress\n- `/profile saved [offset]` - read your saved profile\n- `/profile explain <number>` - inspect a saved finding's evidence\n- `/profile corrections [--all]` - everything you've told me\n- `/profile correct --track \"<title>\" --by \"<artist>\" (--like|--avoid)` - like a track, or keep it out\n- `/profile correct --artist \"<name>\" (--like|--avoid)` - like an artist, or keep them out\n- `/profile retract <correction-id>` - undo a choice\n- `/memory` - what I remember\n- `/tools` - what I can do right now\n- `/doctor` - check your setup\n- `/model` - pick the model I talk through\n- `/model <provider> <model>` - switch straight to a model\n- `/model refresh [provider]` - update public model choices; keep the selected model\n- `/auth [provider]` - sign in to a model provider\n- `/web status|search|read` - look things up on public music sites\n- `/import [path]` - bring in your history, library, or a playlist\n- `/language` - choose the language Moondog uses\n- `/spotify` - Spotify commands\n- `/spotify login [client-id]` - connect Spotify\n- `/spotify now|devices|queue` - see what's playing, where, and what's next\n- `/spotify recent|sync-recent` - see or save your latest plays\n- `/spotify import-history \"/path/to/spotify-history.zip\"` - add a Spotify ZIP, no sign-in needed\n- `/skip` or `/stop` - move to the next song preview, or stop them\n- `/reload` - reload model settings and sign-ins\n- `/remember [kind] <text>` - ask me to remember something\n- `/forget <memory-id>` - forget something\n- `/rewind` or Alt+R - edit an earlier message in place; the messages after it are replaced\n- `/branch` - go on from here in a new conversation; this one stays saved\n- `/rewind latest` - edit the most recent message\n- `/resume` - pick up a saved conversation\n- `/resume <session-id>` - go straight to one\n- `/new` - start fresh; the last one stays saved\n- `/quit` - exit\n\nAnything you type that isn't a command goes to the model you picked with `/model`, or the one set in `MOONDOG_PROVIDER` and `MOONDOG_MODEL`.\nSign in with `/auth`, or set the provider's API key in your environment. `/auth openai-codex` uses your ChatGPT sign-in.\nOnce your profile is ready, I can search your library, explain what I see, and plan playlists with you.\nI can only control Spotify after `moondog spotify login`, and I never post, send messages, delete anything, or spend money.\nAsk me to move playback onto a device by name, such as your iPhone.");
+  return tr("# Every command\n\nFrom your shell:\n\n- `moondog --version` - show the installed version\n- `moondog update [--check] [--channel latest|beta]` - check for or install a published release\n- `moondog web status|search|read [arguments] [--json]` - look things up on public music sites through DeepSeek, Brave Search or the Codex CLI\n- `moondog demo-history --output <absolute-file.zip> [--json]` - make a fictional Spotify history ZIP to try the importer with\n- `moondog auth login <provider>` - sign in to a model provider; the key is typed out of sight; `openai --chatgpt` signs in with your ChatGPT subscription\n- `moondog auth status [provider]` - see which sign-ins are saved\n- `moondog auth logout <provider>` - sign out of a provider\n- `moondog spotify help` - set up and control Spotify\n- `moondog spotify login [client-id]` - connect Spotify in your browser\n- `moondog spotify now|devices|queue` - see what Spotify is playing, where, and what's next\n- `moondog spotify recent` - see what you played lately\n- `moondog spotify sync-recent` - add your latest plays to your profile\n- `moondog spotify sync-library` - add your Spotify library to your profile\n- `moondog spotify play|pause|next|previous` - control Spotify playback\n- `moondog listenbrainz import-history <listen-history.json>` - add a ListenBrainz listens file to your profile\n- `moondog catalog latest-single --artist <name> [--known-release <title> | --from <spotify-history.zip>]` - find an artist's latest single on Apple Music (US), no model needed\n- `moondog status [--json]` - see where things stand\n- `moondog taste [--json]` - your listening report\n- `moondog taste --html [--output <file.html>]` - save your report as a web page that works offline\n- `moondog taste --card [--output <file.html>]` - save a short recap you can check before sharing\n- `moondog taste --from <spotify-history.zip> --html` - a one-off report from a Spotify ZIP, without saving it\n- `moondog taste --from <account-data.zip> --from <extended-history.zip> --html` - a one-off report from both Spotify exports together\n- `moondog taste --from <spotify-history.zip> --save --html` - save the Spotify history, then show your full report\n- `moondog data inspect --scope <listening|apple|profile>` - see what's stored, and get the code needed to reset it\n- `moondog data export --scope <listening|apple|profile> --output <directory>` - export a copy, leaving the original alone\n- `moondog data reset --scope <listening|apple|profile> --confirm <token>` - set stored data aside (it is archived, not deleted)\n- `moondog profile build [--force]` - build or resume a saved profile with your connected model\n- `moondog profile saved [offset]` - read your saved profile\n- `moondog profile explain <number>` - trace a saved finding to its evidence\n- `moondog profile corrections [--all]` - everything you've told me, including earlier choices\n- `moondog profile correct --artist <name> (--like|--avoid)` - like an artist, or keep them out\n- `moondog profile correct --track <title> --by <artist> (--like|--avoid)` - like a track, or keep it out\n- `moondog profile retract <correction-id>` - undo one of your choices\n- `moondog demo --offline [--json]` - a demo with made-up data, no sign-in needed\n- `moondog demo [prompt] [--json]` - the same demo, talking through your model\n- `moondog ask <prompt>` - ask one question and exit\n- `moondog remember <text>` - ask me to remember something\n- `moondog forget <memory-id>` - forget something\n- `moondog memory reflect [--dry-run] [--json]` - let me think over recent conversations now\n- `moondog` - open the listening room\n\nInside the listening room:\n\n- `/update [--check] [--channel latest|beta]` - check for updates, or save and close this session to install one\n- `/status` or `/sources` - see where things stand\n- `/profile` or `/taste` - your profile, and why each song or artist is there\n- `/taste report` - the whole report on one page\n- `/profile build [--force]` - build or resume a saved reading; Ctrl+C keeps progress\n- `/profile saved [offset]` - read your saved profile\n- `/profile explain <number>` - inspect a saved finding's evidence\n- `/profile corrections [--all]` - everything you've told me\n- `/profile correct --track \"<title>\" --by \"<artist>\" (--like|--avoid)` - like a track, or keep it out\n- `/profile correct --artist \"<name>\" (--like|--avoid)` - like an artist, or keep them out\n- `/profile retract <correction-id>` - undo a choice\n- `/memory` - what I remember\n- `/tools` - what I can do right now\n- `/doctor` - check your setup\n- `/model` - pick the model I talk through\n- `/model <provider> <model>` - switch straight to a model\n- `/model refresh [provider]` - update public model choices; keep the selected model\n- `/auth [provider]` - sign in to a model provider\n- `/web status|search|read` - look things up on public music sites\n- `/import [path]` - bring in your history, library, or a playlist\n- `/language` - choose the language Moondog uses\n- `/service [spotify|apple_music|netease]` - choose where I play music\n- `/spotify` - Spotify commands\n- `/spotify login [client-id]` - connect Spotify\n- `/spotify now|devices|queue` - see what's playing, where, and what's next\n- `/spotify recent|sync-recent` - see or save your latest plays\n- `/spotify import-history \"/path/to/spotify-history.zip\"` - add a Spotify ZIP, no sign-in needed\n- `/skip` or `/stop` - move to the next song preview, or stop them\n- `/reload` - reload model settings and sign-ins\n- `/remember [kind] <text>` - ask me to remember something\n- `/forget <memory-id>` - forget something\n- `/rewind` or Alt+R - edit an earlier message in place; the messages after it are replaced\n- `/branch` - go on from here in a new conversation; this one stays saved\n- `/rewind latest` - edit the most recent message\n- `/resume` - pick up a saved conversation\n- `/resume <session-id>` - go straight to one\n- `/new` - start fresh; the last one stays saved\n- `/quit` - exit\n\nAnything you type that isn't a command goes to the model you picked with `/model`, or the one set in `MOONDOG_PROVIDER` and `MOONDOG_MODEL`.\nSign in with `/auth`, or set the provider's API key in your environment. `/auth openai` signs in with your ChatGPT subscription or an API key.\nOnce your profile is ready, I can search your library, explain what I see, and plan playlists with you.\nI can only control Spotify after `moondog spotify login`, and I never post, send messages, delete anything, or spend money.\nAsk me to move playback onto a device by name, such as your iPhone.");
 }

package/src/surfaces/cli/terminal-art.mjs

@@ -1,3 +1,5 @@
+import { logoFigure } from "../brand/logo.mjs";
+
 export const LOGO_MOTION_FRAMES = 64;
 export const LOGO_MOTION_INTERVAL_MS = 125;
 
@@ -6,40 +8,12 @@ const turn = Math.PI * 2;
 /** Record layers from faintest to strongest, matching the logo's fine grooves and solid dog. */
 export const RECORD_LAYERS = Object.freeze({ groove: 1, surface: 2, figure: 3 });
 
-// The dog's eye, in the record's unit coordinates; layouts line the title up with it.
+// Where the dog's eye would be, in the record's unit coordinates; layouts line the title up with it.
+// The logo draws no eye, so neither does the record.
 const eye = [0.22, -0.13];
 
-// The dog's outline runs through these points as one smooth curve (smoothOutline, below), so it
-// keeps its shape without the facets of straight segments between them.
-const dogPoints = [
-  [-0.62, 0.48], [-0.55, 0.29], [-0.47, 0.08], [-0.42, -0.16],
-  [-0.4, -0.34], [-0.32, -0.47], [-0.18, -0.61], [-0.17, -0.44],
-  [-0.12, -0.43], [-0.1, -0.32], [0.02, -0.27], [0.16, -0.24],
-  [0.24, -0.18], [0.28, -0.08], [0.35, -0.03], [0.53, 0.015],
-  [0.55, 0.055], [0.53, 0.16], [0.46, 0.22], [0.31, 0.26],
-  [0.16, 0.26], [0.13, 0.33], [0.13, 0.56], [0.045, 0.58],
-  [0.07, 0.77], [-0.13, 0.75], [-0.3, 0.7], [-0.48, 0.62],
-];
-
-// A closed centripetal Catmull-Rom curve through `points`: it passes through every point, and unlike
-// the uniform kind it never loops or overshoots at the sharp turns of the ear and the nose.
-function smoothOutline(points, steps = 10) {
-  const outline = [];
-  const count = points.length;
-  for (let index = 0; index < count; index += 1) {
-    const p = [-1, 0, 1, 2].map((offset) => points[(index + offset + count) % count]);
-    const t = [0];
-    for (let at = 1; at < 4; at += 1) t.push(t[at - 1] + Math.hypot(p[at][0] - p[at - 1][0], p[at][1] - p[at - 1][1]) ** 0.5);
-    for (let step = 0; step < steps; step += 1) {
-      const u = t[1] + (t[2] - t[1]) * step / steps;
-      const mix = (a, b, from, to) => a.map((value, axis) => ((to - u) * value + (u - from) * b[axis]) / (to - from));
-      const [a1, a2, a3] = [mix(p[0], p[1], t[0], t[1]), mix(p[1], p[2], t[1], t[2]), mix(p[2], p[3], t[2], t[3])];
-      outline.push(mix(mix(a1, a2, t[0], t[2]), mix(a2, a3, t[1], t[3]), t[1], t[2]));
-    }
-  }
-  return outline;
-}
-const dog = smoothOutline(dogPoints);
+// The dog and its headphones, measured from the logo (src/surfaces/brand/logo.mjs).
+const figure = logoFigure();
 
 const smallAscii = [
   "                  /",
@@ -111,17 +85,6 @@ function insidePolygon(x, y, points) {
   return inside;
 }
 
-function bezier(start, first, second, end) {
-  return Array.from({ length: 65 }, (_, index) => {
-    const t = index / 64;
-    const s = 1 - t;
-    return [0, 1].map((axis) =>
-      s ** 3 * start[axis] + 3 * s ** 2 * t * first[axis]
-      + 3 * s * t ** 2 * second[axis] + t ** 3 * end[axis],
-    );
-  });
-}
-
 function drawing(columns, rows, cellAspect) {
   const width = columns * 2;
   const height = rows * 4;
@@ -182,11 +145,8 @@ function drawing(columns, rows, cellAspect) {
   return { dots, width, height, radius, centerX, centerY, pixel, circle, disc, line, polygon, paintLayer };
 }
 
-// The portrait and the tonearm in the record's unit coordinates: the disc has radius 1 around 0,0.
+// The tonearm in the record's unit coordinates: the disc has radius 1 around 0,0.
 const shapes = {
-  headband: bezier([-0.42, -0.03], [-0.47, -0.31], [-0.27, -0.58], [-0.18, -0.59]),
-  ear: [-0.365, -0.005],
-  nose: [0.53, 0.045],
   arm: [[1.17, -1.095], [0.91, -0.8]],
   cartridge: [[0.92, -0.845], [0.998, -0.777], [0.808, -0.567], [0.73, -0.635]],
   // Two short highlights ride fixed grooves as the record turns: the groove's place from the rim, its angle, its length.
@@ -195,7 +155,7 @@ const shapes = {
 
 /** The shapes the record is drawn from, for surfaces that draw it as vectors, such as the window's small mark. */
 export function lunarRecordShapes() {
-  return structuredClone({ dog, eye, ...shapes, earRadius: 0.17, grooves: [1, 0.91, 0.8, 0.66] });
+  return structuredClone({ eye, ...shapes, grooves: [1, 0.91, 0.8, 0.66] });
 }
 
 // The tonearm swings about its pivot, the arm's first point; a negative swing turns it off the record.
@@ -261,25 +221,23 @@ function paint(columns, rows, phase, cellAspect, tonearm = true) {
 
   paintLayer(RECORD_LAYERS.figure);
   // Like the logo, a clear halo separates the dog from the grooves around it.
-  const { headband, ear, nose } = shapes;
-  line([...dog, dog[0]], pixel * 4.5, false);
-  line(headband, Math.max(pixel * 7, 0.11), false);
-  polygon(dog, false);
-  polygon(dog, true, true);
-  line([...dog, dog[0]], pixel * 0.8);
-
-  line(headband, Math.max(pixel * 3.5, 0.065));
-  line(headband, Math.max(pixel * 1.2, 0.025), false);
-  const [earX, earY] = ear;
-  const earRadius = detail > 0 ? 0.157 : 0.17;
-  disc(earX, earY, earRadius + pixel * 1.6, false);
-  circle(earX, earY, earRadius, pixel * 1.1);
-  circle(earX, earY, earRadius * 0.69, pixel);
-  if (detail > 0) circle(earX, earY, earRadius * 0.35, pixel);
+  const { head, headEdge, bandCenter, bandGap, gap, cup } = figure;
+  line(headEdge, pixel * 4.5, false);
+  line(bandCenter, Math.max(pixel * 7, 0.11), false);
+  polygon(head, false);
+  polygon(head, true, true);
+  line(headEdge, pixel * 0.8);
+  // As in the logo, a gap parts the band from the head.
+  line(bandGap, Math.max(gap, pixel * 2), false);
+
+  line(bandCenter, Math.max(pixel * 3.5, 0.065));
+  line(bandCenter, Math.max(pixel * 1.2, 0.025), false);
+  const [earX, earY] = cup.center;
+  disc(earX, earY, cup.radius + pixel * 1.6, false);
+  circle(earX, earY, cup.radius, pixel * 1.1);
+  circle(earX, earY, cup.radius * 0.69, pixel);
+  if (detail > 0) circle(earX, earY, cup.radius * 0.35, pixel);
   else disc(earX, earY, pixel * 0.9);
-  // A small eye and nose keep the dog readable before the hatch pattern resolves.
-  disc(eye[0], eye[1], pixel * 1.05, false);
-  disc(nose[0], nose[1], pixel * 0.85);
 
   if (tonearm) paintTonearm(art, rotation);
   return art;