@onjmin/dtm 2.1.9 → 2.1.11

package/dist/index.js

@@ -22,10 +22,13 @@ var index_exports = {};
 __export(index_exports, {
   A4_HZ: () => A4_HZ,
   A4_UNITS: () => A4_UNITS,
+  BLUES_SCALE: () => BLUES_SCALE,
   BREATH_MARK: () => BREATH_MARK,
   CENTS_PER_UNIT: () => CENTS_PER_UNIT,
   COMPOSE_KEYS: () => COMPOSE_KEYS,
   COMPOSE_MOOD_GROUPS: () => COMPOSE_MOOD_GROUPS,
+  COMPOSE_SCALES: () => COMPOSE_SCALES,
+  COMPOSE_SCALE_IDS: () => COMPOSE_SCALE_IDS,
   CORPUS_BANDS: () => CORPUS_BANDS,
   CORPUS_SIZE: () => CORPUS_SIZE,
   DAW_CSS: () => DAW_CSS,
@@ -45,7 +48,11 @@ __export(index_exports, {
   FADE_IN_MARK: () => FADE_IN_MARK,
   FADE_OUT_MARK: () => FADE_OUT_MARK,
   GLOBAL_STORAGE_KEYS: () => GLOBAL_STORAGE_KEYS,
+  GM_BRIGHT_CEILING: () => GM_BRIGHT_CEILING,
   GM_INSTRUMENT_NAMES: () => GM_INSTRUMENT_NAMES,
+  GM_INSTRUMENT_RANGE: () => GM_INSTRUMENT_RANGE,
+  HARMONIC_MINOR_SCALE: () => HARMONIC_MINOR_SCALE,
+  HUNGARIAN_SCALE: () => HUNGARIAN_SCALE,
   INSTRUMENT_PRESETS: () => INSTRUMENT_PRESETS,
   KEY_COUNT: () => KEY_COUNT,
   KOE_BASE_URL: () => KOE_BASE_URL,
@@ -55,6 +62,7 @@ __export(index_exports, {
   LinkedList: () => LinkedList,
   MACRO_STORAGE_KEYS: () => MACRO_STORAGE_KEYS,
   MAJOR_KEY_IDS: () => MAJOR_KEY_IDS,
+  MAJOR_SCALE: () => MAJOR_SCALE2,
   MAX_VOCAL_VOLUME: () => MAX_VOCAL_VOLUME,
   MICRO_STEP: () => MICRO_STEP,
   MINOR_KEY_IDS: () => MINOR_KEY_IDS,
@@ -123,10 +131,12 @@ __export(index_exports, {
   featureVector: () => featureVector,
   fifthToStep: () => fifthToStep,
   fifthToUnits: () => fifthToUnits,
+  fitInstrumentOctave: () => fitInstrumentOctave,
   formatMmlMeta: () => formatMmlMeta,
   freqFromPitch: () => freqFromPitch,
   generateRandomPattern: () => generateRandomPattern,
   getComposeKeyDescription: () => getComposeKeyDescription,
+  getComposeScaleDescription: () => getComposeScaleDescription,
   getDrumPatternKeys: () => getDrumPatternKeys,
   getMidiBPM: () => getMidiBPM,
   icon: () => icon,
@@ -162,9 +172,13 @@ __export(index_exports, {
   readGlobalSetting: () => readGlobalSetting,
   readMacroSections: () => readMacroSections,
   readMacroSetting: () => readMacroSetting,
+  resolveCenter: () => resolveCenter,
   resolveComposeKey: () => resolveComposeKey,
+  resolveComposeScale: () => resolveComposeScale,
   resolveDrumPattern: () => resolveDrumPattern,
   resolveLoopPoint: () => resolveLoopPoint,
+  scaleDegrees: () => scaleDegrees,
+  scaleSize: () => scaleSize,
   semitonesToUnits: () => semitonesToUnits,
   shiftNotes: () => shiftNotes,
   showLoadingOverlay: () => showLoadingOverlay,
@@ -1956,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);
@@ -2257,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
             });
           });
@@ -4890,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;
@@ -7353,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;
@@ -7371,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) {
@@ -7401,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();
@@ -7416,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;
@@ -7437,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);
@@ -7500,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);
@@ -8314,6 +8393,22 @@ var DAW_CSS = `
   opacity: 0.85;
 }
 .dtm-pill:not(.dtm-pill--active):active { transform: translate(1px,1px); box-shadow: none; }
+/* \u30DC\u30FC\u30AB\u30EB\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u308B\u30C8\u30E9\u30C3\u30AF\u306E\u30BF\u30D6\u306B\u3001\u3046\u3063\u3059\u3089\u58F0\u306E\u30A2\u30A4\u30B3\u30F3\u3092\u91CD\u306D\u308B\uFF08\u80CC\u666F\u8272\u30FB\u30B5\u30A4\u30BA\u306F\u5909\u3048\u306A\u3044\uFF09 */
+.dtm-pill--vocal::after {
+  content: '';
+  position: absolute;
+  inset: 0;
+  background-image: var(--dtm-pill-icon);
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: right center;
+  opacity: 0.4;
+  pointer-events: none;
+}
+.dtm-pill__label {
+  position: relative;
+  z-index: 1;
+}
 /* \u518D\u751F\u4E2D\u3001\u5B9F\u969B\u306B\u767A\u97F3\u3057\u305F\u77AC\u9593\u3060\u3051\u70B9\u706F\uFF08\u3069\u306E\u30BF\u30D6\u304C\u4ECA\u9CF4\u3063\u3066\u3044\u308B\u304B\u8996\u899A\u7684\u306B\u5206\u304B\u308B\u3088\u3046\u306B\uFF09 */
 .dtm-pill--sounding {
   filter: brightness(1.6);
@@ -9939,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;
@@ -11011,6 +11113,12 @@ var SoundFont = class _SoundFont {
   // ファミリごとに変える。
   /** アタック（無音からピークまで）秒。クリック防止の最小限。全楽器共通。 */
   static attackSec = 5e-3;
+  /**
+   * 消え際に最低限確保する秒数。アタックと対になるクリック防止で、**サンプルが
+   * 終わるまでに**必ずここまでに 0 へ落とし切る。振幅が残ったままバッファが尽きたり
+   * `stop()` が来たりすると、その瞬間の値がそのまま段差になりプチノイズが出る。
+   */
+  static minReleaseSec = 4e-3;
   /**
    * 減衰の型ごとのエンベロープ。
    *
@@ -11197,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);
@@ -11213,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);
@@ -11422,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
   };
@@ -11435,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
@@ -12733,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,
@@ -13620,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,
@@ -13653,6 +13773,650 @@ var featureDistance = (a, b) => {
   return Math.sqrt(sum);
 };
 
+// src/compose-scales.ts
+var MAJOR_SCALE2 = [
+  { semi: 0, fifth: 0 },
+  // C
+  { semi: 2, fifth: 2 },
+  // D
+  { semi: 4, fifth: 4 },
+  // E
+  { semi: 5, fifth: -1 },
+  // F
+  { semi: 7, fifth: 1 },
+  // G
+  { semi: 9, fifth: 3 },
+  // A
+  { semi: 11, fifth: 5 }
+  // B
+];
+var HARMONIC_MINOR_SCALE = [
+  { semi: 0, fifth: 0 },
+  // C
+  { semi: 2, fifth: 2 },
+  // D
+  { semi: 4, fifth: 4 },
+  // E
+  { semi: 5, fifth: -1 },
+  // F
+  { semi: 8, fifth: 8 },
+  // G#
+  { semi: 9, fifth: 3 },
+  // A
+  { semi: 11, fifth: 5 }
+  // B
+];
+var HUNGARIAN_SCALE = [
+  { semi: 0, fifth: 0 },
+  // C
+  { semi: 3, fifth: 9 },
+  // D#
+  { semi: 4, fifth: 4 },
+  // E
+  { semi: 5, fifth: -1 },
+  // F
+  { semi: 8, fifth: 8 },
+  // G#
+  { semi: 9, fifth: 3 },
+  // A
+  { semi: 11, fifth: 5 }
+  // B
+];
+var BLUES_SCALE = [
+  { semi: 0, fifth: 0 },
+  // C
+  { semi: 3, fifth: -3 },
+  // Eb
+  { semi: 5, fifth: -1 },
+  // F
+  { semi: 6, fifth: -6 },
+  // Gb（ブルーノート）
+  { semi: 7, fifth: 1 },
+  // G
+  { semi: 10, fifth: -2 }
+  // Bb
+];
+var RYUKYU_CENTER = {
+  tonic: "C",
+  half: "G",
+  deceptive: "Em",
+  tonicPattern: /^C(?![#b]|m)/,
+  a: [
+    ["C", "F", "G", "C"],
+    ["C", "C", "F", "G"],
+    ["F", "G", "C", "C"],
+    ["C", "G", "F", "G"],
+    ["CM7", "F", "G", "C"],
+    ["C", "F", "C", "G"],
+    ["C", "Em", "F", "G"],
+    ["F", "C", "G", "C"]
+  ],
+  b: [
+    ["F", "G", "Em", "C"],
+    ["F", "G", "C", "G"],
+    ["G", "F", "C", "C"],
+    ["FM7", "G", "Em", "F"],
+    ["C", "G", "F", "C"],
+    ["F", "Em", "F", "G"]
+  ],
+  c: [
+    ["Em", "F", "G", "C"],
+    ["F", "C", "G", "Em"],
+    ["C", "Em", "F", "G"]
+  ]
+};
+var MIYAKOBUSHI_CENTER = {
+  tonic: "Em",
+  half: "Am",
+  deceptive: "F",
+  tonicPattern: /^E(?:m|sus)/,
+  a: [
+    ["Em", "F", "Em", "Em"],
+    ["Esus4", "F", "Esus4", "Em"],
+    ["Em", "Am", "F", "Em"],
+    ["Am", "Em", "F", "Em"],
+    ["Em", "F", "Am", "Em"],
+    ["Em", "Em", "F", "F"],
+    ["Am", "F", "Em", "Em"],
+    ["Em", "FM7", "Am", "Em"]
+  ],
+  b: [
+    ["F", "Am", "Em", "Em"],
+    ["Am", "F", "Em", "Em"],
+    ["F", "Em", "Am", "Em"],
+    ["FM7", "Am", "F", "Em"],
+    ["Am", "Em", "F", "Am"],
+    ["F", "Am", "F", "Em"]
+  ],
+  c: [
+    ["Am", "Em", "F", "Am"],
+    ["F", "Am", "Esus4", "Em"],
+    ["Am", "F", "Em", "Em"]
+  ]
+};
+var RITSU_CENTER = {
+  tonic: "Dsus4",
+  half: "G",
+  deceptive: "Em",
+  tonicPattern: /^Dsus/,
+  a: [
+    ["Dsus4", "G", "Dsus4", "Dsus4"],
+    ["Dsus4", "Em", "G", "Dsus4"],
+    ["G", "Dsus4", "Em", "Dsus4"],
+    ["Dsus4", "G", "Em", "G"],
+    ["Em", "G", "Dsus4", "Dsus4"],
+    ["Dsus4", "Em7", "G", "Dsus4"],
+    ["G", "Em", "Dsus4", "G"],
+    ["Dsus4", "Am", "G", "Dsus4"]
+  ],
+  b: [
+    ["G", "Em", "Dsus4", "Dsus4"],
+    ["Em", "G", "Em", "Dsus4"],
+    ["G", "Am", "Em", "Dsus4"],
+    ["Em7", "G", "Dsus4", "Dsus4"],
+    ["Am", "G", "Em", "Dsus4"],
+    ["Dsus4", "Em", "G", "Em"]
+  ],
+  c: [
+    ["Em", "Dsus4", "G", "Em"],
+    ["G", "Em7", "Am", "G"],
+    ["Am", "G", "Em", "Dsus4"]
+  ]
+};
+var HARMONIC_MINOR_CENTER = {
+  tonic: "Am",
+  half: "E7",
+  deceptive: "F",
+  tonicPattern: /^Am/,
+  a: [
+    ["Am", "Dm", "E7", "Am"],
+    // i-iv-V7-i。和声的短音階の基本形
+    ["Am", "F", "E7", "Am"],
+    ["Am", "E7", "Am", "Am"],
+    ["Dm", "E7", "Am", "Am"],
+    ["Am", "AmM7", "Dm", "E7"],
+    // 主和音に導音を重ねたクリシェ
+    ["Am", "F", "Dm", "E7"],
+    ["F", "E7", "Am", "Am"],
+    ["Am", "Bm7-5", "E7", "Am"]
+  ],
+  b: [
+    ["Dm", "E7", "Am", "Am"],
+    ["F", "E7", "Am", "E7"],
+    ["Dm7", "G#dim", "Am", "E7"],
+    ["F", "Dm", "E7", "Am"],
+    ["Am", "Dm", "Bm7-5", "E7"],
+    ["FM7", "E7", "Am", "Am"]
+  ],
+  c: [
+    ["Dm", "Am", "Bm7-5", "E7"],
+    ["F", "C+", "Dm", "E7"],
+    ["Am", "F", "Dm", "E7"]
+  ]
+};
+var HIJAZ_CENTER = {
+  tonic: "E",
+  half: "F",
+  deceptive: "Am",
+  tonicPattern: /^E(?![#b]|m)/,
+  a: [
+    ["E", "F", "E", "E"],
+    // I-♭II。ヒジャーズの顔
+    ["E7", "F", "E", "E"],
+    ["Am", "F", "E", "E"],
+    ["E", "F", "Dm", "E"],
+    ["F", "E", "F", "E"],
+    ["Dm", "E", "F", "E"],
+    ["E7", "Am", "F", "E"],
+    ["E", "Dm", "F", "E"]
+  ],
+  b: [
+    ["F", "E", "Am", "E"],
+    ["Dm", "C+", "F", "E"],
+    ["Am", "Dm", "F", "E"],
+    ["F", "Dm", "E", "E"],
+    ["E7", "F", "Dm", "E"],
+    ["Bm7-5", "E7", "Am", "E"]
+  ],
+  c: [
+    ["Am", "Dm", "F", "E"],
+    ["Dm", "Am", "F", "E7"],
+    ["F", "C+", "Dm", "E"]
+  ]
+};
+var HUNGARIAN_CENTER = {
+  tonic: "Am",
+  half: "E",
+  deceptive: "F",
+  tonicPattern: /^Am/,
+  a: [
+    ["Am", "E", "Am", "Am"],
+    ["Am", "F", "E", "Am"],
+    ["Am", "AmM7", "F", "E"],
+    ["F", "E", "Am", "Am"],
+    ["Am", "Fm", "E", "Am"],
+    // ♭VIm。増2度を和音の側でも鳴らす
+    ["Am", "E", "F", "E"],
+    ["FM7", "E", "Am", "Am"],
+    ["Am", "C+", "F", "E"]
+  ],
+  b: [
+    ["F", "E", "Am", "E"],
+    ["Fm", "E", "Am", "Am"],
+    ["Am", "F", "C+", "E"],
+    ["FM7", "Am", "F", "E"],
+    ["E", "F", "E", "Am"],
+    ["Am", "AmM7", "Fm", "E"]
+  ],
+  c: [
+    ["F", "Am", "Fm", "E"],
+    ["C+", "F", "Am", "E"],
+    ["Am", "Fm", "F", "E"]
+  ]
+};
+var BLUES_CENTER = {
+  tonic: "C7",
+  half: "G7",
+  deceptive: "F7",
+  tonicPattern: /^C7/,
+  a: [
+    ["C7", "C7", "C7", "C7"],
+    // 12小節ブルースの1〜4小節
+    ["C7", "F7", "C7", "C7"],
+    ["C7", "C7", "F7", "F7"],
+    ["F7", "F7", "C7", "C7"],
+    // 5〜8小節
+    ["C7", "F7", "C7", "G7"],
+    ["C7", "C7", "G7", "F7"],
+    ["C7", "F7", "G7", "C7"],
+    ["F7", "C7", "G7", "C7"]
+  ],
+  b: [
+    ["F7", "F7", "C7", "C7"],
+    ["G7", "F7", "C7", "C7"],
+    // 9〜12小節（ターンアラウンド）
+    ["F7", "G7", "C7", "C7"],
+    ["C7", "F7", "G7", "C7"],
+    ["F7", "C7", "G7", "F7"],
+    ["G7", "G7", "F7", "C7"]
+  ],
+  c: [
+    ["G7", "F7", "C7", "G7"],
+    ["F7", "F7", "G7", "G7"],
+    ["C7", "C7", "F7", "G7"]
+  ]
+};
+var COMPOSE_SCALES = {
+  yo: {
+    id: "yo",
+    label: "\u967D\u97F3\u968E\uFF08\u9577\u8ABF\u30DA\u30F3\u30BF\u30C8\u30CB\u30C3\u30AF\uFF09",
+    tonic: 0,
+    core: [0, 1, 2, 4, 5],
+    // ド レ ミ ソ ラ
+    minorish: false,
+    strict: false,
+    description: "J-POP\u306E\u6A19\u6E96\u3002\u660E\u308B\u304F\u7D20\u76F4\u3067\u6B4C\u3044\u3084\u3059\u3044\u3002\u5F93\u6765\u306E\u9577\u8ABF\u3068\u540C\u3058"
+  },
+  minyo: {
+    id: "minyo",
+    label: "\u6C11\u8B21\u97F3\u968E\uFF08\u77ED\u8ABF\u30DA\u30F3\u30BF\u30C8\u30CB\u30C3\u30AF\uFF09",
+    tonic: 5,
+    core: [5, 0, 1, 2, 4],
+    // ラ ド レ ミ ソ
+    minorish: true,
+    strict: false,
+    description: "\u308F\u3089\u3079\u6B4C\u30FB\u6C11\u8B21\u306E\u97F3\u968E\u3002\u7FF3\u308A\u304C\u3042\u308B\u304C\u6697\u3059\u304E\u306A\u3044\u3002\u5F93\u6765\u306E\u77ED\u8ABF\u3068\u540C\u3058"
+  },
+  ritsu: {
+    id: "ritsu",
+    label: "\u5F8B\u97F3\u968E",
+    tonic: 1,
+    core: [1, 2, 4, 5, 6],
+    // レ ミ ソ ラ シ
+    minorish: true,
+    strict: true,
+    center: RITSU_CENTER,
+    description: "\u96C5\u697D\u30FB\u58F0\u660E\u306E\u97F3\u968E\u3002\u534A\u97F3\u3092\u542B\u307E\u305A\u3001\u5E73\u3089\u3067\u8358\u91CD\u306B\u6D41\u308C\u308B"
+  },
+  miyakobushi: {
+    id: "miyakobushi",
+    label: "\u90FD\u7BC0\u97F3\u968E\uFF08\u9670\u97F3\u968E\uFF09",
+    tonic: 2,
+    core: [2, 3, 5, 6, 0],
+    // ミ ファ ラ シ ド
+    minorish: true,
+    strict: true,
+    center: MIYAKOBUSHI_CENTER,
+    description: "\u300E\u3055\u304F\u3089\u3055\u304F\u3089\u300F\u306E\u97F3\u968E\u3002\u4E3B\u97F3\u306E\u3059\u3050\u4E0A\u304C\u534A\u97F3\u3067\u3001\u7FF3\u308A\u304C\u6FC3\u3044"
+  },
+  ryukyu: {
+    id: "ryukyu",
+    label: "\u7409\u7403\u97F3\u968E",
+    tonic: 0,
+    core: [0, 2, 3, 4, 6],
+    // ド ミ ファ ソ シ
+    minorish: false,
+    strict: true,
+    center: RYUKYU_CENTER,
+    description: "\u6C96\u7E04\u97F3\u968E\u3002\u30EC\u3068\u30E9\u3092\u629C\u304D\u3001\u30D5\u30A1\u3068\u30B7\u3092\u67F1\u306B\u3059\u308B\u3002\u660E\u308B\u304F\u8DF3\u306D\u308B"
+  },
+  dorian: {
+    id: "dorian",
+    label: "\u30C9\u30EA\u30A2\u30F3",
+    tonic: 1,
+    core: [1, 3, 4, 5, 0],
+    // レ ファ ソ ラ ド
+    minorish: true,
+    strict: false,
+    description: "\u77ED\u8ABF\u3060\u304C6\u5EA6\u304C\u660E\u308B\u3044\u3002\u30B1\u30EB\u30C8\u30FB\u30ED\u30C3\u30AF\u30FB\u30B7\u30C6\u30A3\u30DD\u30C3\u30D7"
+  },
+  phrygian: {
+    id: "phrygian",
+    label: "\u30D5\u30EA\u30B8\u30A2\u30F3",
+    tonic: 2,
+    core: [2, 3, 5, 6, 1],
+    // ミ ファ ラ シ レ
+    minorish: true,
+    strict: false,
+    description: "\u4E3B\u97F3\u306E\u4E0A\u304C\u534A\u97F3\u3002\u30B9\u30D1\u30CB\u30C3\u30B7\u30E5\uFF0F\u30E1\u30BF\u30EB\u306E\u7DCA\u8FEB\u3057\u305F\u97FF\u304D"
+  },
+  lydian: {
+    id: "lydian",
+    label: "\u30EA\u30C7\u30A3\u30A2\u30F3",
+    tonic: 3,
+    core: [3, 4, 6, 0, 2],
+    // ファ ソ シ ド ミ
+    minorish: false,
+    strict: false,
+    description: "4\u5EA6\u304C\u9AD8\u304F\u3001\u6D6E\u904A\u3057\u3066\u5E83\u304C\u308B\u3002\u6620\u753B\u97F3\u697D\u30FB\u30B2\u30FC\u30E0\u306E\u7A7A\u306E\u8272"
+  },
+  mixolydian: {
+    id: "mixolydian",
+    label: "\u30DF\u30AF\u30BD\u30EA\u30C7\u30A3\u30A2\u30F3",
+    tonic: 4,
+    core: [4, 5, 0, 1, 3],
+    // ソ ラ ド レ ファ
+    minorish: false,
+    strict: false,
+    description: "\u9577\u8ABF\u3060\u304C7\u5EA6\u304C\u4F4E\u3044\u3002\u30D6\u30EB\u30FC\u30B9\u30ED\u30C3\u30AF\u30FB\u6C11\u65CF\u97F3\u697D\u306E\u571F\u304F\u3055\u3055"
+  },
+  harmonic_minor: {
+    id: "harmonic_minor",
+    label: "\u548C\u58F0\u7684\u77ED\u97F3\u968E",
+    tonic: 5,
+    parent: HARMONIC_MINOR_SCALE,
+    core: [5, 0, 1, 2, 4],
+    // ラ ド レ ミ ソ♯
+    minorish: true,
+    strict: false,
+    center: HARMONIC_MINOR_CENTER,
+    description: "\u5C0E\u97F3\u30BD\u266F\u3092\u6301\u3064\u77ED\u8ABF\u3002\u58972\u5EA6\u304C\u6CE3\u304D\u3092\u4F5C\u308B\u3002\u30AF\u30E9\u30B7\u30C3\u30AF\u30FBV\u7CFB\u30FB\u5287\u4F34"
+  },
+  hijaz: {
+    id: "hijaz",
+    label: "\u30D2\u30B8\u30E3\u30FC\u30BA\uFF08\u30D5\u30EA\u30B8\u30A2\u30F3\u30FB\u30C9\u30DF\u30CA\u30F3\u30C8\uFF09",
+    tonic: 2,
+    parent: HARMONIC_MINOR_SCALE,
+    core: [2, 3, 4, 5, 6],
+    // ミ ファ ソ♯ ラ シ
+    minorish: false,
+    strict: false,
+    center: HIJAZ_CENTER,
+    description: "\u4E3B\u97F3\u306E\u4E0A\u304C\u534A\u97F3\u3001\u4E3B\u548C\u97F3\u306F\u9577\u4E09\u548C\u97F3\u3002\u4E2D\u6771\u30FB\u30B9\u30D1\u30CB\u30C3\u30B7\u30E5\u30FB\u30E1\u30BF\u30EB"
+  },
+  hungarian: {
+    id: "hungarian",
+    label: "\u30CF\u30F3\u30AC\u30EA\u30A2\u30F3\u30FB\u30DE\u30A4\u30CA\u30FC\uFF08\u30B8\u30D7\u30B7\u30FC\uFF09",
+    tonic: 5,
+    parent: HUNGARIAN_SCALE,
+    core: [5, 0, 1, 2, 4],
+    // ラ ド レ♯ ミ ソ♯
+    minorish: true,
+    strict: false,
+    center: HUNGARIAN_CENTER,
+    description: "\u58972\u5EA6\u304C2\u304B\u6240\u3002\u97F3\u968E\u306E\u4E2D\u3067\u3044\u3061\u3070\u3093\u8DF3\u306D\u305F\u3001\u7570\u56FD\u3081\u3044\u305F\u97FF\u304D"
+  },
+  blues: {
+    id: "blues",
+    label: "\u30D6\u30EB\u30FC\u30B9\u97F3\u968E",
+    tonic: 0,
+    parent: BLUES_SCALE,
+    core: [0, 1, 2, 4, 5],
+    // ド ミ♭ ファ ソ シ♭
+    minorish: true,
+    strict: true,
+    center: BLUES_CENTER,
+    description: "\u30D6\u30EB\u30FC\u30CE\u30FC\u30C8\u5165\u308A\u306E6\u97F3\u97F3\u968E\u3002\u77ED3\u5EA6\u3067\u6B4C\u3044\u3001\u4F34\u594F\u306F\u95773\u5EA6\u3067\u9CF4\u308B"
+  }
+};
+var COMPOSE_SCALE_IDS = Object.keys(
+  COMPOSE_SCALES
+);
+var TONIC_CENTERS = {
+  // --- レ（律・ドリアン） ---
+  1: {
+    tonic: "Dm",
+    half: "G",
+    deceptive: "F",
+    tonicPattern: /^Dm/,
+    a: [
+      ["Dm", "G", "Dm", "Dm"],
+      // i-IV の往復。ドリアンの顔
+      ["Dm", "Am", "G", "Dm"],
+      ["Dm", "C", "G", "Dm"],
+      ["Dm7", "G", "Dm7", "C"],
+      ["Dm", "F", "C", "G"],
+      ["Dm", "Em", "F", "G"],
+      ["Dm", "G", "F", "C"],
+      ["Dm7", "Em7", "FM7", "G"]
+    ],
+    b: [
+      ["F", "G", "Am", "Dm"],
+      ["C", "G", "Dm", "Dm"],
+      ["G", "F", "C", "Dm"],
+      ["Am", "G", "F", "Dm"],
+      ["FM7", "G", "Em7", "Dm7"],
+      ["Dm", "G", "C", "Am"]
+    ],
+    c: [
+      ["Am", "Dm", "G", "C"],
+      ["F", "Em", "Dm", "G"],
+      ["Dm", "Am", "Em", "G"]
+    ]
+  },
+  // --- ミ（都節・フリジアン） ---
+  2: {
+    tonic: "Em",
+    half: "Am",
+    deceptive: "C",
+    tonicPattern: /^Em/,
+    a: [
+      ["Em", "F", "Em", "Em"],
+      // i-♭II。フリジアン／都節の顔
+      ["Em", "Am", "F", "Em"],
+      ["Am", "Em", "F", "Em"],
+      ["Em", "F", "G", "Em"],
+      ["Em", "Em", "F", "F"],
+      ["Em", "C", "F", "Em"],
+      ["Am", "F", "Em", "Em"],
+      ["Em7", "FM7", "Em7", "Am7"]
+    ],
+    b: [
+      ["F", "G", "Am", "Em"],
+      ["Am", "G", "F", "Em"],
+      ["F", "Em", "Am", "Em"],
+      ["C", "F", "Em", "Em"],
+      ["FM7", "G", "Em7", "Am"],
+      ["Am", "Em", "F", "G"]
+    ],
+    c: [
+      ["Am", "Em", "F", "C"],
+      ["C", "G", "Am", "Em"],
+      ["F", "C", "Am", "Em"]
+    ]
+  },
+  // --- ファ（リディアン） ---
+  3: {
+    tonic: "FM7",
+    half: "C",
+    deceptive: "Dm",
+    tonicPattern: /^F(?![#b]|m)/,
+    a: [
+      ["FM7", "G", "FM7", "FM7"],
+      // I-II。リディアンの顔（♯4 が G の3度に居る）
+      ["FM7", "G", "Em", "Am"],
+      ["F", "G", "C", "F"],
+      ["FM7", "G", "Am", "F"],
+      ["F", "C", "G", "F"],
+      ["FM7", "Em7", "Dm7", "G"],
+      ["F", "G", "F", "C"],
+      ["FM7", "G", "Dm7", "F"]
+    ],
+    b: [
+      ["G", "F", "C", "F"],
+      ["Am", "G", "FM7", "FM7"],
+      ["C", "G", "Am", "F"],
+      ["G", "Em", "Am", "F"],
+      ["Dm7", "G", "FM7", "FM7"],
+      ["FM7", "G", "Em7", "F"]
+    ],
+    c: [
+      ["Dm", "Am", "F", "G"],
+      ["Am", "Em", "F", "G"],
+      ["C", "Am", "Dm", "F"]
+    ]
+  },
+  // --- ソ（ミクソリディアン） ---
+  4: {
+    tonic: "G",
+    half: "Dm",
+    deceptive: "Em",
+    tonicPattern: /^G(?![#b]|m)/,
+    a: [
+      ["G", "F", "C", "G"],
+      // I-♭VII-IV。ミクソリディアンの顔
+      ["G", "C", "F", "G"],
+      ["G", "F", "G", "G"],
+      ["C", "G", "F", "G"],
+      ["G", "Dm", "F", "G"],
+      ["G", "Am", "F", "G"],
+      ["G", "F", "Dm", "C"],
+      ["G", "C", "G", "F"]
+    ],
+    b: [
+      ["F", "C", "G", "G"],
+      ["Am", "F", "C", "G"],
+      ["C", "Dm", "F", "G"],
+      ["Em", "F", "C", "G"],
+      ["F", "G", "Am", "G"],
+      ["Dm7", "F", "C", "G"]
+    ],
+    c: [
+      ["Am", "Em", "F", "G"],
+      ["C", "Am", "Dm", "G"],
+      ["Em", "Am", "F", "C"]
+    ]
+  }
+};
+var scaleDegrees = (scale) => scale.parent ?? MAJOR_SCALE2;
+var scaleSize = (scale) => scaleDegrees(scale).length;
+var degreeToPitch = (scale, degree) => {
+  const list = scaleDegrees(scale);
+  const size = list.length;
+  const index = (degree % size + size) % size;
+  const octave = Math.floor(degree / size);
+  const d = list[index];
+  return { semi: d.semi + octave * 12, fifth: d.fifth };
+};
+var semitoneToDegree = (scale, semi) => {
+  const list = scaleDegrees(scale);
+  const octave = Math.floor(semi / 12);
+  const within = semi - octave * 12;
+  let best = 0;
+  let bestDist = Number.POSITIVE_INFINITY;
+  for (let i2 = 0; i2 < list.length; i2++) {
+    const dist = Math.abs(list[i2].semi - within);
+    if (dist < bestDist) {
+      bestDist = dist;
+      best = i2;
+    }
+  }
+  return octave * list.length + best;
+};
+var walk = (scale, semi, delta) => degreeToPitch(scale, semitoneToDegree(scale, semi) + delta).semi;
+var scaleFifth = (scale, semi) => degreeToPitch(scale, semitoneToDegree(scale, semi)).fifth;
+var SCALE_PCS = /* @__PURE__ */ new Map();
+var scalePcs = (scale) => {
+  const hit = SCALE_PCS.get(scale.id);
+  if (hit) return hit;
+  const set = new Set(
+    scaleDegrees(scale).map((d) => (d.semi % 12 + 12) % 12)
+  );
+  SCALE_PCS.set(scale.id, set);
+  return set;
+};
+var CORE_SORTED = /* @__PURE__ */ new Map();
+var sortedCore = (scale) => {
+  const hit = CORE_SORTED.get(scale.id);
+  if (hit) return hit;
+  const sorted = [...scale.core].sort((a, b) => a - b);
+  CORE_SORTED.set(scale.id, sorted);
+  return sorted;
+};
+var CORE_PCS = /* @__PURE__ */ new Map();
+var corePcs = (scale) => {
+  const hit = CORE_PCS.get(scale.id);
+  if (hit) return hit;
+  const list = scaleDegrees(scale);
+  const set = new Set(scale.core.map((d) => (list[d].semi % 12 + 12) % 12));
+  CORE_PCS.set(scale.id, set);
+  return set;
+};
+var isCoreDegree = (scale, degree) => {
+  const size = scaleSize(scale);
+  return sortedCore(scale).includes((degree % size + size) % size);
+};
+var coreToDegree = (scale, step) => {
+  const sorted = sortedCore(scale);
+  const n = sorted.length;
+  const index = (step % n + n) % n;
+  const octave = Math.floor(step / n);
+  return sorted[index] + octave * scaleSize(scale);
+};
+var degreeToCore = (scale, degree) => {
+  const sorted = sortedCore(scale);
+  const size = scaleSize(scale);
+  const index = (degree % size + size) % size;
+  const octave = Math.floor(degree / size);
+  let best = 0;
+  let bestDist = Number.POSITIVE_INFINITY;
+  for (let i2 = 0; i2 < sorted.length; i2++) {
+    const dist = Math.abs(sorted[i2] - index);
+    if (dist < bestDist) {
+      bestDist = dist;
+      best = i2;
+    }
+  }
+  return octave * sorted.length + best;
+};
+var isOutsideCore = (scale, semi) => scale.strict ? !corePcs(scale).has((semi % 12 + 12) % 12) : !isCoreDegree(scale, semitoneToDegree(scale, semi));
+var resolveComposeScale = (choice, minorKey, rnd = Math.random) => {
+  const c = (choice ?? "").trim() || "auto";
+  const hit = COMPOSE_SCALES[c];
+  if (hit) return hit;
+  if (c === "any")
+    return COMPOSE_SCALES[COMPOSE_SCALE_IDS[Math.floor(rnd() * COMPOSE_SCALE_IDS.length)] ?? "yo"];
+  return COMPOSE_SCALES[minorKey ? "minyo" : "yo"];
+};
+var getComposeScaleDescription = (choice) => {
+  const hit = COMPOSE_SCALES[choice];
+  if (hit) return hit.description;
+  if (choice === "any")
+    return `${COMPOSE_SCALE_IDS.length}\u3064\u306E\u97F3\u968E\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u62BD\u9078\u3057\u307E\u3059`;
+  return "\u30D9\u30FC\u30B9\u8ABF\u306E\u9577\u77ED\u306B\u5408\u308F\u305B\u3066\u3001\u967D\u97F3\u968E\uFF08\u9577\u8ABF\uFF09\u304B\u6C11\u8B21\u97F3\u968E\uFF08\u77ED\u8ABF\uFF09\u3092\u4F7F\u3044\u307E\u3059";
+};
+var resolveCenter = (scale) => scale.center ?? TONIC_CENTERS[scale.tonic] ?? null;
+
 // src/compose-sections.ts
 var SECTION_LABELS = {
   intro: "\u30A4\u30F3\u30C8\u30ED",
@@ -13888,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音も無い、音域が半音未満（同じ音を並べただけ）。 */
@@ -13946,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;
@@ -14077,65 +14845,6 @@ var BPM_CHOICES = [
   180,
   185
 ];
-var MAJOR_SCALE2 = [
-  { semi: 0, fifth: 0 },
-  // C
-  { semi: 2, fifth: 2 },
-  // D
-  { semi: 4, fifth: 4 },
-  // E
-  { semi: 5, fifth: -1 },
-  // F
-  { semi: 7, fifth: 1 },
-  // G
-  { semi: 9, fifth: 3 },
-  // A
-  { semi: 11, fifth: 5 }
-  // B
-];
-var degreeToPitch = (degree) => {
-  const index = (degree % 7 + 7) % 7;
-  const octave = Math.floor(degree / 7);
-  const d = MAJOR_SCALE2[index];
-  return { semi: d.semi + octave * 12, fifth: d.fifth };
-};
-var semitoneToDegree = (semi) => {
-  const octave = Math.floor(semi / 12);
-  const within = semi - octave * 12;
-  let best = 0;
-  let bestDist = Number.POSITIVE_INFINITY;
-  for (let i2 = 0; i2 < MAJOR_SCALE2.length; i2++) {
-    const dist = Math.abs(MAJOR_SCALE2[i2].semi - within);
-    if (dist < bestDist) {
-      bestDist = dist;
-      best = i2;
-    }
-  }
-  return octave * 7 + best;
-};
-var walk = (semi, delta) => degreeToPitch(semitoneToDegree(semi) + delta).semi;
-var NON_PENTATONIC_DEGREES = /* @__PURE__ */ new Set([3, 6]);
-var isNonPentatonic = (semi) => NON_PENTATONIC_DEGREES.has((semitoneToDegree(semi) % 7 + 7) % 7);
-var PENTATONIC_DEGREES = [0, 1, 2, 4, 5];
-var pentaToDegree = (penta) => {
-  const index = (penta % 5 + 5) % 5;
-  const octave = Math.floor(penta / 5);
-  return PENTATONIC_DEGREES[index] + octave * 7;
-};
-var degreeToPenta = (degree) => {
-  const index = (degree % 7 + 7) % 7;
-  const octave = Math.floor(degree / 7);
-  let best = 0;
-  let bestDist = Number.POSITIVE_INFINITY;
-  for (let i2 = 0; i2 < PENTATONIC_DEGREES.length; i2++) {
-    const dist = Math.abs(PENTATONIC_DEGREES[i2] - index);
-    if (dist < bestDist) {
-      bestDist = dist;
-      best = i2;
-    }
-  }
-  return octave * 5 + best;
-};
 var SECTION_A_PROGRESSIONS = [
   ["C", "G", "Am", "Em7"],
   // カノン進行の前半
@@ -14254,6 +14963,22 @@ var SECTION_DECEPTIVE_DERIVATIONS = [
   (a, t) => [a[0], "Dm7", "G7", t === "Am" ? "FM7" : "Am7"],
   (a, t) => [a[0], "F", "G7", t === "Am" ? "F" : "Am7"]
 ];
+var MODAL_FULL_DERIVATIONS = [
+  (a, c) => [a[0], a[1], c.half, c.tonic],
+  (a, c) => [a[0], c.half, a[2], c.tonic],
+  (a, c) => [a[0], a[1], a[2], c.tonic],
+  (a, c) => [c.tonic, c.half, a[2], c.tonic]
+];
+var MODAL_HALF_DERIVATIONS = [
+  (a, c) => [a[0], a[1], a[2], c.half],
+  (a, c) => [a[0], a[1], c.tonic, c.half],
+  (a, c) => [a[0], c.tonic, a[2], c.half]
+];
+var MODAL_DECEPTIVE_DERIVATIONS = [
+  (a, c) => [a[0], a[1], c.half, c.deceptive],
+  (a, c) => [a[0], c.half, a[2], c.deceptive],
+  (a, c) => [a[0], a[1], a[2], c.deceptive]
+];
 var MODAL_BORROW = {
   F: "Fm",
   // IV → IVm（サブドミナントマイナー。いちばん定番）
@@ -14711,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") {
@@ -14844,7 +15577,7 @@ var nearestChordTone = (targetSemi, tones, minWeight, preferColor = false) => {
 var MELODY_LOW = 60;
 var MELODY_HIGH = 81;
 var MELODY_CENTER = (MELODY_LOW + MELODY_HIGH) / 2;
-var harmonyPitch = (melodySemi, tones, prevHarmony, offset, parallel, against) => {
+var harmonyPitch = (scale, melodySemi, tones, prevHarmony, offset, parallel, against) => {
   const lo = Math.max(-12, Math.min(offset, 0) - 7);
   const hi = Math.min(12, Math.max(offset, 0) + 7);
   let best = null;
@@ -14862,7 +15595,8 @@ var harmonyPitch = (melodySemi, tones, prevHarmony, offset, parallel, against) =
         const g = Math.abs(semi - against) % 12;
         clash = g === 3 || g === 4 || g === 8 || g === 9 || g === 7 ? 0 : g === 0 ? 0.5 : 1.2;
       }
-      const cost = stay + clash + Math.abs(delta - offset) * (parallel ? 1.4 : 0.7) + (3 - tone.weight) * 0.4;
+      const offCore = scale.strict && isOutsideCore(scale, semi) ? 1.5 : 0;
+      const cost = stay + clash + offCore + Math.abs(delta - offset) * (parallel ? 1.4 : 0.7) + (3 - tone.weight) * 0.4;
       if (cost < bestCost) {
         bestCost = cost;
         best = { semi, fifth: tone.fifth };
@@ -14885,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);
@@ -14893,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;
@@ -14907,40 +15641,43 @@ var leapTarget = (from, tones, rnd) => {
   ];
   return pick(weighted.length > 0 ? weighted : candidates, rnd);
 };
-var landOn = (degrees, scaleIndex) => {
+var landOn = (scale, degrees, scaleIndex) => {
   if (degrees.length === 0) return;
+  const size = scaleSize(scale);
   const last = degrees[degrees.length - 1];
-  const index = (last % 7 + 7) % 7;
+  const index = (last % size + size) % size;
   let delta = scaleIndex - index;
-  if (delta > 3) delta -= 7;
-  if (delta < -3) delta += 7;
+  if (delta > size / 2) delta -= size;
+  if (delta < -size / 2) delta += size;
   degrees[degrees.length - 1] = last + delta;
 };
-var landPitch = (pitches, scaleIndex) => {
+var landPitch = (scale, pitches, scaleIndex) => {
   if (pitches.length === 0) return;
+  const size = scaleSize(scale);
   const last = pitches[pitches.length - 1];
-  const degree = semitoneToDegree(last);
-  const index = (degree % 7 + 7) % 7;
+  const degree = semitoneToDegree(scale, last);
+  const index = (degree % size + size) % size;
   let delta = scaleIndex - index;
-  if (delta > 3) delta -= 7;
-  if (delta < -3) delta += 7;
+  if (delta > size / 2) delta -= size;
+  if (delta < -size / 2) delta += size;
   pitches[pitches.length - 1] = clampSemi(
-    degreeToPitch(degree + delta).semi,
+    degreeToPitch(scale, degree + delta).semi,
     MELODY_LOW,
     MELODY_HIGH
   );
 };
-var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourOffset, repeatShift, barHeadWeight, preferColor, quarterSteps, rnd) => {
+var barDegrees = (role, slots, tones, style, scale, motifContour, startDegree, contourOffset, repeatShift, barHeadWeight, preferColor, quarterSteps, rnd) => {
   const noteCount = slots.length;
   const out = [];
   if (role === "motif" || role === "sequence" || role === "climax" || role === "answer") {
     const shift = (role === "sequence" ? pick([-2, -1, 1, 2], rnd) : role === "climax" ? 5 : 0) + repeatShift;
     if (style.pentatonicMotif) {
-      const startPenta = degreeToPenta(startDegree);
+      const startCore = degreeToCore(scale, startDegree);
       for (let i2 = 0; i2 < noteCount; i2++)
         out.push(
-          pentaToDegree(
-            startPenta + shift + motifContour[(contourOffset + i2) % motifContour.length]
+          coreToDegree(
+            scale,
+            startCore + shift + motifContour[(contourOffset + i2) % motifContour.length]
           )
         );
     } else {
@@ -14960,9 +15697,9 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
       for (let i2 = 0; i2 < noteCount; i2++)
         out.push(startDegree + dir2 * (i2 < peak ? i2 : peak * 2 - i2 - 1));
     } else if (style.runShape === "broken") {
-      const arp = tones.map((t) => semitoneToDegree(clampSemi(t.semi, 60, 71))).sort((a, b) => a - b);
+      const arp = tones.map((t) => semitoneToDegree(scale, clampSemi(t.semi, 60, 71))).sort((a, b) => a - b);
       for (let i2 = 0; i2 < noteCount; i2++) {
-        const oct = Math.floor(i2 / arp.length) * 7;
+        const oct = Math.floor(i2 / arp.length) * scaleSize(scale);
         const idx = dir2 > 0 ? i2 % arp.length : arp.length - 1 - i2 % arp.length;
         out.push(arp[idx] + dir2 * oct);
       }
@@ -14985,7 +15722,10 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
     return out;
   }
   if (role === "cadence") {
-    const tonic = semitoneToDegree(clampSemi(72, MELODY_LOW, MELODY_HIGH));
+    const tonic = semitoneToDegree(
+      scale,
+      clampSemi(72, MELODY_LOW, MELODY_HIGH)
+    );
     for (let i2 = 0; i2 < noteCount; i2++) {
       if (style.cadenceShape === "descend") {
         out.push(tonic + noteCount - 1 - i2);
@@ -14993,7 +15733,9 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
         const shape = [4, 2, 0];
         out.push(tonic + shape[Math.min(i2, shape.length - 1)]);
       } else if (style.cadenceShape === "leap-up") {
-        out.push(i2 === noteCount - 1 ? tonic : tonic - 7 + Math.min(i2, 4));
+        out.push(
+          i2 === noteCount - 1 ? tonic : tonic - scaleSize(scale) + Math.min(i2, 4)
+        );
       } else {
         out.push(i2 === 0 && noteCount > 1 ? tonic + 1 : tonic);
       }
@@ -15028,8 +15770,9 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
   for (let i2 = 0; i2 < out.length; i2++) {
     if (!slots[i2].isStrong) continue;
     out[i2] = semitoneToDegree(
+      scale,
       nearestChordTone(
-        degreeToPitch(out[i2]).semi,
+        degreeToPitch(scale, out[i2]).semi,
         tones,
         barHeadWeight,
         preferColor
@@ -15040,9 +15783,9 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
     if (slots[i2].isStrong) continue;
     if (slots[i2].value >= quarterSteps) {
       if (rnd() < style.leapAffinity) {
-        const from = degreeToPitch(out[i2 - 1]).semi;
-        const target = leapTarget(from, tones, rnd);
-        if (target !== null) out[i2] = semitoneToDegree(target);
+        const from = degreeToPitch(scale, out[i2 - 1]).semi;
+        const target = leapTarget(from, tones, rnd, style.maxLeap);
+        if (target !== null) out[i2] = semitoneToDegree(scale, target);
       }
       continue;
     }
@@ -15052,20 +15795,20 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
   }
   return out;
 };
-var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, 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 ? pentaToDegree(degreeToPenta(d) + shift) : d + shift
+      (d) => pentatonic ? coreToDegree(scale, degreeToCore(scale, d) + shift) : d + shift
     );
     let score = 0;
     for (let i2 = 0; i2 < moved.length; i2++) {
       const semi = clampSemi(
-        degreeToPitch(moved[i2]).semi,
+        degreeToPitch(scale, moved[i2]).semi,
         MELODY_LOW,
         MELODY_HIGH
       );
@@ -15074,7 +15817,7 @@ var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, pentatonic, prefe
       score += important ? w * 3 : w;
     }
     const head = clampSemi(
-      degreeToPitch(moved[0]).semi,
+      degreeToPitch(scale, moved[0]).semi,
       MELODY_LOW,
       MELODY_HIGH
     );
@@ -15097,7 +15840,7 @@ var shapeBar = (degrees, slots, tones, prevSemi, opts) => {
   const out = [];
   let prev = prevSemi;
   if (opts.preserveContour) {
-    const raw = degrees.map((d) => degreeToPitch(d).semi);
+    const raw = degrees.map((d) => degreeToPitch(opts.scale, d).semi);
     const lo = Math.min(...raw);
     const hi = Math.max(...raw);
     let shift = 0;
@@ -15111,30 +15854,42 @@ var shapeBar = (degrees, slots, tones, prevSemi, opts) => {
   }
   for (let i2 = 0; i2 < degrees.length; i2++) {
     let semi = clampSemi(
-      degreeToPitch(degrees[i2]).semi,
+      degreeToPitch(opts.scale, degrees[i2]).semi,
       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(prev, Math.sign(semi - prev) * 3),
+        walk(opts.scale, prev, Math.sign(semi - prev) * 3),
         MELODY_LOW,
         MELODY_HIGH
       );
     }
     if (!opts.allowArpeggio && i2 >= 2 && Math.abs(out[i2 - 1] - out[i2 - 2]) > STEP_SEMITONES) {
       const back = -Math.sign(out[i2 - 1] - out[i2 - 2]);
-      semi = clampSemi(walk(out[i2 - 1], back), MELODY_LOW, MELODY_HIGH);
+      semi = clampSemi(
+        walk(opts.scale, out[i2 - 1], back),
+        MELODY_LOW,
+        MELODY_HIGH
+      );
     }
     if (toneWeight(semi, tones) === 0 && (slots[i2].isStrong || slots[i2].value >= opts.quarterSteps)) {
       const resolved = semi + 1;
-      const useResolved = resolved <= MELODY_HIGH && !DIATONIC_PCS.has(pitchClass(resolved)) && toneWeight(resolved, tones) >= 2 && resolved !== prev && opts.rnd() < opts.chromaticAffinity;
+      const useResolved = resolved <= MELODY_HIGH && !scalePcs(opts.scale).has(pitchClass(resolved)) && toneWeight(resolved, tones) >= 2 && resolved !== prev && opts.rnd() < opts.chromaticAffinity;
       if (useResolved) {
         semi = resolved;
       } else {
-        const up = clampSemi(walk(semi, 1), MELODY_LOW, MELODY_HIGH);
-        const down = clampSemi(walk(semi, -1), MELODY_LOW, MELODY_HIGH);
+        const up = clampSemi(
+          walk(opts.scale, semi, 1),
+          MELODY_LOW,
+          MELODY_HIGH
+        );
+        const down = clampSemi(
+          walk(opts.scale, semi, -1),
+          MELODY_LOW,
+          MELODY_HIGH
+        );
         const score = (s) => toneWeight(s, tones) * 2 + (i2 > 0 && s === prev ? -3 : 0);
         semi = score(down) >= score(up) ? down : up;
       }
@@ -15142,7 +15897,14 @@ var shapeBar = (degrees, slots, tones, prevSemi, opts) => {
     out.push(semi);
     prev = semi;
   }
-  applyPentatonic(out, slots, tones, prevSemi, opts.quarterSteps / 2);
+  applyPentatonic(
+    out,
+    slots,
+    tones,
+    prevSemi,
+    opts.quarterSteps / 2,
+    opts.scale
+  );
   applyOctaveJumps(out, slots, opts.octaveAffinity, opts.rnd);
   return out;
 };
@@ -15159,27 +15921,27 @@ var applyOctaveJumps = (out, slots, affinity, rnd) => {
     out[i2] = canUp && (!canDown || rnd() < 0.5) ? up : down;
   }
 };
-var applyPentatonic = (out, slots, tones, prevSemi, shortSteps) => {
+var applyPentatonic = (out, slots, tones, prevSemi, shortSteps, scale) => {
   for (let i2 = 0; i2 < out.length; i2++) {
     const semi = out[i2];
-    if (!isNonPentatonic(semi)) continue;
-    if (tones.some((t) => pitchClass(t.semi) === pitchClass(semi))) continue;
+    if (!isOutsideCore(scale, semi)) continue;
+    if (!scale.strict && tones.some((t) => pitchClass(t.semi) === pitchClass(semi)))
+      continue;
     const before = i2 === 0 ? prevSemi : out[i2 - 1];
     const after = i2 + 1 < out.length ? out[i2 + 1] : null;
     const inByStep = Math.abs(semi - before) <= STEP_SEMITONES;
     const outByStep = after !== null && Math.abs(after - semi) <= STEP_SEMITONES;
-    if (inByStep || outByStep) continue;
-    if (!slots[i2].isStrong && slots[i2].value <= shortSteps) continue;
-    const up = clampSemi(walk(semi, 1), MELODY_LOW, MELODY_HIGH);
-    const down = clampSemi(walk(semi, -1), MELODY_LOW, MELODY_HIGH);
-    const score = (s) => (isNonPentatonic(s) ? -4 : 0) + toneWeight(s, tones) + (s === before ? -3 : 0) + (after !== null ? -Math.abs(after - s) / 12 : 0);
+    if (scale.strict ? inByStep && outByStep : inByStep || outByStep) continue;
+    if (!scale.strict && !slots[i2].isStrong && slots[i2].value <= shortSteps)
+      continue;
+    const up = clampSemi(walk(scale, semi, 1), MELODY_LOW, MELODY_HIGH);
+    const down = clampSemi(walk(scale, semi, -1), MELODY_LOW, MELODY_HIGH);
+    const score = (s) => (isOutsideCore(scale, s) ? -4 : 0) + toneWeight(s, tones) + (s === before ? -3 : 0) + (after !== null ? -Math.abs(after - s) / 12 : 0);
     out[i2] = score(down) >= score(up) ? down : up;
   }
 };
-var DIATONIC_PCS = new Set(MAJOR_SCALE2.map((d) => d.semi));
 var SHARP_FIFTHS = [0, 7, 2, 9, 4, -1, 6, 1, 8, 3, 10, 5];
 var FLAT_FIFTHS = [0, -5, 2, -3, 4, -1, -6, 1, -4, 3, -2, 5];
-var diatonicFifth = (semi) => degreeToPitch(semitoneToDegree(semi)).fifth;
 var nearestOctaveOf = (near, semi) => {
   const pc = pitchClass(semi);
   let best = pc;
@@ -15194,7 +15956,7 @@ var nearestOctaveOf = (near, semi) => {
   }
   return best;
 };
-var applyChromatic = (pitches, fifths, slots, tones, opts) => {
+var applyChromatic = (scale, pitches, fifths, slots, tones, opts) => {
   const last = pitches.length - 1;
   for (let i2 = 0; i2 < pitches.length; i2++) {
     const tone = tones.find(
@@ -15202,7 +15964,8 @@ var applyChromatic = (pitches, fifths, slots, tones, opts) => {
     );
     if (tone) fifths[i2] = tone.fifth;
   }
-  const altered = tones.filter((t) => !DIATONIC_PCS.has(pitchClass(t.semi)));
+  const pcs = scalePcs(scale);
+  const altered = tones.filter((t) => !pcs.has(pitchClass(t.semi)));
   for (let i2 = 0; i2 < pitches.length; i2++) {
     if (opts.keepLast && i2 === last) continue;
     if (!slots[i2].isStrong && slots[i2].value < opts.quarterSteps) continue;
@@ -15230,7 +15993,7 @@ var applyChromatic = (pitches, fifths, slots, tones, opts) => {
     const span = Math.abs(after - before);
     const target = span === 2 ? before + dir : span === 3 ? after - dir : null;
     if (target === null) continue;
-    if (DIATONIC_PCS.has(pitchClass(target))) continue;
+    if (pcs.has(pitchClass(target))) continue;
     if (target === before || target === after) continue;
     if (target < MELODY_LOW || target > MELODY_HIGH) continue;
     pitches[i2] = target;
@@ -15238,7 +16001,8 @@ var applyChromatic = (pitches, fifths, slots, tones, opts) => {
     lastAltered = i2;
   }
 };
-var draw = (options, resolvedKey, rnd) => {
+var draw = (options, resolvedKey, scale, rnd) => {
+  const center = resolveCenter(scale);
   const stepsPerBar = options.stepsPerBar;
   const edo = options.edo === 31 ? 31 : 12;
   const scaleStep = (v) => Math.max(1, Math.round(Math.abs(v) * stepsPerBar / BASE_STEPS_PER_BAR)) * Math.sign(v);
@@ -15266,7 +16030,7 @@ var draw = (options, resolvedKey, rnd) => {
   const totalBars = sectionPlan.reduce((sum, s) => sum + s.bars, 0);
   const relativeKinds = /* @__PURE__ */ new Set();
   let relativeShift = 0;
-  if (rnd() < 0.25) {
+  if (rnd() < 0.25 && !center) {
     for (const kind of pick(
       [["prechorus"], ["bridge"], ["prechorus", "bridge"]],
       rnd
@@ -15376,42 +16140,42 @@ var draw = (options, resolvedKey, rnd) => {
       barKeyShift[b] = s.keyShift;
     }
   }
-  const progAPool = resolvedKey.mode === "major" ? SECTION_A_PROGRESSIONS.filter((p) => !p[0].startsWith("Am")) : resolvedKey.mode === "minor" ? SECTION_A_PROGRESSIONS.filter((p) => p[0].startsWith("Am")) : SECTION_A_PROGRESSIONS;
+  const progAPool = center ? center.a : resolvedKey.mode === "major" ? SECTION_A_PROGRESSIONS.filter((p) => !p[0].startsWith("Am")) : resolvedKey.mode === "minor" ? SECTION_A_PROGRESSIONS.filter((p) => p[0].startsWith("Am")) : SECTION_A_PROGRESSIONS;
   const withoutTonic = (pool, root) => {
-    const isTonic = (c) => root === "Am" ? /^Am/.test(c) : /^C(?![#b]|m)/.test(c);
+    const isTonic = (c) => center ? center.tonicPattern.test(c) : root === "Am" ? /^Am/.test(c) : /^C(?![#b]|m)/.test(c);
     const out = pool.filter((p) => !p.some(isTonic));
     return out.length > 0 ? out : pool;
   };
-  const homeRoot = resolvedKey.mode === "minor" ? "Am" : "C";
+  const homeRoot = center ? center.tonic : resolvedKey.mode === "minor" ? "Am" : "C";
   const progA = pick(
     floating ? withoutTonic(progAPool, homeRoot) : progAPool,
     rnd
   );
-  const progBPool = SECTION_B_PROGRESSIONS.filter(
+  const progBPool = (center ? center.b : SECTION_B_PROGRESSIONS).filter(
     (p) => p.join("|") !== progA.join("|")
   );
   const progB = pick(
     floating ? withoutTonic(progBPool, homeRoot) : progBPool,
     rnd
   );
-  const progRelativePool = SECTION_A_PROGRESSIONS.filter(
+  const progRelativePool = center ? center.a : SECTION_A_PROGRESSIONS.filter(
     (p) => resolvedKey.mode === "minor" ? !p[0].startsWith("Am") : p[0].startsWith("Am")
   );
   const progRelative = pick(
     floating ? withoutTonic(progRelativePool, homeRoot) : progRelativePool,
     rnd
   );
-  const progCPool = SECTION_C_PROGRESSIONS.filter(
+  const progCPool = (center ? center.c : SECTION_C_PROGRESSIONS).filter(
     (p) => p.join("|") !== progA.join("|") && p.join("|") !== progB.join("|")
   );
   const progC = pick(
     floating ? withoutTonic(progCPool, homeRoot) : progCPool,
     rnd
   );
-  const tonic = progA[0].startsWith("Am") ? "Am" : "C";
-  const progHalf = pick(SECTION_A2_DERIVATIONS, rnd)(progA);
-  const progFull = pick(SECTION_A3_DERIVATIONS, rnd)(progA, tonic);
-  const progDeceptive = pick(SECTION_DECEPTIVE_DERIVATIONS, rnd)(progA, tonic);
+  const tonic = center ? center.tonic : progA[0].startsWith("Am") ? "Am" : "C";
+  const progHalf = center ? pick(MODAL_HALF_DERIVATIONS, rnd)(progA, center) : pick(SECTION_A2_DERIVATIONS, rnd)(progA);
+  const progFull = center ? pick(MODAL_FULL_DERIVATIONS, rnd)(progA, center) : pick(SECTION_A3_DERIVATIONS, rnd)(progA, tonic);
+  const progDeceptive = center ? pick(MODAL_DECEPTIVE_DERIVATIONS, rnd)(progA, center) : pick(SECTION_DECEPTIVE_DERIVATIONS, rnd)(progA, tonic);
   let lastChorusBar = -1;
   for (const section of sectionPlan)
     if (section.kind === "chorus" || section.kind === "outro")
@@ -15458,7 +16222,7 @@ var draw = (options, resolvedKey, rnd) => {
       progression[bar - 1] = transposeChordName("G7", shift - prev);
     }
   }
-  if (rnd() < 0.3) {
+  if (rnd() < 0.3 && !center) {
     const tonicNames = tonic === "Am" ? ["Am", "Am7"] : ["C", "CM7"];
     const spots = [];
     for (let bar = 0; bar + 1 < totalBars; bar++) {
@@ -15479,21 +16243,27 @@ var draw = (options, resolvedKey, rnd) => {
   const sourceOf = (kind) => kind === "chorus" || kind === "interlude" || kind === "drop_chorus" ? "b" : kind === "prechorus" ? "a2" : kind === "bridge" ? "c" : "a";
   const landingOf = (section) => {
     if (section.spec.landing === null) return null;
-    const minorHere = resolvedKey.mode === "minor" !== relativeKinds.has(section.kind);
-    let landing = (section.spec.landing + (minorHere ? 5 : 0)) % 7;
-    if (floating && landing === (minorHere ? 5 : 0))
-      landing = (landing + pick([2, 4], rnd)) % 7;
+    const relativeHere = relativeKinds.has(section.kind);
+    const tonicDegree = relativeHere ? scale.tonic === 5 ? 0 : 5 : scale.tonic;
+    const size = scaleSize(scale);
+    let landing = (section.spec.landing + tonicDegree) % size;
+    if (floating && landing === tonicDegree)
+      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));
     const src = sourceOf(section.kind);
     for (let u = 0; u < unitCount; u++) {
       if (!section.spec.melody) {
+        const solo2 = section.kind === "interlude";
         units2.push({
-          role: "hold",
-          source: "silent",
+          // 見せ場なので走句と山を交互に置く。`hold` のままだと
+          // リズム型が最も薄いものになり、ソロにならない。
+          role: solo2 ? u % 2 === 0 ? "run" : "climax" : "hold",
+          source: solo2 ? "solo" : "silent",
           landing: null,
           section
         });
@@ -15502,16 +16272,31 @@ var draw = (options, resolvedKey, 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
         });
@@ -15529,6 +16314,7 @@ var draw = (options, resolvedKey, 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
@@ -15550,14 +16336,19 @@ var draw = (options, resolvedKey, 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,
-    pentatonicMotif: rnd() < 0.55,
+    octaveAffinity: 0.18 * registerSpread,
+    maxLeap: pick(LEAP_CEILINGS, rnd),
+    // **音階を厳しく締める曲は必ず中核音の歩数で組む。** ダイアトニックの度数で輪郭を
+    // 作ると、琉球音階なのにレやラが輪郭の中に入り込む。ファ・シを自由に使う
+    // 陽・民謡だけが、曲ごとに掛けたり掛けなかったりする（{@link ComposeScale.strict}）。
+    pentatonicMotif: rnd() < 0.55 || scale.strict,
     runShape: pick(["scale", "turn", "broken", "zigzag"], rnd),
     stepShape: pick(
       ["arch", "valley", "ascend", "descend", "wave", "pivot"],
@@ -15575,7 +16366,11 @@ var draw = (options, resolvedKey, rnd) => {
     // 界隈曲らしさ：調の外の音（クロマチック）や微小な逸脱を積極的に許容する。
     // 刻みを細かくすると経過音の置き場所が増えるので、同じ係数でも変化音は増える。
     // 参考曲の1.75倍まで伸びていたぶんを引く。
-    chromaticAffinity: rnd() < 0.2 ? 0 : 0.12 + rnd() * 0.33,
+    // **音階を厳しく締める曲は変化音を控える。** 半音の経過音は長調・短調の泣きメロの
+    // 芯だが、琉球・都節・律ではその半音が音階の外にしか無く、入れたぶんだけ
+    // 音階の色が薄まる（実測で嬰ヘが3%出て、音階内のラ2%より多いという逆転が
+    // 起きていた）。0 にはしない——民族音階の実際の曲にも装飾の半音は出る。
+    chromaticAffinity: (rnd() < 0.2 ? 0 : 0.12 + rnd() * 0.33) * (scale.strict ? 0.4 : 1),
     barHeadWeight: rnd() < 0.5 ? 3 : 2,
     bassStyle: pick(
       [
@@ -15602,8 +16397,11 @@ var draw = (options, resolvedKey, 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;
@@ -15626,9 +16424,13 @@ var draw = (options, resolvedKey, 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;
     }
@@ -15730,7 +16532,7 @@ var draw = (options, resolvedKey, rnd) => {
       if (breathBars.has(source)) breathBars.add(bar);
       continue;
     }
-    const isB = units2[u].source === "b";
+    const isB = units2[u].source === "b" || units2[u].source === "solo";
     const isA2 = units2[u].source === "a2";
     const isC = units2[u].source === "c";
     const isPrechorusEnd = units2[u].section.kind === "prechorus" && bar === units2[u].section.startBar + units2[u].section.bars - 1;
@@ -15780,6 +16582,7 @@ var draw = (options, resolvedKey, rnd) => {
   const harmony = [];
   const harmony2 = [];
   const pad = [];
+  const solo = [];
   const melodyDurations = [];
   const barTension = new Array(totalBars).fill(0);
   let restSteps = 0;
@@ -15790,9 +16593,9 @@ var draw = (options, resolvedKey, rnd) => {
   let chromaticNotes = 0;
   let sungBars = 0;
   let prevSemi = pick([60, 64, 65, 67, 69, 72, 74, 76], rnd);
-  const pickFigure = (gapSteps, scale) => {
+  const pickFigure = (gapSteps, scale2) => {
     const fits = ANSWER_FIGURES.filter(
-      (f) => f.reduce((sum, v) => sum + scale(Math.abs(v)), 0) <= gapSteps
+      (f) => f.reduce((sum, v) => sum + scale2(Math.abs(v)), 0) <= gapSteps
     );
     return fits.length === 0 ? null : pick(fits, rnd);
   };
@@ -15850,8 +16653,9 @@ var draw = (options, resolvedKey, rnd) => {
       slots,
       tones,
       style,
+      scale,
       motifContour,
-      semitoneToDegree(headSemi),
+      semitoneToDegree(scale, headSemi),
       contourOffset,
       repeatShift,
       headWeight,
@@ -15867,7 +16671,8 @@ var draw = (options, resolvedKey, rnd) => {
         ...plannedDegrees[source]
       );
     const landing = units2[unitOf(bar)].landing;
-    if (landing !== null && barInUnit(bar) === 1) landOn(degrees, landing);
+    if (landing !== null && barInUnit(bar) === 1)
+      landOn(scale, degrees, landing);
     plannedDegrees[bar] = [...degrees];
     const isMotifBar = source !== null || role === "motif" || role === "sequence" || role === "climax" || role === "answer";
     let fitted = degrees;
@@ -15879,13 +16684,18 @@ var draw = (options, resolvedKey, rnd) => {
         tones,
         prevSemi,
         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,
@@ -15900,16 +16710,19 @@ var draw = (options, resolvedKey, rnd) => {
       rnd,
       preserveContour: isMotifBar
     });
-    if (landing !== null && barInUnit(bar) === 1) landPitch(pitches, landing);
-    const fifths = pitches.map(diatonicFifth);
-    applyChromatic(pitches, fifths, slots, tones, {
+    if (landing !== null && barInUnit(bar) === 1)
+      landPitch(scale, pitches, landing);
+    const fifths = pitches.map((semi) => scaleFifth(scale, semi));
+    applyChromatic(scale, pitches, fifths, slots, tones, {
       affinity: style.chromaticAffinity,
       quarterSteps,
       shortSteps: scaleStep(EIGHTH),
       keepLast: landing !== null && barInUnit(bar) === 1,
       rnd
     });
-    const silent = units2[unitOf(bar)].source === "silent";
+    const unitSource = units2[unitOf(bar)].source;
+    const isSolo = unitSource === "solo";
+    const silent = unitSource === "silent" || isSolo;
     const barHead = pitches[0];
     let tensionSum = 0;
     let tensionSteps = 0;
@@ -15917,7 +16730,7 @@ var draw = (options, resolvedKey, rnd) => {
       const semi = pitches[i2];
       tensionSum += (3 - toneWeight(semi, tones)) / 3 * slots[i2].value;
       tensionSteps += slots[i2].value;
-      if (role !== "climax") {
+      if (!silent && role !== "climax") {
         const gap = Math.abs(semi - prevSemi);
         maxLeap = Math.max(maxLeap, gap);
         intervals++;
@@ -15926,10 +16739,25 @@ var draw = (options, resolvedKey, rnd) => {
       }
       const slot = slots[i2];
       if (silent) {
+        if (isSolo) {
+          const ks = barKeyShift[bar];
+          const fifthShiftSolo = ks === 0 ? 0 : SEMITONE_TO_FIFTH_SHIFT[(ks % 12 + 12) % 12];
+          solo.push({
+            startStep: barStart + slot.at,
+            pitchUnits: spelledToUnits(
+              semi + ks,
+              fifths[i2] + fifthShiftSolo,
+              edo
+            ),
+            durationSteps: slot.value,
+            // ソロは前に出る声部なので、歌メロより気持ち強く弾く。
+            velocity: slot.at === 0 ? 116 : slot.value <= scaleStep(SIXTEENTH) ? 96 : 106
+          });
+        }
         prevSemi = semi;
         continue;
       }
-      if (!DIATONIC_PCS.has(pitchClass(semi))) chromaticNotes++;
+      if (!scalePcs(scale).has(pitchClass(semi))) chromaticNotes++;
       const k = barKeyShift[bar];
       const fifthShift = k === 0 ? 0 : SEMITONE_TO_FIFTH_SHIFT[(k % 12 + 12) % 12];
       melody.push({
@@ -15983,7 +16811,7 @@ var draw = (options, resolvedKey, rnd) => {
             subSemi = pushSub(
               cursor,
               step,
-              i2 === 0 ? subSemi : walk(subSemi, subDir)
+              i2 === 0 ? subSemi : walk(scale, subSemi, subDir)
             );
             placed++;
           }
@@ -16007,7 +16835,7 @@ var draw = (options, resolvedKey, rnd) => {
           subSemi = pushSub(
             cursor,
             step,
-            index === 0 ? subSemi : walk(subSemi, subDir * (index % 2 === 0 ? 1 : -1))
+            index === 0 ? subSemi : walk(scale, subSemi, subDir * (index % 2 === 0 ? 1 : -1))
           );
           index++;
         }
@@ -16017,7 +16845,11 @@ var draw = (options, resolvedKey, rnd) => {
       pushSub(0, stepsPerBar, subSemi);
     } else if (subStyle === "long-short") {
       subSemi = pushSub(0, scaleStep(DOT_HALF), subSemi);
-      pushSub(scaleStep(DOT_HALF), scaleStep(QUARTER), walk(subSemi, subDir));
+      pushSub(
+        scaleStep(DOT_HALF),
+        scaleStep(QUARTER),
+        walk(scale, subSemi, subDir)
+      );
     } else if (role === "cadence") {
       pushSub(0, stepsPerBar, subSemi);
     } else {
@@ -16032,6 +16864,7 @@ var draw = (options, resolvedKey, rnd) => {
         const written = [];
         for (let i2 = 0; i2 < slots.length; i2++) {
           const hTone = harmonyPitch(
+            scale,
             pitches[i2],
             tones,
             last,
@@ -16102,6 +16935,7 @@ var draw = (options, resolvedKey, rnd) => {
     const nextTones = chordTones(progression[(bar + 1) % totalBars]);
     const A = clampSemi(
       walk(
+        scale,
         nextTones[0] ? clampSemi(nextTones[0].semi, BASS_LOW, BASS_HIGH) : R,
         -1
       ),
@@ -16158,7 +16992,7 @@ var draw = (options, resolvedKey, rnd) => {
     let bassCursor = 0;
     for (const [semi, value] of bassCell) {
       const len = scaleStep(value);
-      const fifth = semi === R || semi === O ? rootTone.fifth : semi === F ? fifthTone?.fifth ?? rootTone.fifth : semi === T ? thirdTone?.fifth ?? rootTone.fifth : degreeToPitch(semitoneToDegree(semi)).fifth;
+      const fifth = semi === R || semi === O ? rootTone.fifth : semi === F ? fifthTone?.fifth ?? rootTone.fifth : semi === T ? thirdTone?.fifth ?? rootTone.fifth : scaleFifth(scale, semi);
       const k = barKeyShift[bar];
       const fifthShift = k === 0 ? 0 : SEMITONE_TO_FIFTH_SHIFT[(k % 12 + 12) % 12];
       barBass.push({
@@ -16220,7 +17054,7 @@ var draw = (options, resolvedKey, rnd) => {
     const after = melody[i2 + 2];
     if (after && Math.floor(after.startStep / stepsPerBar) === barIdx) {
       const afterSemi = Math.round(after.pitchUnits / UNITS_PER_SEMITONE) - (barKeyShift[barIdx] ?? 0);
-      if (!DIATONIC_PCS.has(pitchClass(afterSemi))) continue;
+      if (!scalePcs(scale).has(pitchClass(afterSemi))) continue;
     }
     const nextRole = barRoles[barIdx];
     let tieProb = 0.3;
@@ -16241,11 +17075,13 @@ var draw = (options, resolvedKey, rnd) => {
         melodyDurations[i2] += melodyDurations[i2 + 1];
         melodyDurations.splice(i2 + 1, 1);
       }
-      const hCurIdx = harmony.findIndex((h) => h.startStep === cur.startStep);
-      const hNxtIdx = harmony.findIndex((h) => h.startStep === nxt.startStep);
-      if (hCurIdx >= 0 && hNxtIdx >= 0) {
-        harmony[hCurIdx].durationSteps += harmony[hNxtIdx].durationSteps;
-        harmony.splice(hNxtIdx, 1);
+      for (const voice of [harmony, harmony2]) {
+        const nxtIdx = voice.findIndex((h) => h.startStep === nxt.startStep);
+        if (nxtIdx < 0) continue;
+        const curIdx = voice.findIndex((h) => h.startStep === cur.startStep);
+        if (curIdx >= 0)
+          voice[curIdx].durationSteps += voice[nxtIdx].durationSteps;
+        voice.splice(nxtIdx, 1);
       }
       i2--;
     }
@@ -16299,17 +17135,20 @@ var draw = (options, resolvedKey, rnd) => {
   };
   const shiftUnits = semitonesToUnits(rootShift, edo);
   if (shiftUnits !== 0)
-    for (const list of [melody, submelody, bass, harmony, harmony2, pad])
+    for (const list of [melody, submelody, bass, harmony, harmony2, pad, solo])
       for (const n of list) n.pitchUnits = n.pitchUnits + shiftUnits;
   const octave = useOctaveLayer ? melody.filter(
     (n) => n.durationSteps >= quarterSteps || rnd() < octaveCoverage
   ).map((n) => ({ ...n, velocity: Math.max(40, n.velocity - 26) })) : [];
   return {
+    form,
     chordProgression,
     chordPattern,
     rootShift,
     keyName: resolvedKey.keyName,
     keyLabel: resolvedKey.keyLabel,
+    scaleId: scale.id,
+    scaleLabel: scale.label,
     moodLabel: resolvedKey.moodLabel,
     bpm,
     sections: sectionPlan,
@@ -16329,6 +17168,7 @@ var draw = (options, resolvedKey, rnd) => {
     harmony2,
     octave,
     pad,
+    solo,
     melodyDurations,
     restSteps,
     totalSteps: Math.max(1, sungBars) * stepsPerBar,
@@ -16388,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),
@@ -16424,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;
   }
@@ -16458,49 +17305,74 @@ var composeSong = (options) => {
   const recent = options.recent ?? [];
   const count = Math.max(1, options.drawCount ?? DRAW_COUNT);
   const resolvedKey = resolveComposeKey(options.baseKey, rnd);
-  let best = null;
-  let bestScore = Number.NEGATIVE_INFINITY;
-  let bestIsValid = false;
+  const scale = resolveComposeScale(
+    options.scale,
+    resolvedKey.mode === "minor",
+    rnd
+  );
+  const valid = [];
+  const invalid = [];
   let rejected = 0;
   for (let attempt = 1; attempt <= count; attempt++) {
-    const d = draw(options, resolvedKey, 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: "",
-      chordProgression: d.chordProgression,
-      chordPattern: d.chordPattern,
-      rootShift: d.rootShift,
-      keyName: d.keyName,
-      keyLabel: d.keyLabel,
-      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,
-      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);
   result.instrument = pickBuiltinInstrument(result, rnd);
+  result.arrange = buildArrangePlan(result, rnd);
   return result;
 };
 var pickBuiltinDrum = (song, rnd) => {
@@ -16512,6 +17384,80 @@ var pickBuiltinDrum = (song, rnd) => {
   const pool = dotted >= 0.08 ? ["shuffle", "8beat", "16beat"] : song.bpm >= 150 ? ["4beat", "dance", "16beat", "disco"] : short >= 0.85 ? ["16beat", "dance", "disco"] : song.bpm <= 115 ? ["bossa", "8beat", "shuffle", "4beat"] : ["8beat", "4beat", "16beat", "dance"];
   return pick(pool, rnd);
 };
+var EMPTY_ARRANGE = {
+  backing: [],
+  sparkle: null,
+  padSections: [],
+  lead: null,
+  bassLayer: null
+};
+var LOUD_KINDS = ["prechorus", "chorus", "bridge"];
+var QUIET_KINDS = [
+  "intro",
+  "verse",
+  "interlude",
+  "drop_chorus",
+  "outro"
+];
+var CHORUS_KINDS = ["chorus", "drop_chorus"];
+var buildArrangePlan = (song, rnd) => {
+  const present = new Set(song.sections.map((s) => s.kind));
+  const narrow = (kinds) => {
+    const hit = kinds.filter((k) => present.has(k));
+    return hit.length === 0 ? null : hit;
+  };
+  const base = {
+    pattern: song.chordPattern,
+    sections: null,
+    octave: 0
+  };
+  const others = chordPatternPool(song.bpm).filter((p) => p !== base.pattern);
+  const backing = [base];
+  const addKinds = pick(
+    [LOUD_KINDS, CHORUS_KINDS, LOUD_KINDS, QUIET_KINDS],
+    rnd
+  );
+  const second = pick(others, rnd);
+  backing.push({
+    pattern: second,
+    sections: narrow(addKinds),
+    octave: 0
+  });
+  if (rnd() < 0.55) {
+    const rest = others.filter((p) => p !== second);
+    backing.push({
+      pattern: pick(rest.length > 0 ? rest : others, rnd),
+      // 2本目と逆側へ置く（両方サビに寄せると、サビだけ団子になる）。
+      sections: narrow(addKinds === QUIET_KINDS ? LOUD_KINDS : QUIET_KINDS),
+      octave: 0
+    });
+  }
+  const sparklePool = chordPatternPool(song.bpm).filter(
+    (p) => p !== "block" && !backing.some((b) => b.pattern === p)
+  );
+  const sparkle = sparklePool.length > 0 && rnd() < 0.7 ? {
+    pattern: pick(sparklePool, rnd),
+    sections: narrow(pick([LOUD_KINDS, CHORUS_KINDS], rnd)) ?? CHORUS_KINDS,
+    octave: 1
+  } : null;
+  const padSections = narrow(
+    pick(
+      [
+        ["prechorus", "chorus", "bridge", "drop_chorus"],
+        ["chorus", "drop_chorus"],
+        ["prechorus", "chorus", "bridge", "drop_chorus"],
+        ["bridge", "chorus"]
+      ],
+      rnd
+    )
+  ) ?? [];
+  const lead = rnd() < 0.75 ? {
+    sections: narrow(pick([CHORUS_KINDS, LOUD_KINDS], rnd)) ?? CHORUS_KINDS,
+    octave: rnd() < 0.5 ? 0 : 1
+  } : null;
+  const bassLayer = rnd() < 0.25 ? { sections: narrow(CHORUS_KINDS) ?? CHORUS_KINDS, octave: 1 } : null;
+  return { backing, sparkle, padSections, lead, bassLayer };
+};
 var pickBuiltinInstrument = (song, rnd) => {
   const eighth = BASE_STEPS_PER_BAR / 8;
   const short = song.melody.filter((n) => n.durationSteps <= eighth).length / Math.max(1, song.melody.length);
@@ -16622,6 +17568,492 @@ var composeLyrics = (melody, options) => {
   return out.join("");
 };
 
+// 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/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 },
@@ -17042,6 +18474,34 @@ var buildUI = (target, options) => {
           <span class="dtm-grow"></span>
           <span class="dtm-hint" data-dtm="compose-key-hint"></span>
         </div>
+        <div class="dtm-row" data-dtm="compose-scale-row">
+          <span class="dtm-label">\u97F3\u968E</span>
+          <select class="dtm-select" data-dtm="compose-scale" title="\u65CB\u5F8B\u304C\u4F7F\u3046\u97F3\u968E\u3092\u9078\u3073\u307E\u3059\u3002\u30D9\u30FC\u30B9\u8ABF\uFF08\u4E3B\u97F3\u306E\u9AD8\u3055\uFF09\u3068\u306F\u72EC\u7ACB\u3057\u305F\u8A2D\u5B9A\u3067\u3059">
+            <option value="auto" title="\u30D9\u30FC\u30B9\u8ABF\u306E\u9577\u77ED\u306B\u5408\u308F\u305B\u3066\u3001\u967D\u97F3\u968E\uFF08\u9577\u8ABF\uFF09\u304B\u6C11\u8B21\u97F3\u968E\uFF08\u77ED\u8ABF\uFF09\u3092\u4F7F\u3044\u307E\u3059">\u304A\u307E\u304B\u305B\uFF08\u5F93\u6765\u3069\u304A\u308A\uFF09</option>
+            <option value="any" title="9\u3064\u306E\u97F3\u968E\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u62BD\u9078\u3057\u307E\u3059">\u5E0C\u671B\u306A\u3057\uFF08\u5168\u97F3\u968E\u304B\u3089\u62BD\u9078\uFF09</option>
+            <optgroup label="\u30DA\u30F3\u30BF\u30C8\u30CB\u30C3\u30AF\uFF085\u97F3\u97F3\u968E\uFF09">
+              <option value="yo" title="J-POP\u306E\u6A19\u6E96\u3002\u660E\u308B\u304F\u7D20\u76F4\u3067\u6B4C\u3044\u3084\u3059\u3044\u3002\u5F93\u6765\u306E\u9577\u8ABF\u3068\u540C\u3058">\u967D\u97F3\u968E\uFF08\u9577\u8ABF\u30DA\u30F3\u30BF\uFF09</option>
+              <option value="minyo" title="\u308F\u3089\u3079\u6B4C\u30FB\u6C11\u8B21\u306E\u97F3\u968E\u3002\u7FF3\u308A\u304C\u3042\u308B\u304C\u6697\u3059\u304E\u306A\u3044\u3002\u5F93\u6765\u306E\u77ED\u8ABF\u3068\u540C\u3058">\u6C11\u8B21\u97F3\u968E\uFF08\u77ED\u8ABF\u30DA\u30F3\u30BF\uFF09</option>
+              <option value="ryukyu" title="\u6C96\u7E04\u97F3\u968E\u3002\u30EC\u3068\u30E9\u3092\u629C\u304D\u3001\u30D5\u30A1\u3068\u30B7\u3092\u67F1\u306B\u3059\u308B\u3002\u660E\u308B\u304F\u8DF3\u306D\u308B">\u7409\u7403\u97F3\u968E\uFF08\u6C96\u7E04\uFF09</option>
+              <option value="miyakobushi" title="\u300E\u3055\u304F\u3089\u3055\u304F\u3089\u300F\u306E\u97F3\u968E\u3002\u4E3B\u97F3\u306E\u3059\u3050\u4E0A\u304C\u534A\u97F3\u3067\u3001\u7FF3\u308A\u304C\u6FC3\u3044">\u90FD\u7BC0\u97F3\u968E\uFF08\u9670\u97F3\u968E\uFF09</option>
+              <option value="ritsu" title="\u96C5\u697D\u30FB\u58F0\u660E\u306E\u97F3\u968E\u3002\u534A\u97F3\u3092\u542B\u307E\u305A\u3001\u5E73\u3089\u3067\u8358\u91CD\u306B\u6D41\u308C\u308B">\u5F8B\u97F3\u968E\uFF08\u96C5\u697D\uFF09</option>
+            </optgroup>
+            <optgroup label="\u30C1\u30E3\u30FC\u30C1\u30E2\u30FC\u30C9\uFF087\u97F3\u97F3\u968E\uFF09">
+              <option value="dorian" title="\u77ED\u8ABF\u3060\u304C6\u5EA6\u304C\u660E\u308B\u3044\u3002\u30B1\u30EB\u30C8\u30FB\u30ED\u30C3\u30AF\u30FB\u30B7\u30C6\u30A3\u30DD\u30C3\u30D7">\u30C9\u30EA\u30A2\u30F3</option>
+              <option value="phrygian" title="\u4E3B\u97F3\u306E\u4E0A\u304C\u534A\u97F3\u3002\u30B9\u30D1\u30CB\u30C3\u30B7\u30E5\uFF0F\u30E1\u30BF\u30EB\u306E\u7DCA\u8FEB\u3057\u305F\u97FF\u304D">\u30D5\u30EA\u30B8\u30A2\u30F3</option>
+              <option value="lydian" title="4\u5EA6\u304C\u9AD8\u304F\u3001\u6D6E\u904A\u3057\u3066\u5E83\u304C\u308B\u3002\u6620\u753B\u97F3\u697D\u30FB\u30B2\u30FC\u30E0\u306E\u7A7A\u306E\u8272">\u30EA\u30C7\u30A3\u30A2\u30F3</option>
+              <option value="mixolydian" title="\u9577\u8ABF\u3060\u304C7\u5EA6\u304C\u4F4E\u3044\u3002\u30D6\u30EB\u30FC\u30B9\u30ED\u30C3\u30AF\u30FB\u6C11\u65CF\u97F3\u697D\u306E\u571F\u304F\u3055\u3055">\u30DF\u30AF\u30BD\u30EA\u30C7\u30A3\u30A2\u30F3</option>
+            </optgroup>
+            <optgroup label="\u7279\u6B8A\u97F3\u968E\uFF08\u97F3\u7A0B\u96C6\u5408\u3054\u3068\u5165\u308C\u66FF\u308F\u308B\uFF09">
+              <option value="harmonic_minor" title="\u5C0E\u97F3\u30BD\u266F\u3092\u6301\u3064\u77ED\u8ABF\u3002\u58972\u5EA6\u304C\u6CE3\u304D\u3092\u4F5C\u308B\u3002\u30AF\u30E9\u30B7\u30C3\u30AF\u30FBV\u7CFB\u30FB\u5287\u4F34">\u548C\u58F0\u7684\u77ED\u97F3\u968E</option>
+              <option value="hijaz" title="\u4E3B\u97F3\u306E\u4E0A\u304C\u534A\u97F3\u3001\u4E3B\u548C\u97F3\u306F\u9577\u4E09\u548C\u97F3\u3002\u4E2D\u6771\u30FB\u30B9\u30D1\u30CB\u30C3\u30B7\u30E5\u30FB\u30E1\u30BF\u30EB">\u30D2\u30B8\u30E3\u30FC\u30BA\uFF08\u30D5\u30EA\u30B8\u30A2\u30F3\u30FB\u30C9\u30DF\u30CA\u30F3\u30C8\uFF09</option>
+              <option value="hungarian" title="\u58972\u5EA6\u304C2\u304B\u6240\u3002\u97F3\u968E\u306E\u4E2D\u3067\u3044\u3061\u3070\u3093\u8DF3\u306D\u305F\u3001\u7570\u56FD\u3081\u3044\u305F\u97FF\u304D">\u30CF\u30F3\u30AC\u30EA\u30A2\u30F3\u30FB\u30DE\u30A4\u30CA\u30FC\uFF08\u30B8\u30D7\u30B7\u30FC\uFF09</option>
+              <option value="blues" title="\u30D6\u30EB\u30FC\u30CE\u30FC\u30C8\u5165\u308A\u306E6\u97F3\u97F3\u968E\u3002\u77ED3\u5EA6\u3067\u6B4C\u3044\u3001\u4F34\u594F\u306F\u95773\u5EA6\u3067\u9CF4\u308B">\u30D6\u30EB\u30FC\u30B9\u97F3\u968E</option>
+            </optgroup>
+          </select>
+          <span class="dtm-grow"></span>
+          <span class="dtm-hint" data-dtm="compose-scale-hint"></span>
+        </div>
       </div>
       <div class="dtm-row">
         <span class="dtm-label">\u5168\u4F53\u30B7\u30D5\u30C8</span>
@@ -17244,6 +18704,8 @@ var buildUI = (target, options) => {
     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"),
@@ -17278,115 +18740,12 @@ var buildUI = (target, options) => {
   };
 };
 
-// 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)"
-  },
-  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)"
-  },
-  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)"
-  },
-  // --- 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)"
-  },
-  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)"
-  },
-  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"
-  },
-  // --- 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"
-  },
-  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"
-  },
-  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"
-  },
-  // --- 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"
-  },
-  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)"
-  },
-  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"
-  }
-};
-
 // src/macro-state.ts
 var MACRO_STORAGE_KEYS = {
   template: "dtm-macro:template",
   sections: "dtm-macro:sections",
   key: "dtm-macro:key",
+  scale: "dtm-macro:scale",
   shift: "dtm-macro:shift",
   transpose: "dtm-macro:transpose"
 };
@@ -19546,6 +20905,7 @@ var COMPOSE_INFO_HTML = `
     <li><strong>\u30E1\u30ED\u30C7\u30A3\u306E\u66F8\u6CD5</strong>\u2014\u2014\u8D70\u53E5\u306E\u5F62\uFF08\u97F3\u968E\uFF0F\u6298\u308A\u8FD4\u3057\uFF0F\u5206\u6563\u548C\u97F3\uFF0F\u30B8\u30B0\u30B6\u30B0\uFF09\u3001\u3064\u306A\u304E\u306E\u5F62\uFF08\u5C71\u306A\u308A\uFF0F\u8C37\uFF0F\u4E0A\u884C\uFF0F\u4E0B\u884C\uFF0F\u3046\u306D\u308A\uFF0F\u8EF8\u97F3\u307E\u308F\u308A\uFF09\u3001\u7D42\u6B62\u306E\u5F62\uFF08\u9806\u6B21\u4E0B\u964D\uFF0F\u30BD\u30DF\u30C9\uFF0F\u8DF3\u306D\u4E0A\u304C\u308A\uFF0F\u30ED\u30F3\u30B0\u30C8\u30FC\u30F3\uFF09\u3001\u30E2\u30C1\u30FC\u30D5\u306E\u539F\u578B\u3001\u8DF3\u8E8D\u306E\u6DF7\u305C\u5177\u5408\u3001\u958B\u59CB\u97F3\u3001\u57FA\u6E96\u306E\u523B\u307F\uFF088\u5206\uFF0F16\u5206\uFF0F\u4E09\u9023\uFF09\u3001\u30B9\u30A6\u30A3\u30F3\u30B0\u91CF</li>
     <li><strong>\u30D9\u30FC\u30B9\u306E\u594F\u6CD5</strong>\uFF084\u5206\u6253\u3061\uFF0F\u30AA\u30EB\u30BF\u30CD\u30A4\u30C8\uFF0F2\u5206\uFF0F8\u5206\u30C9\u30E9\u30A4\u30D6\uFF0F\u30B7\u30F3\u30B3\u30DA\uFF0F\u30A6\u30A9\u30FC\u30AD\u30F3\u30B0\uFF0F\u30AA\u30AF\u30BF\u30FC\u30D6\uFF09</li>
     <li><strong>\u30B5\u30D6\u30E1\u30ED\u306E\u66F8\u304D\u65B9</strong>\u2014\u2014\u5408\u3044\u306E\u624B\uFF08\u30E1\u30ED\u30C7\u30A3\u304C\u4F11\u3093\u3060\u9699\u9593\u306B\u3060\u3051\u5165\u308B\uFF09\u3001\u30CF\u30E2\u30EA\uFF08\u30E1\u30ED\u30C7\u30A3\u306E\u30EA\u30BA\u30E0\u3092\u306A\u305E\u3063\u30663\u5EA6\u30FB6\u5EA6\u4E0B\u3092\u6B4C\u3046\uFF09\u3001\u5BFE\u65CB\u5F8B\uFF088\u5206\u3067\u30E1\u30ED\u30C7\u30A3\u3068\u53CD\u884C\u3059\u308B\uFF09\u3001\u4FDD\u7D9A\u97F3\uFF08\u540C\u3058\u97F3\u3092\u4F38\u3070\u3057\u7D9A\u3051\u308B\uFF09\u3001\u30D1\u30C3\u30C9\u3002\u5C0F\u7BC0\u3054\u3068\u306B\u3001\u30E1\u30ED\u30C7\u30A3\u304C\u606F\u7D99\u304E\u3057\u3066\u3044\u308B\u5834\u6240\u3067\u306F\u81EA\u52D5\u3067\u5408\u3044\u306E\u624B\u306B\u5207\u308A\u66FF\u308F\u308A\u307E\u3059\u3002</li>
+    <li><strong>\u7DE8\u66F2\u30D7\u30E9\u30F3</strong>\uFF08\u4E0A\u7D1A\u8005\u30E2\u30FC\u30C9\u306E\u307F\uFF09\u2014\u2014\u4F34\u594F\u3092\u4F55\u5C64\u306B\u3059\u308B\u304B\u3001\u305D\u308C\u305E\u308C\u3069\u306E\u594F\u6CD5\u3067\u3069\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u9CF4\u3089\u3059\u304B\u3001\u30B5\u30D3\u306E\u91CD\u306D\u3092\u51FA\u3059\u304B\u30FB\u30E6\u30CB\u30BE\u30F3\u304B\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u304B\u3001\u88C5\u98FE\u3092\u3069\u3053\u306B\u7F6E\u304F\u304B\u3002400\u66F2\u5F15\u304F\u3068392\u901A\u308A\u306E\u578B\u304C\u51FA\u307E\u3059\u3002</li>
   </ul>
   <p>\u3055\u3089\u306B\u3001\u76F4\u524D\u306B\u4F5C\u3063\u305F5\u66F2\u3068\u7279\u5FB4\u304C\u4F3C\u3066\u3044\u308B\u5019\u88DC\u306B\u306F\u6E1B\u70B9\u3057\u3066\u3044\u307E\u3059\u3002\u7D9A\u3051\u3066\u62BC\u3057\u305F\u3068\u304D\u306B\u4F3C\u305F\u66F2\u304C\u4E26\u3070\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u305F\u3081\u3067\u3059\u3002</p>
   <h4>\u3067\u304D\u3042\u304C\u308A\u306E\u9078\u3073\u65B9</h4>
@@ -19564,6 +20924,18 @@ var COMPOSE_INFO_HTML = `
     <li><strong>\u639B\u3051\u5408\u3044\uFF08\u30C7\u30E5\u30A8\u30C3\u30C8\uFF09</strong> \u2014 4\u5272\u307B\u3069\u306E\u66F2\u304C2\u4EBA\u6B4C\u3044\u306B\u306A\u308A\u307E\u3059\u3002\u30BB\u30AF\u30B7\u30E7\u30F3\u3054\u3068\uFF0FA\u30E1\u30ED\u30672\u5C0F\u7BC0\u3054\u3068\uFF0F\u639B\u3051\u5408\u3044\u30B5\u30D3\uFF0FA\u30E1\u30ED\u3060\u3051\u3001\u306E4\u901A\u308A\u3002<strong>\u53D7\u3051\u6E21\u3057\u306F\u5C0F\u7BC0\u7DDA\u3074\u3063\u305F\u308A\u3067\u306F\u306A\u304F\u3001\u6B21\u306E\u4EBA\u304C\u624B\u524D\u304B\u3089\u98DF\u3044\u6C17\u5473\u306B\u5165\u308A\u307E\u3059\u3002</strong>\u4E00\u7DD2\u306B\u6B4C\u3046\u30B5\u30D3\u3067\u306F\u76F8\u65B9\u304C\u30CF\u30E2\u30EA\u3078\u56DE\u308A\u307E\u3059\uFF08\u540C\u3058\u97F3\u3092\u306A\u305E\u308B\u30E6\u30CB\u30BE\u30F3\u306B\u306F\u3057\u307E\u305B\u3093\uFF09\u3002</li>
   </ul>
   <p>\u30B7\u30F3\u30D7\u30EB\u30E2\u30FC\u30C9\uFF084\u30C8\u30E9\u30C3\u30AF\uFF09\u306F\u72EC\u5531\u3067\u3059\u30024\u672C\u304C\u57CB\u307E\u3063\u3066\u3044\u3066\u30CF\u30E2\u30EA\u306E\u7F6E\u304D\u5834\u6240\u304C\u7121\u3044\u305F\u3081\u3067\u3059\u3002</p>
+  <h4>\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u697D\u5668\u30FB\u4F34\u594F\u304C\u5909\u308F\u308B\uFF08\u4E0A\u7D1A\u8005\u30E2\u30FC\u30C9\u306E\u307F\uFF09</h4>
+  <p>1\u672C\u306E\u30C8\u30E9\u30C3\u30AF\u306F\u3001\u66F2\u306E\u6700\u521D\u304B\u3089\u6700\u5F8C\u307E\u30671\u3064\u306E\u697D\u5668\u3067\u9CF4\u308A\u307E\u3059\u3002\u3064\u307E\u308A<strong>\u300C\u30B5\u30D3\u3060\u3051\u5225\u306E\u697D\u5668\u306B\u3059\u308B\u300D\u306F\u30011\u672C\u306E\u30C8\u30E9\u30C3\u30AF\u306E\u4E2D\u3067\u306F\u4F5C\u308C\u307E\u305B\u3093</strong>\u3002\u4F5C\u308C\u308B\u306E\u306F\u3001\u9CF4\u3089\u3057\u305F\u3044\u533A\u9593\u3092\u5225\u306E\u30C8\u30E9\u30C3\u30AF\u3078\u66F8\u304D\u5206\u3051\u305F\u3068\u304D\u3060\u3051\u3067\u3059\u3002\u4E0A\u7D1A\u8005\u30E2\u30FC\u30C9\uFF0815\u30C8\u30E9\u30C3\u30AF\uFF09\u304C15\u672C\u3042\u308B\u306E\u306F\u305D\u306E\u305F\u3081\u3067\u3001\u300C\u4F5C\u66F2\u300D\u306F\u5834\u6240\u3054\u3068\u306B\u30C8\u30E9\u30C3\u30AF\u3092\u5206\u3051\u307E\u3059\u3002</p>
+  <ul>
+    <li><strong>\u4F34\u594F\u306E\u624B\u89E6\u308A\u304C\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u5909\u308F\u308B</strong> \u2014 \u540C\u3058\u30B3\u30FC\u30C9\u9032\u884C\u3092\u3001\u30D6\u30ED\u30C3\u30AF\u30FB\u30A2\u30EB\u30DA\u30B8\u30AA\u30FB\u88CF\u62CD\u30FB\u516B\u5206\u98DF\u3044\u30FB\u5206\u6563\u306E\u4E2D\u304B\u3089<strong>\u5225\u3005\u306E\u594F\u6CD5</strong>\u30671\u301C3\u5C64\u306B\u91CD\u306D\u307E\u3059\u3002\u3069\u306E\u594F\u6CD5\u3092\u3069\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u9CF4\u3089\u3059\u304B\u306F\u66F2\u3054\u3068\u306B\u5F15\u304F\u306E\u3067\u3001A\u30E1\u30ED\u3068\u30B5\u30D3\u3067\u4F34\u594F\u306E\u523B\u307F\u65B9\u305D\u306E\u3082\u306E\u304C\u5909\u308F\u308A\u307E\u3059\u3002\u66F2\u5168\u4F53\u3092\u901A\u308B\u300C\u5730\u300D\u306E\u5C64\u304C1\u3064\u3042\u308A\u3001\u6B8B\u308A\u306F\u8DB3\u3059\u5834\u6240\u3092\u7D5E\u308A\u307E\u3059\u3002</li>
+    <li><strong>\u30B5\u30D3\u306E\u91CD\u306D</strong> \u2014 \u4E3B\u65CB\u5F8B\u3092\u3082\u30461\u672C\u306E\u5225\u697D\u5668\uFF08\u30D7\u30EA\u30BB\u30C3\u30C8\u306B\u3088\u3063\u3066\u30D6\u30E9\u30B9\u30FB\u30B9\u30C8\u30EA\u30F3\u30B0\u30B9\u30FB\u30B0\u30ED\u30C3\u30B1\u30F3\u306A\u3069\uFF09\u3067\u91CD\u306D\u307E\u3059\u3002<strong>\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u3068\u30E6\u30CB\u30BE\u30F3\u306E\u4E21\u65B9\u3092\u5F15\u304D\u307E\u3059</strong>\u2014\u2014\u540C\u3058\u9AD8\u3055\u3092\u5225\u306E\u697D\u5668\u3067\u91CD\u306D\u308B\u30682\u3064\u306E\u97F3\u8272\u304C\u6EB6\u3051\u3066\u5225\u306E\u97F3\u8272\u306B\u306A\u308B\u306E\u3067\u3001\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u3052\u308B\u3088\u308A\u60C5\u5831\u91CF\u304C\u591A\u3044\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u91CD\u306D\u306A\u3044\u66F2\u3082\u3042\u308A\u307E\u3059\u3002</li>
+    <li><strong>\u9593\u594F\u306E\u30BD\u30ED</strong> \u2014 \u9593\u594F\u306F\u6B4C\u304C\u4F11\u3080\u5834\u6240\u3067\u3042\u3063\u3066\u3001\u97F3\u697D\u304C\u4F11\u3080\u5834\u6240\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u6B4C\u30E1\u30ED\u306E\u4EE3\u308F\u308A\u306B\u5668\u697D\u306E\u30BD\u30ED\u3092\u66F8\u304D\u3001\u5C02\u7528\u306E\u30C8\u30E9\u30C3\u30AF\u3067\u9CF4\u3089\u3057\u307E\u3059\u3002\u30D7\u30EA\u30BB\u30C3\u30C8\u306B\u3088\u3063\u3066\u6B6A\u307F\u30AE\u30BF\u30FC\u30FB\u30B5\u30C3\u30AF\u30B9\u30FB\u5C3A\u516B\u306A\u3069\u306B\u5909\u308F\u308A\u307E\u3059\u3002\u7D20\u6750\u306F\u30B5\u30D3\u3068\u540C\u3058\u306A\u306E\u3067\u3001\u9593\u594F\u304C\u30B5\u30D3\u306E\u4E3B\u984C\u3092\u5F3E\u304F\u5F62\u306B\u306A\u308A\u307E\u3059\u3002</li>
+    <li><strong>\u30A6\u30EF\u30E2\u30CE</strong> \u2014 \u304D\u3089\u3073\u3084\u304B\u306A\u88C5\u98FE\u3092\u3001\u76DB\u308A\u4E0A\u304C\u308B\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3060\u3051\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u3067\u8DB3\u3057\u307E\u3059\u3002<strong>\u5730\u306E\u4F34\u594F\u3068\u540C\u3058\u594F\u6CD5\u306F\u4F7F\u3044\u307E\u305B\u3093</strong>\u2014\u2014\u540C\u3058\u3082\u306E\u3092\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u3052\u305F\u3060\u3051\u306E\u5C64\u306F\u88C5\u98FE\u3067\u306F\u306A\u304F\u5199\u3057\u3060\u304B\u3089\u3067\u3059\u3002\u30D6\u30ED\u30C3\u30AF\u3082\u5916\u3057\u307E\u3059\uFF08\u548C\u97F3\u3092\u4E38\u3054\u3068\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u3067\u9CF4\u3089\u3059\u306E\u306F\u88C5\u98FE\u3067\u306F\u306A\u304F\u58C1\u306B\u306A\u308A\u307E\u3059\uFF09\u3002</li>
+  </ul>
+  <p><strong>\u697D\u5668\u306E\u97F3\u57DF\u306B\u5408\u308F\u305B\u3066\u30AA\u30AF\u30BF\u30FC\u30D6\u3092\u4E0B\u3052\u307E\u3059\u3002</strong>1\u30C8\u30E9\u30C3\u30AF1\u697D\u5668\u3067\u3001\u3057\u304B\u3082\u5C64\u3054\u3068\u306B\u30AA\u30AF\u30BF\u30FC\u30D6\u3092\u5909\u3048\u308B\u306E\u3067\u3001\u6C7A\u3081\u305F\u30AA\u30AF\u30BF\u30FC\u30D6\u304C\u305D\u306E\u697D\u5668\u306E\u51FA\u305B\u306A\u3044\u9AD8\u3055\u306B\u306A\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u5B9F\u6E2C\u3059\u308B\u3068\u3001\u30B5\u30D3\u306E\u91CD\u306D\u30921\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0A\u3052\u308B\u6307\u5B9A\u306F\u30DF\u30E5\u30FC\u30C8\u30C8\u30E9\u30F3\u30DA\u30C3\u30C8\u3084\u30C8\u30E9\u30F3\u30DA\u30C3\u30C8\u306714\u534A\u97F3\u3076\u3093\u3001\u30B3\u30FC\u30C9\u30D1\u30C3\u30C9\uFF08\u5B9F\u97F377\u301C93\uFF09\u306F\u30CA\u30A4\u30ED\u30F3\u30AE\u30BF\u30FC\u306710\u534A\u97F3\u30FB\u30AB\u30EA\u30F3\u30D0\u30679\u534A\u97F3\u3076\u3093\u97F3\u57DF\u3092\u7A81\u304D\u629C\u3051\u3066\u3044\u307E\u3057\u305F\u3002\u30B5\u30F3\u30D7\u30EB\u304C\u5F15\u304D\u4F38\u3070\u3055\u308C\u3066<strong>\u91D1\u5207\u308A\u97F3</strong>\u306B\u306A\u308A\u3001\u8074\u304D\u624B\u306B\u306F\u300C\u8033\u304C\u75DB\u3044\u300D\u3068\u3057\u304B\u611F\u3058\u3089\u308C\u307E\u305B\u3093\u3002\u305D\u3053\u3067\u3001\u9CF4\u3089\u3059\u97F3\u57DF\u304C\u305D\u306E\u697D\u5668\u306E\u5B9F\u7528\u4E0A\u9650\u306B\u53CE\u307E\u308B\u3068\u3053\u308D\u307E\u3067<strong>\u30AA\u30AF\u30BF\u30FC\u30D6\u3092\u4E0B\u3052\u3066\u304B\u3089</strong>\u7F6E\u304D\u307E\u3059\uFF08\u30C8\u30E9\u30C3\u30AF\u306E\u30AA\u30AF\u30BF\u30FC\u30D6\u8A2D\u5B9A\u306F\u3001\u307E\u3055\u306B\u3053\u3046\u3044\u3046\u300C\u5F97\u610F\u306A\u97F3\u57DF\u304C\u504F\u3063\u305F\u97F3\u6E90\u300D\u3092\u4F7F\u3048\u308B\u3088\u3046\u306B\u3059\u308B\u305F\u3081\u306B\u5728\u308B\u3082\u306E\u3067\u3059\uFF09\u3002<strong>\u4E0B\u3052\u308B\u65B9\u5411\u306B\u3057\u304B\u52D5\u304B\u3057\u307E\u305B\u3093</strong>\u2014\u2014\u4E0A\u3052\u308B\u5074\u304C\u75DB\u307F\u3092\u4F5C\u308B\u5074\u306A\u306E\u3067\u3002</p>
+  <p>\u5B9F\u7269\u306E\u97F3\u57DF\u306B\u53CE\u307E\u3063\u3066\u3044\u3066\u3082\u75DB\u304F\u306A\u308B\u97F3\u8272\u304C\u3042\u308A\u307E\u3059\u3002\u30B0\u30ED\u30C3\u30B1\u30F3\u306F\u5B9F\u7269\u306E\u97F3\u57DF\u304CG5\u301CC8\u306A\u306E\u3067\u3001\u65CB\u5F8B\u306E\u97F3\u57DF\uFF08\u301CC6\uFF09\u306F\u300C\u4F59\u88D5\u3067\u7BC4\u56F2\u5185\u300D\u3067\u3059\u304C\u3001\u91D1\u5C5E\u4F53\u306E\u500D\u97F3\u306F\u4EBA\u306E\u8033\u304C\u3044\u3061\u3070\u3093\u654F\u611F\u306A2\u301C4kHz\u306B\u96C6\u307E\u308B\u305F\u3081\u3001\u305D\u306E\u9AD8\u3055\u3067\u9CF4\u3089\u3057\u7D9A\u3051\u308B\u3068\u523A\u3055\u308A\u307E\u3059\u3002\u3053\u3046\u3044\u3046\u97F3\u8272\u306B\u306F\u97F3\u57DF\u3068\u306F\u5225\u306B<strong>\u660E\u308B\u3055\u306E\u4E0A\u9650</strong>\u3092\u6301\u305F\u305B\u3066\u3042\u308A\u3001\u30B0\u30ED\u30C3\u30B1\u30F3\u306A\u3089C5\u3088\u308A\u4E0A\u3067\u9CF4\u3089\u306A\u3044\u3068\u3053\u308D\u307E\u3067\u4E0B\u3052\u307E\u3059\u3002<strong>\u5019\u88DC\u304B\u3089\u5916\u3059\u306E\u3067\u306F\u306A\u304F\u7F6E\u304D\u5834\u6240\u3092\u5909\u3048\u307E\u3059</strong>\u2014\u2014\u5916\u3059\u3068\u97F3\u8272\u306E\u5E45\u304C\u305D\u306E\u3076\u3093\u6E1B\u308B\u3060\u3051\u3067\u3001\u4F4E\u304F\u9CF4\u3089\u3057\u305F\u30B0\u30ED\u30C3\u30B1\u30F3\u306F\u30DD\u30C3\u30D7\u30B9\u3067\u666E\u901A\u306B\u4F7F\u308F\u308C\u308B\u67D4\u3089\u304B\u3044\u97F3\u3067\u3059\u3002</p>
+  <p><strong>\u30AA\u30AF\u30BF\u30FC\u30D6\u306E\u91CD\u306D\u3092\u4E3B\u5F79\u306B\u3057\u3066\u3044\u307E\u305B\u3093\u3002</strong>\u300C\u65E2\u306B\u3042\u308B\u30C8\u30E9\u30C3\u30AF\u30921\u30AA\u30AF\u30BF\u30FC\u30D6\u52D5\u304B\u3057\u3066\u5225\u30C8\u30E9\u30C3\u30AF\u3078\u5199\u3059\u300D\u5C64\u306F\u3001\u97F3\u697D\u7684\u306A\u4FA1\u5024\u304C\u9AD8\u304F\u3042\u308A\u307E\u305B\u3093\u3002\u4EBA\u306E\u8033\u306F\u30AA\u30AF\u30BF\u30FC\u30D6\u9055\u3044\u3092<strong>\u540C\u3058\u97F3</strong>\u3068\u3057\u3066\u805E\u304F\u306E\u3067\uFF08\u30AA\u30AF\u30BF\u30FC\u30D6\u7B49\u4FA1\uFF09\u3001\u5199\u3057\u305F\u5C64\u306F\u65B0\u3057\u3044\u58F0\u90E8\u306B\u306A\u3089\u305A\u3001\u97F3\u91CF\u3068\u97F3\u8272\u304C\u308F\u305A\u304B\u306B\u5909\u308F\u308B\u3060\u3051\u3067\u3059\u3002\u5F37\u8ABF\u3068\u3057\u3066\u306E\u610F\u5473\u306F\u3042\u308B\u306E\u3067\u4F7F\u3044\u306F\u3057\u307E\u3059\u304C\u3001\u5E38\u8A2D\u306B\u306F\u3057\u307E\u305B\u3093\u3002\u30D9\u30FC\u30B9\u306E\u30AA\u30AF\u30BF\u30FC\u30D6\u4E0B\u306E\u91CD\u306D\u306F\u7279\u306B\u300130Hz\u524D\u5F8C\u307E\u3067\u843D\u3061\u3066\u8F2A\u90ED\u304C\u6FC1\u308B\u306E\u3067\u65E2\u5B9A\u3067\u306F\u51FA\u3057\u307E\u305B\u3093\uFF08\u51FA\u3059\u3068\u304D\u3082\u4E0A\u306E\u30AA\u30AF\u30BF\u30FC\u30D6\u3078\u3001\u76DB\u308A\u4E0A\u304C\u308B\u5834\u6240\u3060\u3051\u306B\u7F6E\u304D\u307E\u3059\uFF09\u3002</p>
+  <p>\u300C\u4F5C\u66F2\u300D\u304C\u6C7A\u3081\u305F\u3053\u308C\u3089\u306E\u697D\u5668\u306F\u3001\u304A\u307E\u304B\u305B\u30DE\u30B9\u30BF\u30EA\u30F3\u30B0\u306E\u5F79\u5272\u63A8\u5B9A\u3088\u308A\u512A\u5148\u3055\u308C\u307E\u3059\uFF08\u6F14\u594F\u5185\u5BB9\u3060\u3051\u3092\u898B\u308B\u3068\u3001\u9593\u594F\u306E\u30BD\u30ED\u3082\u30B5\u30D3\u306E\u91CD\u306D\u3082\u300C\u97F3\u306E\u5C11\u306A\u3044\u5358\u65CB\u5F8B\u300D\u3067\u3001\u4E3B\u65CB\u5F8B\u3068\u533A\u5225\u304C\u4ED8\u304B\u306A\u3044\u305F\u3081\u3067\u3059\uFF09\u3002\u697D\u5668\u3092\u624B\u3067\u9078\u3073\u76F4\u3057\u305F\u30C8\u30E9\u30C3\u30AF\u306F\u3001\u4EE5\u5F8C\u3069\u3061\u3089\u306B\u3082\u4E0A\u66F8\u304D\u3055\u308C\u307E\u305B\u3093\u3002</p>
   <h4>\u305D\u306E\u307B\u304B</h4>
   <ul>
     <li><strong>\u66F2\u306E\u9014\u4E2D\u3067\u8EE2\u8ABF\u3057\u307E\u3059</strong>\uFF08\u304A\u3088\u305D\u534A\u5206\u306E\u66F2\uFF09\u3002\u4E94\u5EA6\u570F\u3067\u8FD1\u3044\u5C5E\u8ABF\u30FB\u4E0B\u5C5E\u8ABF\u3078\u306F\u5171\u901A\u3059\u308B\u548C\u97F3\uFF08\u30D4\u30DC\u30C3\u30C8\u30B3\u30FC\u30C9\uFF09\u304B\u65B0\u3057\u3044\u8ABF\u306E\u30C9\u30DF\u30CA\u30F3\u30C8\u3067\u6A4B\u6E21\u3057\u3057\u3001\u30E9\u30B9\u30B5\u30D3\u306E\u534A\u97F3\u4E0A\u3052\u306F\u6E96\u5099\u306A\u3057\u306E\u76F4\u63A5\u8EE2\u8ABF\u306B\u3057\u307E\u3059\u3002\u8ABF\u53F7\u3092\u5909\u3048\u305A\u306B\u660E\u6697\u3060\u3051\u5165\u308C\u66FF\u3048\u308B<strong>\u5E73\u884C\u8ABF</strong>\uFF08\u30CF\u9577\u8ABF\u2194\u30A4\u77ED\u8ABF\uFF09\u3068\u3001\u4E3B\u97F3\u3092\u4FDD\u3063\u305F\u307E\u307E\u6697\u304F\u3059\u308B<strong>\u540C\u4E3B\u8ABF</strong>\uFF08\u30CF\u9577\u8ABF\u2192\u30CF\u77ED\u8ABF\uFF09\u3082\u5F15\u304D\u307E\u3059\u30021\u5272\u5F37\u306E\u66F2\u306F\u4E3B\u548C\u97F3\u3092\u907F\u3051\u3066\u300C\u660E\u308B\u3044\u306E\u304B\u6697\u3044\u306E\u304B\u5206\u304B\u3089\u306A\u3044\u300D\u6D6E\u904A\u611F\u3067\u901A\u3057\u307E\u3059\u3002</li>
@@ -19830,26 +21202,6 @@ var pickComposeVocal = (exclude) => {
   const list = pool.length > 0 ? pool : COMPOSE_VOCAL_POOL;
   return list[Math.floor(Math.random() * list.length)] ?? "klatt";
 };
-var ADVANCED_COMPOSE_LAYOUT = [
-  { index: 0, part: "melody", octave: 0, volume: 104 },
-  { index: 1, part: "melody", octave: 1, volume: 62 },
-  { index: 2, part: "harmony", octave: 0, volume: 82 },
-  { index: 3, part: "submelody", octave: 0, volume: 86 },
-  { index: 4, part: "bass", octave: 0, volume: 92 },
-  { index: 5, part: "bass", octave: -1, volume: 58 },
-  { index: 6, part: "pad", octave: 0, volume: 64 },
-  { index: 7, part: "block", octave: 0, volume: 62 },
-  { index: 8, part: "arpeggio", octave: 0, volume: 54 },
-  { index: 9, part: "offbeat", octave: 0, volume: 50 },
-  { index: 10, part: "uwamono", octave: 1, volume: 56 },
-  // 掛け合い（デュエット）の相手。**歌入り作曲のときだけ**中身が入る。
-  // 作曲だけならメロディは t0 が全部持つので、ここは空のまま。
-  { index: 11, part: "duet", octave: 0, volume: 104 },
-  // 2声目のハモリ（主旋律を上下から挟む3声）と、主旋律のオクターブ下の重ね。
-  // どちらも曲ごとに出るかどうかが決まる（`song.vocal`）。
-  { index: 12, part: "harmony2", octave: 0, volume: 74 },
-  { index: 13, part: "melody", octave: -1, volume: 56 }
-];
 var LYRIC_MODEL_CATEGORIES = [
   {
     label: "kusa\u30D7\u30EA\u30BB\u30C3\u30C8",
@@ -20005,7 +21357,7 @@ var mountDAW = (target, options = {}) => {
     showChord,
     showMidiSearch,
     // 「作曲」は simple では役割固定の4トラックへ、advanced では15トラックへ
-    // 編曲を展開する（{@link ADVANCED_COMPOSE_LAYOUT}）。どちらでも出す。
+    // 編曲を展開する（{@link buildAdvancedLayers}）。どちらでも出す。
     showCompose: true
   });
   refs.masterVolume.value = String(options.masterVolume ?? 50);
@@ -20199,6 +21551,14 @@ var mountDAW = (target, options = {}) => {
     while (customVocalsMap.has(`custom${n}`)) n++;
     return `custom${n}`;
   };
+  const getVocalIconSrc = (lyricModel) => {
+    if (!lyricModel) return void 0;
+    const customDef = customVocalsMap.get(lyricModel);
+    if (customDef !== void 0)
+      return customDef.iconUrl || FALLBACK_VOCAL_ICON;
+    const imgKey = VOICE_IMAGE_KEY[lyricModel.toLowerCase()];
+    return imgKey ? VOICE_IMAGES[imgKey] : void 0;
+  };
   let selectedNotes = [];
   let selectionRect = null;
   let copiedNotes = [];
@@ -20332,6 +21692,7 @@ var mountDAW = (target, options = {}) => {
         vocalTension: t1?.vocalTension ?? 50,
         vocalOctaveUnison: t1?.vocalOctaveUnison ?? "none",
         trackInstrument: t1?.trackInstrument ?? "",
+        composeSlot: null,
         trackCompression: t1?.trackCompression ?? 0,
         trackWidth: t1?.trackWidth ?? 100,
         trackReverbSend: t1?.trackReverbSend ?? 0,
@@ -21383,25 +22744,38 @@ var mountDAW = (target, options = {}) => {
     refs.undoBtn.disabled = !core.canUndo();
     refs.redoBtn.disabled = !core.canRedo();
   };
-  const updateTrackPanel = () => {
+  const updateTrackTabs = () => {
     refs.trackTabs.innerHTML = "";
     trackPillEls.clear();
     for (const [i2, t] of trackStates.entries()) {
       const [r, g, b] = t.config.color;
       const isActive = t.config.id === activeTrackId;
       const btn = document.createElement("button");
-      btn.className = `dtm-pill ${isActive ? "dtm-pill--active" : ""}`;
+      const vocalIconSrc = getVocalIconSrc(t.lyricModel);
+      btn.className = `dtm-pill ${isActive ? "dtm-pill--active" : ""} ${vocalIconSrc ? "dtm-pill--vocal" : ""}`;
       btn.style.setProperty("--dtm-pill-color", `rgb(${r},${g},${b})`);
+      if (vocalIconSrc) {
+        btn.style.setProperty(
+          "--dtm-pill-icon",
+          `url(${JSON.stringify(vocalIconSrc)})`
+        );
+      }
       btn.title = `Track ${i2 + 1}: ${t.config.name}`;
       btn.setAttribute(
         "aria-label",
-        `Track ${i2 + 1}: ${t.config.name}${isActive ? " (\u9078\u629E\u4E2D)" : ""}`
+        `Track ${i2 + 1}: ${t.config.name}${isActive ? " (\u9078\u629E\u4E2D)" : ""}${vocalIconSrc ? "\uFF08\u30DC\u30FC\u30AB\u30EB\u9078\u629E\u4E2D\uFF09" : ""}`
       );
-      btn.textContent = String(i2 + 1);
+      const labelEl = document.createElement("span");
+      labelEl.className = "dtm-pill__label";
+      labelEl.textContent = String(i2 + 1);
+      btn.appendChild(labelEl);
       btn.addEventListener("click", () => switchTrack(t.config.id));
       refs.trackTabs.appendChild(btn);
       trackPillEls.set(t.config.id, btn);
     }
+  };
+  const updateTrackPanel = () => {
+    updateTrackTabs();
     const active = getActive();
     const activeIndex = trackStates.findIndex(
       (t) => t.config.id === activeTrackId
@@ -21718,6 +23092,7 @@ var mountDAW = (target, options = {}) => {
     syncInstDisabled();
     instSel.addEventListener("change", () => {
       active.trackInstrument = instSel.value;
+      active.composeSlot = null;
       const trackIndex = trackStates.indexOf(active);
       options.onTrackInstrumentChange?.(trackIndex, active.trackInstrument);
       persistTrack1(active);
@@ -22121,6 +23496,7 @@ var mountDAW = (target, options = {}) => {
         redrawAll();
         fireLyricsChange(active);
         reloadVoicesForModel(active.lyricModel);
+        updateTrackTabs();
       });
       lyricCustomGuide.addEventListener("click", () => {
         showModal("\u30AB\u30B9\u30BF\u30E0\u97F3\u58F0(.koe)\u306E\u4F7F\u3044\u65B9", KOE_INFO_HTML);
@@ -22654,6 +24030,7 @@ var mountDAW = (target, options = {}) => {
     }
     trackStates.forEach((t, i2) => {
       if (applyActiveOnly && i2 !== activeTrackIndex) return;
+      t.composeSlot = null;
       const name = normalizeInstrumentName(meta.trackInstruments?.[i2] ?? "");
       if (t.trackInstrument !== name) {
         t.trackInstrument = name;
@@ -22905,7 +24282,7 @@ var mountDAW = (target, options = {}) => {
           const p = programOfInstrumentName(t.trackInstrument);
           if (p !== null) program = p;
         } else if (!t.lyricModel) {
-          const role = DECLARED_ROLE[t.config.id] ?? "melody";
+          const role = t.composeSlot ?? DECLARED_ROLE[t.config.id] ?? "melody";
           const instName = autoPreset[role] ?? autoPreset.melody;
           const p = programOfInstrumentName(instName);
           if (p !== null) program = p;
@@ -23274,7 +24651,7 @@ var mountDAW = (target, options = {}) => {
         if (!stats) continue;
         const role = DECLARED_ROLE[t.config.id] ?? classifyTrackRole(stats, t.config.id === topSingleVoiceId);
         roleByTrackId.set(t.config.id, role);
-        const instName = autoPreset[role];
+        const instName = autoPreset[t.composeSlot ?? role] ?? autoPreset[role];
         t.trackInstrument = instName;
         const trackIndex = trackStates.indexOf(t);
         options.onTrackInstrumentChange?.(trackIndex, instName);
@@ -23425,6 +24802,15 @@ var mountDAW = (target, options = {}) => {
         refs.composeKey.value = savedKey;
       }
     }
+    const savedScale = readMacroSetting("scale");
+    if (savedScale && refs.composeScale) {
+      const hasOption = Array.from(refs.composeScale.options).some(
+        (opt) => opt.value === savedScale
+      );
+      if (hasOption) {
+        refs.composeScale.value = savedScale;
+      }
+    }
     const savedShift = readMacroSetting("shift");
     if (savedShift && refs.shiftSelect) {
       const hasOption = Array.from(refs.shiftSelect.options).some(
@@ -23487,6 +24873,20 @@ var mountDAW = (target, options = {}) => {
       });
       updateComposeKeyHint();
     }
+    const updateComposeScaleHint = () => {
+      if (!refs.composeScale || !refs.composeScaleHint) return;
+      const desc = getComposeScaleDescription(refs.composeScale.value);
+      refs.composeScaleHint.textContent = desc;
+      refs.composeScaleHint.title = desc;
+    };
+    const composeScale = refs.composeScale;
+    if (composeScale) {
+      composeScale.addEventListener("change", () => {
+        writeMacroSetting("scale", composeScale.value);
+        updateComposeScaleHint();
+      });
+      updateComposeScaleHint();
+    }
     if (refs.shiftSelect) {
       refs.shiftSelect.addEventListener("change", () => {
         writeMacroSetting("shift", refs.shiftSelect.value);
@@ -23507,6 +24907,7 @@ var mountDAW = (target, options = {}) => {
           sections: selectedComposeSections(),
           template: tmpl,
           baseKey: refs.composeKey?.value ?? "any",
+          scale: refs.composeScale?.value ?? "auto",
           // 直近に作った曲の特徴を渡すと、それらから離れた候補に加点される。
           // 「作曲」を続けて押したときに似た曲が並ぶのを防ぐ。
           recent: recentComposeFingerprints
@@ -23540,45 +24941,39 @@ var mountDAW = (target, options = {}) => {
           }
           track.core.endBatch();
         };
+        const shouldAutoInstrument = !currentInstrument || currentInstrument === "auto" || currentInstrument === autoComposeInstrument;
+        if (shouldAutoInstrument && song.instrument) {
+          currentInstrument = song.instrument;
+          autoComposeInstrument = song.instrument;
+          options.onInstrumentChange?.(song.instrument);
+        }
         if (isAdvanced) {
-          for (const layer of ADVANCED_COMPOSE_LAYOUT) {
+          const layers = buildAdvancedLayers(song, {
+            edo: renderConfig.edo,
+            stepsPerBar: renderConfig.stepsPerBar,
+            preset: INSTRUMENT_PRESETS[currentInstrument] ?? INSTRUMENT_PRESETS.piano
+          });
+          for (const layer of layers) {
             const track = trackStates[layer.index];
             if (!track) continue;
-            const notes = layer.part === "duet" ? [] : layer.part === "harmony2" ? song.harmony2 : layer.index === 13 ? song.octave : layer.part === "melody" ? song.melody : layer.part === "harmony" ? song.harmony : layer.part === "submelody" ? song.submelody : layer.part === "bass" ? song.bass : layer.part === "pad" ? song.pad : layer.part === "uwamono" ? buildChordPlacements({
-              edo: renderConfig.edo,
-              chordStr: song.chordProgression,
-              patternType: "arpeggio",
-              rootShift: song.rootShift,
-              bpm: song.bpm,
-              stepsPerBar: renderConfig.stepsPerBar
-            }).map((p) => ({
-              startStep: p.startStep,
-              pitchUnits: p.pitchUnits,
-              durationSteps: p.durationSteps,
-              velocity: Math.max(30, p.velocity - 14)
-            })) : buildChordPlacements({
-              edo: renderConfig.edo,
-              chordStr: song.chordProgression,
-              patternType: layer.part,
-              rootShift: song.rootShift,
-              bpm: song.bpm,
-              stepsPerBar: renderConfig.stepsPerBar
-            }).map((p) => ({
-              startStep: p.startStep,
-              pitchUnits: p.pitchUnits,
-              durationSteps: p.durationSteps,
-              velocity: p.velocity
-            }));
-            writeTrackAt(layer.index, notes);
+            writeTrackAt(layer.index, layer.notes);
             track.trackOctave = layer.octave;
             track.volume = layer.volume;
             track.core.setVolume(layer.volume);
+            track.composeSlot = layer.notes.length > 0 ? layer.slot ?? null : null;
+            if (layer.notes.length === 0 && track.trackInstrument) {
+              track.trackInstrument = "";
+              options.onTrackInstrumentChange?.(layer.index, "");
+            }
           }
           for (let i2 = 0; i2 < trackStates.length; i2++) {
-            if (ADVANCED_COMPOSE_LAYOUT.some((l) => l.index === i2)) continue;
+            if (layers.some((l) => l.index === i2)) continue;
             writeTrackAt(i2, []);
+            const t = trackStates[i2];
+            if (t) t.composeSlot = null;
           }
         } else {
+          for (const t of trackStates) t.composeSlot = null;
           writeTrack("melody", song.melody);
           writeTrack("submelody", song.submelody);
           writeTrack("bass", song.bass);
@@ -23595,12 +24990,6 @@ var mountDAW = (target, options = {}) => {
         refs.drumSelect.value = song.drum;
         options.onDrumChange?.(song.drum);
         applyDrumPatternFont(song.drum);
-        const shouldAutoInstrument = !currentInstrument || currentInstrument === "auto" || currentInstrument === autoComposeInstrument;
-        if (shouldAutoInstrument && song.instrument) {
-          currentInstrument = song.instrument;
-          autoComposeInstrument = song.instrument;
-          options.onInstrumentChange?.(song.instrument);
-        }
         if (withVocal) {
           autoComposeVocalTracks.clear();
           const melodyTrack = isAdvanced ? trackStates[0] : trackStates.find((t) => t.config.id === "melody");
@@ -24837,6 +26226,7 @@ var mountDAW = (target, options = {}) => {
       if (!t) return;
       const name = normalizeInstrumentName(instrumentName);
       t.trackInstrument = name;
+      t.composeSlot = null;
       if (t.config.id === activeTrackId) updateTrackPanel();
     },
     noteToCanvas: (step, pitch) => {
@@ -24960,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;
@@ -25967,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;
@@ -25989,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);
@@ -26055,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();
   };
@@ -26267,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();
@@ -27023,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 = () => {
@@ -27106,10 +28497,13 @@ var createDtmStudio = async (options = {}) => {
 0 && (module.exports = {
   A4_HZ,
   A4_UNITS,
+  BLUES_SCALE,
   BREATH_MARK,
   CENTS_PER_UNIT,
   COMPOSE_KEYS,
   COMPOSE_MOOD_GROUPS,
+  COMPOSE_SCALES,
+  COMPOSE_SCALE_IDS,
   CORPUS_BANDS,
   CORPUS_SIZE,
   DAW_CSS,
@@ -27129,7 +28523,11 @@ var createDtmStudio = async (options = {}) => {
   FADE_IN_MARK,
   FADE_OUT_MARK,
   GLOBAL_STORAGE_KEYS,
+  GM_BRIGHT_CEILING,
   GM_INSTRUMENT_NAMES,
+  GM_INSTRUMENT_RANGE,
+  HARMONIC_MINOR_SCALE,
+  HUNGARIAN_SCALE,
   INSTRUMENT_PRESETS,
   KEY_COUNT,
   KOE_BASE_URL,
@@ -27139,6 +28537,7 @@ var createDtmStudio = async (options = {}) => {
   LinkedList,
   MACRO_STORAGE_KEYS,
   MAJOR_KEY_IDS,
+  MAJOR_SCALE,
   MAX_VOCAL_VOLUME,
   MICRO_STEP,
   MINOR_KEY_IDS,
@@ -27207,10 +28606,12 @@ var createDtmStudio = async (options = {}) => {
   featureVector,
   fifthToStep,
   fifthToUnits,
+  fitInstrumentOctave,
   formatMmlMeta,
   freqFromPitch,
   generateRandomPattern,
   getComposeKeyDescription,
+  getComposeScaleDescription,
   getDrumPatternKeys,
   getMidiBPM,
   icon,
@@ -27246,9 +28647,13 @@ var createDtmStudio = async (options = {}) => {
   readGlobalSetting,
   readMacroSections,
   readMacroSetting,
+  resolveCenter,
   resolveComposeKey,
+  resolveComposeScale,
   resolveDrumPattern,
   resolveLoopPoint,
+  scaleDegrees,
+  scaleSize,
   semitonesToUnits,
   shiftNotes,
   showLoadingOverlay,