@onjmin/dtm 2.1.0 → 2.1.2

package/dist/index.mjs

@@ -4213,7 +4213,7 @@ var NATURAL_STEPS2 = {
 };
 var isNatural = (ch) => Object.hasOwn(NATURAL_STEPS2[12], ch);
 var clamp3 = (value, lo, hi) => Math.min(hi, Math.max(lo, value));
-var META_DIRECTIVE = /#(inst|drum|drumfont|volume|drumvolume|reverb|reverbdecay|reverbpredelay|delay|delaydiv|mastercomp|fadein|fadeout|mode|edo)=([\w-]+)/gi;
+var META_DIRECTIVE = /#(inst|drum|drumfont|volume|drumvolume|reverb|reverbdecay|reverbpredelay|delay|delaydiv|mastercomp|fadein|fadeout|mode|edo)=([\w:-]+)/gi;
 var TRACK_INST_DIRECTIVE = /#t(\d+)inst=([^#;\r\n]+)/gi;
 var TRACK_COMP_DIRECTIVE = /#t(\d+)comp=(\d+)/gi;
 var TRACK_WIDTH_DIRECTIVE = /#t(\d+)width=(\d+)/gi;
@@ -8734,6 +8734,27 @@ var DAW_CSS = `
 .dtm-player-play:active { transform: translate(2px, 2px); box-shadow: none; }
 .dtm-player-play--stop { background: var(--dtm-danger); }
 .dtm-player-play:disabled { opacity: 0.4; cursor: default; }
+.dtm-player-loop {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  border: 2px solid var(--dtm-border2);
+  background: var(--dtm-bg);
+  color: var(--dtm-muted);
+  cursor: pointer;
+  flex: 0 0 auto;
+}
+.dtm-player-loop:active { transform: translate(1px, 1px); }
+.dtm-player-loop--on {
+  border-color: var(--c-black);
+  background: var(--dtm-gold);
+  color: var(--c-black);
+  box-shadow: 2px 2px 0 var(--c-black);
+}
+.dtm-player-loop:disabled { opacity: 0.4; cursor: default; }
 .dtm-player-beat-row {
   display: flex;
   align-items: center;
@@ -9392,6 +9413,12 @@ var FALLBACK_VOCAL_ICON = Chip_default;
 var STEPS_PER_BEAT2 = 48;
 var STEPS_PER_BAR2 = 192;
 var DEFAULT_TRACK_COLORS = ["#00e436", "#29adff", "#ff77a8", "#ffec27"];
+var parseLoopMeta = (mml) => {
+  const m = mml.match(/^#\s*loop\s*=\s*(on|off|1|0|true|false)\s*$/im);
+  if (!m) return null;
+  const v = m[1].toLowerCase();
+  return v === "on" || v === "1" || v === "true";
+};
 var activePlayer = null;
 var agreedModelsInSession = /* @__PURE__ */ new Set();
 var LYRIC_MODEL_LABELS = {
@@ -9631,6 +9658,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
   const secondsPerStep = 60 / bpm / STEPS_PER_BEAT2;
+  let loopEnabled = options.loop ?? parseLoopMeta(mml) ?? false;
   const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
     (a, b) => a - b
   );
@@ -9719,6 +9747,13 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   playBtn.className = "dtm-player-play";
   playBtn.innerHTML = icon("play", 12);
   playBtn.disabled = trackIndices.length === 0;
+  const loopBtn = doc.createElement("button");
+  loopBtn.type = "button";
+  loopBtn.className = "dtm-player-loop";
+  loopBtn.innerHTML = icon("loop", 12);
+  loopBtn.title = loopEnabled ? "LOOP ON" : "LOOP OFF";
+  loopBtn.classList.toggle("dtm-player-loop--on", loopEnabled);
+  loopBtn.disabled = trackIndices.length === 0;
   const mutedTracks = /* @__PURE__ */ new Set();
   const labelByTrack = /* @__PURE__ */ new Map();
   const emojiByTrack = /* @__PURE__ */ new Map();
@@ -10151,7 +10186,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   chordEl.className = "dtm-player-chord";
   chordEl.textContent = "";
   beatRow.appendChild(chordEl);
-  head.append(playBtn, beatRow, dots, mmlHeader);
+  head.append(playBtn, loopBtn, beatRow, dots, mmlHeader);
   root.appendChild(head);
   const seekRow = doc.createElement("div");
   seekRow.className = "dtm-player-seek-row";
@@ -10451,6 +10486,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     getPlayStartStep: () => 0,
     getDrumPattern: (currentBar) => resolveDrumPattern(drumPatternName, drumPatternDict, currentBar),
     getSoloTrackId: () => null,
+    getLoop: () => loopEnabled,
     getAudioTime,
     onPlayNote: (e) => {
       const trackIdx = Number(e.trackId);
@@ -10567,8 +10603,16 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (streaming && !skipSinging) {
       const v = ensureVoices();
       v.setVolume(trackVolume / 100 * (masterVolume / 100));
+      let loopLengthSec;
+      let loopStartSec;
+      if (loopEnabled) {
+        loopStartSec = 0;
+        loopLengthSec = maxStep * secondsPerStep;
+      }
       v.startStream(tracks, seq.getStartTime(), {
         isAudible: (t) => !mutedTracks.has(Number(t.id)),
+        loopLengthSec,
+        loopStartSec,
         onLateSkip: () => {
           showPlayerMessage(
             "\u97F3\u58F0\u5408\u6210\u304C\u9593\u306B\u5408\u308F\u306A\u3044\u305F\u3081\u3001\u4E00\u90E8\u306E\u767A\u97F3\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3057\u305F"
@@ -10640,6 +10684,14 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (playing) pause();
     else play(Number(seekInput.value));
   });
+  loopBtn.addEventListener("click", () => {
+    loopEnabled = !loopEnabled;
+    loopBtn.classList.toggle("dtm-player-loop--on", loopEnabled);
+    loopBtn.title = loopEnabled ? "LOOP ON" : "LOOP OFF";
+    if (playing) {
+      seekTo(playStep);
+    }
+  });
   const destroy = () => {
     doc.removeEventListener("click", handleOutsideClick);
     seq.stop();
@@ -11179,7 +11231,7 @@ var parseBpmMeta = (chords) => {
   if (Number.isNaN(val)) return null;
   return Math.max(40, Math.min(240, val));
 };
-var parseLoopMeta = (chords) => {
+var parseLoopMeta2 = (chords) => {
   const m = chords.match(/^#\s*loop\s*=\s*(on|off|1|0|true|false)\s*$/im);
   if (!m) return null;
   const v = m[1].toLowerCase();
@@ -11356,7 +11408,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   let masterVolume = options.volume ?? 80;
   let isLoading = false;
   let loadAbortId = 0;
-  let loopEnabled = options.loop ?? parseLoopMeta(chords) ?? false;
+  let loopEnabled = options.loop ?? parseLoopMeta2(chords) ?? false;
   let metronomeEnabled = parseMetronomeMeta(chords);
   let playOffsetSec = 0;
   let currentPlaySec = 0;
@@ -12422,292 +12474,356 @@ var CORPUS_MEDIANS = {
   complementarity: 0.045
 };
 
-// src/compose-drums.ts
-var DRUM_STYLE_LABELS = {
-  eight: "8\u30D3\u30FC\u30C8",
-  sixteen: "16\u30D3\u30FC\u30C8",
-  four: "4\u3064\u6253\u3061",
-  shuffle: "\u30B7\u30E3\u30C3\u30D5\u30EB",
-  ballad: "\u30D0\u30E9\u30FC\u30C9",
-  rock: "\u30ED\u30C3\u30AF"
-};
-var KICKS = {
-  // [抑えめ, 標準, 最大]
-  eight: [
-    [0, 8],
-    [0, 6, 8],
-    [0, 6, 8, 14]
-  ],
-  sixteen: [
-    [0, 3, 8],
-    [0, 3, 8, 11],
-    [0, 3, 6, 8, 11, 14]
-  ],
-  four: [
-    [0, 4, 8, 12],
-    [0, 4, 8, 12],
-    [0, 4, 8, 12, 14]
-  ],
-  shuffle: [
-    [0, 8],
-    [0, 8, 11],
-    [0, 5, 8, 11]
-  ],
-  ballad: [[0], [0, 8], [0, 8, 12]],
-  rock: [
-    [0, 8],
-    [0, 3, 8],
-    [0, 3, 8, 10, 14]
-  ]
-};
-var SNARES = {
-  eight: [
-    [4, 12],
-    [4, 12],
-    [4, 12]
-  ],
-  sixteen: [
-    [4, 12],
-    [4, 12],
-    [4, 12]
-  ],
-  four: [
-    [4, 12],
-    [4, 12],
-    [4, 12]
-  ],
-  shuffle: [
-    [4, 12],
-    [4, 12],
-    [4, 12]
-  ],
-  // バラードはサイドスティック（リムショット）から入って、盛り上がりでスネアへ移る。
-  ballad: [[12], [4, 12], [4, 12]],
-  rock: [
-    [4, 12],
-    [4, 12],
-    [4, 12]
-  ]
-};
-var GHOSTS = {
-  eight: [7],
-  sixteen: [7, 11, 15],
-  four: [],
-  shuffle: [11],
-  ballad: [],
-  rock: [7, 15]
-};
-var HIHATS = {
-  eight: [
-    [0, 4, 8, 12],
-    [0, 2, 4, 6, 8, 10, 12, 14],
-    [0, 2, 4, 6, 8, 10, 12, 14]
-  ],
-  sixteen: [
-    [0, 2, 4, 6, 8, 10, 12, 14],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-  ],
-  four: [
-    [2, 6, 10, 14],
-    [0, 2, 4, 6, 8, 10, 12, 14],
-    [0, 2, 4, 6, 8, 10, 12, 14]
-  ],
-  shuffle: [[], [], []],
-  // 三連なので格子では書けない。{@link shuffleHats} が作る
-  ballad: [
-    [0, 8],
-    [0, 4, 8, 12],
-    [0, 2, 4, 6, 8, 10, 12, 14]
-  ],
-  rock: [
-    [0, 4, 8, 12],
-    [0, 2, 4, 6, 8, 10, 12, 14],
-    [0, 2, 4, 6, 8, 10, 12, 14]
-  ]
-};
-var FILLS = [
-  // スネアの16分の詰め
+// src/compose-keys.ts
+var COMPOSE_KEYS = {
+  // --- 長調 (12調) ---
+  key_C: {
+    id: "key_C",
+    name: "C",
+    label: "\u30CF\u9577\u8ABF (C)",
+    mode: "major",
+    rootShift: 0,
+    moodId: "mood_happy",
+    description: "\u7121\u57A2\u306B\u559C\u3070\u3057\u3044\u3001\u7D14\u7C8B\u3001\u7D20\u6734\u3001\u51FA\u767A"
+  },
+  key_Db: {
+    id: "key_Db",
+    name: "D\u266D",
+    label: "\u5909\u30CB\u9577\u8ABF (D\u266D)",
+    mode: "major",
+    rootShift: 1,
+    moodId: "mood_melancholy",
+    description: "\u60B2\u3057\u307F\u3001\u6182\u9B31\u306A\u3001\u7518\u7F8E\u306A\u611F\u50B7\uFF08\u5B30\u30CF\u9577\u8ABF\u3068\u540C\u97F3\uFF09"
+  },
+  key_D: {
+    id: "key_D",
+    name: "D",
+    label: "\u30CB\u9577\u8ABF (D)",
+    mode: "major",
+    rootShift: 2,
+    moodId: "mood_triumphant",
+    description: "\u610F\u6C17\u63DA\u3005\u3068\u3057\u305F\u3001\u52DD\u5229\u306E\u3001\u558A\u58F0\u3001\u83EF\u3084\u304B"
+  },
+  key_Eb: {
+    id: "key_Eb",
+    name: "E\u266D",
+    label: "\u5909\u30DB\u9577\u8ABF (E\u266D)",
+    mode: "major",
+    rootShift: 3,
+    moodId: "mood_dark",
+    description: "\u53B3\u3057\u3044\u3001\u304D\u3064\u3044\u3001\u305D\u308C\u3067\u3044\u3066\u611B\u306B\u6E80\u3061\u305F\u3001\u8358\u91CD"
+  },
+  key_E: {
+    id: "key_E",
+    name: "E",
+    label: "\u30DB\u9577\u8ABF (E)",
+    mode: "major",
+    rootShift: 4,
+    moodId: "mood_fierce",
+    description: "\u3051\u3093\u304B\u3063\u65E9\u3044\u3001\u8352\u3005\u3057\u3044\u3001\u8F1D\u304B\u3057\u3044\u60C5\u71B1"
+  },
+  key_F: {
+    id: "key_F",
+    name: "F",
+    label: "\u30D8\u9577\u8ABF (F)",
+    mode: "major",
+    rootShift: 5,
+    moodId: "mood_fierce",
+    description: "\u6012\u308A\u72C2\u3063\u305F\u3001\u6C17\u6027\u306E\u8352\u3044\u3001\u4E00\u6642\u7684\u306A\u60B2\u5606\u3001\u6FC0\u52D5"
+  },
+  key_Gb: {
+    id: "key_Gb",
+    name: "G\u266D",
+    label: "\u5909\u30C8\u9577\u8ABF (G\u266D)",
+    mode: "major",
+    rootShift: 6,
+    moodId: "mood_triumphant",
+    description: "\u56F0\u96E3\u306E\u6253\u7834\u3001\u5B89\u5835\u306E\u305F\u3081\u606F\u3001\u51F1\u65CB\uFF08\u5B30\u30D8\u9577\u8ABF\u3068\u540C\u97F3\uFF09"
+  },
+  key_G: {
+    id: "key_G",
+    name: "G",
+    label: "\u30C8\u9577\u8ABF (G)",
+    mode: "major",
+    rootShift: -5,
+    moodId: "mood_solemn",
+    description: "\u53B3\u7C9B\u306A\u3001\u5D07\u9AD8\u306A\u3001\u5E7B\u60F3\u3001\u8AA0\u5B9F\u3001\u5E83\u304C\u308A"
+  },
+  key_Ab: {
+    id: "key_Ab",
+    name: "A\u266D",
+    label: "\u5909\u30A4\u9577\u8ABF (A\u266D)",
+    mode: "major",
+    rootShift: -4,
+    moodId: "mood_dark",
+    description: "\u6B7B\u3001\u6C38\u9060\u3001\u88C1\u304D\u3001\u6DF1\u9060\u306A\u7791\u60F3"
+  },
+  key_A: {
+    id: "key_A",
+    name: "A",
+    label: "\u30A4\u9577\u8ABF (A)",
+    mode: "major",
+    rootShift: -3,
+    moodId: "mood_happy",
+    description: "\u3046\u308C\u3057\u3044\u3001\u7267\u6B4C\u7684\u306A\u3001\u611B\u306E\u544A\u767D\u3001\u304D\u3089\u3073\u3084\u304B"
+  },
+  key_Bb: {
+    id: "key_Bb",
+    name: "B\u266D",
+    label: "\u5909\u30ED\u9577\u8ABF (B\u266D)",
+    mode: "major",
+    rootShift: -2,
+    moodId: "mood_happy",
+    description: "\u559C\u3070\u3057\u3044\u3001\u98A8\u5909\u308F\u308A\u306A\u3001\u967D\u6C17\u306A\u3001\u8EFD\u5FEB"
+  },
+  key_B: {
+    id: "key_B",
+    name: "B",
+    label: "\u30ED\u9577\u8ABF (B)",
+    mode: "major",
+    rootShift: -1,
+    moodId: "mood_fierce",
+    description: "\u3069\u304E\u3064\u3044\u3001\u5F37\u70C8\u306A\u3001\u8352\u3063\u307D\u3044\u3001\u731B\u70C8"
+  },
+  // --- 短調 (12調) ---
+  key_Am: {
+    id: "key_Am",
+    name: "Am",
+    label: "\u30A4\u77ED\u8ABF (Am)",
+    mode: "minor",
+    rootShift: 0,
+    moodId: "mood_solemn",
+    description: "\u67D4\u3089\u304B\u306A\u3001\u7269\u60B2\u3057\u3044\u3001\u656C\u8654\u306A\u3001\u7D20\u6734\u306A\u54C0\u6101"
+  },
+  key_Bbm: {
+    id: "key_Bbm",
+    name: "B\u266Dm",
+    label: "\u5909\u30ED\u77ED\u8ABF (B\u266Dm)",
+    mode: "minor",
+    rootShift: 1,
+    moodId: "mood_dark",
+    description: "\u6050\u308D\u3057\u3044\u3001\u6697\u95C7\u3001\u5632\u308B\u3088\u3046\u306A\u3001\u4E0D\u6C17\u5473\uFF08\u5B30\u30A4\u77ED\u8ABF\u3068\u540C\u97F3\uFF09"
+  },
+  key_Bm: {
+    id: "key_Bm",
+    name: "Bm",
+    label: "\u30ED\u77ED\u8ABF (Bm)",
+    mode: "minor",
+    rootShift: 2,
+    moodId: "mood_melancholy",
+    description: "\u5B64\u72EC\u306A\u3001\u6182\u9B31\u306A\u3001\u5FCD\u8010\u3001\u9759\u304B\u306A\u8AE6\u5FF5"
+  },
+  key_Cm: {
+    id: "key_Cm",
+    name: "Cm",
+    label: "\u30CF\u77ED\u8ABF (Cm)",
+    mode: "minor",
+    rootShift: 3,
+    moodId: "mood_plaintive",
+    description: "\u7D14\u7C8B\u306B\u60B2\u3057\u3052\u306A\u3001\u604B\u308F\u305A\u3089\u3044\u306E\u3001\u60B2\u5287\u7684"
+  },
+  key_Csm: {
+    id: "key_Csm",
+    name: "C\u266Fm",
+    label: "\u5B30\u30CF\u77ED\u8ABF (C\u266Fm)",
+    mode: "minor",
+    rootShift: 4,
+    moodId: "mood_melancholy",
+    description: "\u843D\u80C6\u3001\u6CE3\u304D\u53EB\u3093\u3060\u3001\u60B2\u6D99\u306E\u3001\u6DF1\u3044\u5606\u304D"
+  },
+  key_Dm: {
+    id: "key_Dm",
+    name: "Dm",
+    label: "\u30CB\u77ED\u8ABF (Dm)",
+    mode: "minor",
+    rootShift: 5,
+    moodId: "mood_solemn",
+    description: "\u53B3\u7C9B\u306A\u3001\u656C\u8654\u306A\u3001\u601D\u7D22\u7684\u306A\u3001\u91CD\u539A\u306A\u7948\u308A"
+  },
+  key_Ebm: {
+    id: "key_Ebm",
+    name: "E\u266Dm",
+    label: "\u5909\u30DB\u77ED\u8ABF (E\u266Dm)",
+    mode: "minor",
+    rootShift: 6,
+    moodId: "mood_anxious",
+    description: "\u6DF1\u3044\u82E6\u60A9\u3001\u5B9F\u5B58\u7684\u306A\u4E0D\u5B89\u3001\u6226\u6144\uFF08\u5B30\u30CB\u77ED\u8ABF\u3068\u540C\u97F3\uFF09"
+  },
+  key_Em: {
+    id: "key_Em",
+    name: "Em",
+    label: "\u30DB\u77ED\u8ABF (Em)",
+    mode: "minor",
+    rootShift: -5,
+    moodId: "mood_plaintive",
+    description: "\u5F31\u3005\u3057\u3044\u3001\u306A\u307E\u3081\u304B\u3057\u3044\u3001\u843D\u3061\u7740\u304D\u306E\u306A\u3044\u3001\u7E4A\u7D30"
+  },
+  key_Fm: {
+    id: "key_Fm",
+    name: "Fm",
+    label: "\u30D8\u77ED\u8ABF (Fm)",
+    mode: "minor",
+    rootShift: -4,
+    moodId: "mood_plaintive",
+    description: "\u307C\u3093\u3084\u308A\u3057\u305F\u3001\u7269\u60B2\u3057\u3044\u3001\u3057\u3081\u3084\u304B\u306A\u3001\u846C\u9001"
+  },
+  key_Fsm: {
+    id: "key_Fsm",
+    name: "F\u266Fm",
+    label: "\u5B30\u30D8\u77ED\u8ABF (F\u266Fm)",
+    mode: "minor",
+    rootShift: -3,
+    moodId: "mood_anxious",
+    description: "\u9670\u6C17\u306A\u3001\u6FC0\u3057\u3044\u61A4\u308A\u3001\u6697\u3044\u60C5\u5FF5"
+  },
+  key_Gm: {
+    id: "key_Gm",
+    name: "Gm",
+    label: "\u30C8\u77ED\u8ABF (Gm)",
+    mode: "minor",
+    rootShift: -2,
+    moodId: "mood_anxious",
+    description: "\u4E0D\u6E80\u3001\u4E0D\u5B89\u3001\u3084\u308B\u305B\u306A\u3055\u3001\u60B2\u75DB\u306A\u53EB\u3073"
+  },
+  key_Abm: {
+    id: "key_Abm",
+    name: "A\u266Dm",
+    label: "\u5909\u30A4\u77ED\u8ABF (A\u266Dm)",
+    mode: "minor",
+    rootShift: -1,
+    moodId: "mood_anxious",
+    description: "\u4E0D\u670D\u306A\u3001\u5606\u304D\u306E\u3001\u6CE3\u304D\u53EB\u3093\u3060\uFF08\u5B30\u30C8\u77ED\u8ABF\u3068\u540C\u97F3\uFF09"
+  }
+};
+var COMPOSE_MOOD_GROUPS = [
   {
-    grid: [12, 13, 14, 15],
-    drums: [
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare
-    ]
+    id: "mood_happy",
+    label: "\u559C\u3070\u3057\u3044\u30FB\u967D\u6C17\u306A\u66F2",
+    description: "\u7121\u57A2\u306B\u559C\u3070\u3057\u3044\u3001\u7267\u6B4C\u7684\u3001\u611B\u306E\u544A\u767D\u3001\u98A8\u5909\u308F\u308A\u3067\u967D\u6C17",
+    keyIds: ["key_C", "key_A", "key_Bb"]
   },
-  // タムで降りる
   {
-    grid: [8, 10, 12, 14],
-    drums: [
-      DRUM_KEYS.highTom,
-      DRUM_KEYS.highTom,
-      DRUM_KEYS.lowMidTom,
-      DRUM_KEYS.lowTom
-    ]
+    id: "mood_triumphant",
+    label: "\u52DD\u5229\u30FB\u529B\u5F37\u3044\u66F2",
+    description: "\u610F\u6C17\u63DA\u3005\u3001\u52DD\u5229\u306E\u558A\u58F0\u3001\u56F0\u96E3\u306E\u6253\u7834\u3001\u5B89\u5835\u306E\u305F\u3081\u606F",
+    keyIds: ["key_D", "key_Gb"]
   },
-  // スネア → タム
   {
-    grid: [8, 9, 10, 11, 12, 14],
-    drums: [
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.highTom,
-      DRUM_KEYS.highTom,
-      DRUM_KEYS.lowMidTom,
-      DRUM_KEYS.lowTom
-    ]
+    id: "mood_fierce",
+    label: "\u6FC0\u3057\u3044\u30FB\u8352\u3005\u3057\u3044\u66F2",
+    description: "\u3051\u3093\u304B\u3063\u65E9\u3044\u3001\u6012\u308A\u72C2\u3063\u305F\u6C17\u6027\u306E\u8352\u3055\u3001\u3069\u304E\u3064\u304F\u731B\u70C8",
+    keyIds: ["key_E", "key_F", "key_B"]
   },
-  // 短く締める
   {
-    grid: [14, 15],
-    drums: [DRUM_KEYS.acousticSnare, DRUM_KEYS.acousticSnare]
+    id: "mood_solemn",
+    label: "\u53B3\u7C9B\u30FB\u5E7B\u60F3\u7684\u306A\u66F2",
+    description: "\u53B3\u7C9B\u3001\u5D07\u9AD8\u3001\u5E7B\u60F3\u3001\u656C\u8654\u3001\u601D\u7D22\u7684\u3001\u67D4\u3089\u304B\u306A\u7269\u60B2\u3057\u3055",
+    keyIds: ["key_G", "key_Dm", "key_Am"]
   },
-  // 16分の連打から解放
   {
-    grid: [8, 9, 10, 11, 12, 13, 14, 15],
-    drums: [
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.acousticSnare,
-      DRUM_KEYS.highTom,
-      DRUM_KEYS.highTom,
-      DRUM_KEYS.lowMidTom,
-      DRUM_KEYS.lowTom
-    ]
+    id: "mood_plaintive",
+    label: "\u7269\u60B2\u3057\u3044\u30FB\u54C0\u6101\u306E\u66F2",
+    description: "\u7D14\u7C8B\u306B\u60B2\u3057\u3052\u3001\u604B\u308F\u305A\u3089\u3044\u3001\u843D\u3061\u7740\u304D\u306E\u306A\u3044\u3001\u3057\u3081\u3084\u304B\u306A\u60B2\u54C0",
+    keyIds: ["key_Cm", "key_Em", "key_Fm"]
+  },
+  {
+    id: "mood_melancholy",
+    label: "\u6182\u9B31\u30FB\u5B64\u72EC\u306A\u66F2",
+    description: "\u60B2\u3057\u307F\u3001\u6182\u9B31\u3001\u5B64\u72EC\u3001\u5FCD\u8010\u3001\u843D\u80C6\u3001\u60B2\u6D99\u306E\u5606\u304D",
+    keyIds: ["key_Db", "key_Bm", "key_Csm"]
+  },
+  {
+    id: "mood_anxious",
+    label: "\u4E0D\u5B89\u30FB\u82E6\u60A9\u306A\u66F2",
+    description: "\u4E0D\u6E80\u3001\u4E0D\u5B89\u3001\u6DF1\u3044\u82E6\u60A9\u3001\u5B9F\u5B58\u7684\u4E0D\u5B89\u3001\u9670\u6C17\u306A\u61A4\u308A\u3001\u5606\u304D",
+    keyIds: ["key_Gm", "key_Ebm", "key_Fsm", "key_Abm"]
   },
-  // 3連のタム回し（16分格子の外）
   {
-    grid: [12, 13.33, 14.67],
-    drums: [DRUM_KEYS.highTom, DRUM_KEYS.lowMidTom, DRUM_KEYS.lowTom]
+    id: "mood_dark",
+    label: "\u6697\u95C7\u30FB\u91CD\u539A\u306A\u66F2",
+    description: "\u53B3\u3057\u3044\u611B\u3001\u6B7B\u3001\u6C38\u9060\u3001\u88C1\u304D\u3001\u6050\u308D\u3057\u3044\u6697\u95C7\u3001\u5632\u308A",
+    keyIds: ["key_Eb", "key_Ab", "key_Bbm"]
   }
 ];
-var pick = (items, rnd) => items[Math.floor(rnd() * items.length)];
-var shuffleHats = (stepsPerBar, level) => {
-  const beat = stepsPerBar / 4;
-  const triplet = beat / 3;
-  const out = [];
-  for (let b = 0; b < 4; b++) {
-    out.push(b * beat);
-    out.push(b * beat + triplet * 2);
-    if (level === 2) out.push(b * beat + triplet);
+var MAJOR_KEY_IDS = Object.values(COMPOSE_KEYS).filter((k) => k.mode === "major").map((k) => k.id);
+var MINOR_KEY_IDS = Object.values(COMPOSE_KEYS).filter((k) => k.mode === "minor").map((k) => k.id);
+var pickItem = (list, rnd) => list[Math.floor(rnd() * list.length)];
+var resolveComposeKey = (choice, rnd = Math.random) => {
+  const c = (choice ?? "").trim() || "any";
+  if (COMPOSE_KEYS[c]) {
+    const target2 = COMPOSE_KEYS[c];
+    const mood2 = COMPOSE_MOOD_GROUPS.find((m) => m.id === target2.moodId);
+    return {
+      mode: target2.mode,
+      rootShift: target2.rootShift,
+      keyName: target2.name,
+      keyLabel: target2.label,
+      moodLabel: mood2?.label,
+      description: target2.description
+    };
   }
-  return out;
-};
-var composeDrumPattern = (options) => {
-  const { bars, stepsPerBar, rnd } = options;
-  const style = options.style ?? pick(
-    ["eight", "sixteen", "four", "shuffle", "ballad", "rock"],
-    rnd
-  );
-  const toStep = (g) => Math.round(g * stepsPerBar / 16) % stepsPerBar;
-  const fillA = pick(FILLS, rnd);
-  const fillB = pick(
-    FILLS.filter((f) => f !== fillA),
-    rnd
-  );
-  const openTail = rnd() < 0.6;
-  const useClap = style === "four" && rnd() < 0.5;
-  const levels = options.levels;
-  const crashSet = new Set(options.crashBars ?? [1, 9, 13]);
-  const fillSet = new Set(
-    options.fillBars ?? [4, 8, 12, bars - 1].filter((b) => b > 0)
-  );
-  const sectionLevel = (bar) => {
-    if (levels) return levels[bar - 1] ?? 1;
-    if (bar <= 4) return 0;
-    if (bar <= 8) return 1;
-    if (bar <= 12) return 2;
-    return 1;
-  };
-  const barPatterns = [];
-  for (let bar = 1; bar <= bars; bar++) {
-    const level = sectionLevel(bar);
-    const isLast = bar === bars;
-    const isFill = !isLast && fillSet.has(bar);
-    const hits = [];
-    if (crashSet.has(bar) || isLast)
-      hits.push({
-        step: 0,
-        pitch: DRUM_KEYS.crashCymbal1,
-        velocity: bar === 9 || isLast ? 1 : 0.85
-      });
-    if (isLast) {
-      hits.push({ step: 0, pitch: DRUM_KEYS.bassDrum1, velocity: 1 });
-      hits.sort((a, b) => a.step - b.step || a.pitch - b.pitch);
-      barPatterns.push(hits);
-      continue;
-    }
-    for (const g of KICKS[style][level])
-      hits.push({
-        step: toStep(g),
-        pitch: DRUM_KEYS.bassDrum1,
-        velocity: g === 0 ? 1 : 0.88
-      });
-    const snarePitch = style === "ballad" && level === 0 ? DRUM_KEYS.sideStick : DRUM_KEYS.acousticSnare;
-    for (const g of SNARES[style][level]) {
-      hits.push({ step: toStep(g), pitch: snarePitch, velocity: 0.95 });
-      if (useClap)
-        hits.push({
-          step: toStep(g),
-          pitch: DRUM_KEYS.handClap,
-          velocity: 0.7
-        });
-    }
-    if (level >= 1)
-      for (const g of GHOSTS[style])
-        hits.push({
-          step: toStep(g),
-          pitch: DRUM_KEYS.acousticSnare,
-          velocity: 0.3
-        });
-    const hatSteps = style === "shuffle" ? shuffleHats(stepsPerBar, level) : HIHATS[style][level].map(toStep);
-    const hatPitch = level === 2 && style !== "four" ? DRUM_KEYS.rideCymbal1 : DRUM_KEYS.closedHihat;
-    for (const step of hatSteps) {
-      if (isFill && step >= stepsPerBar / 2) continue;
-      const isDownbeat = step % (stepsPerBar / 4) === 0;
-      const isTail = openTail && step === toStep(14) && !isFill;
-      hits.push({
-        step,
-        pitch: isTail ? DRUM_KEYS.openHihat : hatPitch,
-        velocity: isTail ? 0.8 : isDownbeat ? 0.75 : 0.5
-      });
-    }
-    if (isFill) {
-      const fill = bar % 8 === 0 ? fillB : fillA;
-      fill.grid.forEach((g, i2) => {
-        hits.push({
-          step: toStep(g),
-          pitch: fill.drums[i2] ?? DRUM_KEYS.acousticSnare,
-          // 追い込みで少しずつ強くする
-          velocity: 0.7 + 0.28 * i2 / Math.max(1, fill.grid.length - 1)
-        });
-      });
-    }
-    hits.sort((a, b) => a.step - b.step || a.pitch - b.pitch);
-    barPatterns.push(hits);
-  }
-  const pattern = [];
-  let runStart = 1;
-  for (let bar = 1; bar <= bars; bar++) {
-    const same = bar < bars && JSON.stringify(barPatterns[bar]) === JSON.stringify(barPatterns[bar - 1]);
-    if (same) continue;
-    const instruction = {
-      ranges: [[runStart, bar]],
-      patternBars: 1,
-      pattern: barPatterns[runStart - 1]
+  const mood = COMPOSE_MOOD_GROUPS.find((m) => m.id === c);
+  if (mood) {
+    const pickedKeyId2 = pickItem(mood.keyIds, rnd);
+    const target2 = COMPOSE_KEYS[pickedKeyId2];
+    return {
+      mode: target2.mode,
+      rootShift: target2.rootShift,
+      keyName: target2.name,
+      keyLabel: target2.label,
+      moodLabel: mood.label,
+      description: target2.description
     };
-    pattern.push(instruction);
-    runStart = bar + 1;
   }
-  const variety = new Set(barPatterns.map((p) => JSON.stringify(p))).size;
+  if (c === "major") {
+    const pickedKeyId2 = pickItem(MAJOR_KEY_IDS, rnd);
+    const target2 = COMPOSE_KEYS[pickedKeyId2];
+    const targetMood2 = COMPOSE_MOOD_GROUPS.find((m) => m.id === target2.moodId);
+    return {
+      mode: "major",
+      rootShift: target2.rootShift,
+      keyName: target2.name,
+      keyLabel: target2.label,
+      moodLabel: targetMood2?.label,
+      description: target2.description
+    };
+  }
+  if (c === "minor") {
+    const pickedKeyId2 = pickItem(MINOR_KEY_IDS, rnd);
+    const target2 = COMPOSE_KEYS[pickedKeyId2];
+    const targetMood2 = COMPOSE_MOOD_GROUPS.find((m) => m.id === target2.moodId);
+    return {
+      mode: "minor",
+      rootShift: target2.rootShift,
+      keyName: target2.name,
+      keyLabel: target2.label,
+      moodLabel: targetMood2?.label,
+      description: target2.description
+    };
+  }
+  const allKeyIds = Object.keys(COMPOSE_KEYS);
+  const pickedKeyId = pickItem(allKeyIds, rnd);
+  const target = COMPOSE_KEYS[pickedKeyId];
+  const targetMood = COMPOSE_MOOD_GROUPS.find((m) => m.id === target.moodId);
   return {
-    style,
-    variety,
-    def: { label: `\u4F5C\u66F2\uFF08${DRUM_STYLE_LABELS[style]}\uFF09`, pattern }
-  };
+    mode: void 0,
+    // コード進行の長短制約は掛けず従来通りランダム
+    rootShift: target.rootShift,
+    keyName: target.name,
+    keyLabel: target.label,
+    moodLabel: targetMood?.label,
+    description: target.description
+  };
+};
+var getComposeKeyDescription = (choice) => {
+  if (!choice || choice === "any") return "\u516824\u8ABF\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u6C7A\u5B9A\u3057\u307E\u3059";
+  if (choice === "major") return "12\u306E\u9577\u8ABF\u306E\u4E2D\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u62BD\u9078\u3057\u307E\u3059";
+  if (choice === "minor") return "12\u306E\u77ED\u8ABF\u306E\u4E2D\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u62BD\u9078\u3057\u307E\u3059";
+  const mood = COMPOSE_MOOD_GROUPS.find((m) => m.id === choice);
+  if (mood) return `${mood.label}\uFF1A${mood.description}`;
+  const target = COMPOSE_KEYS[choice];
+  if (target) return `${target.label}\uFF1A${target.description}`;
+  return "";
 };
 
 // src/compose-metrics.ts
@@ -13139,7 +13255,6 @@ var transposeChordName = (chord, shift) => {
     return names[((pc + normShift) % 12 + 12) % 12];
   });
 };
-var ROOT_SHIFTS = [0, 1, 2, 3, 4, 5, 6, -1, -2, -3, -4, -5];
 var BPM_CHOICES = [
   112,
   120,
@@ -13761,7 +13876,7 @@ var MOTIF_ARCHETYPES = [
   [0, 5, 4, 2, 0]
   // 6度跳躍からの大きな下降
 ];
-var pick2 = (items, rnd) => items[Math.floor(rnd() * items.length)];
+var pick = (items, rnd) => items[Math.floor(rnd() * items.length)];
 var durationEntropy = (durations) => {
   if (durations.length === 0) return 0;
   const counts = /* @__PURE__ */ new Map();
@@ -13829,7 +13944,7 @@ var leapTarget = (from, tones, rnd) => {
     ...octaves,
     ...near.slice(0, Math.max(2, Math.ceil(near.length / 2)))
   ];
-  return pick2(weighted.length > 0 ? weighted : candidates, rnd);
+  return pick(weighted.length > 0 ? weighted : candidates, rnd);
 };
 var landOn = (degrees, scaleIndex) => {
   if (degrees.length === 0) return;
@@ -13858,7 +13973,7 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
   const noteCount = slots.length;
   const out = [];
   if (role === "motif" || role === "sequence" || role === "climax" || role === "answer") {
-    const shift = (role === "sequence" ? pick2([-2, -1, 1, 2], rnd) : role === "climax" ? 5 : 0) + repeatShift;
+    const shift = (role === "sequence" ? pick([-2, -1, 1, 2], rnd) : role === "climax" ? 5 : 0) + repeatShift;
     if (style.pentatonicMotif) {
       const startPenta = degreeToPenta(startDegree);
       for (let i2 = 0; i2 < noteCount; i2++)
@@ -13924,7 +14039,7 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
     }
     return out;
   }
-  const span = pick2([2, 3, 4], rnd);
+  const span = pick([2, 3, 4], rnd);
   const dir = style.stepShape === "descend" ? -1 : style.stepShape === "ascend" ? 1 : rnd() < 0.5 ? 1 : -1;
   for (let i2 = 0; i2 < noteCount; i2++) {
     const t = noteCount === 1 ? 0 : i2 / (noteCount - 1);
@@ -14152,7 +14267,7 @@ var applyChromatic = (pitches, fifths, slots, tones, opts) => {
     lastAltered = i2;
   }
 };
-var draw = (options, rnd) => {
+var draw = (options, resolvedKey, rnd) => {
   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);
@@ -14176,12 +14291,12 @@ var draw = (options, rnd) => {
   const sectionPlan = buildSectionPlan(options.sections ?? DEFAULT_SECTIONS);
   const totalBars = sectionPlan.reduce((sum, s) => sum + s.bars, 0);
   if (rnd() < 0.35) {
-    const modType = pick2(
+    const modType = pick(
       ["chorus_up", "chorus_up", "prechorus_down"],
       rnd
     );
     if (modType === "chorus_up") {
-      const shift = pick2([1, 1, 2], rnd);
+      const shift = pick([1, 1, 2], rnd);
       let lastChorusIdx = -1;
       for (let i2 = 0; i2 < sectionPlan.length; i2++) {
         if (sectionPlan[i2].kind === "chorus") lastChorusIdx = i2;
@@ -14192,7 +14307,7 @@ var draw = (options, rnd) => {
         }
       }
     } else {
-      const shift = pick2([-2, 3], rnd);
+      const shift = pick([-2, 3], rnd);
       for (const s of sectionPlan) {
         if (s.kind === "prechorus") s.keyShift = shift;
       }
@@ -14204,14 +14319,15 @@ var draw = (options, rnd) => {
       barKeyShift[b] = s.keyShift;
     }
   }
-  const progA = pick2(SECTION_A_PROGRESSIONS, rnd);
+  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 progA = pick(progAPool, rnd);
   const progBPool = SECTION_B_PROGRESSIONS.filter(
     (p) => p.join("|") !== progA.join("|")
   );
-  const progB = pick2(progBPool, rnd);
+  const progB = pick(progBPool, rnd);
   const tonic = progA[0].startsWith("Am") ? "Am" : "C";
-  const progHalf = pick2(SECTION_A2_DERIVATIONS, rnd)(progA);
-  const progFull = pick2(SECTION_A3_DERIVATIONS, rnd)(progA, tonic);
+  const progHalf = pick(SECTION_A2_DERIVATIONS, rnd)(progA);
+  const progFull = pick(SECTION_A3_DERIVATIONS, rnd)(progA, tonic);
   const progression = [];
   for (const section of sectionPlan) {
     const base = section.spec.progression === "b" ? progB : progA;
@@ -14229,9 +14345,9 @@ var draw = (options, rnd) => {
   }
   progression.length = totalBars;
   const chordProgression = progression.map((chord, bar) => transposeChordName(chord, barKeyShift[bar])).join("|");
-  const chordPattern = pick2(CHORD_PATTERNS, rnd);
-  const rootShift = pick2(ROOT_SHIFTS, rnd);
-  const bpm = pick2(BPM_CHOICES, rnd);
+  const chordPattern = pick(CHORD_PATTERNS, rnd);
+  const rootShift = resolvedKey.rootShift;
+  const bpm = pick(BPM_CHOICES, rnd);
   const sourceOf = (kind) => kind === "chorus" || kind === "interlude" ? "b" : kind === "prechorus" ? "a2" : "a";
   const units2 = [];
   for (const section of sectionPlan) {
@@ -14280,19 +14396,19 @@ var draw = (options, rnd) => {
     return null;
   };
   const style = {
-    groove: pick2(["eighth", "sixteenth"], rnd),
-    arcPeriod: pick2([4, 8, 8, 16], rnd),
-    arcPhase: pick2([0, 1, 2], rnd),
+    groove: pick(["eighth", "sixteenth"], rnd),
+    arcPeriod: pick([4, 8, 8, 16], rnd),
+    arcPhase: pick([0, 1, 2], rnd),
     arcAmp: 3 + rnd() * 4,
     octaveAffinity: 0.14 + rnd() * 0.2,
     pentatonicMotif: rnd() < 0.55,
-    runShape: pick2(["scale", "turn", "broken", "zigzag"], rnd),
-    stepShape: pick2(
+    runShape: pick(["scale", "turn", "broken", "zigzag"], rnd),
+    stepShape: pick(
       ["arch", "valley", "ascend", "descend", "wave", "pivot"],
       rnd
     ),
-    holdShape: pick2(["long", "third", "neighbor"], rnd),
-    cadenceShape: pick2(
+    holdShape: pick(["long", "third", "neighbor"], rnd),
+    cadenceShape: pick(
       ["descend", "five-three-one", "leap-up", "hold-tonic"],
       rnd
     ),
@@ -14302,7 +14418,7 @@ var draw = (options, rnd) => {
     // 全曲に掛けると「どの曲も同じ味付け」になる）。
     chromaticAffinity: rnd() < 0.25 ? 0 : 0.15 + rnd() * 0.45,
     barHeadWeight: rnd() < 0.65 ? 3 : 2,
-    bassStyle: pick2(
+    bassStyle: pick(
       [
         "quarter",
         "alternate",
@@ -14323,8 +14439,8 @@ var draw = (options, rnd) => {
     // パッド・保続音・付点2分は「置いただけの音」になりやすく、実際
     // サブメロの音の38%が全音符1つ（1.5音/小節）まで薄くなっていた。
     // それらは終止の小節でだけ使う逃げ道に降格する。
-    subStyle: pick2(["harmony", "harmony", "counter"], rnd),
-    subInterval: pick2([3, 4, 8, 9], rnd)
+    subStyle: pick(["harmony", "harmony", "counter"], rnd),
+    subInterval: pick([3, 4, 8, 9], rnd)
   };
   const motifPool = groovyCells(MOTIF_CELLS, style.groove, rnd);
   const targetNotesPerBar = 5.5 + rnd() * 2.5;
@@ -14341,9 +14457,9 @@ var draw = (options, rnd) => {
   };
   const cellDistance = (c) => Math.abs(cellNotes(c) - targetNotesPerBar) + Math.abs(cellRest(c) - targetRestRatio) * 8;
   const pickCell = (pool) => {
-    let best = pick2(pool, rnd);
+    let best = pick(pool, rnd);
     for (let i2 = 0; i2 < 2; i2++) {
-      const c = pick2(pool, rnd);
+      const c = pick(pool, rnd);
       if (cellDistance(c) < cellDistance(best)) best = c;
     }
     return best;
@@ -14366,7 +14482,7 @@ var draw = (options, rnd) => {
   const motifBVar = pickCell(
     motifPool.filter((c) => c !== motifB && c !== motifB2)
   );
-  const buildUpCell = pick2(
+  const buildUpCell = pick(
     [
       {
         value: [EIGHTH, EIGHTH, EIGHTH, EIGHTH, QUARTER, -QUARTER],
@@ -14387,7 +14503,7 @@ var draw = (options, rnd) => {
     ],
     rnd
   );
-  const counterRhythm = pick2(
+  const counterRhythm = pick(
     groovyCells(
       RHYTHM_CELLS.filter((c) => c.density === "medium"),
       style.groove,
@@ -14395,7 +14511,7 @@ var draw = (options, rnd) => {
     ),
     rnd
   ).value;
-  const breathCell = pick2(
+  const breathCell = pick(
     RHYTHM_CELLS.filter(
       (c) => c.density === "sparse" && c.value.some((v) => v < 0)
     ),
@@ -14432,14 +14548,14 @@ var draw = (options, rnd) => {
     barRhythms.push(scaleCell(cell.value));
   }
   const motifNoteCount = motifCell.value.filter((v) => v > 0).length + motifCell2.value.filter((v) => v > 0).length;
-  const archetype = pick2(MOTIF_ARCHETYPES, rnd);
+  const archetype = pick(MOTIF_ARCHETYPES, rnd);
   const motifContour = [];
   let baseDegree = 0;
   for (let i2 = 0; i2 < motifNoteCount; i2++) {
     const idx = i2 % archetype.length;
     if (i2 > 0 && idx === 0) {
       const lastVal = motifContour[i2 - 1];
-      const connectShift = pick2([-1, 0, 1], rnd);
+      const connectShift = pick([-1, 0, 1], rnd);
       baseDegree = lastVal + connectShift - archetype[0];
     }
     motifContour.push(baseDegree + archetype[idx]);
@@ -14457,12 +14573,12 @@ var draw = (options, rnd) => {
   let intervals = 0;
   let chromaticNotes = 0;
   let sungBars = 0;
-  let prevSemi = pick2([60, 64, 65, 67, 69, 72, 74, 76], rnd);
+  let prevSemi = pick([60, 64, 65, 67, 69, 72, 74, 76], rnd);
   const pickFigure = (gapSteps, scale) => {
     const fits = ANSWER_FIGURES.filter(
       (f) => f.reduce((sum, v) => sum + scale(Math.abs(v)), 0) <= gapSteps
     );
-    return fits.length === 0 ? null : pick2(fits, rnd);
+    return fits.length === 0 ? null : pick(fits, rnd);
   };
   const melodyGaps = (slots) => {
     const gaps = [];
@@ -14503,7 +14619,7 @@ var draw = (options, rnd) => {
     ).semi;
     const contourOffset = barInUnit(bar) === 0 ? 0 : barRhythms[bar - 1].filter((v) => v > 0).length;
     const prevRole = bar > 0 ? barRoles[bar - 1] : null;
-    const repeatShift = role === "motif" && (prevRole === "motif" || prevRole === "sequence" || prevRole === "climax") ? pick2([-2, -1, 1, 2], rnd) : 0;
+    const repeatShift = role === "motif" && (prevRole === "motif" || prevRole === "sequence" || prevRole === "climax") ? pick([-2, -1, 1, 2], rnd) : 0;
     const degrees = barDegrees(
       role,
       slots,
@@ -14799,6 +14915,9 @@ var draw = (options, rnd) => {
     chordProgression,
     chordPattern,
     rootShift,
+    keyName: resolvedKey.keyName,
+    keyLabel: resolvedKey.keyLabel,
+    moodLabel: resolvedKey.moodLabel,
     bpm,
     sections: sectionPlan,
     bars: totalBars,
@@ -14913,12 +15032,13 @@ var composeSong = (options) => {
   const rnd = options.random ?? Math.random;
   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;
   let rejected = 0;
   for (let attempt = 1; attempt <= count; attempt++) {
-    const d = draw(options, rnd);
+    const d = draw(options, resolvedKey, rnd);
     const { stats, ok } = evaluate(d, recent);
     if (!ok) rejected++;
     const better = ok === bestIsValid ? stats.score > bestScore : ok;
@@ -14928,10 +15048,13 @@ var composeSong = (options) => {
     best = {
       // ドラムは勝った候補にだけ後から付ける（メロディに依存しないので
       // 候補ごとに引いても採点は動かず、40本ぶん無駄になる）。
-      drums: null,
+      drum: "",
       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,
@@ -14944,32 +15067,14 @@ var composeSong = (options) => {
   const result = best;
   result.stats.attempts = count;
   result.stats.rejected = rejected;
-  const levels = new Array(result.bars).fill(1);
-  const crashBars = [];
-  const fillBars = [];
-  for (const section of result.sections) {
-    for (let i2 = 0; i2 < section.bars; i2++)
-      levels[section.startBar + i2] = section.spec.drumLevel;
-    crashBars.push(section.startBar + 1);
-    const fill = section.startBar + section.bars - 1;
-    if (fill > 0) fillBars.push(fill);
-  }
-  result.drums = composeDrumPattern({
-    bars: result.bars,
-    stepsPerBar: options.stepsPerBar,
-    rnd,
-    style: pickDrumStyle(result, rnd),
-    levels,
-    crashBars,
-    fillBars
-  });
+  result.drum = pickBuiltinDrum(result, rnd);
   return result;
 };
-var pickDrumStyle = (song, rnd) => {
+var pickBuiltinDrum = (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);
-  const pool = song.bpm >= 150 ? ["four", "rock", "sixteen"] : short >= 0.6 ? ["sixteen", "four", "rock"] : song.bpm <= 124 && short < 0.4 ? ["ballad", "eight", "ballad"] : ["eight", "rock", "four", "sixteen"];
-  return pick2(pool, rnd);
+  const pool = song.bpm >= 150 ? ["4beat", "dance", "16beat", "disco"] : short >= 0.6 ? ["16beat", "dance", "4beat", "disco"] : song.bpm <= 110 && short < 0.4 ? ["bossa", "8beat"] : ["8beat", "4beat", "16beat"];
+  return pick(pool, rnd);
 };
 var LYRIC_WORDS = [
   "\u3042\u3055",
@@ -15017,7 +15122,7 @@ var composeLyrics = (melody, options) => {
   const quarter = stepsPerBar / 4;
   let buffer = [];
   const nextKana = () => {
-    if (buffer.length === 0) buffer = [...pick2(LYRIC_WORDS, rnd)];
+    if (buffer.length === 0) buffer = [...pick(LYRIC_WORDS, rnd)];
     return buffer.shift();
   };
   const out = [];
@@ -15382,6 +15487,56 @@ var buildUI = (target, options) => {
         <span class="dtm-grow"></span>
         <span class="dtm-hint" data-dtm="compose-sections-len"></span>
       </div>
+      <div class="dtm-row ${showCompose ? "" : "dtm-hidden"}" data-dtm="compose-key-row">
+        <span class="dtm-label">\u30D9\u30FC\u30B9\u8ABF</span>
+        <select class="dtm-select" data-dtm="compose-key" title="\u81EA\u52D5\u4F5C\u66F2\u306E\u30D9\u30FC\u30B9\u3068\u306A\u308B\u8ABF\u3084\u96F0\u56F2\u6C17\u3092\u9078\u3073\u307E\u3059">
+          <option value="any" title="\u516824\u8ABF\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u6C7A\u5B9A\u3057\u307E\u3059">\u5E0C\u671B\u306A\u3057</option>
+          <optgroup label="\u57FA\u672C">
+            <option value="major" title="12\u306E\u9577\u8ABF\u306E\u4E2D\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u62BD\u9078\u3057\u307E\u3059">\u9577\u8ABF</option>
+            <option value="minor" title="12\u306E\u77ED\u8ABF\u306E\u4E2D\u304B\u3089\u30E9\u30F3\u30C0\u30E0\u306B\u62BD\u9078\u3057\u307E\u3059">\u77ED\u8ABF</option>
+          </optgroup>
+          <optgroup label="\u96F0\u56F2\u6C17\u304B\u3089\u9078\u3076\uFF08\u62BD\u9078\uFF09">
+            <option value="mood_happy" title="\u30CF\u9577\u8ABF\u30FB\u30A4\u9577\u8ABF\u30FB\u5909\u30ED\u9577\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u7121\u57A2\u306B\u559C\u3070\u3057\u3044\u3001\u7267\u6B4C\u7684\u3001\u967D\u6C17\uFF09">\u559C\u3070\u3057\u3044\u30FB\u967D\u6C17\u306A\u66F2</option>
+            <option value="mood_triumphant" title="\u30CB\u9577\u8ABF\u30FB\u5909\u30C8\u9577\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u610F\u6C17\u63DA\u3005\u3001\u52DD\u5229\u306E\u558A\u58F0\u3001\u56F0\u96E3\u6253\u7834\u3001\u5B89\u5835\uFF09">\u52DD\u5229\u30FB\u529B\u5F37\u3044\u66F2</option>
+            <option value="mood_fierce" title="\u30DB\u9577\u8ABF\u30FB\u30D8\u9577\u8ABF\u30FB\u30ED\u9577\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u3051\u3093\u304B\u3063\u65E9\u3044\u3001\u6012\u308A\u72C2\u3063\u305F\u8352\u3005\u3057\u3055\u3001\u3069\u304E\u3064\u304F\u731B\u70C8\uFF09">\u6FC0\u3057\u3044\u30FB\u8352\u3005\u3057\u3044\u66F2</option>
+            <option value="mood_solemn" title="\u30C8\u9577\u8ABF\u30FB\u30CB\u77ED\u8ABF\u30FB\u30A4\u77ED\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u53B3\u7C9B\u3001\u5D07\u9AD8\u3001\u5E7B\u60F3\u3001\u656C\u8654\u3001\u601D\u7D22\u7684\uFF09">\u53B3\u7C9B\u30FB\u5E7B\u60F3\u7684\u306A\u66F2</option>
+            <option value="mood_plaintive" title="\u30CF\u77ED\u8ABF\u30FB\u30DB\u77ED\u8ABF\u30FB\u30D8\u77ED\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u7D14\u7C8B\u306B\u60B2\u3057\u3052\u3001\u604B\u308F\u305A\u3089\u3044\u3001\u843D\u3061\u7740\u304D\u306E\u306A\u3044\u3001\u7269\u60B2\u3057\u3044\u54C0\u6101\uFF09">\u7269\u60B2\u3057\u3044\u30FB\u54C0\u6101\u306E\u66F2</option>
+            <option value="mood_melancholy" title="\u5909\u30CB\u9577\u8ABF\u30FB\u30ED\u77ED\u8ABF\u30FB\u5B30\u30CF\u77ED\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u60B2\u3057\u307F\u3001\u6182\u9B31\u3001\u5B64\u72EC\u3001\u5FCD\u8010\u3001\u843D\u80C6\u3001\u60B2\u6D99\uFF09">\u6182\u9B31\u30FB\u5B64\u72EC\u306A\u66F2</option>
+            <option value="mood_anxious" title="\u30C8\u77ED\u8ABF\u30FB\u5909\u30DB\u77ED\u8ABF\u30FB\u5B30\u30D8\u77ED\u8ABF\u30FB\u5909\u30A4\u77ED\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u4E0D\u6E80\u3001\u4E0D\u5B89\u3001\u6DF1\u3044\u82E6\u60A9\u3001\u9670\u6C17\u306A\u61A4\u308A\uFF09">\u4E0D\u5B89\u30FB\u82E6\u60A9\u306A\u66F2</option>
+            <option value="mood_dark" title="\u5909\u30DB\u9577\u8ABF\u30FB\u5909\u30A4\u9577\u8ABF\u30FB\u5909\u30ED\u77ED\u8ABF\u304B\u3089\u62BD\u9078\uFF08\u53B3\u3057\u3044\u611B\u3001\u6B7B\u3001\u6C38\u9060\u3001\u88C1\u304D\u3001\u6697\u95C7\u3001\u6050\u308D\u3057\u3044\u5632\u308A\uFF09">\u6697\u95C7\u30FB\u91CD\u539A\u306A\u66F2</option>
+          </optgroup>
+          <optgroup label="\u9577\u8ABF\uFF08\u500B\u5225\u6307\u5B9A\uFF09">
+            <option value="key_C" title="\u7121\u57A2\u306B\u559C\u3070\u3057\u3044\u3001\u7D14\u7C8B\u3001\u7D20\u6734\u3001\u51FA\u767A">\u30CF\u9577\u8ABF (C)</option>
+            <option value="key_Db" title="\u60B2\u3057\u307F\u3001\u6182\u9B31\u306A\u3001\u7518\u7F8E\u306A\u611F\u50B7">\u5909\u30CB\u9577\u8ABF (D\u266D)</option>
+            <option value="key_D" title="\u610F\u6C17\u63DA\u3005\u3068\u3057\u305F\u3001\u52DD\u5229\u306E\u3001\u558A\u58F0">\u30CB\u9577\u8ABF (D)</option>
+            <option value="key_Eb" title="\u53B3\u3057\u3044\u3001\u304D\u3064\u3044\u3001\u305D\u308C\u3067\u3044\u3066\u611B\u306B\u6E80\u3061\u305F">\u5909\u30DB\u9577\u8ABF (E\u266D)</option>
+            <option value="key_E" title="\u3051\u3093\u304B\u3063\u65E9\u3044\u3001\u8352\u3005\u3057\u3044\u3001\u8F1D\u304B\u3057\u3044\u60C5\u71B1">\u30DB\u9577\u8ABF (E)</option>
+            <option value="key_F" title="\u6012\u308A\u72C2\u3063\u305F\u3001\u6C17\u6027\u306E\u8352\u3044\u3001\u4E00\u6642\u7684\u306A\u60B2\u5606">\u30D8\u9577\u8ABF (F)</option>
+            <option value="key_Gb" title="\u56F0\u96E3\u306E\u6253\u7834\u3001\u5B89\u5835\u306E\u305F\u3081\u606F\u3001\u51F1\u65CB">\u5909\u30C8\u9577\u8ABF (G\u266D)</option>
+            <option value="key_G" title="\u53B3\u7C9B\u306A\u3001\u5D07\u9AD8\u306A\u3001\u5E7B\u60F3\u3001\u8AA0\u5B9F">\u30C8\u9577\u8ABF (G)</option>
+            <option value="key_Ab" title="\u6B7B\u3001\u6C38\u9060\u3001\u88C1\u304D\u3001\u6DF1\u9060\u306A\u7791\u60F3">\u5909\u30A4\u9577\u8ABF (A\u266D)</option>
+            <option value="key_A" title="\u3046\u308C\u3057\u3044\u3001\u7267\u6B4C\u7684\u306A\u3001\u611B\u306E\u544A\u767D">\u30A4\u9577\u8ABF (A)</option>
+            <option value="key_Bb" title="\u559C\u3070\u3057\u3044\u3001\u98A8\u5909\u308F\u308A\u306A\u3001\u967D\u6C17\u306A\u3001\u8EFD\u5FEB">\u5909\u30ED\u9577\u8ABF (B\u266D)</option>
+            <option value="key_B" title="\u3069\u304E\u3064\u3044\u3001\u5F37\u70C8\u306A\u3001\u8352\u3063\u307D\u3044\u3001\u731B\u70C8">\u30ED\u9577\u8ABF (B)</option>
+          </optgroup>
+          <optgroup label="\u77ED\u8ABF\uFF08\u500B\u5225\u6307\u5B9A\uFF09">
+            <option value="key_Am" title="\u67D4\u3089\u304B\u306A\u3001\u7269\u60B2\u3057\u3044\u3001\u656C\u8654\u306A\u3001\u7D20\u6734\u306A\u54C0\u6101">\u30A4\u77ED\u8ABF (Am)</option>
+            <option value="key_Bbm" title="\u6050\u308D\u3057\u3044\u3001\u6697\u95C7\u3001\u5632\u308B\u3088\u3046\u306A\u3001\u4E0D\u6C17\u5473">\u5909\u30ED\u77ED\u8ABF (B\u266Dm)</option>
+            <option value="key_Bm" title="\u5B64\u72EC\u306A\u3001\u6182\u9B31\u306A\u3001\u5FCD\u8010\u3001\u9759\u304B\u306A\u8AE6\u5FF5">\u30ED\u77ED\u8ABF (Bm)</option>
+            <option value="key_Cm" title="\u7D14\u7C8B\u306B\u60B2\u3057\u3052\u306A\u3001\u604B\u308F\u305A\u3089\u3044\u306E\u3001\u60B2\u5287\u7684">\u30CF\u77ED\u8ABF (Cm)</option>
+            <option value="key_Csm" title="\u843D\u80C6\u3001\u6CE3\u304D\u53EB\u3093\u3060\u3001\u60B2\u6D99\u306E\u3001\u6DF1\u3044\u5606\u304D">\u5B30\u30CF\u77ED\u8ABF (C\u266Fm)</option>
+            <option value="key_Dm" title="\u53B3\u7C9B\u306A\u3001\u656C\u8654\u306A\u3001\u601D\u7D22\u7684\u306A\u3001\u91CD\u539A\u306A\u7948\u308A">\u30CB\u77ED\u8ABF (Dm)</option>
+            <option value="key_Ebm" title="\u6DF1\u3044\u82E6\u60A9\u3001\u5B9F\u5B58\u7684\u306A\u4E0D\u5B89\u3001\u6226\u6144">\u5909\u30DB\u77ED\u8ABF (E\u266Dm)</option>
+            <option value="key_Em" title="\u5F31\u3005\u3057\u3044\u3001\u306A\u307E\u3081\u304B\u3057\u3044\u3001\u843D\u3061\u7740\u304D\u306E\u306A\u3044">\u30DB\u77ED\u8ABF (Em)</option>
+            <option value="key_Fm" title="\u307C\u3093\u3084\u308A\u3057\u305F\u3001\u7269\u60B2\u3057\u3044\u3001\u3057\u3081\u3084\u304B\u306A\u3001\u846C\u9001">\u30D8\u77ED\u8ABF (Fm)</option>
+            <option value="key_Fsm" title="\u9670\u6C17\u306A\u3001\u6FC0\u3057\u3044\u61A4\u308A\u3001\u6697\u3044\u60C5\u5FF5">\u5B30\u30D8\u77ED\u8ABF (F\u266Fm)</option>
+            <option value="key_Gm" title="\u4E0D\u6E80\u3001\u4E0D\u5B89\u3001\u3084\u308B\u305B\u306A\u3055\u3001\u60B2\u75DB\u306A\u53EB\u3073">\u30C8\u77ED\u8ABF (Gm)</option>
+            <option value="key_Abm" title="\u4E0D\u670D\u306A\u3001\u5606\u304D\u306E\u3001\u6CE3\u304D\u53EB\u3093\u3060">\u5909\u30A4\u77ED\u8ABF (A\u266Dm)</option>
+          </optgroup>
+        </select>
+        <span class="dtm-grow"></span>
+        <span class="dtm-hint" data-dtm="compose-key-hint"></span>
+      </div>
       <div class="dtm-row">
         <span class="dtm-label">\u5168\u4F53\u30B7\u30D5\u30C8</span>
         <select class="dtm-select" data-dtm="shift-select">
@@ -15577,6 +15732,8 @@ var buildUI = (target, options) => {
     macroCompose: sel("macro-compose"),
     composeSections: sel("compose-sections"),
     composeSectionsLen: sel("compose-sections-len"),
+    composeKey: sel("compose-key"),
+    composeKeyHint: sel("compose-key-hint"),
     macroComposeVocal: sel("macro-compose-vocal"),
     macroComposeInfo: sel("macro-compose-info"),
     macroClear: sel("macro-clear"),
@@ -19348,6 +19505,7 @@ var mountDAW = (target, options = {}) => {
       redrawAll();
     },
     onEnd: (interrupted) => {
+      options.onScheduleFade?.(null);
       if (interrupted) {
         playbackState = "paused";
         pausedPlayStep = currentPlayStep;
@@ -19439,15 +19597,20 @@ var mountDAW = (target, options = {}) => {
       }
       if (fadeOutSec > 0) {
         const endStep = getSongEndStepExact();
-        const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
-        if (totalDurationSec > 0) {
-          const fadeOutEndAt = anchor + totalDurationSec;
-          const earliestStart = params.fadeInEndAt ?? anchor;
-          params.fadeOutEndAt = fadeOutEndAt;
-          params.fadeOutStartAt = Math.max(
-            fadeOutEndAt - fadeOutSec,
-            earliestStart
-          );
+        if (endStep > fromStep) {
+          const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
+          if (totalDurationSec > 0.1) {
+            const fadeOutEndAt = anchor + totalDurationSec;
+            const earliestStart = params.fadeInEndAt ?? anchor;
+            const fadeOutStartAt = Math.max(
+              fadeOutEndAt - fadeOutSec,
+              earliestStart
+            );
+            if (fadeOutStartAt < fadeOutEndAt) {
+              params.fadeOutStartAt = fadeOutStartAt;
+              params.fadeOutEndAt = fadeOutEndAt;
+            }
+          }
         }
       }
       options.onScheduleFade?.(params);
@@ -21472,6 +21635,16 @@ var mountDAW = (target, options = {}) => {
     };
     refs.composeSections.addEventListener("change", updateComposeSectionsLen);
     updateComposeSectionsLen();
+    const updateComposeKeyHint = () => {
+      if (!refs.composeKey || !refs.composeKeyHint) return;
+      const desc = getComposeKeyDescription(refs.composeKey.value);
+      refs.composeKeyHint.textContent = desc;
+      refs.composeKeyHint.title = desc;
+    };
+    if (refs.composeKey) {
+      refs.composeKey.addEventListener("change", updateComposeKeyHint);
+      updateComposeKeyHint();
+    }
     const runCompose = (withVocal) => {
       stop();
       overlayDuring(() => {
@@ -21479,6 +21652,7 @@ var mountDAW = (target, options = {}) => {
           stepsPerBar: renderConfig.stepsPerBar,
           edo: renderConfig.edo,
           sections: selectedComposeSections(),
+          baseKey: refs.composeKey?.value ?? "any",
           // 直近に作った曲の特徴を渡すと、それらから離れた候補に加点される。
           // 「作曲」を続けて押したときに似た曲が並ぶのを防ぐ。
           recent: recentComposeFingerprints
@@ -21551,7 +21725,10 @@ var mountDAW = (target, options = {}) => {
           }
         }
         setBpm(song.bpm);
-        applyComposedDrumPattern(song.drums.def);
+        currentDrumPattern = song.drum;
+        refs.drumSelect.value = song.drum;
+        options.onDrumChange?.(song.drum);
+        applyDrumPatternFont(song.drum);
         for (const t of bassTracksForCompose()) {
           t.trackCompression = AUTO_ROLE_MIX.bass.compression;
           options.onTrackCompressionChange?.(t.config.id, t.trackCompression);
@@ -21570,6 +21747,10 @@ var mountDAW = (target, options = {}) => {
             fireLyricsChange(melodyTrack);
           }
         }
+        if (refs.composeKeyHint) {
+          refs.composeKeyHint.textContent = `${song.keyLabel} \u3067\u4F5C\u6210`;
+          refs.composeKeyHint.title = `${song.keyLabel}${song.moodLabel ? `\uFF08${song.moodLabel}\uFF09` : ""}`;
+        }
         playStartStep = 0;
         redrawAll();
         updateTrackPanel();
@@ -21920,9 +22101,6 @@ var mountDAW = (target, options = {}) => {
     extractedMidiDrum = patternDef.pattern;
     installDrumPattern("_extracted_midi", patternDef);
   };
-  const applyComposedDrumPattern = (patternDef) => {
-    installDrumPattern("_composed", patternDef);
-  };
   const wireMidi = () => {
     refs.midiInput.addEventListener("change", async () => {
       const file = refs.midiInput.files?.[0];
@@ -23880,6 +24058,8 @@ var createDtmStudio = async (options = {}) => {
     };
   };
   const resumeAudio = () => {
+    fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
+    fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
   };
@@ -24441,7 +24621,7 @@ var createDtmStudio = async (options = {}) => {
         await loadInstrument(key);
       }
     };
-    void Promise.all([
+    const presetPromise = Promise.all([
       loadPreset(
         playerPreset,
         loadTrackIds,
@@ -24481,25 +24661,29 @@ var createDtmStudio = async (options = {}) => {
         duration: e.duration
       });
     };
+    const { onResumeAudio: userOnResumeAudio, ...playerOpts } = opts;
     const player = mountMmlPlayer(target, mml, {
+      ...playerOpts,
       getAudioTime: () => audioCtx.currentTime,
       onResumeAudio: async () => {
         await resumeAudio();
+        await presetPromise;
         if (meta.drum) {
           await loadRequiredDrums(
             getDrumPatternKeys(
               meta.drum,
-              resolveDrumPatterns(opts.drumPatterns ?? options.drumPatterns)
+              resolveDrumPatterns(
+                playerOpts.drumPatterns ?? options.drumPatterns
+              )
             ),
             meta.drumFont || "FluidR3_GM_sf2_file:0"
           );
         }
-        await opts.onResumeAudio?.();
+        await userOnResumeAudio?.();
       },
       onPlayNote: playPlayerNote,
       onPlayDrum: playDrum,
-      singingVoices,
-      ...opts
+      singingVoices
     });
     mountedPlayers.push(player);
     const destroy = () => {
@@ -24532,7 +24716,7 @@ var createDtmStudio = async (options = {}) => {
         await loadInstrument(key);
       }
     };
-    void Promise.all([
+    const presetPromise = Promise.all([
       loadPreset(
         playerPreset,
         loadTrackIds,
@@ -24572,8 +24756,9 @@ var createDtmStudio = async (options = {}) => {
         duration: e.duration
       });
     };
+    const { onResumeAudio: userOnResumeAudio, ...playOpts } = opts;
     return playMML(mml, {
-      ...opts,
+      ...playOpts,
       audioContext: audioCtx,
       destination: masterGain,
       synth: false,
@@ -24581,15 +24766,18 @@ var createDtmStudio = async (options = {}) => {
       onPlayDrum: playDrum,
       onResumeAudio: async () => {
         await resumeAudio();
+        await presetPromise;
         if (meta.drum) {
           await loadRequiredDrums(
             getDrumPatternKeys(
               meta.drum,
-              resolveDrumPatterns(opts.drumPatterns ?? options.drumPatterns)
+              resolveDrumPatterns(
+                playOpts.drumPatterns ?? options.drumPatterns
+              )
             )
           );
         }
-        await opts.onResumeAudio?.();
+        await userOnResumeAudio?.();
       }
     });
   };
@@ -24616,7 +24804,7 @@ var createDtmStudio = async (options = {}) => {
         await loadInstrument(key);
       }
     };
-    void Promise.all([
+    const presetPromise = Promise.all([
       loadPreset(
         playerPreset,
         loadTrackIds,
@@ -24656,8 +24844,9 @@ var createDtmStudio = async (options = {}) => {
         duration: e.duration
       });
     };
+    const { onResumeAudio: userOnResumeAudio, ...playOpts } = opts;
     return playSingingMML(mml, {
-      ...opts,
+      ...playOpts,
       audioContext: audioCtx,
       destination: masterGain,
       synth: false,
@@ -24666,15 +24855,18 @@ var createDtmStudio = async (options = {}) => {
       onPlayDrum: playDrum,
       onResumeAudio: async () => {
         await resumeAudio();
+        await presetPromise;
         if (meta.drum) {
           await loadRequiredDrums(
             getDrumPatternKeys(
               meta.drum,
-              resolveDrumPatterns(opts.drumPatterns ?? options.drumPatterns)
+              resolveDrumPatterns(
+                playOpts.drumPatterns ?? options.drumPatterns
+              )
             )
           );
         }
-        await opts.onResumeAudio?.();
+        await userOnResumeAudio?.();
       }
     });
   };
@@ -24711,9 +24903,7 @@ var createDtmStudio = async (options = {}) => {
     if (!sfInst) return;
     const vol = options2.volume ?? 80;
     const dur = options2.duration ?? 1;
-    if (audioCtx.state === "suspended") {
-      await audioCtx.resume();
-    }
+    await resumeAudio();
     const { midi, detuneCents } = unitsToMidiDetune(options2.pitchUnits);
     sfInst.play({
       ctx: audioCtx,
@@ -24743,7 +24933,7 @@ var createDtmStudio = async (options = {}) => {
       velocity: p.velocity
     }));
     const playerPreset = defaultPreset;
-    void loadPreset(playerPreset, ["chord"]);
+    const presetPromise = loadPreset(playerPreset, ["chord"]);
     const playPlayerNote = (e) => {
       const sfInst = resolveSoundFont(playerPreset, "chord");
       if (!sfInst) return;
@@ -24759,16 +24949,21 @@ var createDtmStudio = async (options = {}) => {
         duration: e.duration
       });
     };
+    const { onResumeAudio: userOnResumeAudio, ...chordOpts } = opts;
     return playPlacements(placements, {
-      ...opts,
+      ...chordOpts,
       audioContext: audioCtx,
       destination: masterGain,
       synth: false,
       onPlayNote: playPlayerNote,
       onPlayDrum: playDrum,
-      onResumeAudio: resumeAudio,
+      onResumeAudio: async () => {
+        await resumeAudio();
+        await presetPromise;
+        await userOnResumeAudio?.();
+      },
       bpm,
-      metaVolume: opts.volume ?? 100
+      metaVolume: chordOpts.volume ?? 100
     });
   };
   const mountChordPlayerInstance = (target, chords, options2 = {}) => {
@@ -24894,6 +25089,8 @@ export {
   A4_UNITS,
   BREATH_MARK,
   CENTS_PER_UNIT,
+  COMPOSE_KEYS,
+  COMPOSE_MOOD_GROUPS,
   CORPUS_BANDS,
   CORPUS_SIZE,
   DAW_CSS,
@@ -24920,8 +25117,10 @@ export {
   KOE_VOICEBANK_LABELS,
   KOE_VOICEBANK_TERMS,
   LinkedList,
+  MAJOR_KEY_IDS,
   MAX_VOCAL_VOLUME,
   MICRO_STEP,
+  MINOR_KEY_IDS,
   MMLCore,
   MML_END_MARKER,
   MidiSearchClient,
@@ -24990,6 +25189,7 @@ export {
   formatMmlMeta,
   freqFromPitch,
   generateRandomPattern,
+  getComposeKeyDescription,
   getDrumPatternKeys,
   getMidiBPM,
   icon,
@@ -25019,6 +25219,7 @@ export {
   playNote,
   playPlacements,
   playSingingMML,
+  resolveComposeKey,
   resolveDrumPattern,
   resolveLoopPoint,
   semitonesToUnits,