@onjmin/dtm 2.1.10 → 2.1.11

package/dist/index.js

@@ -1970,11 +1970,19 @@ var createChannelStrip = (ctx, destination, options = {}) => {
   const duckGain = ctx.createGain();
   duckGain.gain.value = 1;
   const DUCK_ATTACK_SEC = 8e-3;
+  let duckReleaseEndAt = 0;
   const duck = (atTime, depth = 0.3, releaseSec = 0.18) => {
     const t = Math.max(atTime, ctx.currentTime);
     const floor = clamp(1 - depth, 0, 1);
-    duckGain.gain.linearRampToValueAtTime(floor, t + DUCK_ATTACK_SEC);
-    duckGain.gain.linearRampToValueAtTime(1, t + DUCK_ATTACK_SEC + releaseSec);
+    const param = duckGain.gain;
+    if (t >= duckReleaseEndAt) {
+      param.setValueAtTime(1, t);
+    } else if (typeof param.cancelAndHoldAtTime === "function") {
+      param.cancelAndHoldAtTime(t);
+    }
+    param.linearRampToValueAtTime(floor, t + DUCK_ATTACK_SEC);
+    param.linearRampToValueAtTime(1, t + DUCK_ATTACK_SEC + releaseSec);
+    duckReleaseEndAt = t + DUCK_ATTACK_SEC + releaseSec;
   };
   eqHigh.connect(compressor);
   compressor.connect(duckGain);
@@ -2271,12 +2279,15 @@ var buildChordPlacements = (options) => {
             }
           }
         } else if (patternType === "alternating") {
+          const quarterSteps = Math.floor(stepsPerBar / 4);
           notes.forEach((noteOffset, i2) => {
-            const stepOffset = i2 * Math.floor(stepsPerBar / 4);
+            const stepOffset = i2 * quarterSteps;
+            const isLast = i2 === notes.length - 1;
+            const durationSteps = isLast ? Math.max(12, noteLength - stepOffset) : Math.max(12, quarterSteps);
             placements.push({
               startStep: chord.whenStep + stepOffset,
               pitchUnits: toUnits(noteOffset),
-              durationSteps: Math.max(12, Math.floor(stepsPerBar / 4)),
+              durationSteps,
               velocity: 100
             });
           });
@@ -4904,6 +4915,45 @@ var createReverbImpulse = (ctx, decaySec = DEFAULT_REVERB_DECAY_SEC) => {
 };
 var reverbAmountToGain = (amount) => Math.max(0, Math.min(100, amount)) / 100;
 
+// src/safety-limiter.ts
+var THRESHOLD_DB = -1;
+var KNEE_DB = 0;
+var RATIO = 20;
+var ATTACK_SEC = 1e-3;
+var RELEASE_SEC = 0.1;
+var CURVE_SAMPLES2 = 2048;
+var SOFT_KNEE = 0.85;
+var CEILING = 0.98;
+var SHAPER_RANGE = 4;
+var OVERSAMPLE2 = "none";
+var createSoftClipCurve = () => {
+  const curve = new Float32Array(CURVE_SAMPLES2);
+  const span = CEILING - SOFT_KNEE;
+  for (let i2 = 0; i2 < CURVE_SAMPLES2; i2++) {
+    const x2 = (i2 / (CURVE_SAMPLES2 - 1) * 2 - 1) * SHAPER_RANGE;
+    const a = Math.abs(x2);
+    curve[i2] = Math.sign(x2) * (a <= SOFT_KNEE ? a : SOFT_KNEE + span * Math.tanh((a - SOFT_KNEE) / span));
+  }
+  return curve;
+};
+var createSafetyLimiter = (ctx, destination) => {
+  const limiter = ctx.createDynamicsCompressor();
+  limiter.threshold.value = THRESHOLD_DB;
+  limiter.knee.value = KNEE_DB;
+  limiter.ratio.value = RATIO;
+  limiter.attack.value = ATTACK_SEC;
+  limiter.release.value = RELEASE_SEC;
+  const preScale = ctx.createGain();
+  preScale.gain.value = 1 / SHAPER_RANGE;
+  const softClip = ctx.createWaveShaper();
+  softClip.curve = createSoftClipCurve();
+  softClip.oversample = OVERSAMPLE2;
+  limiter.connect(preScale);
+  preScale.connect(softClip);
+  softClip.connect(destination);
+  return limiter;
+};
+
 // src/sequencer.ts
 var STEPS_PER_BEAT = 48;
 var PLAN_TIME = 0.5;
@@ -7367,6 +7417,9 @@ var SONG_DRUM_PATTERNS = {
 
 // src/synth.ts
 var freqFromPitch = (pitchUnits) => unitsToHz(pitchUnits);
+var MIN_ATTACK_SEC = 15e-4;
+var MIN_RELEASE_SEC = 4e-3;
+var TAIL_RATIO = 1e-3;
 var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
   const wave = tone.wave ?? "square";
   const attack = tone.attack ?? 0;
@@ -7385,25 +7438,25 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
     osc.frequency.value = freqFromPitch(e.pitchUnits);
     const t0 = ctx.currentTime + e.when;
     const peak = Math.max(1e-4, 0.06 * e.volume * 1.5 * gainScale);
+    const tail = peak * TAIL_RATIO;
+    const stopAt = t0 + e.duration + MIN_RELEASE_SEC;
     if (tone.decay) {
       gain.gain.setValueAtTime(1e-4, t0);
       gain.gain.linearRampToValueAtTime(peak, t0 + Math.max(3e-3, attack));
-      gain.gain.exponentialRampToValueAtTime(1e-3, t0 + e.duration);
+      gain.gain.exponentialRampToValueAtTime(tail, t0 + e.duration);
     } else {
       const releaseTime = Math.min(0.02, e.duration * 0.1);
       const sustainDuration = e.duration - releaseTime;
-      if (attack > 0) {
-        gain.gain.setValueAtTime(1e-4, t0);
-        gain.gain.linearRampToValueAtTime(
-          peak,
-          t0 + Math.min(attack, sustainDuration)
-        );
-      } else {
-        gain.gain.setValueAtTime(peak, t0);
-      }
+      const attackTime = Math.min(
+        Math.max(attack, MIN_ATTACK_SEC),
+        sustainDuration
+      );
+      gain.gain.setValueAtTime(1e-4, t0);
+      gain.gain.linearRampToValueAtTime(peak, t0 + attackTime);
       gain.gain.setValueAtTime(peak, t0 + sustainDuration);
-      gain.gain.exponentialRampToValueAtTime(1e-3, t0 + e.duration);
+      gain.gain.exponentialRampToValueAtTime(tail, t0 + e.duration);
     }
+    gain.gain.linearRampToValueAtTime(0, stopAt);
     osc.connect(gain);
     let panner = null;
     if (typeof ctx.createStereoPanner === "function" && e.pan) {
@@ -7415,7 +7468,7 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
       gain.connect(compressor);
     }
     osc.start(t0);
-    osc.stop(t0 + e.duration + 0.02);
+    osc.stop(stopAt);
     osc.onended = () => {
       osc.disconnect();
       gain.disconnect();
@@ -7430,14 +7483,21 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
     if (isKick) {
       const osc = ctx.createOscillator();
       const g2 = ctx.createGain();
+      const kickPeak = vol * 0.135;
+      const kickDecayEnd = t0 + 0.18;
+      const kickEnd = kickDecayEnd + MIN_RELEASE_SEC;
       osc.frequency.setValueAtTime(150, t0);
       osc.frequency.exponentialRampToValueAtTime(50, t0 + 0.12);
-      g2.gain.setValueAtTime(vol * 0.135, t0);
-      g2.gain.exponentialRampToValueAtTime(1e-3, t0 + 0.18);
+      g2.gain.setValueAtTime(kickPeak, t0);
+      g2.gain.exponentialRampToValueAtTime(kickPeak * TAIL_RATIO, kickDecayEnd);
+      g2.gain.linearRampToValueAtTime(0, kickEnd);
       osc.connect(g2).connect(compressor);
       osc.start(t0);
-      osc.stop(t0 + 0.2);
-      osc.onended = () => osc.disconnect();
+      osc.stop(kickEnd);
+      osc.onended = () => {
+        osc.disconnect();
+        g2.disconnect();
+      };
       return;
     }
     const dur = isSnareLike ? 0.18 : 0.05;
@@ -7451,8 +7511,13 @@ var createSynth = (ctx, destination = ctx.destination, tone = {}) => {
     filter.type = isSnareLike ? "bandpass" : "highpass";
     filter.frequency.value = isSnareLike ? 2e3 : 8e3;
     const g = ctx.createGain();
-    g.gain.setValueAtTime(vol * (isSnareLike ? 0.105 : 0.06), t0);
-    g.gain.exponentialRampToValueAtTime(1e-3, t0 + dur);
+    const noisePeak = vol * (isSnareLike ? 0.105 : 0.06);
+    g.gain.setValueAtTime(noisePeak, t0);
+    g.gain.exponentialRampToValueAtTime(
+      noisePeak * TAIL_RATIO,
+      t0 + dur - MIN_RELEASE_SEC
+    );
+    g.gain.linearRampToValueAtTime(0, t0 + dur);
     src.connect(filter).connect(g).connect(compressor);
     src.start(t0);
     src.stop(t0 + dur);
@@ -7514,7 +7579,7 @@ var playPlacements = (placements, options) => {
   reverbPreDelay.connect(reverbConvolver);
   reverbConvolver.connect(reverbWetGain);
   reverbWetGain.connect(finalMix);
-  finalMix.connect(rawDestination);
+  finalMix.connect(createSafetyLimiter(ctx, rawDestination));
   const channelStrips = /* @__PURE__ */ new Map();
   const getChannelStrip = (index) => {
     let strip = channelStrips.get(index);
@@ -9969,17 +10034,24 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (!audioCtx) audioCtx = new AudioContext();
     return audioCtx;
   };
+  let limiterNode = null;
+  const ensureOutput = () => {
+    const ctx = ensureCtx();
+    if (!limiterNode) limiterNode = createSafetyLimiter(ctx, ctx.destination);
+    return limiterNode;
+  };
   let synthInstance = null;
   const ensureSynth = () => {
-    if (!synthInstance) synthInstance = createSynth(ensureCtx());
+    if (!synthInstance) {
+      synthInstance = createSynth(ensureCtx(), ensureOutput());
+    }
     return synthInstance;
   };
   let voices = null;
   const ensureVoices = () => {
     if (options.singingVoices) return options.singingVoices;
     if (!voices) {
-      const ctx = ensureCtx();
-      voices = createSingingVoices(ctx, ctx.destination);
+      voices = createSingingVoices(ensureCtx(), ensureOutput());
       voices.setVolume(trackVolume / 100 * (masterVolume / 100));
     }
     return voices;
@@ -11041,6 +11113,12 @@ var SoundFont = class _SoundFont {
   // ファミリごとに変える。
   /** アタック（無音からピークまで）秒。クリック防止の最小限。全楽器共通。 */
   static attackSec = 5e-3;
+  /**
+   * 消え際に最低限確保する秒数。アタックと対になるクリック防止で、**サンプルが
+   * 終わるまでに**必ずここまでに 0 へ落とし切る。振幅が残ったままバッファが尽きたり
+   * `stop()` が来たりすると、その瞬間の値がそのまま段差になりプチノイズが出る。
+   */
+  static minReleaseSec = 4e-3;
   /**
    * 減衰の型ごとのエンベロープ。
    *
@@ -11227,14 +11305,23 @@ var SoundFont = class _SoundFont {
     const startGainTime = Math.max(ctx.currentTime, _when);
     g.gain.setValueAtTime(0, startGainTime);
     const env = _SoundFont.envelopes[this.style.env] ?? _SoundFont.envelopes.sustain;
-    const limit = src.loop ? Number.POSITIVE_INFINITY : _when + _param.max - startOffsetSec;
+    const playRate = _param.playbackRate * 2 ** ((humanizeCents + detuneCents) / 1200);
+    const sampleEnd = _when + (buffer.duration - startOffsetSec) / playRate;
+    const limit = src.loop ? Number.POSITIVE_INFINITY : sampleEnd;
     const attackEnd = Math.min(startGainTime + _SoundFont.attackSec, limit);
     const decayEnd = Math.min(
       Math.max(attackEnd, attackEnd + env.decaySec),
       limit
     );
-    const noteOff = Math.min(Math.max(decayEnd, _when + duration), limit);
-    const end = isDrum ? _when + buffer.duration - startOffsetSec : Math.max(Math.min(noteOff + env.releaseSec, limit), noteOff + 1e-3);
+    const tailRoom = Math.min(
+      _SoundFont.minReleaseSec,
+      Math.max(0, limit - decayEnd)
+    );
+    const noteOff = Math.min(
+      Math.max(decayEnd, _when + duration),
+      limit - tailRoom
+    );
+    const end = isDrum ? sampleEnd : Math.max(Math.min(noteOff + env.releaseSec, limit), noteOff + tailRoom);
     if (!isDrum) {
       const sustainVolume = effectiveVolume * env.sustain;
       g.gain.linearRampToValueAtTime(effectiveVolume, attackEnd);
@@ -11243,6 +11330,11 @@ var SoundFont = class _SoundFont {
       g.gain.linearRampToValueAtTime(0, end);
     } else {
       g.gain.linearRampToValueAtTime(effectiveVolume, attackEnd);
+      const releaseStart = Math.max(attackEnd, end - _SoundFont.minReleaseSec);
+      if (releaseStart > attackEnd) {
+        g.gain.setValueAtTime(effectiveVolume, releaseStart);
+      }
+      g.gain.linearRampToValueAtTime(0, end);
     }
     if (filter) src.connect(filter).connect(g);
     else src.connect(g);
@@ -11452,12 +11544,10 @@ var addParam = (zone, pitch) => {
     coarseTune,
     fineTune,
     sampleRate,
-    delay,
-    buffer
+    delay
   } = zone;
   const baseDetune = originalPitch - 100 * coarseTune - fineTune;
   const playbackRate = 2 ** ((100 * pitch - baseDetune) / 1200);
-  const max = (buffer?.duration ?? 0) / playbackRate;
   const src = {
     loop: loopStart >= 1 && loopStart < loopEnd
   };
@@ -11465,7 +11555,7 @@ var addParam = (zone, pitch) => {
     [src.loopStart, src.loopEnd] = [loopStart, loopEnd].map(
       (v) => v / sampleRate + delay
     );
-  zone._param = { playbackRate, max, src };
+  zone._param = { playbackRate, src };
 };
 
 // src/chord-player.ts
@@ -12763,29 +12853,30 @@ var CORPUS_BANDS = {
   climaxPeaks: [1, 2, 13.5, 26],
   complementarity: [0, 0.026, 0.179, 0.405]
 };
-var CORPUS_MEDIANS = {
-  entropy: 0.907,
-  valueKinds: 4,
-  restRatio: 0.149,
-  leapRatio: 0.339,
-  stepRatio: 0.538,
-  chromaticRatio: 0.052,
-  maxLeap: 12,
-  melodyRange: 20,
-  notesPerBar: 5.511,
-  shortNoteRatio: 0.816,
-  barDensityCv: 0.279,
-  densityCliff: 0.026,
-  sim1: 0.518,
-  sim2: 0.552,
-  sim4: 0.616,
-  sim8: 0.676,
-  phraseBreath: 0.227,
-  turnRatio: 0.519,
-  climaxPosition: 0.273,
-  climaxPeaks: 6,
-  complementarity: 0.075
-};
+var CORPUS_PROFILE_KEYS = [
+  "entropy",
+  "valueKinds",
+  "restRatio",
+  "leapRatio",
+  "stepRatio",
+  "chromaticRatio",
+  "maxLeap",
+  "melodyRange",
+  "notesPerBar",
+  "shortNoteRatio",
+  "barDensityCv",
+  "densityCliff",
+  "sim1",
+  "sim2",
+  "sim4",
+  "sim8",
+  "phraseBreath",
+  "turnRatio",
+  "climaxPosition",
+  "climaxPeaks",
+  "complementarity"
+];
+var CORPUS_DEVIATION_BUDGET = 4;
 var CORPUS_CELL_WEIGHTS = {
   "0,2,4,6,8,10,12,14": 584,
   "0,2,4,6,8,12,14": 512,
@@ -13650,16 +13741,15 @@ var tensionFeatures = (barTension, opts) => {
   return { rise, resolve };
 };
 var band = (v, lo, idealLo, idealHi, hi) => {
-  if (v <= lo || v >= hi) return 0;
   if (v >= idealLo && v <= idealHi) return 1;
+  if (v <= lo || v >= hi) return 0;
   if (v < idealLo) return idealLo === lo ? 0 : (v - lo) / (idealLo - lo);
   return hi === idealHi ? 0 : (hi - v) / (hi - idealHi);
 };
-var centeredBand = (v, b, median) => {
-  const score = band(v, b[0], b[1], b[2], b[3]);
-  if (score < 1) return score;
-  const spread = Math.max(median - b[1], b[2] - median, 1e-9);
-  return 1 - 0.15 * Math.min(1, Math.abs(v - median) / spread);
+var plausibleBand = (v, b) => {
+  const span = b[3] - b[0];
+  const margin = span > 0 ? span * 0.5 : 1;
+  return band(v, b[0] - margin, b[0], b[3], b[3] + margin);
 };
 var featureVector = (f) => [
   f.entropy / 3,
@@ -14562,6 +14652,7 @@ var sectionAt = (plan, bar) => {
 // src/compose.ts
 var STEP_SEMITONES = 2;
 var MAX_LEAP_SEMITONES = 10;
+var LEAP_CEILINGS = [7, 8, 9, 10, 10, 12, 14, 16];
 var MAX_BAR_LEAP_SEMITONES = 10;
 var HARD = {
   /** メロディが1音も無い、音域が半音未満（同じ音を並べただけ）。 */
@@ -14620,13 +14711,16 @@ var WEIGHTS = {
   // --- 直近に作った曲と違うか ---
   novelty: 1.2
 };
+var DEVIATION_BUDGET = CORPUS_DEVIATION_BUDGET;
+var BUDGETED_KEYS = new Set(CORPUS_PROFILE_KEYS);
 var HAND_BANDS = {
   /** サブメロの音数/小節。少なすぎると「置いただけ」、多すぎるとメロディを食う。 */
   subDensity: [0.5, 1.8, 4.5, 8],
   complementarity: [0.05, 0.25, 0.7, 0.95],
   climaxPeaks: [0, 1, 2, 5]
 };
-var DRAW_COUNT = 40;
+var DRAW_COUNT = 12;
+var SELECT_TEMPERATURE = 0.05;
 var BASE_STEPS_PER_BAR = 192;
 var WHOLE = 192;
 var DOT_HALF = 144;
@@ -15342,6 +15436,14 @@ for (const c of [...MOTIF_CELLS, ...RHYTHM_CELLS]) {
   const key = onsetKeyOf(c.value);
   cellEntryCount.set(key, (cellEntryCount.get(key) ?? 0) + 1);
 }
+var resolveMelodyForm = (choice, rnd) => {
+  const c = (choice ?? "").trim() || "auto";
+  if (c === "motif" || c === "ostinato" || c === "through") return c;
+  const r = rnd();
+  if (r < 0.25) return "ostinato";
+  if (r < 0.4) return "through";
+  return "motif";
+};
 var groovyCells = (cells, groove, rnd) => {
   const hasSixteenth = (c) => c.value.some((v) => Math.abs(v) <= SIXTEENTH);
   if (groove === "eighth") {
@@ -15517,7 +15619,7 @@ var clampSemi = (semi, low, high) => {
   while (s > high) s -= 12;
   return s;
 };
-var leapTarget = (from, tones, rnd) => {
+var leapTarget = (from, tones, rnd, maxLeap = MAX_LEAP_SEMITONES) => {
   const candidates = [];
   for (const tone of tones) {
     const base = pitchClass(tone.semi);
@@ -15525,7 +15627,7 @@ var leapTarget = (from, tones, rnd) => {
       const semi = base + oct * 12;
       if (semi < MELODY_LOW || semi > MELODY_HIGH) continue;
       const gap = Math.abs(semi - from);
-      if (gap >= 3 && gap <= MAX_LEAP_SEMITONES) candidates.push(semi);
+      if (gap >= 3 && gap <= maxLeap) candidates.push(semi);
     }
   }
   if (candidates.length === 0) return null;
@@ -15682,7 +15784,7 @@ var barDegrees = (role, slots, tones, style, scale, motifContour, startDegree, c
     if (slots[i2].value >= quarterSteps) {
       if (rnd() < style.leapAffinity) {
         const from = degreeToPitch(scale, out[i2 - 1]).semi;
-        const target = leapTarget(from, tones, rnd);
+        const target = leapTarget(from, tones, rnd, style.maxLeap);
         if (target !== null) out[i2] = semitoneToDegree(scale, target);
       }
       continue;
@@ -15693,13 +15795,13 @@ var barDegrees = (role, slots, tones, style, scale, motifContour, startDegree, c
   }
   return out;
 };
-var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, scale, pentatonic, preferShift) => {
+var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, scale, pentatonic, preferShift, maxShift = 3) => {
   let best = degrees;
   let bestShift = 0;
   let bestScore = Number.NEGATIVE_INFINITY;
   let preferScore = Number.NEGATIVE_INFINITY;
   let preferMoved = null;
-  for (let shift = -3; shift <= 3; shift++) {
+  for (let shift = -maxShift; shift <= maxShift; shift++) {
     const moved = degrees.map(
       (d) => pentatonic ? coreToDegree(scale, degreeToCore(scale, d) + shift) : d + shift
     );
@@ -15756,7 +15858,7 @@ var shapeBar = (degrees, slots, tones, prevSemi, opts) => {
       MELODY_LOW,
       MELODY_HIGH
     );
-    const limit = i2 === 0 ? MAX_BAR_LEAP_SEMITONES : MAX_LEAP_SEMITONES;
+    const limit = i2 === 0 ? MAX_BAR_LEAP_SEMITONES : opts.maxLeap;
     if (!opts.allowLeap && Math.abs(semi - prev) > limit) {
       semi = clampSemi(
         walk(opts.scale, prev, Math.sign(semi - prev) * 3),
@@ -16149,6 +16251,7 @@ var draw = (options, resolvedKey, scale, rnd) => {
       landing = (landing + pick([2, 4], rnd)) % size;
     return landing;
   };
+  const form = resolveMelodyForm(options.form, rnd);
   const units2 = [];
   for (const section of sectionPlan) {
     const unitCount = Math.max(1, Math.round(section.bars / 2));
@@ -16169,16 +16272,31 @@ var draw = (options, resolvedKey, scale, rnd) => {
       const isLast = u === unitCount - 1;
       if (u % 2 === 0) {
         units2.push({
-          role: section.kind === "bridge" ? "step" : section.kind === "chorus" ? "climax" : src === "a2" || u > 0 ? "sequence" : "motif",
-          source: src,
+          // リフ主体の曲は**変形しない**。セクエンツもオクターブ上げも入れず、
+          // 同じ型を回し続ける。セクションの対比は編曲側（ドラム・楽器・レイヤ）
+          // が担う——ヤツメ穴型の曲がまさにその作りで、120小節を通して
+          // 5半音のセルが変わらない。
+          role: form === "ostinato" ? "motif" : form === "through" ? (
+            // 通し作曲は素材を戻さない。`step` の書法（アーチ・谷・波）で
+            // 独立した線を書き、たまに走句と山を挟んで単調さを避ける。
+            u % 3 === 2 ? "run" : u % 3 === 1 ? "climax" : "step"
+          ) : section.kind === "bridge" ? "step" : section.kind === "chorus" ? "climax" : src === "a2" || u > 0 ? "sequence" : "motif",
+          // リフ型は素材も1つに揃える（`sourceOf` でセクションごとに
+          // 変えると、そこだけ別の型が始まってオスティナートにならない）。
+          source: form === "ostinato" ? "a" : src,
           landing: null,
           section
         });
       } else {
         const landing = landingOf(section);
+        const riff = form === "ostinato" && !(isLast && landing === 0);
         units2.push({
-          role: isLast && landing === 0 ? "cadence" : "answer",
-          source: "answer",
+          role: isLast && landing === 0 ? "cadence" : riff ? "motif" : (
+            // 通し作曲は「問いと答え」で閉じない。answer は問いのリズムを
+            // 受けて着地音だけ変える形なので、そのままだと反復が戻る。
+            form === "through" ? "step" : "answer"
+          ),
+          source: riff ? "a" : "answer",
           landing: isLast ? landing : null,
           section
         });
@@ -16196,6 +16314,7 @@ var draw = (options, resolvedKey, scale, rnd) => {
   const restatementOf = (bar) => {
     const curSec = sectionAt(sectionPlan, bar);
     if (!curSec.spec.melody) return null;
+    if (form === "through") return null;
     if (curSec.restatement) {
       const firstSec = sectionPlan.find(
         (s) => s.kind === curSec.kind && !s.restatement
@@ -16217,13 +16336,15 @@ var draw = (options, resolvedKey, scale, rnd) => {
     }
     return null;
   };
+  const registerSpread = form === "ostinato" ? rnd() ** 2 * 0.5 : 0.25 + rnd() * 0.75;
   const style = {
     groove: pick(["eighth", "sixteenth"], rnd),
     arcPeriod: pick([4, 8, 8, 16], rnd),
     arcPhase: pick([0, 1, 2], rnd),
-    arcAmp: 2 + rnd() * 3,
+    arcAmp: 5 * registerSpread,
     // オクターブ跳躍は参考曲では音程の1.0%しかない。上げすぎると音域が広がる。
-    octaveAffinity: 0.06 + rnd() * 0.12,
+    octaveAffinity: 0.18 * registerSpread,
+    maxLeap: pick(LEAP_CEILINGS, rnd),
     // **音階を厳しく締める曲は必ず中核音の歩数で組む。** ダイアトニックの度数で輪郭を
     // 作ると、琉球音階なのにレやラが輪郭の中に入り込む。ファ・シを自由に使う
     // 陽・民謡だけが、曲ごとに掛けたり掛けなかったりする（{@link ComposeScale.strict}）。
@@ -16276,8 +16397,11 @@ var draw = (options, resolvedKey, scale, rnd) => {
     subInterval: pick([3, 4, 8, 9], rnd)
   };
   const motifPool = groovyCells(MOTIF_CELLS, style.groove, rnd);
-  const targetNotesPerBar = 4.5 + rnd() * 4.5;
-  const targetRestRatio = 0.02 + rnd() * 0.1;
+  const targetRestRatio = 0.02 + rnd() ** 2 * 0.42;
+  const targetNotesPerBar = Math.max(
+    2.8,
+    Math.min(9.5, 7.4 - 6 * targetRestRatio + (rnd() * 4 - 2))
+  );
   const cellNotes = (c) => c.value.filter((v) => v > 0).length;
   const cellRest = (c) => {
     let rest = 0;
@@ -16300,9 +16424,13 @@ var draw = (options, resolvedKey, scale, rnd) => {
     return pool[pool.length - 1];
   };
   const pickCell = (pool, densityMul = 1) => {
-    let best = weightedPick(pool);
+    const want = targetRestRatio / Math.max(0.5, densityMul);
+    const tol = Math.max(0.08, want * 0.6);
+    const near = pool.filter((c) => Math.abs(cellRest(c) - want) <= tol);
+    const from = near.length > 0 ? near : pool;
+    let best = weightedPick(from);
     for (let i2 = 0; i2 < 2; i2++) {
-      const c = weightedPick(pool);
+      const c = weightedPick(from);
       if (cellDistance(c, densityMul) < cellDistance(best, densityMul))
         best = c;
     }
@@ -16558,13 +16686,16 @@ var draw = (options, resolvedKey, scale, rnd) => {
         quarterSteps,
         scale,
         style.pentatonicMotif,
-        motifShiftMemo.get(shiftKey) ?? null
+        motifShiftMemo.get(shiftKey) ?? null,
+        // リフ型は和音へ寄せない。同じセルを回し続けるのが役目。
+        form === "ostinato" ? 0 : 3
       );
       fitted = r.degrees;
       motifShiftMemo.set(shiftKey, r.shift);
     }
     const pitches = shapeBar(fitted, slots, tones, prevSemi, {
       scale,
+      maxLeap: style.maxLeap,
       allowLeap: role === "climax",
       allowArpeggio: role === "climax" || role === "run" && style.runShape === "broken" || role === "cadence" && style.cadenceShape !== "descend",
       quarterSteps,
@@ -17010,6 +17141,7 @@ var draw = (options, resolvedKey, scale, rnd) => {
     (n) => n.durationSteps >= quarterSteps || rnd() < octaveCoverage
   ).map((n) => ({ ...n, velocity: Math.max(40, n.velocity - 26) })) : [];
   return {
+    form,
     chordProgression,
     chordPattern,
     rootShift,
@@ -17096,7 +17228,7 @@ var evaluate = (d, recent) => {
     Math.min(...recent.map((r) => featureDistance(fingerprint, r))) / 1
   );
   const at = (b, v) => band(v, b[0], b[1], b[2], b[3]);
-  const atc = (key, v) => centeredBand(v, CORPUS_BANDS[key], CORPUS_MEDIANS[key]);
+  const atc = (key, v) => plausibleBand(v, CORPUS_BANDS[key]);
   const peakBand = d.bars > 24 ? [0, 1, Math.round(d.bars / 16), Math.round(d.bars / 8) + 2] : HAND_BANDS.climaxPeaks;
   const scoreBreakdown = {
     entropy: atc("entropy", entropy),
@@ -17132,9 +17264,16 @@ var evaluate = (d, recent) => {
     tensionResolve: d.tonal.floating ? 1 : tension.resolve,
     novelty
   };
+  const forgiven = new Set(
+    Object.entries(WEIGHTS).filter(([key]) => BUDGETED_KEYS.has(key)).map(([key, weight]) => ({
+      key,
+      deficit: weight * (1 - (scoreBreakdown[key] ?? 0))
+    })).sort((a, b) => b.deficit - a.deficit).slice(0, DEVIATION_BUDGET).filter((e) => e.deficit > 0).map((e) => e.key)
+  );
   let weighted = 0;
   let weightSum = 0;
   for (const [key, weight] of Object.entries(WEIGHTS)) {
+    if (forgiven.has(key)) continue;
     weighted += (scoreBreakdown[key] ?? 0) * weight;
     weightSum += weight;
   }
@@ -17171,49 +17310,64 @@ var composeSong = (options) => {
     resolvedKey.mode === "minor",
     rnd
   );
-  let best = null;
-  let bestScore = Number.NEGATIVE_INFINITY;
-  let bestIsValid = false;
+  const valid = [];
+  const invalid = [];
   let rejected = 0;
   for (let attempt = 1; attempt <= count; attempt++) {
-    const d = draw(options, resolvedKey, scale, rnd);
-    const { stats, ok } = evaluate(d, recent);
-    if (!ok) rejected++;
-    const better = ok === bestIsValid ? stats.score > bestScore : ok;
-    if (!better) continue;
-    bestScore = stats.score;
-    bestIsValid = ok;
-    best = {
-      // ドラム・楽器・編曲プランは勝った候補にだけ後から付ける（メロディに
-      // 依存しないので候補ごとに引いても採点は動かず、40本ぶん無駄になる）。
-      drum: "",
-      instrument: "",
-      arrange: EMPTY_ARRANGE,
-      chordProgression: d.chordProgression,
-      chordPattern: d.chordPattern,
-      rootShift: d.rootShift,
-      keyName: d.keyName,
-      keyLabel: d.keyLabel,
-      scaleId: scale.id,
-      scaleLabel: scale.label,
-      moodLabel: d.moodLabel,
-      bpm: d.bpm,
-      sections: d.sections,
-      bars: d.bars,
-      vocal: d.vocal,
-      tonal: d.tonal,
-      melody: d.melody,
-      submelody: d.submelody,
-      bass: d.bass,
-      harmony: d.harmony,
-      harmony2: d.harmony2,
-      octave: d.octave,
-      pad: d.pad,
-      solo: d.solo,
-      stats: { ...stats, attempts: attempt, rejected }
-    };
+    const d2 = draw(options, resolvedKey, scale, rnd);
+    const { stats, ok } = evaluate(d2, recent);
+    if (ok) valid.push({ d: d2, stats });
+    else {
+      rejected++;
+      invalid.push({ d: d2, stats });
+    }
+  }
+  const pool = valid.length > 0 ? valid : invalid;
+  const top = Math.max(...pool.map((c) => c.stats.score));
+  const weights = pool.map(
+    (c) => Math.exp((c.stats.score - top) / SELECT_TEMPERATURE)
+  );
+  const total = weights.reduce((a, b) => a + b, 0);
+  let ticket = rnd() * total;
+  let chosen = pool[pool.length - 1];
+  for (let i2 = 0; i2 < pool.length; i2++) {
+    ticket -= weights[i2];
+    if (ticket <= 0) {
+      chosen = pool[i2];
+      break;
+    }
   }
-  const result = best;
+  const d = chosen.d;
+  const result = {
+    // ドラム・楽器・編曲プランは勝った候補にだけ後から付ける（メロディに
+    // 依存しないので候補ごとに引いても採点は動かず、候補数ぶん無駄になる）。
+    drum: "",
+    instrument: "",
+    arrange: EMPTY_ARRANGE,
+    chordProgression: d.chordProgression,
+    chordPattern: d.chordPattern,
+    rootShift: d.rootShift,
+    keyName: d.keyName,
+    keyLabel: d.keyLabel,
+    scaleId: scale.id,
+    scaleLabel: scale.label,
+    form: d.form,
+    moodLabel: d.moodLabel,
+    bpm: d.bpm,
+    sections: d.sections,
+    bars: d.bars,
+    vocal: d.vocal,
+    tonal: d.tonal,
+    melody: d.melody,
+    submelody: d.submelody,
+    bass: d.bass,
+    harmony: d.harmony,
+    harmony2: d.harmony2,
+    octave: d.octave,
+    pad: d.pad,
+    solo: d.solo,
+    stats: { ...chosen.stats, attempts: count, rejected }
+  };
   result.stats.attempts = count;
   result.stats.rejected = rejected;
   result.drum = pickBuiltinDrum(result, rnd);
@@ -17414,157 +17568,643 @@ var composeLyrics = (melody, options) => {
   return out.join("");
 };
 
-// src/delay.ts
-var DELAY_DIVISIONS = [
-  { value: "4", label: "4\u5206", beats: 1 },
-  { value: "8", label: "8\u5206", beats: 0.5 },
-  { value: "8d", label: "\u4ED8\u70B98\u5206", beats: 0.75 },
-  { value: "16", label: "16\u5206", beats: 0.25 }
-];
-var clamp4 = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
-var divisionToSeconds = (division, bpm) => {
-  const beats = DELAY_DIVISIONS.find((d) => d.value === division)?.beats ?? 0.5;
-  const safeBpm = bpm > 0 ? bpm : 120;
-  return 60 / safeBpm * beats;
-};
-var DELAY_MAX_WET = 0.45;
-var delayAmountToGain = (amount) => clamp4(amount, 0, 100) / 100 * DELAY_MAX_WET;
-var FEEDBACK_GAIN = 0.3;
-var MAX_DELAY_SEC = 2;
-var createDelayBus = (ctx, destination, options = {}) => {
-  const input = ctx.createGain();
-  const delayNode = ctx.createDelay(MAX_DELAY_SEC);
-  const feedback = ctx.createGain();
-  feedback.gain.value = FEEDBACK_GAIN;
-  const wetGain = ctx.createGain();
-  wetGain.gain.value = delayAmountToGain(options.amount ?? 0);
-  input.connect(delayNode);
-  delayNode.connect(feedback);
-  feedback.connect(delayNode);
-  delayNode.connect(wetGain);
-  wetGain.connect(destination);
-  let bpm = options.bpm ?? 120;
-  let division = options.division ?? "8";
-  const applyTime = () => {
-    delayNode.delayTime.setTargetAtTime(
-      divisionToSeconds(division, bpm),
-      ctx.currentTime,
-      0.05
-    );
-  };
-  applyTime();
-  return {
-    input,
-    setAmount: (amount) => {
-      wetGain.gain.setTargetAtTime(
-        delayAmountToGain(amount),
-        ctx.currentTime,
-        0.02
-      );
-    },
-    setDivision: (d) => {
-      division = d;
-      applyTime();
-    },
-    setBpm: (b) => {
-      bpm = b;
-      applyTime();
-    },
-    dispose: () => {
-      input.disconnect();
-      delayNode.disconnect();
-      feedback.disconnect();
-      wetGain.disconnect();
-    }
-  };
-};
-
-// src/panel-state.ts
-var STORAGE_PREFIX = "dtm-panel-open:";
-var readPanelOpen = (key) => {
-  try {
-    if (typeof localStorage === "undefined" || !localStorage) return null;
-    const raw = localStorage.getItem(STORAGE_PREFIX + key);
-    if (raw === "1") return true;
-    if (raw === "0") return false;
-  } catch (_) {
-  }
-  return null;
-};
-var writePanelOpen = (key, open) => {
-  try {
-    if (typeof localStorage === "undefined" || !localStorage) return;
-    localStorage.setItem(STORAGE_PREFIX + key, open ? "1" : "0");
-  } catch (_) {
-  }
-};
-var persistPanels = (root) => {
-  const panels = root.querySelectorAll(
-    "details[data-dtm-acc]"
-  );
-  for (const panel of panels) {
-    const key = panel.dataset.dtmAcc;
-    if (!key) continue;
-    const stored = readPanelOpen(key);
-    if (stored !== null) panel.open = stored;
-    panel.addEventListener("toggle", () => {
-      writePanelOpen(key, panel.open);
-    });
+// src/instrument-presets.ts
+var INSTRUMENT_PRESETS = {
+  // --- STANDARD: 汎用性と完成度重視 ---
+  piano: {
+    displayName: "\u30B0\u30E9\u30F3\u30C9\u30D4\u30A2\u30CE",
+    description: "\u6700\u3082\u7834\u7DBB\u3057\u306B\u304F\u3044\u69CB\u6210\u3002\u697D\u66F2\u5236\u4F5C\u306E\u30B9\u30B1\u30C3\u30C1\u306B\u3082\u6700\u9069\u3002",
+    melody: "Acoustic Grand Piano",
+    submelody: "Vibraphone",
+    bass: "Electric Bass (finger)",
+    chord: "Pad 2 (warm)",
+    solo: "Electric Guitar (clean)",
+    // **Glockenspiel は使わない。音源側のサンプルが音程を外している**（実聴で確認）。
+    // 音域の問題（G5〜の高音楽器）なら {@link GM_BRIGHT_CEILING} で下げれば済むが、
+    // ピッチそのものがずれているものは置き場所を変えても直らない。同じ役割
+    // （サビの上に乗る明るい音板）で、素直に鳴る Celesta へ差し替えてある。
+    // ※ {@link GM_INSTRUMENT_RANGE} / {@link GM_BRIGHT_CEILING} の Glockenspiel の
+    //    項は残す。手で選んだときの置き場所の判断はそのまま要るため。
+    chorusLead: "Celesta",
+    chordAlt: "Electric Piano 1",
+    sparkle: "Music Box",
+    bassAlt: "Acoustic Bass",
+    harmonyAlt: "Choir Aahs"
+  },
+  acoustic: {
+    displayName: "\u30A2\u30B3\u30FC\u30B9\u30C6\u30A3\u30C3\u30AF",
+    description: "\u751F\u697D\u5668\u306E\u6E29\u304B\u307F\u3092\u91CD\u8996\u3002\u30D5\u30A9\u30FC\u30AF\u3084\u30DD\u30C3\u30D7\u30B9\u306B\u3002",
+    melody: "Acoustic Guitar (steel)",
+    submelody: "Harmonica",
+    bass: "Acoustic Bass",
+    chord: "Acoustic Guitar (nylon)",
+    solo: "Overdriven Guitar",
+    chorusLead: "String Ensemble 1",
+    chordAlt: "Acoustic Grand Piano",
+    sparkle: "Celesta",
+    bassAlt: "Electric Bass (finger)",
+    harmonyAlt: "Choir Aahs"
+  },
+  jazz_night: {
+    displayName: "\u30B8\u30E3\u30BA\u30FB\u30CA\u30A4\u30C8",
+    description: "Rhodes\u98A8\u306EEP\u3068\u30A6\u30C3\u30C9\u30D9\u30FC\u30B9\u306B\u3088\u308B\u3001\u5927\u4EBA\u3073\u305F\u30A2\u30F3\u30B5\u30F3\u30D6\u30EB\u3002",
+    melody: "Electric Piano 1",
+    submelody: "Flute",
+    bass: "Acoustic Bass",
+    chord: "Electric Guitar (jazz)",
+    solo: "Tenor Sax",
+    chorusLead: "Muted Trumpet",
+    chordAlt: "Vibraphone",
+    sparkle: "Celesta",
+    bassAlt: "Electric Bass (finger)",
+    harmonyAlt: "Choir Aahs"
+  },
+  // --- MODERN & VIBE: エッジの効いた現代的な響き ---
+  synth_pop: {
+    displayName: "\u30B7\u30F3\u30BB\u30DD\u30C3\u30D7",
+    description: "80s\u301C\u73FE\u4EE3\u307E\u3067\u3002\u629C\u3051\u308B\u30EA\u30FC\u30C9\u3068\u592A\u3044\u30D9\u30FC\u30B9\u306E\u738B\u9053\u3002",
+    melody: "Lead 2 (sawtooth)",
+    submelody: "Lead 4 (chiff)",
+    bass: "Synth Bass 2",
+    chord: "Pad 3 (polysynth)",
+    solo: "Distortion Guitar",
+    chorusLead: "Synth Brass 1",
+    chordAlt: "Electric Piano 2",
+    sparkle: "FX 3 (crystal)",
+    bassAlt: "Synth Bass 1",
+    harmonyAlt: "Synth Choir"
+  },
+  cyber_punk: {
+    displayName: "\u30B5\u30A4\u30D0\u30FC\u30D1\u30F3\u30AF",
+    description: "\u30C7\u30B8\u30BF\u30EB\u306A\u51B7\u305F\u3055\u3068\u6B6A\u307F\u304C\u6DF7\u3056\u308A\u5408\u3046\u3001\u672A\u6765\u7684\u306A\u97FF\u304D\u3002",
+    melody: "Lead 8 (bass + lead)",
+    submelody: "Lead 5 (charang)",
+    bass: "Synth Bass 2",
+    chord: "Pad 8 (sweep)",
+    solo: "Distortion Guitar",
+    chorusLead: "Lead 7 (fifths)",
+    chordAlt: "Pad 4 (choir)",
+    sparkle: "FX 3 (crystal)",
+    bassAlt: "Synth Bass 1",
+    harmonyAlt: "Synth Choir"
+  },
+  rock: {
+    displayName: "\u30CF\u30FC\u30C9\u30ED\u30C3\u30AF",
+    description: "\u6B6A\u307F\u30AE\u30BF\u30FC\u3068\u91CD\u539A\u306A\u30D9\u30FC\u30B9\u3067\u3001\u30D1\u30EF\u30FC\u3092\u524D\u9762\u306B\u3002",
+    melody: "Distortion Guitar",
+    submelody: "Rock Organ",
+    bass: "Electric Bass (pick)",
+    chord: "Overdriven Guitar",
+    solo: "Distortion Guitar",
+    chorusLead: "Brass Section",
+    chordAlt: "Electric Guitar (clean)",
+    sparkle: "Electric Guitar (muted)",
+    bassAlt: "Electric Bass (finger)",
+    harmonyAlt: "Choir Aahs"
+  },
+  // --- WORLD & CLASSIC: 特定のジャンル・地域 ---
+  orchestra: {
+    displayName: "\u30AA\u30FC\u30B1\u30B9\u30C8\u30E9",
+    description: "\u58EE\u5927\u306A\u7269\u8A9E\u3092\u4E88\u611F\u3055\u305B\u308B\u3001\u7BA1\u5F26\u697D\u5668\u306E\u91CD\u539A\u306A\u97FF\u304D\u3002",
+    melody: "French Horn",
+    submelody: "Pizzicato Strings",
+    bass: "Cello",
+    chord: "Tremolo Strings",
+    solo: "Violin",
+    chorusLead: "Trumpet",
+    chordAlt: "String Ensemble 1",
+    sparkle: "Orchestral Harp",
+    bassAlt: "Contrabass",
+    harmonyAlt: "Choir Aahs"
+  },
+  japanese_wa: {
+    displayName: "\u548C\u98A8\u30FB\u96C5",
+    description: "\u7434\u3068\u4E09\u5473\u7DDA\u306E\u7E4A\u7D30\u306A\u8ABF\u3079\u306B\u3001\u5C3A\u516B\u306E\u60C5\u7DD2\u3092\u6DFB\u3048\u3066\u3002",
+    melody: "Koto",
+    submelody: "Shamisen",
+    bass: "Taiko Drum",
+    chord: "Shakuhachi",
+    solo: "Shakuhachi",
+    // piano プリセットと同じ理由で Glockenspiel を避ける（音源のピッチずれ）。
+    chorusLead: "Celesta",
+    chordAlt: "Kalimba",
+    sparkle: "Music Box",
+    bassAlt: "Acoustic Bass",
+    harmonyAlt: "Choir Aahs"
+  },
+  arabic_exotic: {
+    displayName: "\u30A8\u30AD\u30BE\u30C1\u30C3\u30AF",
+    description: "\u30B7\u30BF\u30FC\u30EB\u3084\u30D0\u30B0\u30D1\u30A4\u30D7\u306B\u3088\u308B\u3001\u7570\u56FD\u60C5\u7DD2\u6EA2\u308C\u308B\u30B5\u30A6\u30F3\u30C9\u3002",
+    melody: "Sitar",
+    submelody: "Bagpipe",
+    bass: "Fretless Bass",
+    chord: "Kalimba",
+    solo: "Shanai",
+    chorusLead: "Steel Drums",
+    chordAlt: "Orchestral Harp",
+    sparkle: "Tinkle Bell",
+    bassAlt: "Acoustic Bass",
+    harmonyAlt: "Choir Aahs"
+  },
+  // --- FANTASY & ATMOSPHERE: 雰囲気と余韻 ---
+  fantasy_rpg: {
+    displayName: "\u30D5\u30A1\u30F3\u30BF\u30B8\u30FCRPG",
+    description: "\u30AA\u30AB\u30EA\u30CA\u3068\u30CF\u30FC\u30D7\u304C\u7D21\u3050\u3001\u5192\u967A\u3068\u9B54\u6CD5\u306E\u4E16\u754C\u89B3\u3002",
+    melody: "Ocarina",
+    submelody: "Celesta",
+    bass: "Timpani",
+    chord: "Orchestral Harp",
+    solo: "Pan Flute",
+    chorusLead: "Choir Aahs",
+    chordAlt: "String Ensemble 2",
+    sparkle: "Tinkle Bell",
+    bassAlt: "Contrabass",
+    harmonyAlt: "Choir Aahs"
+  },
+  ambient_cloud: {
+    displayName: "\u30A2\u30F3\u30D3\u30A8\u30F3\u30C8",
+    description: "\u8F2A\u90ED\u3092\u307C\u304B\u3057\u305F\u97F3\u8272\u3067\u3001\u6DF1\u3044\u6CA1\u5165\u611F\u3068\u4F59\u97FB\u3092\u6F14\u51FA\u3002",
+    melody: "Lead 6 (voice)",
+    submelody: "Music Box",
+    bass: "Synth Bass 1",
+    chord: "Pad 7 (halo)",
+    solo: "Lead 3 (calliope)",
+    chorusLead: "Synth Choir",
+    chordAlt: "Pad 5 (bowed)",
+    sparkle: "FX 3 (crystal)",
+    bassAlt: "Synth Bass 2",
+    harmonyAlt: "Synth Choir"
+  },
+  retro_game: {
+    displayName: "8-bit \u30EC\u30C8\u30ED",
+    description: "\u77E9\u5F62\u6CE2\u3092\u60F3\u8D77\u3055\u305B\u308B\u3001\u521D\u671F\u30B2\u30FC\u30E0\u6A5F\u306E\u3088\u3046\u306A\u61D0\u304B\u3057\u3044\u97FF\u304D\u3002",
+    melody: "Lead 1 (square)",
+    submelody: "Lead 2 (sawtooth)",
+    bass: "Synth Bass 1",
+    chord: "Clavinet",
+    solo: "Lead 8 (bass + lead)",
+    chorusLead: "Lead 4 (chiff)",
+    chordAlt: "Lead 5 (charang)",
+    sparkle: "Xylophone",
+    bassAlt: "Synth Bass 2",
+    harmonyAlt: "Lead 6 (voice)"
   }
 };
+var GM_INSTRUMENT_RANGE = {
+  // 鍵盤・音板
+  "Acoustic Grand Piano": [21, 108],
+  "Electric Piano 1": [28, 103],
+  Clavinet: [36, 96],
+  Celesta: [60, 108],
+  Glockenspiel: [79, 108],
+  "Music Box": [72, 108],
+  Vibraphone: [53, 89],
+  Kalimba: [60, 84],
+  "Orchestral Harp": [23, 104],
+  // 弦・撥弦
+  "Acoustic Guitar (steel)": [40, 83],
+  "Acoustic Guitar (nylon)": [40, 83],
+  "Electric Guitar (clean)": [40, 86],
+  "Electric Guitar (jazz)": [40, 86],
+  "Overdriven Guitar": [40, 88],
+  "Distortion Guitar": [40, 88],
+  Violin: [55, 103],
+  Cello: [36, 76],
+  "String Ensemble 1": [28, 100],
+  "Tremolo Strings": [28, 100],
+  "Pizzicato Strings": [28, 96],
+  Sitar: [48, 79],
+  Shamisen: [48, 84],
+  Koto: [41, 77],
+  // ベース
+  "Acoustic Bass": [28, 60],
+  "Electric Bass (finger)": [28, 67],
+  "Electric Bass (pick)": [28, 67],
+  "Fretless Bass": [28, 67],
+  "Synth Bass 1": [24, 72],
+  "Synth Bass 2": [24, 72],
+  // 管
+  Flute: [60, 96],
+  "Pan Flute": [60, 91],
+  Shakuhachi: [62, 86],
+  Ocarina: [60, 84],
+  Harmonica: [60, 96],
+  Bagpipe: [62, 86],
+  Shanai: [60, 86],
+  "Tenor Sax": [44, 75],
+  Trumpet: [55, 82],
+  "Muted Trumpet": [55, 82],
+  "French Horn": [41, 77],
+  "Brass Section": [41, 84],
+  // 声・打・オルガン
+  "Choir Aahs": [43, 84],
+  "Synth Choir": [43, 84],
+  "Steel Drums": [55, 86],
+  "Taiko Drum": [30, 60],
+  Timpani: [36, 57],
+  "Rock Organ": [36, 96],
+  // シンセ（実物が無いので一般的な使用域）
+  "Synth Brass 1": [36, 96],
+  "Lead 1 (square)": [36, 96],
+  "Lead 2 (sawtooth)": [36, 96],
+  "Lead 3 (calliope)": [48, 96],
+  "Lead 4 (chiff)": [48, 96],
+  "Lead 5 (charang)": [40, 96],
+  "Lead 6 (voice)": [43, 91],
+  "Lead 7 (fifths)": [36, 84],
+  "Lead 8 (bass + lead)": [28, 91],
+  "Pad 2 (warm)": [24, 96],
+  "Pad 3 (polysynth)": [24, 96],
+  "Pad 7 (halo)": [24, 96],
+  "Pad 8 (sweep)": [24, 96]
+};
+var GM_BRIGHT_CEILING = {
+  Glockenspiel: 72,
+  "Tinkle Bell": 72,
+  "Music Box": 79,
+  Celesta: 84,
+  Kalimba: 79,
+  "Steel Drums": 84,
+  "FX 3 (crystal)": 79
+};
+var OCTAVE_FIT_TOLERANCE = 3;
+var fitInstrumentOctave = (semitoneRange, instrument, wanted) => {
+  const range = GM_INSTRUMENT_RANGE[instrument];
+  if (!range || !semitoneRange) return wanted;
+  const hi = Math.min(range[1], GM_BRIGHT_CEILING[instrument] ?? range[1]);
+  let octave = wanted;
+  while (octave > wanted - 2) {
+    if (semitoneRange[1] + octave * 12 <= hi + OCTAVE_FIT_TOLERANCE) break;
+    octave--;
+  }
+  return octave;
+};
 
-// src/daw-ui.ts
-var q = (root, sel) => root.querySelector(sel);
-var buildUI = (target, options) => {
-  const {
-    drumPatterns,
-    defaultDrumPattern,
-    defaultBpm,
-    showMidi,
-    showMidiSearch,
-    showCompose
-  } = options;
-  const drumOptions = [`<option value="none">\u306A\u3057</option>`].concat(
-    drumPatterns.map(
-      (p) => `<option value="${p.value}" ${p.value === defaultDrumPattern ? "selected" : ""}>${p.label}</option>`
-    )
-  ).join("");
-  target.innerHTML = `
-<div class="dtm-daw" data-dtm="root">
-  <div class="dtm-topbar" data-dtm="transport">
-    <div class="dtm-topbar-row1">
-      <button class="dtm-iconbtn" data-dtm="prev-bar" title="1\u5C0F\u7BC0\u524D">${icon("chevronLeft")}</button>
-      <button class="dtm-play" data-dtm="play" disabled>${icon("play")}</button>
-      <button class="dtm-iconbtn" data-dtm="next-bar" title="1\u5C0F\u7BC0\u5F8C">${icon("chevronRight")}</button>
-      <label class="dtm-toggle"><input type="checkbox" data-dtm="solo"><span>\u30BD\u30ED</span></label>
-      <span class="dtm-topbar-loading dtm-blink" data-dtm="topbar-loading">... LOADING ...</span>
-      <button class="dtm-clip-badge dtm-hidden" data-dtm="clip-badge" title="\u97F3\u5272\u308C\u691C\u77E5\uFF08\u30AF\u30EA\u30C3\u30AF\u3067\u6D88\u3059\uFF09">CLIP</button>
-      <span class="dtm-grow"></span>
-      <span class="dtm-label">BPM</span>
-      <input type="number" class="dtm-input dtm-input--num" data-dtm="bpm" value="${defaultBpm}" min="20" max="300">
-    </div>
-    <div class="dtm-tracks" data-dtm="track-tabs"></div>
-  </div>
-
-  <div class="dtm-tooldock">
-    <div class="dtm-seg">
-      <button class="dtm-segbtn dtm-segbtn--active" data-dtm="tool-pen" title="\u30DA\u30F3">${icon("pen")}</button>
-      <button class="dtm-segbtn" data-dtm="tool-select" title="\u9078\u629E">${icon("select")}</button>
-      <button class="dtm-segbtn" data-dtm="tool-eraser" title="\u6D88\u3057\u30B4\u30E0">${icon("eraser")}</button>
-    </div>
-    <button class="dtm-iconbtn" data-dtm="undo" title="\u5143\u306B\u623B\u3059" disabled>${icon("undo")}</button>
-    <button class="dtm-iconbtn" data-dtm="redo" title="\u3084\u308A\u76F4\u3057" disabled>${icon("redo")}</button>
-    <select class="dtm-select dtm-grow" data-dtm="note-length" title="\u97F3\u7B26\u306E\u9577\u3055">
-      <option value="48">4\u5206</option>
-      <option value="32">3\u90234</option>
-      <option value="24">8\u5206</option>
-      <option value="16">3\u90238</option>
-      <option value="12" selected>16\u5206</option>
-      <option value="8">3\u902316</option>
-      <option value="6">32\u5206</option>
-      <option value="4">3\u902332</option>
-    </select>
-  </div>
+// src/advanced-layers.ts
+var buildAdvancedLayers = (song, config) => {
+  const { edo, stepsPerBar, preset } = config;
+  const semitoneRange = (notes) => {
+    if (notes.length === 0) return null;
+    let lo = Number.POSITIVE_INFINITY;
+    let hi = Number.NEGATIVE_INFINITY;
+    for (const n of notes) {
+      const semi = n.pitchUnits / UNITS_PER_SEMITONE;
+      if (semi < lo) lo = semi;
+      if (semi > hi) hi = semi;
+    }
+    return [Math.round(lo), Math.round(hi)];
+  };
+  const fit = (notes, slot, wanted) => fitInstrumentOctave(semitoneRange(notes), preset[slot], wanted);
+  const kindAtBar = (bar) => song.sections.find(
+    (sec) => bar >= sec.startBar && bar < sec.startBar + sec.bars
+  )?.kind ?? null;
+  const onlyIn = (notes, kinds) => {
+    if (!kinds) return notes;
+    const want = new Set(kinds);
+    return notes.filter((n) => {
+      const kind = kindAtBar(Math.floor(n.startStep / stepsPerBar));
+      return kind !== null && want.has(kind);
+    });
+  };
+  const chordNotes = (pattern, velocityShift = 0) => buildChordPlacements({
+    edo,
+    chordStr: song.chordProgression,
+    patternType: pattern,
+    rootShift: song.rootShift,
+    bpm: song.bpm,
+    stepsPerBar
+  }).map((p) => ({
+    startStep: p.startStep,
+    pitchUnits: p.pitchUnits,
+    durationSteps: p.durationSteps,
+    velocity: Math.max(30, p.velocity + velocityShift)
+  }));
+  const plan = song.arrange;
+  const kindsPresent = [...new Set(song.sections.map((sec) => sec.kind))];
+  const LOUD = ["chorus", "drop_chorus"];
+  const loudKinds = kindsPresent.filter((k) => LOUD.includes(k));
+  const quietKinds = kindsPresent.filter((k) => !LOUD.includes(k));
+  const splittable = loudKinds.length > 0 && quietKinds.length > 0;
+  const leadNotes = plan.lead ? onlyIn(song.melody, plan.lead.sections) : [];
+  const leadOctave = fit(leadNotes, "chorusLead", plan.lead?.octave ?? 0);
+  const leadLayer = {
+    index: 1,
+    notes: leadNotes,
+    octave: leadOctave,
+    // ユニゾンで重ねるときは、オクターブ上より前に出やすいので少し引く。
+    volume: leadOctave === 0 ? 54 : 62,
+    slot: "chorusLead"
+  };
+  const bassNotes = plan.bassLayer ? onlyIn(song.bass, plan.bassLayer.sections) : [];
+  const bassOctave = fit(bassNotes, "bass", plan.bassLayer?.octave ?? 0);
+  const wantBassLayer = plan.bassLayer !== null && bassOctave !== 0;
+  const bassLayer = wantBassLayer ? {
+    index: 5,
+    notes: bassNotes,
+    octave: bassOctave,
+    volume: 58,
+    slot: "bass"
+  } : {
+    index: 5,
+    notes: splittable ? onlyIn(song.bass, loudKinds) : [],
+    octave: 0,
+    volume: 92,
+    slot: "bassAlt"
+  };
+  const padNotes = onlyIn(song.pad, plan.padSections);
+  const layers = [
+    { index: 0, notes: song.melody, octave: 0, volume: 104, slot: "melody" },
+    leadLayer,
+    // t2 ハモリ。**セクションで分割しない。**
+    // 一度 t12 と loud/quiet で分けてみたが、ハモリは音の87%が盛り上がる側にあり、
+    // 71%の曲は静かな側に1音も無い——分割すると t2 が空になって中身が t12 へ移る。
+    // 「トラック番号と役割の対応は固定」（ピアノロールのどこに何があるかが曲ごとに
+    // 動くとユーザーが編集できない）という原則にも反するので、ここは丸ごと持つ。
+    { index: 2, notes: song.harmony, octave: 0, volume: 82 },
+    // t3 サブメロ。t14 が間奏ソロを持たないとき、そちらへ盛り上がる側を渡して
+    // こちらは静かな側だけ持つ。対旋律・合いの手がセクションで音色替えする。
+    {
+      index: 3,
+      notes: song.solo.length === 0 && splittable ? onlyIn(song.submelody, quietKinds) : song.submelody,
+      octave: 0,
+      volume: 86,
+      slot: "submelody"
+    },
+    // t4。t5 が `bassAlt` で盛り上がる側を持つときは、こちらは静かな側だけ持つ
+    // （分割であって間引きではない——2本合わせて元のベースが漏れなく鳴る）。
+    {
+      index: 4,
+      notes: !wantBassLayer && splittable ? onlyIn(song.bass, quietKinds) : song.bass,
+      octave: 0,
+      volume: 92,
+      slot: "bass"
+    },
+    bassLayer,
+    // **パッドは伴奏用の楽器で、伴奏より1.5オクターブ高いところを鳴らす。**
+    // そのまま置くとナイロンギターで10半音、カリンバで9半音、尺八で7半音ぶん
+    // 音域を突き抜ける。楽器に合わせて下げる。
+    {
+      index: 6,
+      notes: padNotes,
+      octave: fit(padNotes, "chord", 0),
+      volume: 64,
+      slot: "chord"
+    }
+  ];
+  const backingVolumes = [62, 54, 50];
+  for (let i2 = 0; i2 < 3; i2++) {
+    const layer = plan.backing[i2];
+    layers.push({
+      index: 7 + i2,
+      notes: layer ? onlyIn(chordNotes(layer.pattern), layer.sections) : [],
+      octave: layer?.octave ?? 0,
+      volume: backingVolumes[i2],
+      slot: i2 % 2 === 0 ? "chordAlt" : "chord"
+    });
+  }
+  const sparkleNotes = plan.sparkle ? onlyIn(chordNotes(plan.sparkle.pattern, -14), plan.sparkle.sections) : [];
+  layers.push(
+    {
+      index: 10,
+      notes: sparkleNotes,
+      // 装飾は伴奏と別の音色にする（以前はここも `chord` の使い回しだった）。
+      octave: fit(sparkleNotes, "sparkle", plan.sparkle?.octave ?? 0),
+      volume: 56,
+      slot: "sparkle"
+    },
+    // 掛け合い（デュエット）の相手。**歌入り作曲のときだけ**中身が入る。
+    { index: 11, notes: [], octave: 0, volume: 104, slot: "melody" },
+    // 2声目のハモリ（主旋律を上下から挟む3声）と、主旋律のオクターブ下の重ね。
+    // どちらも曲ごとに出るかどうかが決まる（`song.vocal`）。
+    // t12。3声目のハモリは曲ごとに出るかが決まり、実測28%。
+    //
+    // 出ない曲では**パッド(t6)が鳴っていないセクション**を、別の音色
+    // （`harmonyAlt` ＝声もの・柔らかい持続音）で受け持つ。パッドはセクション種別の
+    // 39%しか覆っておらず補集合は常に存在するので、ここは**いま何も鳴っていない
+    // 場所に持続音を足す**ことになる——重ねでも写しでもなく、純粋な追加。
+    song.harmony2.length > 0 ? { index: 12, notes: song.harmony2, octave: 0, volume: 74 } : (() => {
+      const rest = plan.padSections ? kindsPresent.filter((k) => !plan.padSections?.includes(k)) : [];
+      const notes = rest.length > 0 ? onlyIn(song.pad, rest) : [];
+      return {
+        index: 12,
+        notes,
+        octave: fit(notes, "harmonyAlt", 0),
+        volume: 60,
+        slot: "harmonyAlt"
+      };
+    })(),
+    // t13。既定は**主旋律のオクターブ下の重ね**で、歌入り作曲ではここに歌詞が付く
+    // （オクターブ下でハモる歌手。単なる写しではない）。
+    //
+    // ただしこの層は曲ごとに出るかどうかが決まり、実測で**18%しか鳴らない**。
+    // 残り82%はトラックが1本まるごと遊ぶ。オクターブ等価の写しに常設の価値は
+    // 無いが、**空けておく価値はもっと無い**ので、層が無い曲では
+    // 「t1（サビ重ね）が担当しないセクションの主旋律を、別の楽器でなぞる」層に回す。
+    // t1 は CHORUS/LOUD 側を持つので、こちらは静かな側を持つ——結果として
+    // **セクションの境目で主旋律に付く音色が入れ替わる**。1トラック1楽器の制約下で
+    // 「パートごとに楽器が変わる」を作れるのは、この書き分けだけ。
+    song.octave.length > 0 ? {
+      index: 13,
+      notes: song.octave,
+      octave: -1,
+      volume: 56,
+      slot: "melody"
+    } : (() => {
+      const leadKinds = new Set(plan.lead?.sections ?? []);
+      const quiet = song.sections.filter((sec) => sec.spec.melody && !leadKinds.has(sec.kind)).map((sec) => sec.kind);
+      const notes = quiet.length > 0 ? onlyIn(song.melody, quiet) : [];
+      const slot = ["solo", "chorusLead", "submelody", "chordAlt"].find(
+        (k) => preset[k] !== preset.melody && preset[k] !== preset.chord
+      ) ?? "submelody";
+      return {
+        index: 13,
+        notes,
+        // ユニゾンで置く。**音色だけを変えるのが狙い**なので、
+        // オクターブを動かすと「オクターブ写し」に戻ってしまう。
+        octave: fit(notes, slot, 0),
+        volume: 58,
+        slot
+      };
+    })(),
+    // **間奏のソロ。** 音が入るのは間奏の小節だけなので、この1本だけを
+    // 別の楽器にしても他のセクションの鳴りは変わらない。歌の音域をそのまま
+    // 渡すと管楽器が上へ抜ける（テナーサックスで10半音）ので、ここも合わせる。
+    // t14。**間奏のソロ。** ただし間奏は既定の構成（`DEFAULT_SECTIONS`）に無く、
+    // テンプレートも `jpop_standard` しか含まないので、実測で**0%**——設計上の
+    // 出番が既定では一度も来ないトラックだった。
+    // 間奏が無い曲では、サブメロの盛り上がる側を `solo` の音色で受け持つ
+    // （t3 は静かな側。分割なので音数は増えない）。
+    song.solo.length > 0 ? {
+      index: 14,
+      notes: song.solo,
+      octave: fit(song.solo, "solo", 0),
+      volume: 100,
+      slot: "solo"
+    } : (() => {
+      const notes = splittable ? onlyIn(song.submelody, loudKinds) : [];
+      return {
+        index: 14,
+        notes,
+        octave: fit(notes, "solo", 0),
+        volume: 86,
+        slot: "solo"
+      };
+    })()
+  );
+  return layers;
+};
+
+// src/delay.ts
+var DELAY_DIVISIONS = [
+  { value: "4", label: "4\u5206", beats: 1 },
+  { value: "8", label: "8\u5206", beats: 0.5 },
+  { value: "8d", label: "\u4ED8\u70B98\u5206", beats: 0.75 },
+  { value: "16", label: "16\u5206", beats: 0.25 }
+];
+var clamp4 = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
+var divisionToSeconds = (division, bpm) => {
+  const beats = DELAY_DIVISIONS.find((d) => d.value === division)?.beats ?? 0.5;
+  const safeBpm = bpm > 0 ? bpm : 120;
+  return 60 / safeBpm * beats;
+};
+var DELAY_MAX_WET = 0.45;
+var delayAmountToGain = (amount) => clamp4(amount, 0, 100) / 100 * DELAY_MAX_WET;
+var FEEDBACK_GAIN = 0.3;
+var MAX_DELAY_SEC = 2;
+var createDelayBus = (ctx, destination, options = {}) => {
+  const input = ctx.createGain();
+  const delayNode = ctx.createDelay(MAX_DELAY_SEC);
+  const feedback = ctx.createGain();
+  feedback.gain.value = FEEDBACK_GAIN;
+  const wetGain = ctx.createGain();
+  wetGain.gain.value = delayAmountToGain(options.amount ?? 0);
+  input.connect(delayNode);
+  delayNode.connect(feedback);
+  feedback.connect(delayNode);
+  delayNode.connect(wetGain);
+  wetGain.connect(destination);
+  let bpm = options.bpm ?? 120;
+  let division = options.division ?? "8";
+  const applyTime = () => {
+    delayNode.delayTime.setTargetAtTime(
+      divisionToSeconds(division, bpm),
+      ctx.currentTime,
+      0.05
+    );
+  };
+  applyTime();
+  return {
+    input,
+    setAmount: (amount) => {
+      wetGain.gain.setTargetAtTime(
+        delayAmountToGain(amount),
+        ctx.currentTime,
+        0.02
+      );
+    },
+    setDivision: (d) => {
+      division = d;
+      applyTime();
+    },
+    setBpm: (b) => {
+      bpm = b;
+      applyTime();
+    },
+    dispose: () => {
+      input.disconnect();
+      delayNode.disconnect();
+      feedback.disconnect();
+      wetGain.disconnect();
+    }
+  };
+};
+
+// src/panel-state.ts
+var STORAGE_PREFIX = "dtm-panel-open:";
+var readPanelOpen = (key) => {
+  try {
+    if (typeof localStorage === "undefined" || !localStorage) return null;
+    const raw = localStorage.getItem(STORAGE_PREFIX + key);
+    if (raw === "1") return true;
+    if (raw === "0") return false;
+  } catch (_) {
+  }
+  return null;
+};
+var writePanelOpen = (key, open) => {
+  try {
+    if (typeof localStorage === "undefined" || !localStorage) return;
+    localStorage.setItem(STORAGE_PREFIX + key, open ? "1" : "0");
+  } catch (_) {
+  }
+};
+var persistPanels = (root) => {
+  const panels = root.querySelectorAll(
+    "details[data-dtm-acc]"
+  );
+  for (const panel of panels) {
+    const key = panel.dataset.dtmAcc;
+    if (!key) continue;
+    const stored = readPanelOpen(key);
+    if (stored !== null) panel.open = stored;
+    panel.addEventListener("toggle", () => {
+      writePanelOpen(key, panel.open);
+    });
+  }
+};
+
+// src/daw-ui.ts
+var q = (root, sel) => root.querySelector(sel);
+var buildUI = (target, options) => {
+  const {
+    drumPatterns,
+    defaultDrumPattern,
+    defaultBpm,
+    showMidi,
+    showMidiSearch,
+    showCompose
+  } = options;
+  const drumOptions = [`<option value="none">\u306A\u3057</option>`].concat(
+    drumPatterns.map(
+      (p) => `<option value="${p.value}" ${p.value === defaultDrumPattern ? "selected" : ""}>${p.label}</option>`
+    )
+  ).join("");
+  target.innerHTML = `
+<div class="dtm-daw" data-dtm="root">
+  <div class="dtm-topbar" data-dtm="transport">
+    <div class="dtm-topbar-row1">
+      <button class="dtm-iconbtn" data-dtm="prev-bar" title="1\u5C0F\u7BC0\u524D">${icon("chevronLeft")}</button>
+      <button class="dtm-play" data-dtm="play" disabled>${icon("play")}</button>
+      <button class="dtm-iconbtn" data-dtm="next-bar" title="1\u5C0F\u7BC0\u5F8C">${icon("chevronRight")}</button>
+      <label class="dtm-toggle"><input type="checkbox" data-dtm="solo"><span>\u30BD\u30ED</span></label>
+      <span class="dtm-topbar-loading dtm-blink" data-dtm="topbar-loading">... LOADING ...</span>
+      <button class="dtm-clip-badge dtm-hidden" data-dtm="clip-badge" title="\u97F3\u5272\u308C\u691C\u77E5\uFF08\u30AF\u30EA\u30C3\u30AF\u3067\u6D88\u3059\uFF09">CLIP</button>
+      <span class="dtm-grow"></span>
+      <span class="dtm-label">BPM</span>
+      <input type="number" class="dtm-input dtm-input--num" data-dtm="bpm" value="${defaultBpm}" min="20" max="300">
+    </div>
+    <div class="dtm-tracks" data-dtm="track-tabs"></div>
+  </div>
+
+  <div class="dtm-tooldock">
+    <div class="dtm-seg">
+      <button class="dtm-segbtn dtm-segbtn--active" data-dtm="tool-pen" title="\u30DA\u30F3">${icon("pen")}</button>
+      <button class="dtm-segbtn" data-dtm="tool-select" title="\u9078\u629E">${icon("select")}</button>
+      <button class="dtm-segbtn" data-dtm="tool-eraser" title="\u6D88\u3057\u30B4\u30E0">${icon("eraser")}</button>
+    </div>
+    <button class="dtm-iconbtn" data-dtm="undo" title="\u5143\u306B\u623B\u3059" disabled>${icon("undo")}</button>
+    <button class="dtm-iconbtn" data-dtm="redo" title="\u3084\u308A\u76F4\u3057" disabled>${icon("redo")}</button>
+    <select class="dtm-select dtm-grow" data-dtm="note-length" title="\u97F3\u7B26\u306E\u9577\u3055">
+      <option value="48">4\u5206</option>
+      <option value="32">3\u90234</option>
+      <option value="24">8\u5206</option>
+      <option value="16">3\u90238</option>
+      <option value="12" selected>16\u5206</option>
+      <option value="8">3\u902316</option>
+      <option value="6">32\u5206</option>
+      <option value="4">3\u902332</option>
+    </select>
+  </div>
 
   <div class="dtm-roll-wrap">
     <div class="dtm-roll" data-dtm="roll">
@@ -17969,355 +18609,135 @@ var buildUI = (target, options) => {
       <div class="dtm-modal-header">
         <span class="dtm-modal-title" data-dtm="modal-title"></span>
         <button class="dtm-modal-close" data-dtm="modal-close">&times;</button>
-      </div>
-      <div class="dtm-modal-body" data-dtm="modal-body"></div>
-    </div>
-  </div>
-
-</div>`;
-  const root = q(target, '[data-dtm="root"]');
-  persistPanels(root);
-  const sel = (name) => q(root, `[data-dtm="${name}"]`);
-  return {
-    root,
-    topbar: sel("transport"),
-    topbarLoading: sel("topbar-loading"),
-    playBtn: sel("play"),
-    prevBarBtn: sel("prev-bar"),
-    nextBarBtn: sel("next-bar"),
-    soloCheckbox: sel("solo"),
-    clipBadge: sel("clip-badge"),
-    toolPen: sel("tool-pen"),
-    toolSelect: sel("tool-select"),
-    toolEraser: sel("tool-eraser"),
-    undoBtn: sel("undo"),
-    redoBtn: sel("redo"),
-    noteLengthSelect: sel("note-length"),
-    bpmInput: sel("bpm"),
-    zoomXLabel: sel("zoomx-label"),
-    zoomYLabel: sel("zoomy-label"),
-    zoomXIn: sel("zoomx-in"),
-    zoomXOut: sel("zoomx-out"),
-    zoomYIn: sel("zoomy-in"),
-    zoomYOut: sel("zoomy-out"),
-    bgFileInput: sel("bg-file-input"),
-    bgUploadBtn: sel("bg-upload"),
-    bgRemoveBtn: sel("bg-remove"),
-    bgOpacityInput: sel("bg-opacity"),
-    bgOpacityRow: sel("bg-opacity-row"),
-    rollContainer: sel("roll"),
-    wrapper: sel("wrapper"),
-    vScroll: sel("vscroll"),
-    vScrollThumb: sel("vscroll-thumb"),
-    hScroll: sel("hscroll"),
-    hScrollThumb: sel("hscroll-thumb"),
-    loopToggle: sel("loop-toggle"),
-    loopToggleLabel: sel("loop-toggle-label"),
-    loopInfoBtn: sel("loop-info"),
-    masterVolume: sel("master-volume"),
-    masterVolumeLabel: sel("master-volume-label"),
-    masterComp: sel("master-comp"),
-    masterCompLabel: sel("master-comp-label"),
-    masterCompInfoBtn: sel("master-comp-info"),
-    reverbAmount: sel("reverb-amount"),
-    reverbAmountLabel: sel("reverb-amount-label"),
-    reverbAmountInfoBtn: sel("reverb-amount-info"),
-    reverbDecay: sel("reverb-decay"),
-    reverbDecayLabel: sel("reverb-decay-label"),
-    reverbPreDelay: sel("reverb-predelay"),
-    reverbPreDelayLabel: sel("reverb-predelay-label"),
-    delayAmount: sel("delay-amount"),
-    delayAmountLabel: sel("delay-amount-label"),
-    delayAmountInfoBtn: sel("delay-amount-info"),
-    delayDivision: sel("delay-division"),
-    fadeIn: sel("fade-in"),
-    fadeInLabel: sel("fade-in-label"),
-    fadeOut: sel("fade-out"),
-    fadeOutLabel: sel("fade-out-label"),
-    fadeInfoBtn: sel("fade-info"),
-    autoMasterBtn: sel("auto-master"),
-    autoMasterInfoBtn: sel("auto-master-info"),
-    trackTabs: sel("track-tabs"),
-    trackBody: sel("track-body"),
-    drumSelect: sel("drum-select"),
-    drumFontSelect: sel("drum-font-select"),
-    drumVolume: sel("drum-volume"),
-    drumVolumeLabel: sel("drum-volume-label"),
-    midiInput: sel("midi-input"),
-    midiLoadBtn: sel("midi-load"),
-    midiInfoBtn: sel("midi-info"),
-    midiTrackSelection: sel("midi-track-selection"),
-    midiPanel: sel("midi-panel"),
-    midiSearchOpenBtn: sel("midi-search-open"),
-    mmlInput: sel("mml-input"),
-    mmlLoadBtn: sel("mml-load"),
-    mmlLoadNote: sel("mml-load-note"),
-    applyActiveOnly: sel("apply-active-only"),
-    shiftSelect: sel("shift-select"),
-    shiftApplyBtn: sel("shift-apply"),
-    transposeSelect: sel("transpose-select"),
-    transposeApplyBtn: sel("transpose-apply"),
-    transposeInfoBtn: sel("transpose-info"),
-    macroCompose: sel("macro-compose"),
-    composeTemplate: sel("compose-template"),
-    composeSections: sel("compose-sections"),
-    composeSectionsLen: sel("compose-sections-len"),
-    composeKey: sel("compose-key"),
-    composeKeyHint: sel("compose-key-hint"),
-    composeScale: sel("compose-scale"),
-    composeScaleHint: sel("compose-scale-hint"),
-    macroComposeVocal: sel("macro-compose-vocal"),
-    macroComposeInfo: sel("macro-compose-info"),
-    macroClear: sel("macro-clear"),
-    macroRandom: sel("macro-random"),
-    macroHarmonic: sel("macro-harmonic"),
-    macroMono: sel("macro-mono"),
-    exportMidiBtn: sel("export-midi"),
-    exportWavBtn: sel("export-wav"),
-    drumJsonExportBtn: sel("drum-json-export"),
-    drumJsonOutput: sel("drum-json-output"),
-    drumJsonStatus: sel("drum-json-status"),
-    drumJsonText: sel("drum-json-text"),
-    drumJsonCopyBtn: sel("drum-json-copy"),
-    generateMmlBtn: sel("generate-mml"),
-    decomposeChordToggle: sel("decompose-chord"),
-    ignoreChordHeavyToggle: sel("ignore-chord-heavy"),
-    barLimitSelect: sel("bar-limit"),
-    outputContainer: sel("output-container"),
-    outputStatus: sel("output-status"),
-    outputFull: sel("output-full"),
-    outputMini: sel("output-mini"),
-    copyFullBtn: sel("copy-full"),
-    copyMiniBtn: sel("copy-mini"),
-    overlay: sel("overlay"),
-    mmlInfoBtn: sel("mml-info"),
-    edoSelect: sel("edo-select"),
-    edoInfoBtn: sel("edo-info"),
-    modalOverlay: sel("modal-overlay"),
-    modalTitle: sel("modal-title"),
-    modalBody: sel("modal-body"),
-    modalClose: sel("modal-close")
-  };
-};
-
-// src/instrument-presets.ts
-var INSTRUMENT_PRESETS = {
-  // --- STANDARD: 汎用性と完成度重視 ---
-  piano: {
-    displayName: "\u30B0\u30E9\u30F3\u30C9\u30D4\u30A2\u30CE",
-    description: "\u6700\u3082\u7834\u7DBB\u3057\u306B\u304F\u3044\u69CB\u6210\u3002\u697D\u66F2\u5236\u4F5C\u306E\u30B9\u30B1\u30C3\u30C1\u306B\u3082\u6700\u9069\u3002",
-    melody: "Acoustic Grand Piano",
-    submelody: "Vibraphone",
-    bass: "Electric Bass (finger)",
-    chord: "Pad 2 (warm)",
-    solo: "Electric Guitar (clean)",
-    // グロッケンは実物の音域が G5(79)〜 の高音楽器で、旋律の音域へそのまま置くと
-    // 金切り音になる。**外すのではなくオクターブで下げて使う**
-    // （{@link GM_BRIGHT_CEILING} / {@link fitInstrumentOctave}）。
-    chorusLead: "Glockenspiel"
-  },
-  acoustic: {
-    displayName: "\u30A2\u30B3\u30FC\u30B9\u30C6\u30A3\u30C3\u30AF",
-    description: "\u751F\u697D\u5668\u306E\u6E29\u304B\u307F\u3092\u91CD\u8996\u3002\u30D5\u30A9\u30FC\u30AF\u3084\u30DD\u30C3\u30D7\u30B9\u306B\u3002",
-    melody: "Acoustic Guitar (steel)",
-    submelody: "Harmonica",
-    bass: "Acoustic Bass",
-    chord: "Acoustic Guitar (nylon)",
-    solo: "Overdriven Guitar",
-    chorusLead: "String Ensemble 1"
-  },
-  jazz_night: {
-    displayName: "\u30B8\u30E3\u30BA\u30FB\u30CA\u30A4\u30C8",
-    description: "Rhodes\u98A8\u306EEP\u3068\u30A6\u30C3\u30C9\u30D9\u30FC\u30B9\u306B\u3088\u308B\u3001\u5927\u4EBA\u3073\u305F\u30A2\u30F3\u30B5\u30F3\u30D6\u30EB\u3002",
-    melody: "Electric Piano 1",
-    submelody: "Flute",
-    bass: "Acoustic Bass",
-    chord: "Electric Guitar (jazz)",
-    solo: "Tenor Sax",
-    chorusLead: "Muted Trumpet"
-  },
-  // --- MODERN & VIBE: エッジの効いた現代的な響き ---
-  synth_pop: {
-    displayName: "\u30B7\u30F3\u30BB\u30DD\u30C3\u30D7",
-    description: "80s\u301C\u73FE\u4EE3\u307E\u3067\u3002\u629C\u3051\u308B\u30EA\u30FC\u30C9\u3068\u592A\u3044\u30D9\u30FC\u30B9\u306E\u738B\u9053\u3002",
-    melody: "Lead 2 (sawtooth)",
-    submelody: "Lead 4 (chiff)",
-    bass: "Synth Bass 2",
-    chord: "Pad 3 (polysynth)",
-    solo: "Distortion Guitar",
-    chorusLead: "Synth Brass 1"
-  },
-  cyber_punk: {
-    displayName: "\u30B5\u30A4\u30D0\u30FC\u30D1\u30F3\u30AF",
-    description: "\u30C7\u30B8\u30BF\u30EB\u306A\u51B7\u305F\u3055\u3068\u6B6A\u307F\u304C\u6DF7\u3056\u308A\u5408\u3046\u3001\u672A\u6765\u7684\u306A\u97FF\u304D\u3002",
-    melody: "Lead 8 (bass + lead)",
-    submelody: "Lead 5 (charang)",
-    bass: "Synth Bass 2",
-    chord: "Pad 8 (sweep)",
-    solo: "Distortion Guitar",
-    chorusLead: "Lead 7 (fifths)"
-  },
-  rock: {
-    displayName: "\u30CF\u30FC\u30C9\u30ED\u30C3\u30AF",
-    description: "\u6B6A\u307F\u30AE\u30BF\u30FC\u3068\u91CD\u539A\u306A\u30D9\u30FC\u30B9\u3067\u3001\u30D1\u30EF\u30FC\u3092\u524D\u9762\u306B\u3002",
-    melody: "Distortion Guitar",
-    submelody: "Rock Organ",
-    bass: "Electric Bass (pick)",
-    chord: "Overdriven Guitar",
-    solo: "Distortion Guitar",
-    chorusLead: "Brass Section"
-  },
-  // --- WORLD & CLASSIC: 特定のジャンル・地域 ---
-  orchestra: {
-    displayName: "\u30AA\u30FC\u30B1\u30B9\u30C8\u30E9",
-    description: "\u58EE\u5927\u306A\u7269\u8A9E\u3092\u4E88\u611F\u3055\u305B\u308B\u3001\u7BA1\u5F26\u697D\u5668\u306E\u91CD\u539A\u306A\u97FF\u304D\u3002",
-    melody: "French Horn",
-    submelody: "Pizzicato Strings",
-    bass: "Cello",
-    chord: "Tremolo Strings",
-    solo: "Violin",
-    chorusLead: "Trumpet"
-  },
-  japanese_wa: {
-    displayName: "\u548C\u98A8\u30FB\u96C5",
-    description: "\u7434\u3068\u4E09\u5473\u7DDA\u306E\u7E4A\u7D30\u306A\u8ABF\u3079\u306B\u3001\u5C3A\u516B\u306E\u60C5\u7DD2\u3092\u6DFB\u3048\u3066\u3002",
-    melody: "Koto",
-    submelody: "Shamisen",
-    bass: "Taiko Drum",
-    chord: "Shakuhachi",
-    solo: "Shakuhachi",
-    chorusLead: "Glockenspiel"
-  },
-  arabic_exotic: {
-    displayName: "\u30A8\u30AD\u30BE\u30C1\u30C3\u30AF",
-    description: "\u30B7\u30BF\u30FC\u30EB\u3084\u30D0\u30B0\u30D1\u30A4\u30D7\u306B\u3088\u308B\u3001\u7570\u56FD\u60C5\u7DD2\u6EA2\u308C\u308B\u30B5\u30A6\u30F3\u30C9\u3002",
-    melody: "Sitar",
-    submelody: "Bagpipe",
-    bass: "Fretless Bass",
-    chord: "Kalimba",
-    solo: "Shanai",
-    chorusLead: "Steel Drums"
-  },
-  // --- FANTASY & ATMOSPHERE: 雰囲気と余韻 ---
-  fantasy_rpg: {
-    displayName: "\u30D5\u30A1\u30F3\u30BF\u30B8\u30FCRPG",
-    description: "\u30AA\u30AB\u30EA\u30CA\u3068\u30CF\u30FC\u30D7\u304C\u7D21\u3050\u3001\u5192\u967A\u3068\u9B54\u6CD5\u306E\u4E16\u754C\u89B3\u3002",
-    melody: "Ocarina",
-    submelody: "Celesta",
-    bass: "Timpani",
-    chord: "Orchestral Harp",
-    solo: "Pan Flute",
-    chorusLead: "Choir Aahs"
-  },
-  ambient_cloud: {
-    displayName: "\u30A2\u30F3\u30D3\u30A8\u30F3\u30C8",
-    description: "\u8F2A\u90ED\u3092\u307C\u304B\u3057\u305F\u97F3\u8272\u3067\u3001\u6DF1\u3044\u6CA1\u5165\u611F\u3068\u4F59\u97FB\u3092\u6F14\u51FA\u3002",
-    melody: "Lead 6 (voice)",
-    submelody: "Music Box",
-    bass: "Synth Bass 1",
-    chord: "Pad 7 (halo)",
-    solo: "Lead 3 (calliope)",
-    chorusLead: "Synth Choir"
-  },
-  retro_game: {
-    displayName: "8-bit \u30EC\u30C8\u30ED",
-    description: "\u77E9\u5F62\u6CE2\u3092\u60F3\u8D77\u3055\u305B\u308B\u3001\u521D\u671F\u30B2\u30FC\u30E0\u6A5F\u306E\u3088\u3046\u306A\u61D0\u304B\u3057\u3044\u97FF\u304D\u3002",
-    melody: "Lead 1 (square)",
-    submelody: "Lead 2 (sawtooth)",
-    bass: "Synth Bass 1",
-    chord: "Clavinet",
-    solo: "Lead 8 (bass + lead)",
-    chorusLead: "Lead 4 (chiff)"
-  }
-};
-var GM_INSTRUMENT_RANGE = {
-  // 鍵盤・音板
-  "Acoustic Grand Piano": [21, 108],
-  "Electric Piano 1": [28, 103],
-  Clavinet: [36, 96],
-  Celesta: [60, 108],
-  Glockenspiel: [79, 108],
-  "Music Box": [72, 108],
-  Vibraphone: [53, 89],
-  Kalimba: [60, 84],
-  "Orchestral Harp": [23, 104],
-  // 弦・撥弦
-  "Acoustic Guitar (steel)": [40, 83],
-  "Acoustic Guitar (nylon)": [40, 83],
-  "Electric Guitar (clean)": [40, 86],
-  "Electric Guitar (jazz)": [40, 86],
-  "Overdriven Guitar": [40, 88],
-  "Distortion Guitar": [40, 88],
-  Violin: [55, 103],
-  Cello: [36, 76],
-  "String Ensemble 1": [28, 100],
-  "Tremolo Strings": [28, 100],
-  "Pizzicato Strings": [28, 96],
-  Sitar: [48, 79],
-  Shamisen: [48, 84],
-  Koto: [41, 77],
-  // ベース
-  "Acoustic Bass": [28, 60],
-  "Electric Bass (finger)": [28, 67],
-  "Electric Bass (pick)": [28, 67],
-  "Fretless Bass": [28, 67],
-  "Synth Bass 1": [24, 72],
-  "Synth Bass 2": [24, 72],
-  // 管
-  Flute: [60, 96],
-  "Pan Flute": [60, 91],
-  Shakuhachi: [62, 86],
-  Ocarina: [60, 84],
-  Harmonica: [60, 96],
-  Bagpipe: [62, 86],
-  Shanai: [60, 86],
-  "Tenor Sax": [44, 75],
-  Trumpet: [55, 82],
-  "Muted Trumpet": [55, 82],
-  "French Horn": [41, 77],
-  "Brass Section": [41, 84],
-  // 声・打・オルガン
-  "Choir Aahs": [43, 84],
-  "Synth Choir": [43, 84],
-  "Steel Drums": [55, 86],
-  "Taiko Drum": [30, 60],
-  Timpani: [36, 57],
-  "Rock Organ": [36, 96],
-  // シンセ（実物が無いので一般的な使用域）
-  "Synth Brass 1": [36, 96],
-  "Lead 1 (square)": [36, 96],
-  "Lead 2 (sawtooth)": [36, 96],
-  "Lead 3 (calliope)": [48, 96],
-  "Lead 4 (chiff)": [48, 96],
-  "Lead 5 (charang)": [40, 96],
-  "Lead 6 (voice)": [43, 91],
-  "Lead 7 (fifths)": [36, 84],
-  "Lead 8 (bass + lead)": [28, 91],
-  "Pad 2 (warm)": [24, 96],
-  "Pad 3 (polysynth)": [24, 96],
-  "Pad 7 (halo)": [24, 96],
-  "Pad 8 (sweep)": [24, 96]
-};
-var GM_BRIGHT_CEILING = {
-  Glockenspiel: 72,
-  "Tinkle Bell": 72,
-  "Music Box": 79,
-  Celesta: 84,
-  Kalimba: 79,
-  "Steel Drums": 84,
-  "FX 3 (crystal)": 79
-};
-var OCTAVE_FIT_TOLERANCE = 3;
-var fitInstrumentOctave = (semitoneRange, instrument, wanted) => {
-  const range = GM_INSTRUMENT_RANGE[instrument];
-  if (!range || !semitoneRange) return wanted;
-  const hi = Math.min(range[1], GM_BRIGHT_CEILING[instrument] ?? range[1]);
-  let octave = wanted;
-  while (octave > wanted - 2) {
-    if (semitoneRange[1] + octave * 12 <= hi + OCTAVE_FIT_TOLERANCE) break;
-    octave--;
-  }
-  return octave;
+      </div>
+      <div class="dtm-modal-body" data-dtm="modal-body"></div>
+    </div>
+  </div>
+
+</div>`;
+  const root = q(target, '[data-dtm="root"]');
+  persistPanels(root);
+  const sel = (name) => q(root, `[data-dtm="${name}"]`);
+  return {
+    root,
+    topbar: sel("transport"),
+    topbarLoading: sel("topbar-loading"),
+    playBtn: sel("play"),
+    prevBarBtn: sel("prev-bar"),
+    nextBarBtn: sel("next-bar"),
+    soloCheckbox: sel("solo"),
+    clipBadge: sel("clip-badge"),
+    toolPen: sel("tool-pen"),
+    toolSelect: sel("tool-select"),
+    toolEraser: sel("tool-eraser"),
+    undoBtn: sel("undo"),
+    redoBtn: sel("redo"),
+    noteLengthSelect: sel("note-length"),
+    bpmInput: sel("bpm"),
+    zoomXLabel: sel("zoomx-label"),
+    zoomYLabel: sel("zoomy-label"),
+    zoomXIn: sel("zoomx-in"),
+    zoomXOut: sel("zoomx-out"),
+    zoomYIn: sel("zoomy-in"),
+    zoomYOut: sel("zoomy-out"),
+    bgFileInput: sel("bg-file-input"),
+    bgUploadBtn: sel("bg-upload"),
+    bgRemoveBtn: sel("bg-remove"),
+    bgOpacityInput: sel("bg-opacity"),
+    bgOpacityRow: sel("bg-opacity-row"),
+    rollContainer: sel("roll"),
+    wrapper: sel("wrapper"),
+    vScroll: sel("vscroll"),
+    vScrollThumb: sel("vscroll-thumb"),
+    hScroll: sel("hscroll"),
+    hScrollThumb: sel("hscroll-thumb"),
+    loopToggle: sel("loop-toggle"),
+    loopToggleLabel: sel("loop-toggle-label"),
+    loopInfoBtn: sel("loop-info"),
+    masterVolume: sel("master-volume"),
+    masterVolumeLabel: sel("master-volume-label"),
+    masterComp: sel("master-comp"),
+    masterCompLabel: sel("master-comp-label"),
+    masterCompInfoBtn: sel("master-comp-info"),
+    reverbAmount: sel("reverb-amount"),
+    reverbAmountLabel: sel("reverb-amount-label"),
+    reverbAmountInfoBtn: sel("reverb-amount-info"),
+    reverbDecay: sel("reverb-decay"),
+    reverbDecayLabel: sel("reverb-decay-label"),
+    reverbPreDelay: sel("reverb-predelay"),
+    reverbPreDelayLabel: sel("reverb-predelay-label"),
+    delayAmount: sel("delay-amount"),
+    delayAmountLabel: sel("delay-amount-label"),
+    delayAmountInfoBtn: sel("delay-amount-info"),
+    delayDivision: sel("delay-division"),
+    fadeIn: sel("fade-in"),
+    fadeInLabel: sel("fade-in-label"),
+    fadeOut: sel("fade-out"),
+    fadeOutLabel: sel("fade-out-label"),
+    fadeInfoBtn: sel("fade-info"),
+    autoMasterBtn: sel("auto-master"),
+    autoMasterInfoBtn: sel("auto-master-info"),
+    trackTabs: sel("track-tabs"),
+    trackBody: sel("track-body"),
+    drumSelect: sel("drum-select"),
+    drumFontSelect: sel("drum-font-select"),
+    drumVolume: sel("drum-volume"),
+    drumVolumeLabel: sel("drum-volume-label"),
+    midiInput: sel("midi-input"),
+    midiLoadBtn: sel("midi-load"),
+    midiInfoBtn: sel("midi-info"),
+    midiTrackSelection: sel("midi-track-selection"),
+    midiPanel: sel("midi-panel"),
+    midiSearchOpenBtn: sel("midi-search-open"),
+    mmlInput: sel("mml-input"),
+    mmlLoadBtn: sel("mml-load"),
+    mmlLoadNote: sel("mml-load-note"),
+    applyActiveOnly: sel("apply-active-only"),
+    shiftSelect: sel("shift-select"),
+    shiftApplyBtn: sel("shift-apply"),
+    transposeSelect: sel("transpose-select"),
+    transposeApplyBtn: sel("transpose-apply"),
+    transposeInfoBtn: sel("transpose-info"),
+    macroCompose: sel("macro-compose"),
+    composeTemplate: sel("compose-template"),
+    composeSections: sel("compose-sections"),
+    composeSectionsLen: sel("compose-sections-len"),
+    composeKey: sel("compose-key"),
+    composeKeyHint: sel("compose-key-hint"),
+    composeScale: sel("compose-scale"),
+    composeScaleHint: sel("compose-scale-hint"),
+    macroComposeVocal: sel("macro-compose-vocal"),
+    macroComposeInfo: sel("macro-compose-info"),
+    macroClear: sel("macro-clear"),
+    macroRandom: sel("macro-random"),
+    macroHarmonic: sel("macro-harmonic"),
+    macroMono: sel("macro-mono"),
+    exportMidiBtn: sel("export-midi"),
+    exportWavBtn: sel("export-wav"),
+    drumJsonExportBtn: sel("drum-json-export"),
+    drumJsonOutput: sel("drum-json-output"),
+    drumJsonStatus: sel("drum-json-status"),
+    drumJsonText: sel("drum-json-text"),
+    drumJsonCopyBtn: sel("drum-json-copy"),
+    generateMmlBtn: sel("generate-mml"),
+    decomposeChordToggle: sel("decompose-chord"),
+    ignoreChordHeavyToggle: sel("ignore-chord-heavy"),
+    barLimitSelect: sel("bar-limit"),
+    outputContainer: sel("output-container"),
+    outputStatus: sel("output-status"),
+    outputFull: sel("output-full"),
+    outputMini: sel("output-mini"),
+    copyFullBtn: sel("copy-full"),
+    copyMiniBtn: sel("copy-mini"),
+    overlay: sel("overlay"),
+    mmlInfoBtn: sel("mml-info"),
+    edoSelect: sel("edo-select"),
+    edoInfoBtn: sel("edo-info"),
+    modalOverlay: sel("modal-overlay"),
+    modalTitle: sel("modal-title"),
+    modalBody: sel("modal-body"),
+    modalClose: sel("modal-close")
+  };
 };
 
 // src/macro-state.ts
@@ -20782,128 +21202,6 @@ var pickComposeVocal = (exclude) => {
   const list = pool.length > 0 ? pool : COMPOSE_VOCAL_POOL;
   return list[Math.floor(Math.random() * list.length)] ?? "klatt";
 };
-var buildAdvancedLayers = (song, config) => {
-  const { edo, stepsPerBar, preset } = config;
-  const semitoneRange = (notes) => {
-    if (notes.length === 0) return null;
-    let lo = Number.POSITIVE_INFINITY;
-    let hi = Number.NEGATIVE_INFINITY;
-    for (const n of notes) {
-      const semi = n.pitchUnits / UNITS_PER_SEMITONE;
-      if (semi < lo) lo = semi;
-      if (semi > hi) hi = semi;
-    }
-    return [Math.round(lo), Math.round(hi)];
-  };
-  const fit = (notes, slot, wanted) => fitInstrumentOctave(semitoneRange(notes), preset[slot], wanted);
-  const kindAtBar = (bar) => song.sections.find(
-    (sec) => bar >= sec.startBar && bar < sec.startBar + sec.bars
-  )?.kind ?? null;
-  const onlyIn = (notes, kinds) => {
-    if (!kinds) return notes;
-    const want = new Set(kinds);
-    return notes.filter((n) => {
-      const kind = kindAtBar(Math.floor(n.startStep / stepsPerBar));
-      return kind !== null && want.has(kind);
-    });
-  };
-  const chordNotes = (pattern, velocityShift = 0) => buildChordPlacements({
-    edo,
-    chordStr: song.chordProgression,
-    patternType: pattern,
-    rootShift: song.rootShift,
-    bpm: song.bpm,
-    stepsPerBar
-  }).map((p) => ({
-    startStep: p.startStep,
-    pitchUnits: p.pitchUnits,
-    durationSteps: p.durationSteps,
-    velocity: Math.max(30, p.velocity + velocityShift)
-  }));
-  const plan = song.arrange;
-  const leadNotes = plan.lead ? onlyIn(song.melody, plan.lead.sections) : [];
-  const leadOctave = fit(leadNotes, "chorusLead", plan.lead?.octave ?? 0);
-  const leadLayer = {
-    index: 1,
-    notes: leadNotes,
-    octave: leadOctave,
-    // ユニゾンで重ねるときは、オクターブ上より前に出やすいので少し引く。
-    volume: leadOctave === 0 ? 54 : 62,
-    slot: "chorusLead"
-  };
-  const bassNotes = plan.bassLayer ? onlyIn(song.bass, plan.bassLayer.sections) : [];
-  const bassOctave = fit(bassNotes, "bass", plan.bassLayer?.octave ?? 0);
-  const bassLayer = {
-    index: 5,
-    notes: bassOctave === 0 ? [] : bassNotes,
-    octave: bassOctave,
-    volume: 58,
-    slot: "bass"
-  };
-  const padNotes = onlyIn(song.pad, plan.padSections);
-  const layers = [
-    { index: 0, notes: song.melody, octave: 0, volume: 104, slot: "melody" },
-    leadLayer,
-    { index: 2, notes: song.harmony, octave: 0, volume: 82 },
-    {
-      index: 3,
-      notes: song.submelody,
-      octave: 0,
-      volume: 86,
-      slot: "submelody"
-    },
-    { index: 4, notes: song.bass, octave: 0, volume: 92, slot: "bass" },
-    bassLayer,
-    // **パッドは伴奏用の楽器で、伴奏より1.5オクターブ高いところを鳴らす。**
-    // そのまま置くとナイロンギターで10半音、カリンバで9半音、尺八で7半音ぶん
-    // 音域を突き抜ける。楽器に合わせて下げる。
-    {
-      index: 6,
-      notes: padNotes,
-      octave: fit(padNotes, "chord", 0),
-      volume: 64,
-      slot: "chord"
-    }
-  ];
-  const backingVolumes = [62, 54, 50];
-  for (let i2 = 0; i2 < 3; i2++) {
-    const layer = plan.backing[i2];
-    layers.push({
-      index: 7 + i2,
-      notes: layer ? onlyIn(chordNotes(layer.pattern), layer.sections) : [],
-      octave: layer?.octave ?? 0,
-      volume: backingVolumes[i2],
-      slot: "chord"
-    });
-  }
-  const sparkleNotes = plan.sparkle ? onlyIn(chordNotes(plan.sparkle.pattern, -14), plan.sparkle.sections) : [];
-  layers.push(
-    {
-      index: 10,
-      notes: sparkleNotes,
-      octave: fit(sparkleNotes, "chord", plan.sparkle?.octave ?? 0),
-      volume: 56,
-      slot: "chord"
-    },
-    // 掛け合い（デュエット）の相手。**歌入り作曲のときだけ**中身が入る。
-    { index: 11, notes: [], octave: 0, volume: 104, slot: "melody" },
-    // 2声目のハモリ（主旋律を上下から挟む3声）と、主旋律のオクターブ下の重ね。
-    // どちらも曲ごとに出るかどうかが決まる（`song.vocal`）。
-    { index: 12, notes: song.harmony2, octave: 0, volume: 74 },
-    { index: 13, notes: song.octave, octave: -1, volume: 56, slot: "melody" },
-    // **間奏のソロ。** 音が入るのは間奏の小節だけなので、この1本だけを
-    // 別の楽器にしても他のセクションの鳴りは変わらない。歌の音域をそのまま
-    // 渡すと管楽器が上へ抜ける（テナーサックスで10半音）ので、ここも合わせる。
-    {
-      index: 14,
-      notes: song.solo,
-      octave: fit(song.solo, "solo", 0),
-      volume: 100,
-      slot: "solo"
-    }
-  );
-  return layers;
-};
 var LYRIC_MODEL_CATEGORIES = [
   {
     label: "kusa\u30D7\u30EA\u30BB\u30C3\u30C8",
@@ -26052,8 +26350,9 @@ var playSingingMML = async (mml, options = {}) => {
   });
   const ownsCtx = !options.audioContext;
   const ctx = options.audioContext ?? new AudioContext();
-  const destination = options.destination ?? ctx.destination;
+  const rawDestination = options.destination ?? ctx.destination;
   const useSynth = options.synth ?? !options.onPlayNote;
+  const destination = createSafetyLimiter(ctx, rawDestination);
   const synth = useSynth ? createSynth(ctx, destination) : null;
   const pauseWhenHidden = options.pauseWhenHidden ?? ownsCtx;
   let playing = false;
@@ -27059,21 +27358,29 @@ var createDtmStudio = async (options = {}) => {
   };
   applyGlueCompression(options.masterCompression ?? 0);
   const setMasterCompression = (amount) => applyGlueCompression(amount);
-  const safetyLimiter = audioCtx.createDynamicsCompressor();
-  safetyLimiter.threshold.value = -1;
-  safetyLimiter.knee.value = 0;
-  safetyLimiter.ratio.value = 20;
-  safetyLimiter.attack.value = 1e-3;
-  safetyLimiter.release.value = 0.1;
-  glueMakeup.connect(safetyLimiter);
   const fadeGain = audioCtx.createGain();
   fadeGain.gain.value = 1;
-  safetyLimiter.connect(fadeGain);
   fadeGain.connect(options.destination ?? audioCtx.destination);
+  const safetyLimiter = createSafetyLimiter(audioCtx, fadeGain);
+  glueMakeup.connect(safetyLimiter);
+  const FADE_RESTORE_SEC = 0.02;
+  const rampFadeGainToUnity = (from, at) => {
+    fadeGain.gain.setValueAtTime(from, at);
+    fadeGain.gain.linearRampToValueAtTime(1, at + FADE_RESTORE_SEC);
+  };
+  const restoreFadeGainIfMuted = () => {
+    const current = fadeGain.gain.value;
+    if (current >= 1) return;
+    const now = audioCtx.currentTime;
+    fadeGain.gain.cancelScheduledValues(now);
+    rampFadeGainToUnity(current, now);
+  };
   const scheduleFade = (params) => {
-    fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
+    const now = audioCtx.currentTime;
+    const current = fadeGain.gain.value;
+    fadeGain.gain.cancelScheduledValues(now);
     if (!params) {
-      fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
+      rampFadeGainToUnity(current, now);
       return;
     }
     const { fadeInStartAt, fadeInEndAt, fadeOutStartAt, fadeOutEndAt } = params;
@@ -27081,13 +27388,12 @@ var createDtmStudio = async (options = {}) => {
       fadeGain.gain.setValueAtTime(0, fadeInStartAt);
       fadeGain.gain.linearRampToValueAtTime(1, fadeInEndAt);
     } else {
-      fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
+      rampFadeGainToUnity(current, now);
     }
     if (fadeOutStartAt !== void 0 && fadeOutEndAt !== void 0) {
       fadeGain.gain.setValueAtTime(1, fadeOutStartAt);
       fadeGain.gain.linearRampToValueAtTime(0, fadeOutEndAt);
-      fadeGain.gain.setValueAtTime(0, fadeOutEndAt + 2);
-      fadeGain.gain.setValueAtTime(1, fadeOutEndAt + 2);
+      rampFadeGainToUnity(0, fadeOutEndAt + 2);
     }
   };
   const clipMeter = createClipMeter(audioCtx, glueMakeup);
@@ -27147,8 +27453,7 @@ var createDtmStudio = async (options = {}) => {
     };
   };
   const resumeAudio = () => {
-    fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
-    fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
+    restoreFadeGainIfMuted();
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
   };
@@ -27359,12 +27664,6 @@ var createDtmStudio = async (options = {}) => {
   await listReady;
   nameToKey = await buildNameToKeyMapping();
   await Promise.all([drumReady, loadPreset(defaultPreset)]);
-  const restoreFadeGainIfMuted = () => {
-    if (fadeGain.gain.value < 1) {
-      fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
-      fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
-    }
-  };
   const playDrum = (e) => {
     if (!sfDrum.font) return;
     if (e.when === 0) restoreFadeGainIfMuted();
@@ -28115,7 +28414,7 @@ var createDtmStudio = async (options = {}) => {
   };
   const setMasterVolume = (volume) => {
     const g = Math.max(0, Math.min(100, volume)) / 100;
-    masterGain.gain.setValueAtTime(g, audioCtx.currentTime);
+    masterGain.gain.setTargetAtTime(g, audioCtx.currentTime, 0.02);
   };
   let recordDestNode = null;
   const createMediaStreamDestination = () => {