@libraz/libcantus 0.9.4 → 0.9.5

package/dist/{chunk-4HLLZPXT.cjs → chunk-MPTVJIVG.cjs}

@@ -1,25 +1,25 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class;
 
-var _chunkRUMU3UA6cjs = require('./chunk-RUMU3UA6.cjs');
+var _chunkMTMZTMWMcjs = require('./chunk-MTMZTMWM.cjs');
 
 
 
 
 
 
-var _chunk36N73KZ3cjs = require('./chunk-36N73KZ3.cjs');
 
+var _chunk2A2QMA74cjs = require('./chunk-2A2QMA74.cjs');
 
 
-var _chunkCAN76NCUcjs = require('./chunk-CAN76NCU.cjs');
 
+var _chunkKQN2ZYNDcjs = require('./chunk-KQN2ZYND.cjs');
 
-var _chunkFCANXBATcjs = require('./chunk-FCANXBAT.cjs');
 
+var _chunkYFJXS3AUcjs = require('./chunk-YFJXS3AU.cjs');
 
 
-var _chunkQ6OP4U43cjs = require('./chunk-Q6OP4U43.cjs');
 
+var _chunkWFDXOLUBcjs = require('./chunk-WFDXOLUB.cjs');
 
 
 
@@ -32,9 +32,9 @@ var _chunkQ6OP4U43cjs = require('./chunk-Q6OP4U43.cjs');
 
 
 
-var _chunkFNDWXRRIcjs = require('./chunk-FNDWXRRI.cjs');
 
 
+var _chunkBSLTLGM3cjs = require('./chunk-BSLTLGM3.cjs');
 
 
 
@@ -45,10 +45,21 @@ var _chunkFNDWXRRIcjs = require('./chunk-FNDWXRRI.cjs');
 
 
 
-var _chunk7MGZ7D62cjs = require('./chunk-7MGZ7D62.cjs');
+
+
+
+
+
+var _chunkPI3UXRWKcjs = require('./chunk-PI3UXRWK.cjs');
 
 // src/generate/bass/index.ts
-var BASS_STYLES = ["root", "rootFifth", "pop", "walking", "arpeggio"];
+var BASS_STYLES = Object.freeze([
+  "root",
+  "rootFifth",
+  "pop",
+  "walking",
+  "arpeggio"
+]);
 var DEFAULT_TS = { numerator: 4, denominator: 4 };
 var DEFAULT_STYLE = "root";
 var DEFAULT_OCTAVE = 2;
@@ -71,29 +82,43 @@ function chordTonePcs(chord) {
   const seen = /* @__PURE__ */ new Set();
   const pcs = [];
   for (const interval of chord.intervals) {
-    const pc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc + interval);
+    const pc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc + interval);
     if (!seen.has(pc)) {
       seen.add(pc);
       pcs.push(pc);
     }
   }
   if (pcs.length === 0) {
-    pcs.push(_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc));
+    pcs.push(_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc));
   }
   return pcs;
 }
 function fifthPcOf(chord) {
-  const fifths = new Set(chord.intervals.map((i) => _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, i)));
+  const fifths = new Set(chord.intervals.map((i) => _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, i)));
   const chosen = fifths.has(7) ? 7 : fifths.has(6) ? 6 : fifths.has(8) ? 8 : void 0;
-  return chosen === void 0 ? _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc) : _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, chord.rootPc + chosen);
+  return chosen === void 0 ? _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc) : _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, chord.rootPc + chosen);
 }
 function bassPcOf(chord) {
-  return _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, _nullishCoalesce(chord.bassPc, () => ( chord.rootPc)));
+  return _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, _nullishCoalesce(chord.bassPc, () => ( chord.rootPc)));
 }
-function beatPositions(start, end) {
+function beatPositions(start, end, ts) {
   const positions = [];
-  for (let p = start; p < end - EPS; p += 1) {
-    positions.push(p);
+  const barBeats = _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
+  const pulse = _chunk2A2QMA74cjs.pulseBeats.call(void 0, ts);
+  const firstBar = Math.floor(start / barBeats);
+  const lastBar = Math.floor((end - EPS) / barBeats);
+  for (let bar = firstBar; bar <= lastBar; bar += 1) {
+    const barStart = bar * barBeats;
+    const firstPulse = Math.max(0, Math.ceil((start - barStart - EPS) / pulse));
+    for (let index = firstPulse; ; index += 1) {
+      const position = barStart + index * pulse;
+      if (position >= barStart + barBeats - EPS || position >= end - EPS) {
+        break;
+      }
+      if (position >= start - EPS) {
+        positions.push(position);
+      }
+    }
   }
   if (positions.length === 0) {
     positions.push(start);
@@ -101,8 +126,11 @@ function beatPositions(start, end) {
   return positions;
 }
 function emit(ctx, pos, pc, midiOverride) {
-  const midi = _nullishCoalesce(midiOverride, () => ( placePc(pc, ctx.prevMidi, ctx.low)));
-  const velocity = _chunk36N73KZ3cjs.isStrongBeat.call(void 0, pos, ctx.ts) ? STRONG_VELOCITY : WEAK_VELOCITY;
+  const midi = _chunkPI3UXRWKcjs.clampToMidi.call(void 0, 
+    _nullishCoalesce(midiOverride, () => ( placePc(pc, ctx.prevMidi, ctx.low))),
+    "generated bass pitch"
+  );
+  const velocity = _chunk2A2QMA74cjs.isStrongBeat.call(void 0, pos, ctx.ts) ? STRONG_VELOCITY : WEAK_VELOCITY;
   ctx.notes.push({ startBeat: pos, pitch: midi, velocity });
   return midi;
 }
@@ -117,11 +145,11 @@ function buildRootFifth(ctx, seg) {
   }
 }
 function buildPop(ctx, seg) {
-  const positions = beatPositions(seg.startBeat, seg.endBeat);
+  const positions = beatPositions(seg.startBeat, seg.endBeat, ctx.ts);
   const rootPc = bassPcOf(seg.chord);
   let emitted = false;
   for (const pos of positions) {
-    if (_chunk36N73KZ3cjs.isStrongBeat.call(void 0, pos, ctx.ts)) {
+    if (_chunk2A2QMA74cjs.isStrongBeat.call(void 0, pos, ctx.ts)) {
       ctx.prevMidi = emit(ctx, pos, rootPc);
       emitted = true;
     } else if (ctx.rng.prob(PICKUP_PROB)) {
@@ -140,7 +168,7 @@ function buildPop(ctx, seg) {
 }
 function buildArpeggio(ctx, seg) {
   const tones = chordTonePcs(seg.chord);
-  const positions = beatPositions(seg.startBeat, seg.endBeat);
+  const positions = beatPositions(seg.startBeat, seg.endBeat, ctx.ts);
   positions.forEach((pos, i) => {
     const pc = _nullishCoalesce(tones[i % tones.length], () => ( bassPcOf(seg.chord)));
     ctx.prevMidi = emit(ctx, pos, pc);
@@ -152,7 +180,7 @@ function approachNote(ctx, target, from) {
   if (ctx.rng.prob(0.5)) {
     return foldIntoBand(chromatic, ctx.low);
   }
-  const cand = _chunkFNDWXRRIcjs.nearestScaleTone.call(void 0, target + dir * 2, ctx.key);
+  const cand = _chunkBSLTLGM3cjs.nearestScaleTone.call(void 0, target + dir * 2, ctx.key);
   const step = Math.abs(cand - target);
   return foldIntoBand(step >= 1 && step <= 2 ? cand : chromatic, ctx.low);
 }
@@ -168,7 +196,7 @@ function foldIntoBand(midi, low) {
 }
 function buildWalking(ctx, seg, next) {
   const tones = chordTonePcs(seg.chord);
-  const positions = beatPositions(seg.startBeat, seg.endBeat);
+  const positions = beatPositions(seg.startBeat, seg.endBeat, ctx.ts);
   const count = positions.length;
   positions.forEach((pos, i) => {
     if (i === 0) {
@@ -178,7 +206,7 @@ function buildWalking(ctx, seg, next) {
     if (next && count > 1 && i === count - 1) {
       const nextBass = placePc(bassPcOf(next.chord), ctx.prevMidi, ctx.low);
       const midi = approachNote(ctx, nextBass, ctx.prevMidi);
-      ctx.prevMidi = emit(ctx, pos, _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, midi), midi);
+      ctx.prevMidi = emit(ctx, pos, _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, midi), midi);
       return;
     }
     const pc = _nullishCoalesce(tones[i % tones.length], () => ( bassPcOf(seg.chord)));
@@ -186,36 +214,45 @@ function buildWalking(ctx, seg, next) {
   });
 }
 function generateBassLine(opts) {
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, opts.segments.length, "bass segments");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, opts.segments.length, "bass segments");
   for (let index = 0; index < opts.segments.length; index += 1) {
     const segment = opts.segments[index];
     if (!segment) continue;
-    _chunk7MGZ7D62cjs.assertRange.call(void 0, segment.startBeat, 0, Number.MAX_SAFE_INTEGER, `segments[${index}].startBeat`);
-    _chunk7MGZ7D62cjs.assertRange.call(void 0, segment.endBeat, 0, Number.MAX_SAFE_INTEGER, `segments[${index}].endBeat`);
+    _chunkPI3UXRWKcjs.assertRange.call(void 0, segment.startBeat, 0, Number.MAX_SAFE_INTEGER, `segments[${index}].startBeat`);
+    _chunkPI3UXRWKcjs.assertRange.call(void 0, segment.endBeat, 0, Number.MAX_SAFE_INTEGER, `segments[${index}].endBeat`);
     if (segment.endBeat <= segment.startBeat) {
-      throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`segments[${index}] must have a positive duration`);
+      throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`segments[${index}] must have a positive duration`);
     }
   }
   const segments = [...opts.segments].sort((a, b) => a.startBeat - b.startBeat);
+  for (let index = 1; index < segments.length; index += 1) {
+    const previous = segments[index - 1];
+    const current = segments[index];
+    if (previous !== void 0 && current !== void 0 && current.startBeat < previous.endBeat) {
+      throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(
+        `bass segments must not overlap: segments ${index - 1} and ${index} overlap`
+      );
+    }
+  }
   if (segments.length === 0) {
     return [];
   }
   const ts = _nullishCoalesce(opts.ts, () => ( DEFAULT_TS));
-  _chunk7MGZ7D62cjs.assertTimeSignature.call(void 0, ts);
-  const style = _chunk7MGZ7D62cjs.assertOneOf.call(void 0, _nullishCoalesce(opts.style, () => ( DEFAULT_STYLE)), BASS_STYLES, "bass style");
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts);
+  const style = _chunkPI3UXRWKcjs.assertOneOf.call(void 0, _nullishCoalesce(opts.style, () => ( DEFAULT_STYLE)), BASS_STYLES, "bass style");
   const octave = _nullishCoalesce(opts.octave, () => ( DEFAULT_OCTAVE));
-  _chunk7MGZ7D62cjs.assertInteger.call(void 0, octave, "bass octave", -1, 9);
+  _chunkPI3UXRWKcjs.assertInteger.call(void 0, octave, "bass octave", -1, 8);
   const estimatedNotes = segments.reduce(
     (count, segment) => count + Math.max(1, Math.ceil(segment.endBeat - segment.startBeat)),
     0
   );
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, estimatedNotes, "bass notes");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, estimatedNotes, "bass notes");
   const low = octave * 12 + 12;
   const ctx = {
     ts,
     low,
     key: opts.key,
-    rng: _chunkRUMU3UA6cjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0))),
+    rng: _chunkMTMZTMWMcjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0))),
     notes: [],
     prevMidi: low
   };
@@ -256,7 +293,7 @@ function generateBassLine(opts) {
       continue;
     }
     out.push({
-      pitch: note.pitch,
+      pitch: _chunkPI3UXRWKcjs.clampToMidi.call(void 0, note.pitch, "generated bass pitch"),
       startBeat: note.startBeat,
       durationBeat,
       velocity: note.velocity
@@ -315,7 +352,7 @@ function complementOnsets(melody, ts, spanStart, spanEnd, rng) {
       place = isWholeBeat(beat);
     } else if (!attacked) {
       place = rng.prob(isWholeBeat(beat) ? HOLD_ON_BEAT_PROB : HOLD_OFF_BEAT_PROB);
-    } else if (_chunk36N73KZ3cjs.isStrongBeat.call(void 0, beat, ts)) {
+    } else if (_chunk2A2QMA74cjs.isStrongBeat.call(void 0, beat, ts)) {
       place = rng.prob(REINFORCE_PROB);
     }
     if (place && beat - last >= MIN_ONSET_GAP - EPS2) {
@@ -337,7 +374,7 @@ function scoreCandidate(pitch, melPitch, melPrev, prevPitch, chord, center) {
       score -= 2;
     }
   }
-  if (chord && _chunkFNDWXRRIcjs.chordToneRole.call(void 0, pitch, chord) !== null) {
+  if (chord && _chunkBSLTLGM3cjs.chordToneRole.call(void 0, pitch, chord) !== null) {
     score += 1;
   }
   if (prevPitch !== void 0) {
@@ -347,7 +384,7 @@ function scoreCandidate(pitch, melPitch, melPrev, prevPitch, chord, center) {
     if (dist > 0 && dist <= 2) {
       score += 1;
     }
-    if (_chunkFNDWXRRIcjs.isForbiddenMelodicLeap.call(void 0, prevPitch, pitch)) {
+    if (_chunkBSLTLGM3cjs.isForbiddenMelodicLeap.call(void 0, prevPitch, pitch)) {
       score -= 6;
     }
     if (melPitch !== void 0 && melPrev !== void 0) {
@@ -388,7 +425,7 @@ function boundaryContexts(melody, harmony, startBeat, endBeat, ts) {
       melodyVoice,
       otherVoices: melodyVoice === void 0 ? [] : [melodyVoice],
       chord: harmony.chordAt(boundary),
-      strongBeat: _chunk36N73KZ3cjs.isStrongBeat.call(void 0, boundary, ts),
+      strongBeat: _chunk2A2QMA74cjs.isStrongBeat.call(void 0, boundary, ts),
       atCounterOnset: Math.abs(boundary - startBeat) < EPS2
     };
   });
@@ -400,7 +437,7 @@ function heldPitchSafety(pitch, contexts, prevPitch, key, profile, register, low
     if (melodyVoice !== void 0 && (register === "below" && pitch >= melodyVoice.pitch || register === "above" && pitch <= melodyVoice.pitch)) {
       return null;
     }
-    const result = _chunkQ6OP4U43cjs.evaluateSafety.call(void 0, 
+    const result = _chunkWFDXOLUBcjs.evaluateSafety.call(void 0, 
       {
         profile,
         candidatePitch: pitch,
@@ -429,42 +466,40 @@ function generateCounterMelody(opts) {
   }
   const chordChangeBeats = timeline === void 0 ? _nullishCoalesce(opts.chordChangeBeats, () => ( [])) : timeline.segments.flatMap((segment) => [segment.startBeat, segment.endBeat]);
   const register = _nullishCoalesce(opts.register, () => ( "below"));
-  const melody = _chunk36N73KZ3cjs.createNoteEventIndex.call(void 0, opts.melody, {
-    allowNonPositiveDuration: true,
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, opts.melody, "countermelody melody", { allowNonPositiveDuration: true });
+  const melody = _chunk2A2QMA74cjs.createNoteEventIndex.call(void 0, _chunkPI3UXRWKcjs.soundingNotesOnly.call(void 0, opts.melody), {
     tieBreak: register === "below" ? "highest" : "lowest"
   });
   const ts = _nullishCoalesce(opts.ts, () => ( DEFAULT_TS2));
-  _chunk7MGZ7D62cjs.assertTimeSignature.call(void 0, ts);
-  const rhythm = _chunk7MGZ7D62cjs.assertOneOf.call(void 0, _nullishCoalesce(opts.rhythm, () => ( "complement")), ["complement", "follow"], "rhythm");
-  const profile = _chunk7MGZ7D62cjs.assertOneOf.call(void 0, _nullishCoalesce(opts.profile, () => ( "pop")), ["strict", "pop"], "safety profile");
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
-  if (opts.pitchLow !== void 0) {
-    _chunk7MGZ7D62cjs.assertInteger.call(void 0, opts.pitchLow, "countermelody pitchLow");
-  }
-  if (opts.pitchHigh !== void 0) {
-    _chunk7MGZ7D62cjs.assertInteger.call(void 0, opts.pitchHigh, "countermelody pitchHigh");
-  }
-  if (melody.notes.every((indexed) => indexed.note.durationBeat <= 0)) {
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts);
+  const rhythm = _chunkPI3UXRWKcjs.assertOneOf.call(void 0, _nullishCoalesce(opts.rhythm, () => ( "complement")), ["complement", "follow"], "rhythm");
+  const profile = _chunkPI3UXRWKcjs.assertOneOf.call(void 0, _nullishCoalesce(opts.profile, () => ( "pop")), ["strict", "pop"], "safety profile");
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
+  if (melody.notes.length === 0) {
     return [];
   }
   const spanStart = _nullishCoalesce(_optionalChain([melody, 'access', _8 => _8.notes, 'access', _9 => _9[0], 'optionalAccess', _10 => _10.note, 'access', _11 => _11.startBeat]), () => ( 0));
   const spanEnd = melody.notes.reduce((end, n) => Math.max(end, n.endBeat), spanStart);
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, Math.ceil((spanEnd - spanStart) / GRID_STEP), "countermelody grid");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, Math.ceil((spanEnd - spanStart) / GRID_STEP), "countermelody grid");
   const meanPitch = melody.notes.reduce((sum, n) => sum + n.note.pitch, 0) / melody.notes.length;
   const defaultCenter = register === "below" ? meanPitch - REGISTER_OFFSET : meanPitch + REGISTER_OFFSET;
-  const low = _nullishCoalesce(opts.pitchLow, () => ( Math.round(defaultCenter) - DEFAULT_HALF_RANGE));
-  const high = _nullishCoalesce(opts.pitchHigh, () => ( Math.round(defaultCenter) + DEFAULT_HALF_RANGE));
-  _chunk7MGZ7D62cjs.assertInteger.call(void 0, low, "countermelody pitchLow");
-  _chunk7MGZ7D62cjs.assertInteger.call(void 0, high, "countermelody pitchHigh");
+  const low = _chunkPI3UXRWKcjs.clampToMidi.call(void 0, 
+    _nullishCoalesce(opts.pitchLow, () => ( Math.round(defaultCenter) - DEFAULT_HALF_RANGE)),
+    "countermelody pitchLow"
+  );
+  const high = _chunkPI3UXRWKcjs.clampToMidi.call(void 0, 
+    _nullishCoalesce(opts.pitchHigh, () => ( Math.round(defaultCenter) + DEFAULT_HALF_RANGE)),
+    "countermelody pitchHigh"
+  );
   if (low > high) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(
       `countermelody pitchLow must not exceed pitchHigh; received ${low} > ${high}`
     );
   }
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, high - low + 1, "countermelody pitch candidates");
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, chordChangeBeats.length, "chord change beats");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, high - low + 1, "countermelody pitch candidates");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, chordChangeBeats.length, "chord change beats");
   for (let index = 0; index < chordChangeBeats.length; index += 1) {
-    _chunk7MGZ7D62cjs.assertRange.call(void 0, 
+    _chunkPI3UXRWKcjs.assertRange.call(void 0, 
       _nullishCoalesce(chordChangeBeats[index], () => ( Number.NaN)),
       0,
       Number.MAX_SAFE_INTEGER,
@@ -474,7 +509,7 @@ function generateCounterMelody(opts) {
   const center = (low + high) / 2;
   const onsets = rhythm === "follow" ? followOnsets(melody) : complementOnsets(melody, ts, spanStart, spanEnd, rng);
   const boundaryEstimate = onsets.length + Math.ceil((spanEnd - spanStart) / GRID_STEP) + melody.notes.length + chordChangeBeats.length;
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, boundaryEstimate * (high - low + 1), "countermelody search");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, boundaryEstimate * (high - low + 1), "countermelody search");
   const jitter = Array.from({ length: high - low + 1 }, () => rng.next() * TIE_BREAK_JITTER);
   const out = [];
   let prevPitch;
@@ -492,14 +527,14 @@ function generateCounterMelody(opts) {
     const contexts = boundaryContexts(melody, { chordAt, chordChangeBeats }, beat, endBeat, ts);
     const chord = _nullishCoalesce(_optionalChain([contexts, 'access', _14 => _14[0], 'optionalAccess', _15 => _15.chord]), () => ( chordAt(beat)));
     const otherVoices = melodyVoice !== void 0 ? [melodyVoice] : [];
-    const candidates = _chunkQ6OP4U43cjs.enumerateSafePitches.call(void 0, 
+    const candidates = _chunkWFDXOLUBcjs.enumerateSafePitches.call(void 0, 
       {
         profile,
         prevPitch,
         chord,
         key: opts.key,
         otherVoices,
-        strongBeat: _chunk36N73KZ3cjs.isStrongBeat.call(void 0, beat, ts),
+        strongBeat: _chunk2A2QMA74cjs.isStrongBeat.call(void 0, beat, ts),
         vocalLow: low,
         vocalHigh: high
       },
@@ -526,7 +561,7 @@ function generateCounterMelody(opts) {
       if (melPitch !== void 0) {
         if (prevPitch !== void 0 && melPrev !== void 0 && // Parallel octaves are the perfect-class-zero case of this predicate,
         // so a single check covers both parallel fifths and octaves.
-        _chunkFNDWXRRIcjs.createsParallelPerfect.call(void 0, prevPitch, candidate, melPrev, melPitch)) {
+        _chunkBSLTLGM3cjs.createsParallelPerfect.call(void 0, prevPitch, candidate, melPrev, melPitch)) {
           continue;
         }
       }
@@ -547,7 +582,12 @@ function generateCounterMelody(opts) {
       1,
       Math.min(127, Math.round((_nullishCoalesce(_optionalChain([melNote, 'optionalAccess', _16 => _16.velocity]), () => ( DEFAULT_MELODY_VELOCITY))) - VELOCITY_DROP))
     );
-    out.push({ pitch, startBeat: beat, durationBeat: endBeat - beat, velocity });
+    out.push({
+      pitch: _chunkPI3UXRWKcjs.clampToMidi.call(void 0, pitch),
+      startBeat: beat,
+      durationBeat: endBeat - beat,
+      velocity
+    });
     prevPitch = pitch;
   }
   return out;
@@ -819,13 +859,10 @@ function getGhostProbabilityAtPosition(beat, sixteenthInBeat) {
   const leadsIntoBackbeat = (beat === 0 || beat === 2) && sixteenthInBeat === 3;
   return leadsIntoBackbeat ? 0.6 : 0.25;
 }
-function selectGhostPositions(mood, rng) {
+function selectGhostPositions(mood) {
   if (mood === 2 /* Energetic */) {
     return ["e", "a"];
   }
-  if (mood === 0 /* Calm */) {
-    return rng.prob(0.5) ? ["e"] : [];
-  }
   return ["e"];
 }
 
@@ -841,6 +878,9 @@ function roleHiHatInstrument(role, useRide) {
   if (role === "ambient") {
     return GM.RIDE;
   }
+  if (role === "minimal") {
+    return GM.FHH;
+  }
   return useRide ? GM.RIDE : GM.CHH;
 }
 function sparser(level) {
@@ -1161,7 +1201,7 @@ function generateGhostNotesForBeat(ctx, sec) {
   if (ctx.beat !== 0 && ctx.beat !== 2) {
     return;
   }
-  const positions = selectGhostPositions(sec.ghostMood, ctx.rng);
+  const positions = selectGhostPositions(sec.ghostMood);
   let ghostProb = getGhostDensity(sec.ghostMood, ctx.section, sec.backingDensity, ctx.bpm);
   if (sec.ghostBoost) {
     ghostProb = Math.min(1, ghostProb * 1.4);
@@ -1196,16 +1236,18 @@ function generatePreChorusBuildup(ctx, sec, isSectionLastBar) {
   const progress = (barInLift * 4 + ctx.beat) / (barsInLift * 4);
   const buildupVel = ctx.velocity * (0.5 + 0.5 * progress);
   ctx.track.add(GM.SD, ctx.beatTick, EIGHTH, buildupVel);
-  ctx.track.add(GM.SD, ctx.beatTick + EIGHTH, EIGHTH, buildupVel * 0.85);
+  ctx.track.add(
+    GM.SD,
+    swing16(ctx.beatTick + EIGHTH, sec, ctx.swingAmount),
+    EIGHTH,
+    buildupVel * 0.85
+  );
   if (isSectionLastBar && ctx.beat === 3) {
     ctx.track.add(GM.CRASH, ctx.beatTick + EIGHTH + SIXTEENTH, SIXTEENTH, ctx.velocity * 1.1);
   }
 }
 function generateHiHatForBeat(ctx, sec) {
   if (!shouldPlayHiHat(sec.role)) {
-    if (sec.useFootHh && (ctx.beat === 0 || ctx.beat === 2)) {
-      ctx.track.add(GM.FHH, ctx.beatTick, EIGHTH, footHiHatVelocity(ctx.rng));
-    }
     return;
   }
   const crossStick = sec.useRide && shouldUseBridgeCrossStick(ctx.section, ctx.beat);
@@ -1213,11 +1255,12 @@ function generateHiHatForBeat(ctx, sec) {
   const hhType = sectionHiHatType(ctx.section, sec.role);
   const typeMult = hiHatTypeVelocityMultiplier(hhType);
   const isDynamicOpen = ctx.barHasOpenHh && ctx.beat === ctx.openHhBeat;
+  const allowsOpenHiHat = sec.role !== "ambient" && sec.role !== "minimal";
   const dm = sec.densityMult;
   if (sec.hhLevel === "quarter") {
     const introRest = ctx.section === "intro" && ctx.beat !== 0;
     if (!introRest) {
-      if (isDynamicOpen) {
+      if (isDynamicOpen && allowsOpenHiHat) {
         ctx.track.add(
           GM.OHH,
           ctx.beatTick,
@@ -1250,7 +1293,7 @@ function generateHiHatForBeat(ctx, sec) {
         continue;
       }
       const hhVel = Math.max(20, ctx.velocity * dm * typeMult * (eighth === 0 ? 0.9 : 0.65));
-      if (isDynamicOpen && eighth === 0) {
+      if (isDynamicOpen && allowsOpenHiHat && eighth === 0) {
         ctx.track.add(GM.OHH, hhTick, EIGHTH, hhVel + OHH_VEL_BOOST);
         continue;
       }
@@ -1261,7 +1304,7 @@ function generateHiHatForBeat(ctx, sec) {
       } else if (eighth === 0) {
         useOpen = shouldAddOpenHHAccent(ctx.section, ctx.beat, ctx.bar, ctx.rng);
       }
-      if (useOpen) {
+      if (useOpen && allowsOpenHiHat) {
         ctx.track.add(hiHatNote("open"), hhTick, EIGHTH, Math.max(20, hhVel * 1.1));
       } else {
         ctx.track.add(hhInstrument, hhTick, EIGHTH / 2, hhVel);
@@ -1276,11 +1319,11 @@ function generateHiHatForBeat(ctx, sec) {
     }
     const metricVel = hiHatVelocityMultiplier(sixteenth, ctx.rng);
     const hhVel = Math.max(20, ctx.velocity * dm * typeMult * metricVel);
-    if (isDynamicOpen && sixteenth === 0) {
+    if (isDynamicOpen && allowsOpenHiHat && sixteenth === 0) {
       ctx.track.add(GM.OHH, hhTick, SIXTEENTH, hhVel + OHH_VEL_BOOST);
       continue;
     }
-    if (ctx.beat === 3 && sixteenth === 3) {
+    if (allowsOpenHiHat && ctx.beat === 3 && sixteenth === 3) {
       const openProb = Math.max(0.1, Math.min(0.4, 30 / ctx.bpm));
       if (ctx.rng.prob(openProb)) {
         ctx.track.add(GM.OHH, hhTick, SIXTEENTH, Math.max(20, hhVel * 1.2));
@@ -1293,10 +1336,10 @@ function generateHiHatForBeat(ctx, sec) {
 
 // src/generate/drums/euclid.ts
 function euclideanRhythm(pulses, steps, rotation = 0) {
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, steps, "euclidean steps");
-  _chunk7MGZ7D62cjs.assertInteger.call(void 0, pulses, "euclidean pulses");
-  _chunk7MGZ7D62cjs.assertInteger.call(void 0, rotation, "euclidean rotation");
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, steps, "euclidean pattern steps");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, steps, "euclidean steps");
+  _chunkPI3UXRWKcjs.assertInteger.call(void 0, pulses, "euclidean pulses");
+  _chunkPI3UXRWKcjs.assertInteger.call(void 0, rotation, "euclidean rotation");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, steps, "euclidean pattern steps");
   const p = Math.max(0, Math.min(pulses, steps));
   const base = bjorklund(p, steps);
   const shift = (rotation % steps + steps) % steps;
@@ -1335,7 +1378,7 @@ function getFillStartBeat(energy) {
       return 2;
     case "high":
     case "peak":
-      return 0;
+      return 2;
   }
 }
 function selectFillType(from, to, style, nextEnergy, rng) {
@@ -1600,7 +1643,7 @@ function generateFill(track, beatTick, beat, fillType, velocity) {
 }
 
 // src/generate/drums/hit.ts
-var DRUM_NOTES = {
+var DRUM_NOTES = Object.freeze({
   kick: GM.BD,
   snare: GM.SD,
   sideStick: GM.SIDESTICK,
@@ -1615,7 +1658,7 @@ var DRUM_NOTES = {
   midTom: GM.TOM_M,
   lowTom: GM.TOM_L,
   shaker: GM.SHAKER
-};
+});
 var VOICE_BY_NOTE = new Map(
   Object.entries(DRUM_NOTES).map(([voice, note]) => [note, voice])
 );
@@ -1794,12 +1837,12 @@ function getPercussionConfig(mood, section) {
     shaker16th: act[1]
   };
 }
-function generateAuxPercussionForBar(track, barStart, config, role, densityMult, rng, bpm) {
+function generateAuxPercussionForBar(track, barStart, config, role, densityMult, rng, bpm, sec, swingAmount, barBeats = 4) {
   if (role === "minimal") {
     return;
   }
   if (config.tambourine) {
-    for (let beat = 1; beat <= 3; beat += 2) {
+    for (let beat = 1; beat < barBeats; beat += 2) {
       const raw = 70 * densityMult * rng.float(0.9, 1.1);
       track.add(GM.TAMBOURINE, barStart + beat, EIGHTH, Math.max(40, Math.min(90, raw)));
     }
@@ -1808,12 +1851,12 @@ function generateAuxPercussionForBar(track, barStart, config, role, densityMult,
     const use16th = config.shaker16th && bpm < HH_16TH_BPM_THRESHOLD;
     if (use16th) {
       const velCurve = [0.75, 0.45, 0.6, 0.45];
-      for (let beat = 0; beat < 4; beat += 1) {
+      for (let beat = 0; beat < barBeats; beat += 1) {
         for (let sub = 0; sub < 4; sub += 1) {
           const raw = 80 * (_nullishCoalesce(velCurve[sub], () => ( 0.5))) * densityMult * rng.float(0.9, 1.1);
           track.add(
             GM.SHAKER,
-            barStart + beat + sub * SIXTEENTH,
+            swing16(barStart + beat + sub * SIXTEENTH, sec, swingAmount),
             SIXTEENTH,
             Math.max(25, Math.min(85, raw))
           );
@@ -1821,12 +1864,12 @@ function generateAuxPercussionForBar(track, barStart, config, role, densityMult,
       }
     } else {
       const velCurve = [0.75, 0.55];
-      for (let beat = 0; beat < 4; beat += 1) {
+      for (let beat = 0; beat < barBeats; beat += 1) {
         for (let sub = 0; sub < 2; sub += 1) {
           const raw = 80 * (_nullishCoalesce(velCurve[sub], () => ( 0.6))) * densityMult * rng.float(0.9, 1.1);
           track.add(
             GM.SHAKER,
-            barStart + beat + sub * EIGHTH,
+            swing16(barStart + beat + sub * EIGHTH, sec, swingAmount),
             EIGHTH,
             Math.max(25, Math.min(85, raw))
           );
@@ -1835,7 +1878,7 @@ function generateAuxPercussionForBar(track, barStart, config, role, densityMult,
     }
   }
   if (config.handclap) {
-    for (let beat = 1; beat <= 3; beat += 2) {
+    for (let beat = 1; beat < barBeats; beat += 2) {
       const raw = 85 * densityMult * rng.float(0.9, 1.1);
       track.add(GM.HANDCLAP, barStart + beat, EIGHTH, Math.max(50, Math.min(100, raw)));
     }
@@ -1845,27 +1888,30 @@ function generateAuxPercussionForBar(track, barStart, config, role, densityMult,
 // src/generate/drums/index.ts
 var MAX_HITS_PER_BAR = 128;
 function generateDrums(opts) {
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, opts.bars, "drum bars");
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, opts.bpm, Number.MIN_VALUE, 1e3, "drum bpm");
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, opts.density, 0, 1, "drum density");
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, opts.bars * MAX_HITS_PER_BAR, "drum hits");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, opts.bars, "drum bars");
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, opts.bpm, Number.MIN_VALUE, 1e3, "drum bpm");
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, opts.density, 0, 1, "drum density");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, opts.bars * MAX_HITS_PER_BAR, "drum hits");
   if (opts.euclideanKick) {
     const steps = _nullishCoalesce(opts.euclideanKick.steps, () => ( 16));
-    _chunk7MGZ7D62cjs.assertInteger.call(void 0, steps, "euclidean steps", 1, 16);
-    _chunk7MGZ7D62cjs.assertInteger.call(void 0, opts.euclideanKick.pulses, "euclidean pulses");
-    _chunk7MGZ7D62cjs.assertInteger.call(void 0, _nullishCoalesce(opts.euclideanKick.rotation, () => ( 0)), "euclidean rotation");
+    _chunkPI3UXRWKcjs.assertInteger.call(void 0, steps, "euclidean steps", 1, 16);
+    _chunkPI3UXRWKcjs.assertInteger.call(void 0, opts.euclideanKick.pulses, "euclidean pulses");
+    _chunkPI3UXRWKcjs.assertInteger.call(void 0, _nullishCoalesce(opts.euclideanKick.rotation, () => ( 0)), "euclidean rotation");
   }
-  const publicStyle = _chunk7MGZ7D62cjs.assertOneOf.call(void 0, opts.style, GROOVE_STYLES, "drum style");
-  const publicSection = _chunk7MGZ7D62cjs.assertOneOf.call(void 0, opts.section, PUBLIC_SECTIONS, "drum section");
+  const publicStyle = _chunkPI3UXRWKcjs.assertOneOf.call(void 0, opts.style, GROOVE_STYLES, "drum style");
+  const publicSection = _chunkPI3UXRWKcjs.assertOneOf.call(void 0, opts.section, PUBLIC_SECTIONS, "drum section");
   if (opts.nextSection !== void 0) {
-    _chunk7MGZ7D62cjs.assertOneOf.call(void 0, opts.nextSection, PUBLIC_SECTIONS, "drum nextSection");
+    _chunkPI3UXRWKcjs.assertOneOf.call(void 0, opts.nextSection, PUBLIC_SECTIONS, "drum nextSection");
   }
   const track = new HitList();
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
   const mapping = mapStyle(publicStyle);
   const style = mapping.style;
-  const feel = opts.feel === void 0 ? mapping.feel : _chunk7MGZ7D62cjs.assertOneOf.call(void 0, opts.feel, DRUM_FEELS, "drum feel");
-  const role = opts.role === void 0 ? "full" : _chunk7MGZ7D62cjs.assertOneOf.call(void 0, opts.role, DRUM_ROLES, "drum role");
+  const feel = opts.feel === void 0 ? mapping.feel : _chunkPI3UXRWKcjs.assertOneOf.call(void 0, opts.feel, DRUM_FEELS, "drum feel");
+  const role = opts.role === void 0 ? "full" : _chunkPI3UXRWKcjs.assertOneOf.call(void 0, opts.role, DRUM_ROLES, "drum role");
+  const ts = _nullishCoalesce(opts.ts, () => ( { numerator: 4, denominator: 4 }));
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts, "drum time signature");
+  const barBeats = _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
   const playMainVoices = role !== "fxOnly";
   const section = mapSection(publicSection);
   const backingDensity = mapDensity(opts.density);
@@ -1901,7 +1947,7 @@ function generateDrums(opts) {
   const reuseSectionKick = (section === "b" || section === "chorus") && style !== "sparse";
   let sectionKick;
   for (let bar = 0; bar < opts.bars; bar += 1) {
-    const barStart = bar * 4;
+    const barStart = bar * barBeats;
     const isLastBar = bar === opts.bars - 1;
     if (bar === 0 && section === "chorus") {
       track.add(GM.CRASH, barStart, 0.5, 100 * densityMult);
@@ -1921,7 +1967,7 @@ function generateDrums(opts) {
     }
     const inLift = isInPreChorusLift(section, bar, opts.bars, nextSection === "chorus");
     let currentFill = "snareRoll";
-    for (let beat = 0; beat < 4; beat += 1) {
+    for (let beat = 0; beat < barBeats; beat += 1) {
       const beatTick = barStart + beat;
       const velocity = calculateVelocity(section, beat);
       if (opts.fills && isLastBar && !inLift && beat >= fillStartBeat) {
@@ -1958,14 +2004,14 @@ function generateDrums(opts) {
           generatePreChorusBuildup(ctx, sec, isLastBar);
         }
         if (euclidKick && !inLift) {
-          const stepLength = 4 / euclidSteps;
+          const stepLength = barBeats / euclidSteps;
           for (let step = 0; step < euclidKick.length; step += 1) {
             const onset = step * stepLength;
             if (euclidKick[step] && Math.floor(onset) === beat) {
               const wholeBeat = Math.abs(onset - Math.round(onset)) < 1e-9;
               track.add(
                 GM.BD,
-                barStart + onset,
+                swing16(barStart + onset, sec, swingAmount),
                 Math.min(0.5, stepLength),
                 velocity * (wholeBeat ? 1 : 0.85)
               );
@@ -1982,7 +2028,7 @@ function generateDrums(opts) {
       generateHiHatForBeat(ctx, sec);
     }
     if (sec.useFootHh && shouldPlayHiHat(role)) {
-      for (let fhhBeat = 0; fhhBeat < 4; fhhBeat += 2) {
+      for (let fhhBeat = 0; fhhBeat < barBeats; fhhBeat += 2) {
         const fhhTick = barStart + fhhBeat;
         if (!track.hasOnset(GM.FHH, fhhTick)) {
           track.add(GM.FHH, fhhTick, 0.5, footHiHatVelocity(rng));
@@ -2005,10 +2051,14 @@ function generateDrums(opts) {
       role,
       densityMult,
       rng,
-      opts.bpm
+      opts.bpm,
+      sec,
+      swingAmount,
+      barBeats
     );
   }
-  return [...track.hits].sort((a, b) => a.startBeat - b.startBeat || a.pitch - b.pitch);
+  const endBeat = opts.bars * barBeats;
+  return track.hits.filter((hit) => hit.startBeat < endBeat).sort((a, b) => a.startBeat - b.startBeat || a.pitch - b.pitch);
 }
 
 // src/generate/groove/index.ts
@@ -2023,22 +2073,22 @@ var MIN_VELOCITY = 1;
 var MAX_VELOCITY = 127;
 function humanize(events, opts = {}) {
   const ts = _nullishCoalesce(opts.ts, () => ( DEFAULT_TS3));
-  _chunk7MGZ7D62cjs.assertTimeSignature.call(void 0, ts);
-  _chunk7MGZ7D62cjs.assertNoteEvents.call(void 0, events, "humanize events", { allowNonPositiveDuration: true });
-  const sounding = _chunk7MGZ7D62cjs.dropSilentNotes.call(void 0, events);
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts);
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, events, "humanize events", { allowNonPositiveDuration: true });
+  const sounding = _chunkPI3UXRWKcjs.dropSilentNotes.call(void 0, events);
   const timing = _nullishCoalesce(opts.timing, () => ( DEFAULT_TIMING));
   const velocityJitter = _nullishCoalesce(opts.velocity, () => ( DEFAULT_VELOCITY_JITTER));
   const accent = _nullishCoalesce(opts.accent, () => ( DEFAULT_ACCENT));
   const baseVelocity = _nullishCoalesce(opts.baseVelocity, () => ( DEFAULT_BASE_VELOCITY));
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, timing, 0, Number.MAX_SAFE_INTEGER, "humanize timing");
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, velocityJitter, 0, 127, "humanize velocity jitter");
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, accent, 0, 127, "humanize accent");
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, baseVelocity, 0, 127, "humanize base velocity");
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, timing, 0, Number.MAX_SAFE_INTEGER, "humanize timing");
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, velocityJitter, 0, 127, "humanize velocity jitter");
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, accent, 0, 127, "humanize accent");
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, baseVelocity, 0, 127, "humanize base velocity");
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
   return sounding.map((event) => {
     const timingOffset = rng.float(-timing, timing);
     const startBeat = Math.max(0, event.startBeat + timingOffset);
-    const weight = _chunk36N73KZ3cjs.metricWeight.call(void 0, event.startBeat, ts);
+    const weight = _chunk2A2QMA74cjs.metricWeight.call(void 0, event.startBeat, ts);
     const accentBoost = weight / MAX_METRIC_WEIGHT * accent;
     const velocityOffset = rng.float(-velocityJitter, velocityJitter);
     const rawVelocity = (_nullishCoalesce(event.velocity, () => ( baseVelocity))) + accentBoost + velocityOffset;
@@ -2066,17 +2116,18 @@ function quantizeToGrid(beat, barBeats, subdivision, slotsPerBar) {
   };
 }
 function extractGrooveTemplate(events, ts, subdivision = DEFAULT_GROOVE_SUBDIVISION) {
-  _chunk7MGZ7D62cjs.assertTimeSignature.call(void 0, ts);
-  _chunk7MGZ7D62cjs.assertNoteEvents.call(void 0, events, "groove source events", { allowNonPositiveDuration: true });
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, subdivision, "groove subdivision");
-  const barBeats = _chunk36N73KZ3cjs.beatsPerBar.call(void 0, ts);
-  const slotsPerBar = Math.round(barBeats * subdivision);
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, slotsPerBar, "groove template slots");
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts);
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, events, "groove source events", { allowNonPositiveDuration: true });
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, subdivision, "groove subdivision");
+  const barBeats = _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
+  const slotsPerBar = Math.ceil(barBeats * subdivision);
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, slotsPerBar, "groove template slots");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, slotsPerBar, "groove template slots");
   const offsetSums = new Array(slotsPerBar).fill(0);
   const velocitySums = new Array(slotsPerBar).fill(0);
   const counts = new Array(slotsPerBar).fill(0);
   const velocityCounts = new Array(slotsPerBar).fill(0);
-  for (const event of _chunk7MGZ7D62cjs.dropSilentNotes.call(void 0, events)) {
+  for (const event of _chunkPI3UXRWKcjs.dropSilentNotes.call(void 0, events)) {
     const { quantizedBeat, slotIndex } = quantizeToGrid(
       event.startBeat,
       barBeats,
@@ -2106,21 +2157,21 @@ function extractGrooveTemplate(events, ts, subdivision = DEFAULT_GROOVE_SUBDIVIS
   return { subdivision, slotsPerBar, slots, ts };
 }
 function applyGrooveTemplate(events, template, ts) {
-  _chunk7MGZ7D62cjs.assertTimeSignature.call(void 0, ts);
-  _chunk7MGZ7D62cjs.assertNoteEvents.call(void 0, events, "groove target events", { allowNonPositiveDuration: true });
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, template.subdivision, "template subdivision");
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, template.slotsPerBar, "template slotsPerBar");
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, template.slots.length, "template slots");
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts);
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, events, "groove target events", { allowNonPositiveDuration: true });
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, template.subdivision, "template subdivision");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, template.slotsPerBar, "template slotsPerBar");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, template.slots.length, "template slots");
   if (template.slots.length !== template.slotsPerBar) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)("template slots length must equal slotsPerBar");
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)("template slots length must equal slotsPerBar");
   }
   if (template.ts && (template.ts.numerator !== ts.numerator || template.ts.denominator !== ts.denominator)) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(
-      `Groove template meter ${_chunk36N73KZ3cjs.formatTimeSignature.call(void 0, template.ts)} does not match apply-time meter ${_chunk36N73KZ3cjs.formatTimeSignature.call(void 0, ts)}`
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(
+      `Groove template meter ${_chunk2A2QMA74cjs.formatTimeSignature.call(void 0, template.ts)} does not match apply-time meter ${_chunk2A2QMA74cjs.formatTimeSignature.call(void 0, ts)}`
     );
   }
-  const barBeats = _chunk36N73KZ3cjs.beatsPerBar.call(void 0, ts);
-  return _chunk7MGZ7D62cjs.dropSilentNotes.call(void 0, events).map((event) => {
+  const barBeats = _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
+  return _chunkPI3UXRWKcjs.dropSilentNotes.call(void 0, events).map((event) => {
     const { quantizedBeat, slotIndex } = quantizeToGrid(
       event.startBeat,
       barBeats,
@@ -2128,7 +2179,7 @@ function applyGrooveTemplate(events, template, ts) {
       template.slotsPerBar
     );
     const slot = template.slots[slotIndex];
-    const startBeat = quantizedBeat + (_nullishCoalesce(_optionalChain([slot, 'optionalAccess', _21 => _21.timingOffset]), () => ( 0)));
+    const startBeat = Math.max(0, quantizedBeat + (_nullishCoalesce(_optionalChain([slot, 'optionalAccess', _21 => _21.timingOffset]), () => ( 0))));
     const velocity = slot && slot.velocity !== null && slot.velocity !== void 0 ? Math.round(slot.velocity) : event.velocity;
     return {
       pitch: event.pitch,
@@ -2145,7 +2196,7 @@ var FALLBACK = {
   quality: "maj",
   secondaryDominant: false,
   base: 0,
-  pcs: _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, _chunkFNDWXRRIcjs.makeChord.call(void 0, 0, "maj"))
+  pcs: _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, _chunkBSLTLGM3cjs.makeChord.call(void 0, 0, "maj"))
 };
 var DEFAULT_HARMONIC_RHYTHM = 2;
 var DEFAULT_PLACEMENT = { transposeSearch: false, octaveSearch: false };
@@ -2155,21 +2206,21 @@ var COMFORT_HIGH = 79;
 var TESSITURA_WEIGHT = 1e-3;
 var TIE_BREAK_JITTER2 = 1e-6;
 function inferKey(melody) {
-  let best = _chunkFNDWXRRIcjs.majorKey.call(void 0, 0);
+  let best = _chunkBSLTLGM3cjs.majorKey.call(void 0, 0);
   let bestScore = Number.NEGATIVE_INFINITY;
   const candidates = [];
   for (let tonic = 0; tonic < 12; tonic += 1) {
-    candidates.push(_chunkFNDWXRRIcjs.majorKey.call(void 0, tonic), _chunkFNDWXRRIcjs.minorKey.call(void 0, tonic));
+    candidates.push(_chunkBSLTLGM3cjs.majorKey.call(void 0, tonic), _chunkBSLTLGM3cjs.minorKey.call(void 0, tonic));
   }
   for (const key of candidates) {
-    const tonic = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc);
-    const isMinor = key.modeMask12 === _chunkFNDWXRRIcjs.NATURAL_MINOR_MASK;
+    const tonic = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc);
+    const isMinor = key.modeMask12 === _chunkBSLTLGM3cjs.NATURAL_MINOR_MASK;
     const leadingTone = (tonic + 11) % 12;
     let score = 0;
     for (const n of melody) {
       const w = Math.max(0.25, n.durationBeat);
-      const pc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, n.pitch);
-      if (_chunkFNDWXRRIcjs.isScaleTone.call(void 0, n.pitch, key) || isMinor && pc === leadingTone) {
+      const pc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, n.pitch);
+      if (_chunkBSLTLGM3cjs.isScaleTone.call(void 0, n.pitch, key) || isMinor && pc === leadingTone) {
         score += w;
       }
       if (pc === tonic) {
@@ -2184,16 +2235,16 @@ function inferKey(melody) {
   return best;
 }
 function buildCandidates(key, reharmonize) {
-  const tones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, key);
+  const tones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, key);
   const candidates = tones.map((rootPc, degree) => {
-    const quality = _chunkFNDWXRRIcjs.diatonicTriad.call(void 0, degree, key).quality;
+    const quality = _chunkBSLTLGM3cjs.diatonicTriad.call(void 0, degree, key).quality;
     return {
       rootPc,
       quality,
       degree,
       secondaryDominant: false,
       base: 0,
-      pcs: _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, _chunkFNDWXRRIcjs.makeChord.call(void 0, rootPc, quality))
+      pcs: _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, _chunkBSLTLGM3cjs.makeChord.call(void 0, rootPc, quality))
     };
   });
   if (reharmonize !== "diatonic") {
@@ -2206,22 +2257,22 @@ function buildCandidates(key, reharmonize) {
         secondaryDominant: true,
         targetDegree: target,
         base: 1.5,
-        pcs: _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, _chunkFNDWXRRIcjs.makeChord.call(void 0, rootPc, "dom7"))
+        pcs: _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, _chunkBSLTLGM3cjs.makeChord.call(void 0, rootPc, "dom7"))
       });
     }
   }
   if (reharmonize === "borrowed") {
-    const parallel = _chunkCAN76NCUcjs.parallelKey.call(void 0, key);
-    const parallelTones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, parallel);
+    const parallel = _chunkKQN2ZYNDcjs.parallelKey.call(void 0, key);
+    const parallelTones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, parallel);
     for (let degree = 0; degree < parallelTones.length; degree += 1) {
-      const chord = _chunkFNDWXRRIcjs.diatonicTriad.call(void 0, degree, parallel);
-      if (!_chunkCAN76NCUcjs.isDiatonic.call(void 0, chord, key)) {
+      const chord = _chunkBSLTLGM3cjs.diatonicTriad.call(void 0, degree, parallel);
+      if (!_chunkKQN2ZYNDcjs.isDiatonic.call(void 0, chord, key)) {
         candidates.push({
           rootPc: chord.rootPc,
           quality: chord.quality,
           secondaryDominant: false,
           base: 1.25,
-          pcs: _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, chord)
+          pcs: _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, chord)
         });
       }
     }
@@ -2250,12 +2301,12 @@ function emissionCost(seg, cand, melody, key, ts) {
       continue;
     }
     const w = Math.max(0.25, overlap);
-    if (pcs.includes(_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, note.pitch))) {
+    if (pcs.includes(_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, note.pitch))) {
       continue;
     }
-    const strong = _chunk36N73KZ3cjs.isStrongBeat.call(void 0, overlapStart, ts);
+    const strong = _chunk2A2QMA74cjs.isStrongBeat.call(void 0, overlapStart, ts);
     cost += (strong ? 10 : 2) * w;
-    if (!_chunkFNDWXRRIcjs.isScaleTone.call(void 0, note.pitch, key)) {
+    if (!_chunkBSLTLGM3cjs.isScaleTone.call(void 0, note.pitch, key)) {
       cost += w;
     }
   }
@@ -2288,7 +2339,7 @@ function transitionCost(prev, cur, tonicPc) {
   return cost;
 }
 function harmonizeOnce(melody, key, candidates, segments, jitter, ts) {
-  const tonicPc = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, key.rootPc);
+  const tonicPc = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, key.rootPc);
   const n = candidates.length;
   const candAt = (i) => _nullishCoalesce(candidates[i], () => ( FALLBACK));
   const seg0 = segments[0];
@@ -2338,43 +2389,49 @@ function harmonizeOnce(melody, key, candidates, segments, jitter, ts) {
   return { cost: bestCost, path };
 }
 function harmonizeMelody(opts) {
-  const noteIndex = _chunk36N73KZ3cjs.createNoteEventIndex.call(void 0, opts.melody, { allowNonPositiveDuration: true });
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, opts.melody, "harmonize melody", { allowNonPositiveDuration: true });
+  const soundingMelody = _chunkPI3UXRWKcjs.soundingNotesOnly.call(void 0, opts.melody);
+  const noteIndex = _chunk2A2QMA74cjs.createNoteEventIndex.call(void 0, soundingMelody);
   const ts = _nullishCoalesce(opts.ts, () => ( DEFAULT_METER));
-  _chunk7MGZ7D62cjs.assertTimeSignature.call(void 0, ts);
+  _chunkPI3UXRWKcjs.assertTimeSignature.call(void 0, ts);
   const requestedKey = _nullishCoalesce(opts.key, () => ( "infer"));
-  const key = requestedKey === "infer" ? inferKey(opts.melody) : requestedKey;
+  const key = requestedKey === "infer" ? inferKey(soundingMelody) : requestedKey;
   const placement = _nullishCoalesce(opts.placement, () => ( DEFAULT_PLACEMENT));
-  if (noteIndex.notes.every((indexed) => indexed.note.durationBeat <= 0)) {
+  if (noteIndex.notes.length === 0) {
     return { transposeSemitones: 0, key, chords: [], melodyRoles: [] };
   }
   const candidates = buildCandidates(key, _nullishCoalesce(opts.reharmonize, () => ( "diatonic")));
   const candAt = (i) => _nullishCoalesce(candidates[i], () => ( FALLBACK));
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
   const jitter = candidates.map(() => rng.next() * TIE_BREAK_JITTER2);
-  const melodyEnd = noteIndex.notes.reduce((m, n) => Math.max(m, n.endBeat), 0);
-  const hr = _chunk7MGZ7D62cjs.assertRange.call(void 0, 
+  const melodyStart = noteIndex.notes.reduce(
+    (start, indexed) => Math.min(start, indexed.note.startBeat),
+    Number.POSITIVE_INFINITY
+  );
+  const melodyEnd = noteIndex.notes.reduce((end, indexed) => Math.max(end, indexed.endBeat), 0);
+  const hr = _chunkPI3UXRWKcjs.assertRange.call(void 0, 
     _nullishCoalesce(opts.harmonicRhythm, () => ( DEFAULT_HARMONIC_RHYTHM)),
     Number.MIN_VALUE,
     Number.MAX_SAFE_INTEGER,
     "harmonic rhythm"
   );
-  const segCount = Math.max(1, Math.ceil(melodyEnd / hr));
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, segCount, "harmonic segments");
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, segCount * candidates.length * candidates.length, "harmonization search");
+  const segmentStart = Math.floor(melodyStart / hr) * hr;
+  const segCount = Math.max(1, Math.ceil((melodyEnd - segmentStart) / hr));
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, segCount, "harmonic segments");
   const segments = Array.from({ length: segCount }, (_, s) => ({
-    startBeat: s * hr,
-    endBeat: (s + 1) * hr,
+    startBeat: segmentStart + s * hr,
+    endBeat: segmentStart + (s + 1) * hr,
     noteIndices: []
   }));
   let memberships = 0;
   for (const indexed of noteIndex.notes) {
-    if (indexed.note.durationBeat <= 0) {
-      continue;
-    }
-    const first = Math.max(0, Math.floor(indexed.note.startBeat / hr));
-    const lastExclusive = Math.min(segCount, Math.ceil(indexed.endBeat / hr - Number.EPSILON));
+    const first = Math.max(0, Math.floor((indexed.note.startBeat - segmentStart) / hr));
+    const lastExclusive = Math.min(
+      segCount,
+      Math.ceil((indexed.endBeat - segmentStart) / hr - Number.EPSILON)
+    );
     memberships += Math.max(0, lastExclusive - first);
-    _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, memberships, "note-to-segment memberships");
+    _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, memberships, "note-to-segment memberships");
     for (let segment = first; segment < lastExclusive; segment += 1) {
       _optionalChain([segments, 'access', _22 => _22[segment], 'optionalAccess', _23 => _23.noteIndices, 'access', _24 => _24.push, 'call', _25 => _25(indexed.originalIndex)]);
     }
@@ -2394,6 +2451,10 @@ function harmonizeMelody(opts) {
       }
     }
   }
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, 
+    transposes.length * segCount * candidates.length * candidates.length,
+    "harmonization placement search"
+  );
   let bestCost = Number.POSITIVE_INFINITY;
   let bestTs = 0;
   let bestPath = [];
@@ -2414,7 +2475,7 @@ function harmonizeMelody(opts) {
     const chord = {
       rootPc: cand.rootPc,
       quality: cand.quality,
-      startBeat: _nullishCoalesce(_optionalChain([segments, 'access', _26 => _26[s], 'optionalAccess', _27 => _27.startBeat]), () => ( s * hr))
+      startBeat: _nullishCoalesce(_optionalChain([segments, 'access', _26 => _26[s], 'optionalAccess', _27 => _27.startBeat]), () => ( segmentStart + s * hr))
     };
     if (cand.degree !== void 0) {
       chord.degree = cand.degree;
@@ -2427,8 +2488,8 @@ function harmonizeMelody(opts) {
   const melodyRoles = bestMelody.map((note, noteIndex2) => {
     const segIdx = Math.min(segments.length - 1, Math.max(0, Math.floor(note.startBeat / hr)));
     const cand = candAt(_nullishCoalesce(bestPath[segIdx], () => ( 0)));
-    const chord = _chunkFNDWXRRIcjs.makeChord.call(void 0, cand.rootPc, cand.quality);
-    return { noteIndex: noteIndex2, role: _chunkFCANXBATcjs.roleOf.call(void 0, note.pitch, chord).role };
+    const chord = _chunkBSLTLGM3cjs.makeChord.call(void 0, cand.rootPc, cand.quality);
+    return { noteIndex: noteIndex2, role: _chunkYFJXS3AUcjs.roleOf.call(void 0, note.pitch, chord).role };
   });
   return { transposeSemitones: bestTs, key, chords, melodyRoles };
 }
@@ -2443,7 +2504,7 @@ function isDownbeat(startBeat, barBeats) {
 }
 function upScaleTone(pitch, key) {
   for (let d = 1; d <= 12; d += 1) {
-    if (_chunkFNDWXRRIcjs.isScaleTone.call(void 0, pitch + d, key)) {
+    if (_chunkBSLTLGM3cjs.isScaleTone.call(void 0, pitch + d, key)) {
       return pitch + d;
     }
   }
@@ -2451,14 +2512,14 @@ function upScaleTone(pitch, key) {
 }
 function downScaleTone(pitch, key) {
   for (let d = 1; d <= 12; d += 1) {
-    if (_chunkFNDWXRRIcjs.isScaleTone.call(void 0, pitch - d, key)) {
+    if (_chunkBSLTLGM3cjs.isScaleTone.call(void 0, pitch - d, key)) {
       return pitch - d;
     }
   }
   return pitch - 12;
 }
 function stepDiatonic(pitch, degrees, key) {
-  let p = _chunkFNDWXRRIcjs.nearestScaleTone.call(void 0, pitch, key);
+  let p = _chunkBSLTLGM3cjs.nearestScaleTone.call(void 0, pitch, key);
   const steps = Math.abs(Math.trunc(degrees));
   for (let i = 0; i < steps; i += 1) {
     p = degrees >= 0 ? upScaleTone(p, key) : downScaleTone(p, key);
@@ -2466,12 +2527,12 @@ function stepDiatonic(pitch, degrees, key) {
   return p;
 }
 function nearestChordTone(pitch, chord) {
-  const pcs = _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, chord);
+  const pcs = _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, chord);
   for (let d = 0; d <= 12; d += 1) {
-    if (pcs.includes(_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, pitch - d))) {
+    if (pcs.includes(_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, pitch - d))) {
       return pitch - d;
     }
-    if (pcs.includes(_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, pitch + d))) {
+    if (pcs.includes(_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, pitch + d))) {
       return pitch + d;
     }
   }
@@ -2524,16 +2585,16 @@ function contourOffsets(contour, count) {
 }
 function generateMotif(opts) {
   const contour = _nullishCoalesce(opts.contour, () => ( "arch"));
-  const bars = _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, opts.bars, "motif bars");
-  const barBeats = _chunk36N73KZ3cjs.beatsPerBar.call(void 0, _nullishCoalesce(opts.ts, () => ( DEFAULT_TS4)));
+  const bars = _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, opts.bars, "motif bars");
+  const barBeats = _chunk2A2QMA74cjs.beatsPerBar.call(void 0, _nullishCoalesce(opts.ts, () => ( DEFAULT_TS4)));
   const totalBeats = bars * barBeats;
   const noteCount = Math.max(3, bars * 2);
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, noteCount, "motif notes");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, noteCount, "motif notes");
   const beatsPerNote = totalBeats / noteCount;
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
-  const requestedJitter = _chunk7MGZ7D62cjs.assertFiniteNumber.call(void 0, _nullishCoalesce(opts.jitter, () => ( 0)), "motif jitter");
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, _nullishCoalesce(opts.seed, () => ( 0)));
+  const requestedJitter = _chunkPI3UXRWKcjs.assertFiniteNumber.call(void 0, _nullishCoalesce(opts.jitter, () => ( 0)), "motif jitter");
   const jitterProb = Math.min(1, Math.max(0, requestedJitter));
-  const tonic = _chunk7MGZ7D62cjs.pitchClassOf.call(void 0, opts.key.rootPc) + 60;
+  const tonic = _chunkPI3UXRWKcjs.pitchClassOf.call(void 0, opts.key.rootPc) + 60;
   const offsets = contourOffsets(contour, noteCount);
   const notes = [];
   for (let i = 0; i < noteCount; i += 1) {
@@ -2546,7 +2607,11 @@ function generateMotif(opts) {
     if (opts.chord && isDownbeat(startBeat, barBeats)) {
       pitch = nearestChordTone(pitch, opts.chord);
     }
-    notes.push({ pitch, startBeat, durationBeat: beatsPerNote });
+    notes.push({
+      pitch: _chunkPI3UXRWKcjs.clampToMidi.call(void 0, pitch, "generated motif pitch"),
+      startBeat,
+      durationBeat: beatsPerNote
+    });
   }
   return { notes };
 }
@@ -2559,7 +2624,7 @@ function transformMotif(cell, t, amount, key) {
 function assertInRange(cell) {
   for (const note of cell.notes) {
     if (note.pitch < 0 || note.pitch > 127) {
-      throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(
+      throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(
         `transformed motif pitch ${note.pitch} is outside the MIDI range 0..127`
       );
     }
@@ -2567,15 +2632,18 @@ function assertInRange(cell) {
   return cell;
 }
 function transformUnchecked(cell, t, amount, key) {
-  _chunk7MGZ7D62cjs.assertNoteEvents.call(void 0, cell.notes, "motif notes");
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, cell.notes, "motif notes");
   if (amount !== void 0) {
-    _chunk7MGZ7D62cjs.assertFiniteNumber.call(void 0, amount, "motif transform amount");
+    _chunkPI3UXRWKcjs.assertFiniteNumber.call(void 0, amount, "motif transform amount");
   }
-  if ((t === "transposeDiatonic" || t === "sequence") && amount !== void 0) {
-    _chunk7MGZ7D62cjs.assertInteger.call(void 0, amount, "diatonic transform amount");
+  if ((t === "transposeChromatic" || t === "transposeDiatonic" || t === "sequence") && amount !== void 0) {
+    _chunkPI3UXRWKcjs.assertInteger.call(void 0, 
+      amount,
+      `${t === "transposeChromatic" ? "chromatic" : "diatonic"} transform amount`
+    );
   }
   if ((t === "augment" || t === "diminish") && amount !== void 0 && amount <= 0) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)("time transform amount must be positive");
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)("time transform amount must be positive");
   }
   const notes = cell.notes;
   switch (t) {
@@ -2636,10 +2704,10 @@ function scaleTime(cell, factor) {
   };
 }
 function developMotif(cell, timeline, key, bars, ts = DEFAULT_TS4) {
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, bars, "development bars");
-  _chunk7MGZ7D62cjs.assertNoteEvents.call(void 0, cell.notes, "motif notes");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, bars, "development bars");
+  _chunkPI3UXRWKcjs.assertNoteEvents.call(void 0, cell.notes, "motif notes");
   const span = cellSpan(cell);
-  const totalBeats = bars * _chunk36N73KZ3cjs.beatsPerBar.call(void 0, ts);
+  const totalBeats = bars * _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
   const origin = cellOrigin(cell.notes);
   const out = [];
   if (span <= 0) {
@@ -2647,7 +2715,7 @@ function developMotif(cell, timeline, key, bars, ts = DEFAULT_TS4) {
   }
   const tileSpan = Math.max(span, MIN_TILE_SPAN);
   const tileCount = Math.ceil(totalBeats / tileSpan);
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, tileCount * cell.notes.length, "developed motif notes");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, tileCount * cell.notes.length, "developed motif notes");
   for (let k = 0; k < tileCount; k += 1) {
     const offset = k * tileSpan;
     for (const n of cell.notes) {
@@ -2658,10 +2726,10 @@ function developMotif(cell, timeline, key, bars, ts = DEFAULT_TS4) {
       const chord = timeline.at(startBeat);
       let pitch = n.pitch;
       if (chord) {
-        const isMember = _chunkFNDWXRRIcjs.chordPitchClasses.call(void 0, chord).includes(_chunk7MGZ7D62cjs.pitchClassOf.call(void 0, pitch));
+        const isMember = _chunkBSLTLGM3cjs.chordPitchClasses.call(void 0, chord).includes(_chunkPI3UXRWKcjs.pitchClassOf.call(void 0, pitch));
         pitch = isMember ? pitch : nearestChordTone(pitch, chord);
       } else {
-        pitch = _chunkFNDWXRRIcjs.nearestScaleTone.call(void 0, pitch, key);
+        pitch = _chunkBSLTLGM3cjs.nearestScaleTone.call(void 0, pitch, key);
       }
       out.push({ pitch, startBeat, durationBeat: n.durationBeat });
     }
@@ -2670,7 +2738,7 @@ function developMotif(cell, timeline, key, bars, ts = DEFAULT_TS4) {
 }
 
 // src/generate/progression/index.ts
-var BORROWED_DEGREES = {
+var BORROWED_DEGREES = Object.freeze({
   /** Flat submediant: bVI. */
   bVI: 8,
   /** Flat subtonic: bVII. */
@@ -2683,7 +2751,7 @@ var BORROWED_DEGREES = {
   bII: 13,
   /** Sharp subdominant, the diminished #IV. */
   sharpIV: 14
-};
+});
 var PRESETS = [
   {
     id: "fourChordPop",
@@ -2856,15 +2924,19 @@ function progressionsByStyle(style) {
 }
 function degreeToRootPc(degree, key) {
   if (degree >= 0 && degree <= 6) {
-    const tones = _chunkFNDWXRRIcjs.scaleTonesInDegreeOrder.call(void 0, key);
+    const tones = _chunkBSLTLGM3cjs.scaleTonesInDegreeOrder.call(void 0, key);
     return tones.length > 0 ? _nullishCoalesce(tones[degree % tones.length], () => ( key.rootPc % 12)) : key.rootPc % 12;
   }
   const offset = _nullishCoalesce(BORROWED_OFFSET[degree], () => ( 0));
   return ((key.rootPc % 12 + offset) % 12 + 12) % 12;
 }
-function autoQuality(degree, key) {
+function autoQuality(degree, key, harmonicDominant) {
   if (degree >= 0 && degree <= 6) {
-    return _chunkFNDWXRRIcjs.diatonicTriad.call(void 0, degree, key).quality;
+    const isMinor = (key.modeMask12 >> 3 & 1) === 1 && (key.modeMask12 >> 4 & 1) === 0;
+    if (harmonicDominant && isMinor && degree === 4) {
+      return "maj";
+    }
+    return _chunkBSLTLGM3cjs.diatonicTriad.call(void 0, degree, key).quality;
   }
   if (degree === 14) {
     return "dim";
@@ -2874,13 +2946,13 @@ function autoQuality(degree, key) {
   }
   return "maj";
 }
-function resolveCycle(degrees, key, ext) {
+function resolveCycle(degrees, key, ext, harmonicDominant) {
   const steps = [];
   for (const degree of degrees) {
     const step = {
       source: degree,
       rootPc: degreeToRootPc(degree, key),
-      quality: ext !== void 0 && ext !== "auto" ? ext : autoQuality(degree, key)
+      quality: ext !== void 0 && ext !== "auto" ? ext : autoQuality(degree, key, harmonicDominant)
     };
     if (degree >= 0 && degree <= 6) {
       step.degree = degree;
@@ -2904,25 +2976,34 @@ function sameStep(a, b) {
 function pickProgressionPreset(style, seed = 0) {
   const pool = PRESETS.filter((preset) => preset.styles.includes(style));
   if (pool.length === 0) {
-    throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`Unknown progression style: ${style}`);
+    throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`Unknown progression style: ${style}`);
   }
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, seed);
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, seed);
   const index = Math.floor(rng.next() * pool.length) % pool.length;
   return _nullishCoalesce(pool[index], () => ( PRESETS[0]));
 }
 function generateProgression(opts) {
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, opts.bars, "progression bars");
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, opts.bars, "progression chords");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, opts.bars, "progression bars");
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, opts.bars, "progression chords");
   const seed = _nullishCoalesce(opts.seed, () => ( 0));
   let preset;
   if (opts.preset !== void 0) {
     if (opts.preset.degrees.length === 0) {
-      throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)("progression preset must name at least one degree");
+      throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)("progression preset must name at least one degree");
     }
     preset = {
       id: _nullishCoalesce(opts.preset.id, () => ( "custom")),
       name: _nullishCoalesce(opts.preset.name, () => ( "Custom")),
-      degrees: opts.preset.degrees,
+      degrees: opts.preset.degrees.map((degree, index) => {
+        _chunkPI3UXRWKcjs.assertDegree.call(void 0, degree, `progression preset degrees[${index}]`);
+        const supported = degree >= 0 && degree <= 6 || Object.values(BORROWED_DEGREES).includes(degree);
+        if (!supported) {
+          throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(
+            `progression preset degrees[${index}] is not a supported progression degree; received ${degree}`
+          );
+        }
+        return degree;
+      }),
       functional: _nullishCoalesce(opts.preset.functional, () => ( "loop")),
       styles: _nullishCoalesce(opts.preset.styles, () => ( [opts.style]))
     };
@@ -2930,27 +3011,34 @@ function generateProgression(opts) {
   if (preset === void 0 && opts.presetId !== void 0) {
     preset = PRESETS.find((p) => p.id === opts.presetId);
     if (preset === void 0) {
-      throw new (0, _chunk7MGZ7D62cjs.InvalidInputError)(`Unknown progression preset: ${opts.presetId}`);
+      throw new (0, _chunkPI3UXRWKcjs.InvalidInputError)(`Unknown progression preset: ${opts.presetId}`);
     }
   }
   preset ??= pickProgressionPreset(opts.style, seed);
-  const cycle = resolveCycle(_nullishCoalesce(_optionalChain([preset, 'optionalAccess', _30 => _30.degrees]), () => ( [0])), opts.key, opts.ext);
+  const ext = opts.ext === void 0 ? "auto" : _chunkPI3UXRWKcjs.assertOneOf.call(void 0, opts.ext, ["auto", ..._chunkBSLTLGM3cjs.chordQualities.call(void 0, )], "progression extension");
+  const cycle = resolveCycle(
+    _nullishCoalesce(_optionalChain([preset, 'optionalAccess', _30 => _30.degrees]), () => ( [0])),
+    opts.key,
+    ext,
+    _optionalChain([preset, 'optionalAccess', _31 => _31.functional]) === "cadenceStrong"
+  );
   const chords = [];
   for (let bar = 0; bar < opts.bars; bar += 1) {
     const step = cycle[bar % cycle.length];
     const chord = {
-      rootPc: _nullishCoalesce(_optionalChain([step, 'optionalAccess', _31 => _31.rootPc]), () => ( 0)),
-      quality: _nullishCoalesce(_optionalChain([step, 'optionalAccess', _32 => _32.quality]), () => ( "maj")),
+      rootPc: _nullishCoalesce(_optionalChain([step, 'optionalAccess', _32 => _32.rootPc]), () => ( 0)),
+      quality: _nullishCoalesce(_optionalChain([step, 'optionalAccess', _33 => _33.quality]), () => ( "maj")),
       startBeat: bar * 4
     };
-    if (_optionalChain([step, 'optionalAccess', _33 => _33.degree]) !== void 0) {
+    if (_optionalChain([step, 'optionalAccess', _34 => _34.degree]) !== void 0) {
       chord.degree = step.degree;
     }
     chords.push(chord);
   }
   if (opts.reharmonize) {
     const tonicPc = (opts.key.rootPc % 12 + 12) % 12;
-    const rrng = _chunkRUMU3UA6cjs.createRng.call(void 0, (seed ^ 2654435769) >>> 0);
+    const rrng = _chunkMTMZTMWMcjs.createRng.call(void 0, (seed ^ 2654435769) >>> 0);
+    let tonicStatements = chords.filter((chord) => chord.rootPc === tonicPc).length;
     for (let i = 0; i < chords.length - 1; i += 1) {
       const cur = chords[i];
       const next = chords[i + 1];
@@ -2959,12 +3047,16 @@ function generateProgression(opts) {
       }
       const domRoot = (next.rootPc + 7) % 12;
       const targetsTonic = (next.rootPc - tonicPc + 12) % 12 === 0;
+      const isLastTonicStatement = cur.rootPc === tonicPc && tonicStatements <= 1;
       const alreadySecondary = cur.rootPc === domRoot && cur.quality === "dom7";
-      const isResolutionTarget = _optionalChain([chords, 'access', _34 => _34[i - 1], 'optionalAccess', _35 => _35.secondaryDominant]) === true;
-      if (targetsTonic || alreadySecondary || isResolutionTarget) {
+      const isResolutionTarget = _optionalChain([chords, 'access', _35 => _35[i - 1], 'optionalAccess', _36 => _36.secondaryDominant]) === true;
+      if (targetsTonic || isLastTonicStatement || alreadySecondary || isResolutionTarget) {
         continue;
       }
       if (rrng.next() < 0.5) {
+        if (cur.rootPc === tonicPc) {
+          tonicStatements -= 1;
+        }
         chords[i] = {
           rootPc: domRoot,
           quality: "dom7",
@@ -2980,8 +3072,8 @@ function generateProgression(opts) {
 // src/generate/rhythm/index.ts
 var DEFAULT_RHYTHM_VELOCITY = 96;
 function rhythmToNoteEvents(events, pitch, velocity = DEFAULT_RHYTHM_VELOCITY) {
-  _chunk7MGZ7D62cjs.assertFiniteNumber.call(void 0, pitch, "pitch");
-  _chunk7MGZ7D62cjs.assertRange.call(void 0, velocity, 0, 127, "velocity");
+  _chunkPI3UXRWKcjs.assertFiniteNumber.call(void 0, pitch, "pitch");
+  _chunkPI3UXRWKcjs.assertRange.call(void 0, velocity, 0, 127, "velocity");
   return events.map((event) => ({
     pitch,
     startBeat: event.position,
@@ -3008,27 +3100,34 @@ function generateRhythm(ts, opts = {}) {
   const seed = _nullishCoalesce(opts.seed, () => ( 0));
   const bars = _nullishCoalesce(opts.bars, () => ( DEFAULT_BARS));
   const subdivision = _nullishCoalesce(opts.subdivision, () => ( DEFAULT_SUBDIVISION));
-  const density = _chunk7MGZ7D62cjs.assertRange.call(void 0, _nullishCoalesce(opts.density, () => ( DEFAULT_DENSITY)), 0, 1, "rhythm density");
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, bars, "rhythm bars");
-  _chunk7MGZ7D62cjs.assertPositiveInt.call(void 0, subdivision, "rhythm subdivision");
-  const barBeats = _chunk36N73KZ3cjs.beatsPerBar.call(void 0, ts);
+  const density = _chunkPI3UXRWKcjs.assertRange.call(void 0, _nullishCoalesce(opts.density, () => ( DEFAULT_DENSITY)), 0, 1, "rhythm density");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, bars, "rhythm bars");
+  _chunkPI3UXRWKcjs.assertPositiveInt.call(void 0, subdivision, "rhythm subdivision");
+  const barBeats = _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
   const spanBeats = barBeats * bars;
   const step = 1 / subdivision;
-  const slotCount = Math.round(spanBeats * subdivision);
-  _chunk7MGZ7D62cjs.assertGenerationBudget.call(void 0, slotCount, "rhythm grid slots");
-  const slotsPerBar = Math.round(barBeats * subdivision);
-  const rng = _chunkRUMU3UA6cjs.createRng.call(void 0, seed);
+  const slotsPerBar = Math.ceil(barBeats * subdivision);
+  const slotCount = slotsPerBar * bars;
+  _chunkPI3UXRWKcjs.assertGenerationBudget.call(void 0, slotCount, "rhythm grid slots");
+  const rng = _chunkMTMZTMWMcjs.createRng.call(void 0, seed);
   const positions = [];
-  for (let i = 0; i < slotCount; i += 1) {
-    const position = i * step;
-    if (i % slotsPerBar === 0) {
-      positions.push(position);
-      continue;
-    }
-    const weight = _chunk36N73KZ3cjs.metricWeight.call(void 0, position, ts);
-    const probability = onsetWeightCurve(weight) * density;
-    if (rng.prob(probability)) {
-      positions.push(position);
+  for (let bar = 0; bar < bars; bar += 1) {
+    const barStart = bar * barBeats;
+    const barEnd = barStart + barBeats;
+    for (let slot = 0; slot < slotsPerBar; slot += 1) {
+      const position = barStart + slot * step;
+      if (position >= barEnd - Number.EPSILON) {
+        break;
+      }
+      if (slot === 0) {
+        positions.push(position);
+        continue;
+      }
+      const weight = _chunk2A2QMA74cjs.metricWeight.call(void 0, position, ts);
+      const probability = onsetWeightCurve(weight) * density;
+      if (rng.prob(probability)) {
+        positions.push(position);
+      }
     }
   }
   const events = [];
@@ -3044,8 +3143,8 @@ function rhythmDensity(events, ts) {
     return 0;
   }
   const last = events[events.length - 1];
-  const spanBeats = (_nullishCoalesce(_optionalChain([last, 'optionalAccess', _36 => _36.position]), () => ( 0))) + (_nullishCoalesce(_optionalChain([last, 'optionalAccess', _37 => _37.duration]), () => ( 0)));
-  const bars = spanBeats / _chunk36N73KZ3cjs.beatsPerBar.call(void 0, ts);
+  const spanBeats = (_nullishCoalesce(_optionalChain([last, 'optionalAccess', _37 => _37.position]), () => ( 0))) + (_nullishCoalesce(_optionalChain([last, 'optionalAccess', _38 => _38.duration]), () => ( 0)));
+  const bars = spanBeats / _chunk2A2QMA74cjs.beatsPerBar.call(void 0, ts);
   return bars > 0 ? events.length / bars : 0;
 }
 
@@ -3074,4 +3173,4 @@ function rhythmDensity(events, ts) {
 
 
 exports.BASS_STYLES = BASS_STYLES; exports.generateBassLine = generateBassLine; exports.generateCounterMelody = generateCounterMelody; exports.DRUM_NOTES = DRUM_NOTES; exports.drumVoiceOf = drumVoiceOf; exports.generateDrums = generateDrums; exports.humanize = humanize; exports.extractGrooveTemplate = extractGrooveTemplate; exports.applyGrooveTemplate = applyGrooveTemplate; exports.harmonizeMelody = harmonizeMelody; exports.generateMotif = generateMotif; exports.motifToNoteEvents = motifToNoteEvents; exports.transformMotif = transformMotif; exports.developMotif = developMotif; exports.BORROWED_DEGREES = BORROWED_DEGREES; exports.progressions = progressions; exports.progressionsByStyle = progressionsByStyle; exports.pickProgressionPreset = pickProgressionPreset; exports.generateProgression = generateProgression; exports.rhythmToNoteEvents = rhythmToNoteEvents; exports.onsetWeightCurve = onsetWeightCurve; exports.generateRhythm = generateRhythm; exports.rhythmDensity = rhythmDensity;
-//# sourceMappingURL=chunk-4HLLZPXT.cjs.map
+//# sourceMappingURL=chunk-MPTVJIVG.cjs.map