@pinkpixel/haku 0.2.0 → 1.0.0

package/dist/{src-dP0jXhPP.mjs → src-Bz-0ulVm.mjs}

@@ -775,18 +775,36 @@ const INSTRUMENTS = {
 		kind: "tonal",
 		gm: 9
 	},
+	vibes: {
+		label: "Vibraphone",
+		range: [53, 86],
+		kind: "tonal",
+		gm: 11
+	},
 	marimba: {
 		label: "Marimba",
 		range: [55, 84],
 		kind: "tonal",
 		gm: 12
 	},
+	kalimba: {
+		label: "Kalimba",
+		range: [60, 83],
+		kind: "tonal",
+		gm: 108
+	},
 	harp: {
 		label: "Harp",
 		range: [48, 84],
 		kind: "tonal",
 		gm: 46
 	},
+	guitar: {
+		label: "Nylon guitar",
+		range: [45, 79],
+		kind: "tonal",
+		gm: 24
+	},
 	pad: {
 		label: "Warm pad",
 		range: [55, 79],
@@ -799,6 +817,18 @@ const INSTRUMENTS = {
 		kind: "tonal",
 		gm: 24
 	},
+	celesta: {
+		label: "Celesta",
+		range: [60, 96],
+		kind: "tonal",
+		gm: 8
+	},
+	musicbox: {
+		label: "Music box",
+		range: [64, 96],
+		kind: "tonal",
+		gm: 10
+	},
 	bass: {
 		label: "Round bass",
 		range: [31, 55],
@@ -890,6 +920,14 @@ const DRUM_PIECES = {
 	tom: {
 		label: "Tom",
 		gm: 45
+	},
+	shaker: {
+		label: "Shaker",
+		gm: 82
+	},
+	cabasa: {
+		label: "Cabasa",
+		gm: 69
 	}
 };
 const DRUM_PIECE_IDS = Object.keys(DRUM_PIECES);
@@ -918,7 +956,9 @@ const COMP_STYLES = [
 	"sustain",
 	"lazy",
 	"stabs",
-	"arp"
+	"arp",
+	"rolled",
+	"shells"
 ];
 const BASS_STYLES = [
 	"roots",
@@ -930,14 +970,18 @@ const CHORD_INSTRUMENTS = [
 	"wurli",
 	"fm-ep",
 	"pad",
-	"harp"
+	"harp",
+	"vibes",
+	"guitar"
 ];
 const GROOVE_IDS = [
 	"dusty",
 	"brushes",
 	"halftime",
 	"bossa",
-	"sparse"
+	"sparse",
+	"jazz-ride",
+	"lazy-kick"
 ];
 const WINDOW_SCENES = [
 	"rain",
@@ -1751,8 +1795,17 @@ function closeVoicing(order, bottom) {
 	}
 	return notes;
 }
-function candidateVoicings(rootPc, quality, range = VOICING_RANGE) {
-	const pcs = [...new Set(QUALITIES[quality].voicing.map((i) => mod12(rootPc + i)))];
+/**
+* The intervals a comping voicing uses. Rootless leaves the root to the bass, the way jazz pianists
+* comp, as long as at least three notes are left (plain triads keep their root).
+*/
+function voicingIntervals(quality, rootless = false) {
+	const all = QUALITIES[quality].voicing;
+	const without = all.filter((i) => mod12(i) !== 0);
+	return rootless && without.length >= 3 ? without : all;
+}
+function candidateVoicings(rootPc, quality, range = VOICING_RANGE, rootless = false) {
+	const pcs = [...new Set(voicingIntervals(quality, rootless).map((i) => mod12(rootPc + i)))];
 	const out = [];
 	for (let r = 0; r < pcs.length; r++) {
 		const order = [...pcs.slice(r), ...pcs.slice(0, r)];
@@ -1781,8 +1834,8 @@ function roughness(v) {
 	if (v[v.length - 1] > 74) penalty += 1.5;
 	return penalty;
 }
-function voiceChord(rootPc, quality, prev, range = VOICING_RANGE) {
-	const candidates = candidateVoicings(rootPc, quality, range);
+function voiceChord(rootPc, quality, prev, range = VOICING_RANGE, rootless = false) {
+	const candidates = candidateVoicings(rootPc, quality, range, rootless);
 	let best = candidates[0] ?? [];
 	let bestCost = Infinity;
 	for (const v of candidates) {
@@ -1819,6 +1872,11 @@ const GROOVES = {
 			kick: "o.......o.......",
 			brush: "g...X..g....X.g.",
 			brushhat: "x...x.o.x...x.o."
+		},
+		turnaround: {
+			kick: "o.......o.....o.",
+			brush: "g...X..g....XgXg",
+			brushhat: "x...x.o.x...x..."
 		}
 	},
 	halftime: {
@@ -1842,7 +1900,14 @@ const GROOVES = {
 		bar: {
 			kick: "x..ox..ox..ox..o",
 			rim: "x..x..x...x..x..",
-			hat: "o.g.o.g.o.g.o.g."
+			hat: "o.g.o.g.o.g.o.g.",
+			cabasa: ".g.o.g.o.g.o.g.o"
+		},
+		turnaround: {
+			kick: "x..ox..ox..ox..o",
+			rim: "..x..x...x..x...",
+			hat: "o.g.o.g.o.g.o.g.",
+			cabasa: ".g.o.g.o.g.o.gxo"
 		}
 	},
 	sparse: {
@@ -1852,6 +1917,46 @@ const GROOVES = {
 			kick: "x.......o.......",
 			rim: "........o.......",
 			ride: "o...o...o...o..."
+		},
+		turnaround: {
+			kick: "x.......o.....o.",
+			rim: "........o...o...",
+			ride: "o...o...o...o.o."
+		}
+	},
+	"jazz-ride": {
+		label: "Jazzy ride",
+		kit: "sticks",
+		bar: {
+			kick: "g...g...g...g...",
+			ride: "x...X..ox...X..o",
+			hat: "....o.......o...",
+			snare: "..........g....."
+		},
+		turnaround: {
+			kick: "g...g...g...g...",
+			ride: "x...X..ox...X...",
+			hat: "....o.......o...",
+			snare: "......g...g..xg."
+		}
+	},
+	"lazy-kick": {
+		label: "Lazy kick",
+		kit: "sticks",
+		bar: {
+			kick: "X.....x...X..x..",
+			snare: "....X.......X...",
+			shaker: "xgogxgogxgogxgog"
+		},
+		turnaround: {
+			kick: "X.....x...X.....",
+			snare: "....X.......X.gg",
+			shaker: "xgogxgogxgogx...",
+			openhat: "..............o."
+		},
+		lag: {
+			kick: .06,
+			snare: .03
 		}
 	}
 };
@@ -1875,6 +1980,12 @@ function grooveBar(id, turnaround) {
 	}
 	return hits.sort((a, b) => a.beat - b.beat);
 }
+/** Pushes the band's drum hits behind the grid by the groove's lag. Run after swing. */
+function applyGrooveLag(events, id) {
+	const lag = GROOVES[id].lag;
+	if (!lag) return;
+	for (const e of events) if (e.track === "backing:drums" && e.drum) e.time += lag[e.drum] ?? 0;
+}
 // ../../packages/core/src/engine/backing.ts
 /** Lays the progression across the scene, looping it if it's shorter than the scene. */
 function placeChords(progression, key, totalBeats) {
@@ -1894,6 +2005,16 @@ function placeChords(progression, key, totalBeats) {
 	}
 	return out;
 }
+/** Splits a chord into whole bars and hits each one the same way, clipped to the chord's length. */
+function perBar(beats, pattern) {
+	const hits = [];
+	for (let bar = 0; bar < beats; bar += 4) for (const h of pattern) if (bar + h.at < beats) hits.push({
+		...h,
+		at: bar + h.at,
+		len: Math.min(h.len, beats - bar - h.at)
+	});
+	return hits;
+}
 /** Hit times (beat offset, length) for one chord, by comping style. */
 function compRhythm(style, beats) {
 	switch (style) {
@@ -1907,19 +2028,44 @@ function compRhythm(style, beats) {
 			len: beats - .3,
 			strum: .035
 		}];
-		case "stabs": {
-			const hits = [];
-			for (let bar = 0; bar < beats; bar += 4) for (const [at, len] of [
-				[0, .9],
-				[1.5, .4],
-				[3, .4]
-			]) if (bar + at < beats) hits.push({
-				at: bar + at,
-				len: Math.min(len, beats - bar - at),
+		case "stabs": return perBar(beats, [
+			{
+				at: 0,
+				len: .9,
 				strum: .01
-			});
-			return hits;
-		}
+			},
+			{
+				at: 1.5,
+				len: .4,
+				strum: .01
+			},
+			{
+				at: 3,
+				len: .4,
+				strum: .01
+			}
+		]);
+		case "rolled": return perBar(beats, [{
+			at: 0,
+			len: 2.4,
+			strum: .08
+		}, {
+			at: 2.5,
+			len: 1.5,
+			strum: .07,
+			vel: .4
+		}]);
+		case "shells": return perBar(beats, [{
+			at: 0,
+			len: 1.2,
+			strum: .012,
+			vel: .52
+		}, {
+			at: 1.5,
+			len: 2.2,
+			strum: .012,
+			vel: .44
+		}]);
 		case "arp": return [];
 	}
 }
@@ -1932,7 +2078,7 @@ function compChords(placed, backing, carry) {
 		brightness: .6
 	};
 	for (const p of placed) {
-		const voicing = voiceChord(p.rootPc, p.chord.quality, carry.voicing);
+		const voicing = voiceChord(p.rootPc, p.chord.quality, carry.voicing, VOICING_RANGE, backing.style === "shells");
 		carry.voicing = voicing;
 		if (backing.style === "arp") {
 			const order = [...voicing, ...voicing.slice(1, -1).reverse()];
@@ -1952,7 +2098,7 @@ function compChords(placed, backing, carry) {
 				time: p.start + at,
 				duration: Math.max(.1, hit.len - i * hit.strum),
 				midi,
-				velocity: .5 - i * .03
+				velocity: (hit.vel ?? .5) - i * .03
 			});
 		});
 	}
@@ -2140,6 +2286,7 @@ function sceneEvents(project, scene, { offset = 0, pass = 0, carry = newCarry()
 	const kept = events.filter((e) => e.time < totalBeats);
 	for (const e of kept) e.duration = Math.min(e.duration, totalBeats - e.time);
 	applySwing(kept, project.swing);
+	if (backing && scene.backing.drums.enabled) applyGrooveLag(kept, scene.backing.drums.groove);
 	applyHumanize(kept, project.humanize, hashSeed(project.seed, scene.id), pass);
 	for (const e of kept) e.time += offset;
 	const flats = prefersFlats(project.key);

package/dist/{src-CgZeiBJc.mjs → src-DNP73wX3.mjs}

@@ -1,4 +1,4 @@
-import { S as DRUM_PIECE_IDS, T as INSTRUMENTS, i as buildSceneScore, p as createRng, r as buildArrangementScore } from "./src-dP0jXhPP.mjs";
+import { S as DRUM_PIECE_IDS, T as INSTRUMENTS, i as buildSceneScore, p as createRng, r as buildArrangementScore } from "./src-Bz-0ulVm.mjs";
 import * as Tone from "tone";
 // ../../packages/core/src/engine/types.ts
 function beatsToSeconds(beats, bpm) {
@@ -44,8 +44,13 @@ const INSTRUMENT_TRIM_DB = {
 	glock: -9,
 	marimba: -2,
 	harp: -3,
+	vibes: -9,
+	kalimba: -3,
+	guitar: -9,
 	pad: -11,
 	pluck: -6,
+	celesta: -4.5,
+	musicbox: -3,
 	bass: -19,
 	drums: 0
 };
@@ -66,7 +71,9 @@ const DRUM_TRIM_DB = {
 	brushhat: 2,
 	openhat: -12,
 	ride: -10,
-	tom: -4
+	tom: -4,
+	shaker: -3,
+	cabasa: -10
 };
 /** Reverb return level at reverb = 1. */
 const REVERB_RETURN = .55;
@@ -172,6 +179,46 @@ function synthVoice(instrument) {
 			});
 			filter.Q.value = .5;
 			break;
+		case "celesta":
+			synth = new Tone.PolySynth(Tone.FMSynth, {
+				harmonicity: 1,
+				modulationIndex: 16,
+				oscillator: { type: "sine" },
+				modulation: { type: "sine" },
+				envelope: {
+					attack: .002,
+					decay: 2.2,
+					sustain: 0,
+					release: 1.2
+				},
+				modulationEnvelope: {
+					attack: .001,
+					decay: .35,
+					sustain: .01,
+					release: .5
+				}
+			});
+			break;
+		case "musicbox":
+			synth = new Tone.PolySynth(Tone.FMSynth, {
+				harmonicity: 6.27,
+				modulationIndex: 24,
+				oscillator: { type: "sine" },
+				modulation: { type: "sine" },
+				envelope: {
+					attack: .001,
+					decay: 1.5,
+					sustain: 0,
+					release: .7
+				},
+				modulationEnvelope: {
+					attack: .001,
+					decay: .5,
+					sustain: 0,
+					release: .4
+				}
+			});
+			break;
 		case "pluck":
 			synth = new Tone.PolySynth(Tone.Synth, {
 				oscillator: { type: "triangle" },

package/dist/{tools-_xkF2Yfv.mjs → tools-CO-tdB7d.mjs}

@@ -1,4 +1,4 @@
-import { A as PROGRESSIONS, C as GROOVE_IDS, D as RAIN_KINDS, E as INSTRUMENT_IDS, F as prefersFlats, I as scalePcs, L as mod12, M as resolveProgression, N as MODES, O as WINDOW_SCENES, P as keyLabel, R as noteName, T as INSTRUMENTS, _ as BASS_STYLES, a as layerRange, b as COMP_STYLES, c as createProject, d as findScene, f as parseProject, g as getMood, h as MOOD_IDS, i as buildSceneScore, j as progressionText, k as drumRows, l as createScene, m as makeId, n as describeProject, o as pitchToY, r as buildArrangementScore, s as createLayer, t as scoreToMidi, u as findLayer, v as BRUSH_IDS, w as HARMONY_MODES, x as DRUM_KITS, y as CHORD_INSTRUMENTS, z as parseNote } from "./src-dP0jXhPP.mjs";
+import { A as PROGRESSIONS, C as GROOVE_IDS, D as RAIN_KINDS, E as INSTRUMENT_IDS, F as prefersFlats, I as scalePcs, L as mod12, M as resolveProgression, N as MODES, O as WINDOW_SCENES, P as keyLabel, R as noteName, T as INSTRUMENTS, _ as BASS_STYLES, a as layerRange, b as COMP_STYLES, c as createProject, d as findScene, f as parseProject, g as getMood, h as MOOD_IDS, i as buildSceneScore, j as progressionText, k as drumRows, l as createScene, m as makeId, n as describeProject, o as pitchToY, r as buildArrangementScore, s as createLayer, t as scoreToMidi, u as findLayer, v as BRUSH_IDS, w as HARMONY_MODES, x as DRUM_KITS, y as CHORD_INSTRUMENTS, z as parseNote } from "./src-Bz-0ulVm.mjs";
 import { readFile, rename, stat, writeFile } from "node:fs/promises";
 import { delimiter, extname, join, normalize, resolve, sep } from "node:path";
 import { z } from "zod";
@@ -960,7 +960,7 @@ The canvas:
 
 A good loop:
 1. describe to see what's there. set_mood picks a whole vibe in one go: ${MOOD_IDS.join(", ")}.
-2. add_layer for each part (piano, wurli, fm-ep, glock, marimba, harp, pad, pluck, bass, drums).
+2. add_layer for each part (piano, wurli, fm-ep, glock, vibes, marimba, kalimba, harp, guitar, pad, pluck, celesta, musicbox, bass, drums).
 3. Draw with draw_shape, draw_curve, or draw_line. Use batch to send many commands as one step.
 4. Check your work: describe (text piano roll), snapshot (a picture), analyze (chord fit, clashes, loudness).
 5. play to listen, export for WAV, MIDI, or the project file.
@@ -1176,7 +1176,7 @@ function loadAudio() {
 	kit ??= (async () => {
 		const node = await import("./node-CVxAljK8.mjs");
 		node.setupNodeAudio();
-		const audio = await import("./src-CgZeiBJc.mjs");
+		const audio = await import("./src-DNP73wX3.mjs");
 		const dir = samplesDir();
 		const bank = await audio.loadSampleBank(await node.readManifest(dir), node.nodeDecoder(dir));
 		return {
@@ -1193,7 +1193,7 @@ function loadAudio() {
 	return kit;
 }
 // src/version.ts
-const VERSION = "0.2.0";
+const VERSION = "1.0.0";
 // src/web.ts
 const WEB_HOST = "127.0.0.1";
 const WEB_PORT = 5177;
@@ -1376,20 +1376,8 @@ function snapshotSvg(project, opts = {}) {
 	out.push(`<text x="${x0}" y="29" font-size="17" font-weight="600" fill="${C.text}">${esc(project.name)}</text>`);
 	const info = `Scene ${scene.name} · ${scene.bars} bars · ${keyLabel(project.key)} · ${project.bpm} BPM`;
 	out.push(`<text x="${x1}" y="29" font-size="13" fill="${C.muted}" text-anchor="end">${esc(info)}</text>`);
-	out.push(`<rect x="${x0}" y="${header}" width="${cw}" height="${strip}" fill="${C.sunken}" rx="4"/>`);
-	for (const [i, chord] of score.chords.entries()) {
-		const cx = bx(chord.time);
-		const w = bx(chord.time + chord.duration) - cx;
-		if (i % 2 === 1) out.push(`<rect x="${n(cx)}" y="${header}" width="${n(w)}" height="${strip}" fill="${C.raised}" opacity="0.5"/>`);
-		out.push(`<text x="${n(cx + 9)}" y="66" font-size="12.5" font-weight="600" fill="${C.muted}">${esc(chord.symbol)}</text>`);
-	}
-	out.push(`<rect x="${x0}" y="${top}" width="${cw}" height="${ch}" fill="${C.sunken}" opacity="0.55"/>`);
-	for (let b = 0; b <= beats; b++) {
-		const gx = n(bx(b));
-		const bar = b % 4 === 0;
-		out.push(`<line x1="${gx}" y1="${bar ? header : top}" x2="${gx}" y2="${bottom}" stroke="${bar ? C.strong : C.border}" opacity="${bar ? .9 : .45}"/>`);
-		if (bar && b > 0) out.push(`<text x="${n(gx - 6)}" y="${bottom - 6}" font-size="10" fill="${C.faint}" text-anchor="end">${b / 4}</text>`);
-	}
+	chordStrip(out, score, bx, x0, cw, header, strip);
+	grid(out, beats, bx, x0, cw, header, top, bottom);
 	if (focus && INSTRUMENTS[focus.instrument].kind === "drums") {
 		const rows = drumRows(focus.kit);
 		rows.forEach((piece, i) => {
@@ -1408,27 +1396,7 @@ function snapshotSvg(project, opts = {}) {
 	const layers = [...scene.layers].sort((a, b) => Number(a.id === focus?.id) - Number(b.id === focus?.id));
 	for (const layer of layers) {
 		const front = layer.id === focus?.id;
-		const drums = INSTRUMENTS[layer.instrument].kind === "drums";
-		const range = layerRange(layer);
-		const rows = drumRows(layer.kit);
-		out.push(`<g fill="${layer.color}" opacity="${front ? .75 : .32}">`);
-		for (const e of score.events) {
-			if (e.track !== layer.id) continue;
-			let ny;
-			let nh;
-			if (drums) {
-				ny = 1 - (Math.max(0, rows.indexOf(e.drum)) + 1) / rows.length;
-				nh = 1 / rows.length;
-			} else {
-				nh = 1 / (range[1] - range[0]);
-				ny = pitchToY(e.midi, range) - nh / 2;
-			}
-			const rx = bx(e.time);
-			const rw = Math.max(3, bx(e.time + e.duration) - rx - 1.5);
-			const rh = Math.max(4, nh * ch - 1.5);
-			out.push(`<rect x="${n(rx)}" y="${n(top + ny * ch)}" width="${n(rw)}" height="${n(rh)}" rx="${n(Math.min(3, rh / 2))}"/>`);
-		}
-		out.push("</g>");
+		notes(out, layer, score, bx, top, ch, front ? .75 : .32);
 		for (const s of layer.strokes) {
 			const width = n(2 + s.size * 10);
 			const opacity = front ? .85 : .2;
@@ -1455,6 +1423,118 @@ function snapshotSvg(project, opts = {}) {
 	out.push("</svg>");
 	return out.join("\n");
 }
+/** The whole arrangement: song order on top, then one panel per scene, all on the same time scale. */
+function songSnapshotSvg(project, opts = {}) {
+	const W = opts.width ?? 1200;
+	const pad = 20;
+	const header = 46;
+	const order = 34;
+	const label = 26;
+	const strip = 24;
+	const canvas = 120;
+	const gap = 16;
+	const x0 = pad;
+	const x1 = W - pad;
+	const cw = x1 - x0;
+	const items = project.arrangement.flatMap((item) => {
+		const scene = project.scenes.find((s) => s.id === item.sceneId);
+		return scene ? [{
+			scene,
+			repeat: item.repeat
+		}] : [];
+	});
+	const scenes = [...new Map(items.map((i) => [i.scene.id, i.scene])).values()];
+	const unused = project.scenes.filter((s) => !scenes.includes(s));
+	const plays = (s) => items.filter((i) => i.scene.id === s.id).reduce((sum, i) => sum + i.repeat, 0);
+	const totalBars = items.reduce((sum, i) => sum + i.scene.bars * i.repeat, 0);
+	const maxBeats = Math.max(4, ...scenes.map((s) => s.bars * 4));
+	const bx = (b) => x0 + b / maxBeats * cw;
+	const panelTop = 102;
+	const panel = 186;
+	const H = panelTop + scenes.length * panel + pad - gap;
+	const out = [];
+	out.push(`<svg xmlns="http://www.w3.org/2000/svg" width="${W}" height="${H}" viewBox="0 0 ${W} ${H}" font-family="${FONT}">`);
+	out.push(`<rect width="${W}" height="${H}" fill="${C.bg}"/>`);
+	out.push(`<text x="${x0}" y="29" font-size="17" font-weight="600" fill="${C.text}">${esc(project.name)}</text>`);
+	const info = `Song · ${`${scenes.length} ${scenes.length === 1 ? "scene" : "scenes"}`} · ${totalBars} bars · ${keyLabel(project.key)} · ${project.bpm} BPM`;
+	out.push(`<text x="${x1}" y="29" font-size="13" fill="${C.muted}" text-anchor="end">${esc(info)}</text>`);
+	let ox = x0;
+	for (const [i, item] of items.entries()) {
+		const w = item.scene.bars * item.repeat * cw / Math.max(1, totalBars);
+		out.push(`<rect x="${n(ox)}" y="${header}" width="${n(Math.max(1, w - 2))}" height="${order}" rx="4" fill="${i % 2 ? C.raised : C.sunken}" stroke="${C.border}"/>`);
+		const text = item.repeat > 1 ? `${item.scene.name} ×${item.repeat}` : item.scene.name;
+		if (w > text.length * 7.5 + 14) out.push(`<text x="${n(ox + 9)}" y="68" font-size="12.5" font-weight="600" fill="${C.text}">${esc(text)}</text>`);
+		ox += w;
+	}
+	for (const [i, scene] of scenes.entries()) {
+		const y = panelTop + i * panel;
+		const score = buildSceneScore(project, scene.id);
+		const beats = scene.bars * 4;
+		const sx1 = bx(beats);
+		const top = y + label + strip;
+		const bottom = top + canvas;
+		const times = plays(scene);
+		const ids = new Set(scene.layers.map((l) => l.id));
+		const noteTotal = score.events.filter((e) => ids.has(e.track)).length;
+		const head = `Scene ${scene.name} · ${scene.bars} ${scene.bars === 1 ? "bar" : "bars"} · plays ${times}×`;
+		const tail = `${scene.layers.length} ${scene.layers.length === 1 ? "layer" : "layers"} · ${noteTotal} notes`;
+		out.push(`<text x="${x0}" y="${y + 17}" font-size="13" font-weight="600" fill="${C.text}">${esc(head)}</text>`);
+		out.push(`<text x="${x1}" y="${y + 17}" font-size="12" fill="${C.muted}" text-anchor="end">${esc(tail)}</text>`);
+		chordStrip(out, score, bx, x0, sx1 - x0, y + label, strip);
+		grid(out, beats, bx, x0, sx1 - x0, y + label, top, bottom);
+		for (const layer of scene.layers) notes(out, layer, score, bx, top, canvas, layer.muted ? .25 : .7);
+		if (!scene.layers.length) out.push(`<text x="30" y="${top + 22}" font-size="12" fill="${C.faint}">No layers yet</text>`);
+	}
+	out.push("</svg>");
+	return {
+		svg: out.join("\n"),
+		scenes,
+		unused
+	};
+}
+function chordStrip(out, score, bx, x0, width, y, h) {
+	out.push(`<rect x="${x0}" y="${y}" width="${n(width)}" height="${h}" fill="${C.sunken}" rx="4"/>`);
+	for (const [i, chord] of score.chords.entries()) {
+		const cx = bx(chord.time);
+		const w = bx(chord.time + chord.duration) - cx;
+		if (i % 2 === 1) out.push(`<rect x="${n(cx)}" y="${y}" width="${n(w)}" height="${h}" fill="${C.raised}" opacity="0.5"/>`);
+		out.push(`<text x="${n(cx + 9)}" y="${n(y + h / 2 + 5)}" font-size="12.5" font-weight="600" fill="${C.muted}">${esc(chord.symbol)}</text>`);
+	}
+}
+/** The canvas background and beat lines. Bar lines run up through the chord strip from stripTop. */
+function grid(out, beats, bx, x0, width, stripTop, top, bottom) {
+	out.push(`<rect x="${x0}" y="${top}" width="${n(width)}" height="${bottom - top}" fill="${C.sunken}" opacity="0.55"/>`);
+	for (let b = 0; b <= beats; b++) {
+		const gx = n(bx(b));
+		const bar = b % 4 === 0;
+		out.push(`<line x1="${gx}" y1="${bar ? stripTop : top}" x2="${gx}" y2="${bottom}" stroke="${bar ? C.strong : C.border}" opacity="${bar ? .9 : .45}"/>`);
+		if (bar && b > 0) out.push(`<text x="${n(gx - 6)}" y="${bottom - 6}" font-size="10" fill="${C.faint}" text-anchor="end">${b / 4}</text>`);
+	}
+}
+/** One layer's notes as pills: drums on their rows, tonal parts by pitch across the layer's range. */
+function notes(out, layer, score, bx, top, ch, opacity) {
+	const drums = INSTRUMENTS[layer.instrument].kind === "drums";
+	const range = layerRange(layer);
+	const rows = drumRows(layer.kit);
+	out.push(`<g fill="${layer.color}" opacity="${opacity}">`);
+	for (const e of score.events) {
+		if (e.track !== layer.id) continue;
+		let ny;
+		let nh;
+		if (drums) {
+			ny = 1 - (Math.max(0, rows.indexOf(e.drum)) + 1) / rows.length;
+			nh = 1 / rows.length;
+		} else {
+			nh = 1 / (range[1] - range[0]);
+			ny = pitchToY(e.midi, range) - nh / 2;
+		}
+		const rx = bx(e.time);
+		const rw = Math.max(3, bx(e.time + e.duration) - rx - 1.5);
+		const rh = Math.max(4, nh * ch - 1.5);
+		out.push(`<rect x="${n(rx)}" y="${n(top + ny * ch)}" width="${n(rw)}" height="${n(rh)}" rx="${n(Math.min(3, rh / 2))}"/>`);
+	}
+	out.push("</g>");
+}
 /** PNG bytes. resvg is a native module, so it's only loaded when a PNG is actually asked for. */
 async function snapshotPng(svg, width) {
 	const { Resvg } = await import("@resvg/resvg-js");
@@ -1741,25 +1821,35 @@ const stop = define({
 const snapshot = define({
 	name: "snapshot",
 	title: "Snapshot",
-	description: "A picture of a scene: chords along the top, each layer's notes and strokes, and a legend. Returns a PNG. Pass out to also save it (.png or .svg).",
+	description: "A picture of a scene: chords along the top, each layer's notes and strokes, and a legend. With scope song, the whole arrangement instead: the song order on top, then the chords and notes of each scene in it. Returns a PNG. Pass out to also save it (.png or .svg).",
 	readOnly: true,
 	input: z.object({
 		file,
+		scope,
 		scene: sceneArg,
-		layer: z.string().optional().describe("Layer to bring to the front, with its pitch guides"),
+		layer: z.string().optional().describe("Layer to bring to the front, with its pitch guides. Scene scope only."),
 		width: z.number().int().min(400).max(2400).optional().describe("Image width in pixels. Default 1200."),
 		out: z.string().optional().describe("Also save the picture here (.png or .svg)")
 	}),
-	async run({ file: path, scene, layer, width = 1200, out }, ctx) {
+	async run({ file: path, scope = "scene", scene, layer, width = 1200, out }, ctx) {
 		const project = await (await targetFor(ctx, path)).read();
-		const s = sceneOf(project, scene);
-		const svg = snapshotSvg(project, {
-			scene: s.id,
-			layer,
-			width,
-			height: Math.round(width * .53)
-		});
-		const notes = [`Snapshot of scene ${s.name} in "${project.name}"`];
+		let svg;
+		const notes = [];
+		if (scope === "song") {
+			const shot = songSnapshotSvg(project, { width });
+			svg = shot.svg;
+			notes.push(`Snapshot of the song in "${project.name}" (${shot.scenes.map((s) => s.name).join(", ")})`);
+			if (shot.unused.length) notes.push(`not in the song: ${shot.unused.map((s) => s.name).join(", ")}`);
+		} else {
+			const s = sceneOf(project, scene);
+			svg = snapshotSvg(project, {
+				scene: s.id,
+				layer,
+				width,
+				height: Math.round(width * .53)
+			});
+			notes.push(`Snapshot of scene ${s.name} in "${project.name}"`);
+		}
 		if (out?.toLowerCase().endsWith(".svg")) {
 			const full = resolve(ctx.cwd, out);
 			await writeFile(full, svg);