@onjmin/dtm 2.1.6 → 2.1.9

package/dist/index.js

@@ -156,6 +156,7 @@ __export(index_exports, {
   playNote: () => playNote,
   playPlacements: () => playPlacements,
   playSingingMML: () => playSingingMML,
+  programOfInstrumentName: () => programOfInstrumentName,
   readGlobalBool: () => readGlobalBool,
   readGlobalNumber: () => readGlobalNumber,
   readGlobalSetting: () => readGlobalSetting,
@@ -339,6 +340,14 @@ async function buildNameToKeyMapping() {
   return nameToKey;
 }
 var GM_INSTRUMENT_NAMES = FONT_NAME_SURIKOV.trim().split("\n").map((line) => line.slice(line.indexOf(" ") + 1));
+var programOfInstrumentName = (name) => {
+  if (!name) return null;
+  const stripped = name.replace(/\s+/g, "").toLowerCase();
+  const idx = GM_INSTRUMENT_NAMES.findIndex(
+    (n) => n.replace(/\s+/g, "").toLowerCase() === stripped
+  );
+  return idx >= 0 ? idx : null;
+};
 
 // node_modules/.pnpm/@onjmin+chord-parser@1.1.1/node_modules/@onjmin/chord-parser/dist/index.mjs
 var SHARP_NAMES = [
@@ -12702,44 +12711,365 @@ var mountChordPlayer = (target, chords, options = {}) => {
 // src/compose-corpus.ts
 var CORPUS_SIZE = 91;
 var CORPUS_BANDS = {
-  entropy: [0.127, 0.621, 1.182, 1.754],
-  valueKinds: [2, 3, 5.5, 7],
-  restRatio: [9e-3, 0.06, 0.167, 0.351],
-  leapRatio: [0.255, 0.306, 0.653, 0.959],
-  stepRatio: [0.023, 0.202, 0.61, 0.693],
-  chromaticRatio: [0, 0.018, 0.121, 0.237],
-  maxLeap: [6.5, 9, 15, 19],
-  melodyRange: [11, 17, 24, 29.5],
-  notesPerBar: [3.192, 5.043, 7.261, 11.995],
-  shortNoteRatio: [0.428, 0.756, 0.957, 1],
-  sim1: [0.362, 0.483, 0.709, 0.898],
-  sim2: [0.397, 0.508, 0.781, 0.909],
-  sim4: [0.437, 0.569, 0.786, 0.916],
-  sim8: [0.063, 0.585, 0.784, 0.972],
-  phraseBreath: [0, 0.058, 0.26, 0.884],
-  climaxPosition: [0.026, 0.132, 0.625, 0.92],
-  climaxPeaks: [1, 2, 14.5, 26],
-  complementarity: [0, 0.013, 0.115, 0.388]
+  entropy: [0.25, 0.711, 1.237, 1.754],
+  valueKinds: [2, 3, 6, 7],
+  restRatio: [0.016, 0.091, 0.223, 0.464],
+  leapRatio: [0.202, 0.28, 0.412, 0.71],
+  stepRatio: [0.188, 0.438, 0.617, 0.693],
+  chromaticRatio: [0, 0.017, 0.121, 0.242],
+  maxLeap: [5, 8, 12, 16],
+  melodyRange: [8, 17, 22, 28],
+  notesPerBar: [2.743, 4.77, 6.473, 11.995],
+  shortNoteRatio: [0.055, 0.753, 0.91, 1],
+  barDensityCv: [0.148, 0.206, 0.328, 0.451],
+  densityCliff: [0, 0, 0.043, 0.125],
+  sim1: [0.345, 0.465, 0.598, 0.803],
+  sim2: [0.389, 0.5, 0.647, 0.845],
+  sim4: [0.437, 0.549, 0.723, 0.882],
+  sim8: [0.063, 0.561, 0.771, 0.972],
+  phraseBreath: [0, 0.115, 0.323, 0.884],
+  turnRatio: [0.4, 0.478, 0.556, 0.769],
+  climaxPosition: [0.016, 0.14, 0.655, 0.92],
+  climaxPeaks: [1, 2, 13.5, 26],
+  complementarity: [0, 0.026, 0.179, 0.405]
 };
 var CORPUS_MEDIANS = {
-  entropy: 0.898,
+  entropy: 0.907,
   valueKinds: 4,
-  restRatio: 0.116,
-  leapRatio: 0.391,
-  stepRatio: 0.504,
-  chromaticRatio: 0.06,
+  restRatio: 0.149,
+  leapRatio: 0.339,
+  stepRatio: 0.538,
+  chromaticRatio: 0.052,
   maxLeap: 12,
-  melodyRange: 21,
-  notesPerBar: 5.898,
-  shortNoteRatio: 0.842,
-  sim1: 0.554,
-  sim2: 0.575,
-  sim4: 0.676,
-  sim8: 0.699,
-  phraseBreath: 0.167,
+  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: 7,
-  complementarity: 0.045
+  climaxPeaks: 6,
+  complementarity: 0.075
+};
+var CORPUS_CELL_WEIGHTS = {
+  "0,2,4,6,8,10,12,14": 584,
+  "0,2,4,6,8,12,14": 512,
+  "0,4,6,8,10,12,14": 246,
+  "0,8": 187,
+  "0,4,8,10,12,14": 158,
+  "0,6,8,10,12,14": 153,
+  "2,5,10,13": 128,
+  "0,12,14": 123,
+  "0,4,6,8,12,14": 114,
+  "0,4,8,12": 110,
+  "0": 105,
+  "0,2,4,6,8,12": 103,
+  "0,4,8,12,14": 102,
+  "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15": 89,
+  "0,2,4,6,8": 76,
+  "0,6,8,12,14": 58,
+  "0,6,8,14": 48,
+  "0,4,6,8,12": 44,
+  "0,4,8,14": 44,
+  "0,2,4,5,6,8,9,10,12,13,14,15": 44,
+  "2,6,10,14": 42,
+  "0,8,12": 40,
+  "0,2,4,6,8,10,12": 39,
+  "0,3,9,10,11,12,13,14,15": 36,
+  "0,3,6,8,11,14": 32,
+  "0,2,4,6,7,9,10,12,14": 32,
+  "0,2,4,6,10,12,14": 31,
+  "0,10,12,14": 28,
+  "12,14": 27,
+  "0,2,4,6,8,14": 27,
+  "0,6,8,12": 25,
+  "0,4,6,8,10,12": 24,
+  "0,1,2,4,5,6,7,8,9,10,11,12,13,14,15": 24,
+  "2,4,6,8,10,12,14": 22,
+  "0,6,8": 19,
+  "0,12": 19,
+  "8,12": 17,
+  "0,2,4,8,12,14": 16,
+  "0,3,5,6,7,8,11,13,14,15": 16,
+  "0,3,4,5,6,7,8,10,12,14": 16,
+  "0,14": 15,
+  "0,4,8": 15,
+  "0,4,6,8,14": 14,
+  "0,4,6,8,10,11,12,14": 14,
+  "2,4,6,8": 13,
+  "0,4,6,10,12,14": 13,
+  "0,4,6,8": 13,
+  "0,2,4,8,9,11,14,15": 12,
+  "0,4,8,10,11,12,14": 12,
+  "0,2,4,6,8,9,12,14": 12,
+  "0,3,4,6,8,12,14": 12,
+  "0,2,4,6,8,11,14": 12,
+  "0,2,4,5,6,7,8,9,10,11,12,14": 12,
+  "2,4,6,8,12,14": 11,
+  "0,2,4,8,10,12": 11,
+  "0,1,2,3,4,5,6,7,8,9,10,11,12": 11,
+  "0,2,4,6,8,10,11,12,14": 10,
+  "0,4,6,7,8,14,15": 10,
+  "0,8,10,12,14": 10,
+  "0,3,4,6,8,10,12,14": 9,
+  "0,2,3,4,6,8,12,14": 9,
+  "0,2,4,5,6,8,12,14": 9,
+  "0,3,4,6,8,9,10,11,12": 9,
+  "0,3,4,6,8,9,10,11,12,14,15": 9,
+  "0,3,4,6,7,8,10,12,14,15": 9,
+  "0,2,4,5,6,7,8,9,10,12,13,14,15": 9,
+  "0,2,4,8,10,12,14": 8,
+  "0,2,4,6,8,10,12,14,15": 8,
+  "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15": 8,
+  "0,3,6,8,12,14": 7,
+  "0,1,2,3,4,5,6,7,8": 7,
+  "0,4,8,10,12": 7,
+  "0,2,3,4,5,6,7,8": 7,
+  "0,3,4,6,8,12": 6,
+  "0,2,4,6,10,14": 6,
+  "4,12": 6,
+  "0,6,8,10,14": 6,
+  "0,2,3,4,5,6,7,8,9,10,11,12": 6,
+  "0,1,2,3,4,6,7,8,10,12,14,15": 6,
+  "0,3,6,8,12": 6,
+  "2,4,6,8,10,11,12,14": 6,
+  "6,8,10,12,14": 5,
+  "2,6,8,10,12,14": 5,
+  "0,8,12,14": 5,
+  "0,3,4,6,8": 5,
+  "0,8,11,14": 5,
+  "0,3,4,6,8,10,11,12,14": 5,
+  "0,3,6,8": 5,
+  "0,1,4,8,9,12,13": 5,
+  "10,12,14": 5,
+  "0,4,6,8,10,11,12,13,14": 5,
+  "12,13,14,15": 5,
+  "0,2,4,7,8,14,15": 5,
+  "0,4,8,9,10,11,12,13,14,15": 5,
+  "0,4,7,8,14,15": 5,
+  "0,4,8,9,10,11,12": 5,
+  "0,2,6,8,10,12,14": 5,
+  "2,4,6,12,14": 4,
+  "0,2,4,6,7,8,10,12,14": 4,
+  "4,5,7,8,10,12,13,14": 4,
+  "0,2,3,4,5,8,9,12,13": 4,
+  "2,3,4,6,8,12,13,14": 4,
+  "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14": 4,
+  "0,2,4,8,12": 4,
+  "4,6,8,10,12": 4,
+  "0,2,4,5,6,8,12,13,14,15": 4,
+  "0,2,3,4,6,8": 4,
+  "0,4,6,8,10,12,13,14": 4,
+  "0,6,8,12,14,15": 4,
+  "0,4,8,9,10,12,14": 4,
+  "0,3,4,7,8,9,10,11,12": 4,
+  "0,1,2,3,4,5,7,8,9,10,11,12": 4,
+  "2,4,8,12": 4,
+  "0,2,4,6,10,12": 4,
+  "0,3,4,6,7,8,9,10,12,14": 4,
+  "0,3,6,9,11,12": 4,
+  "0,1,4,6,8,12,14": 4,
+  "4,8,12": 4,
+  "2,4,6,14": 3,
+  "0,3,4,8": 3,
+  "0,2,4,12,14": 3,
+  "14": 3,
+  "0,4,6,12,14": 3,
+  "0,6,10,12,14": 3,
+  "4,8,9,11,14": 3,
+  "0,2,4,8,9,11,14": 3,
+  "0,4,8,9,11,14": 3,
+  "0,2,4,5,7,9,11,12": 3,
+  "0,3,6,8,10,12,14": 3,
+  "0,3,4,6,8,11,12,14": 3,
+  "0,1,4,5,8,9,12,13": 3,
+  "0,2,4,5,8,9": 3,
+  "2,3,4,6,8,9,12,14": 3,
+  "0,2,4,8": 3,
+  "0,2,3,4,5,6,8,9": 3,
+  "2,3,4,6,8,10,12,13": 3,
+  "12,14,15": 3,
+  "0,2,3,4,6,7,8,10,12": 3,
+  "0,2,3,4,5,6,7,8,9,10,12": 3,
+  "0,1,2,3,4,5,6,7,8,9,10,11,12,14": 3,
+  "0,2,3,4,6,7,8,9,10,11,12": 3,
+  "0,4,6,12": 3,
+  "0,2,3,6,8,11,14": 3,
+  "0,2,6,8,12,14": 3,
+  "2,4,6,8,14,15": 3,
+  "0,2,4,6,12,14": 2,
+  "2,4,6,10,12,14": 2,
+  "4,6,10,12,14": 2,
+  "0,8,14": 2,
+  "2,4,8,10,12,14": 2,
+  "8": 2,
+  "0,2,4,6,8,9,10,11,12,14": 2,
+  "0,2,4,6,8,12,13,14": 2,
+  "0,6,8,11,12,14": 2,
+  "0,1,2,3,4,5,6,7,8,9,11,12,13,14,15": 2,
+  "0,1,3,4,5,6,7,8,9,10,11,12,13,14,15": 2,
+  "0,6,7,8,10,12": 2,
+  "0,3,6,7,8,10,12": 2,
+  "1,2,3,4,6,8,10,12,13": 2,
+  "0,2,8,10,12,14": 2,
+  "0,2,7,8,9,10": 2,
+  "4,8,9,10,12,13": 2,
+  "0,2,4,7,8,9,10": 2,
+  "2,4,7,8,12,15": 2,
+  "0,4,7,8,10": 2,
+  "0,4,8,9,12,13": 2,
+  "0,2,4,5,6,8,9": 2,
+  "0,1,4": 2,
+  "0,4": 2,
+  "0,3,6,10,12,14": 2,
+  "0,2,6,10,12,14": 2,
+  "0,2,3,4,6,8,14,15": 2,
+  "2,4,6,8,12,14,15": 2,
+  "0,2,4,6,8,9,10,12": 2,
+  "0,3,6,8,10,12": 2,
+  "0,3,4,6,8,10,14": 2,
+  "0,4,8,11,12,14": 2,
+  "0,2,4,6,8,9,10,11,12,13,14": 2,
+  "0,2,4,5,6,7,8,9,10,12": 2,
+  "0,1,2,3,4,6,7,8,9,10,12,14": 2,
+  "0,1,2,4,5,6,8,9,10,11,12,13,14": 2,
+  "0,1,2,3,4,6,7,8,9,10,11,12,13,14": 2,
+  "0,1,2,3,4,6,7,8,9,10,11,12,13,14,15": 2,
+  "0,1,2,4,6,8,9,10,11,12,13,14": 2,
+  "0,1,2,3,4,5,6,8,9,10,11,12,13,14": 2,
+  "0,1,2,3,4,6,7,8,9,10,12,13,14,15": 2,
+  "0,2,4,6,8,9,10,11,12,13,14,15": 2,
+  "0,2,3,4,5,6,8,10,12": 2,
+  "0,2,3,4,5,6,7,8,10,11,12": 2,
+  "0,2,3,4,6,7,8,9,10,12": 2,
+  "0,1,2,3,4,6,7,8,9,10,11,12": 2,
+  "0,4,5,8,12,13": 2,
+  "0,3,4,5,8,11,12,13": 2,
+  "0,2,4,7,8,9": 2,
+  "0,4,6,7,8,12": 2,
+  "0,2,3,4,6,7,8,10,11,12,14": 2,
+  "0,2,3,4,5,6,7,8,10,11,12,13": 2,
+  "12": 2,
+  "0,2,4,6,8,13": 2,
+  "2,4,6,8,11,14": 2,
+  "0,5,8,13": 2,
+  "0,2,4,6,8,10,11,12,13,14": 2,
+  "0,4,6,8,10,11,12,13,14,15": 2,
+  "0,5,8,12": 2,
+  "2,4,6,8,14": 1,
+  "0,6,7,8,14": 1,
+  "0,6,8,14,15": 1,
+  "0,6,7,8,10,11,12,13": 1,
+  "0,6,7,8,9,10,11,12,14": 1,
+  "0,1,2,4,6,7,8,10,11,12,13,14,15": 1,
+  "0,4,8,10,11,12": 1,
+  "0,6,7,8,11,14": 1,
+  "0,2,5,8,11,14": 1,
+  "0,2,4,6,8,10,11,12": 1,
+  "0,11,14": 1,
+  "0,8,11,12,13,14,15": 1,
+  "0,1,12": 1,
+  "0,3,5,8,12": 1,
+  "0,4,8,11,14": 1,
+  "2,6,8,11,14": 1,
+  "0,2,3,4,6,8,12": 1,
+  "0,4,6,8,11,12,14": 1,
+  "0,1,12,14": 1,
+  "0,9,12": 1,
+  "0,3": 1,
+  "0,1": 1,
+  "4,6,8,14": 1,
+  "2,12,14": 1,
+  "2,8,12": 1,
+  "0,3,6,8,11": 1,
+  "10,12,14,15": 1,
+  "0,2,3,6,8,9,11,14": 1,
+  "0,2,4,8,10,11": 1,
+  "0,2,4,6,7,8,10,12,13": 1,
+  "2,3,4,5,8,10,12,13,15": 1,
+  "0,2,3,4,5,6,8,10,11,12": 1,
+  "4,6,8,10,11,12": 1,
+  "0,1,2,3,4,6,8,9,10,13,15": 1,
+  "0,1,2,3,4,10,11,12": 1,
+  "0,3,6,7,8,9,11": 1,
+  "0,2,4,5,8,10,11,15": 1,
+  "0,2,4,6,7,8,9,12,13": 1,
+  "0,1,2,4,5,8,10,12,13": 1,
+  "0,2,3,4,5,6,8,10,11,12,13": 1,
+  "4,6,8,10,11,12,13": 1,
+  "0,3,8,12,14": 1,
+  "0,3,4,5,7,8,9,10,12,14,15": 1,
+  "0,2,4,6,8,9,11": 1,
+  "10,14": 1,
+  "0,2,4,6,9,10,12,14": 1,
+  "0,2,4,6,7,9,10,12": 1,
+  "0,2,3,5,8,10,12,13,14": 1,
+  "0,1,2,3,5,6,7,8,9,10,12,13,14": 1,
+  "2,3,4,6,7,8,12,13,14": 1,
+  "0,1,2,3,6,7,8,10,12,13,14": 1,
+  "2,3,4,5,6,8,9,10,11,12,13,14": 1,
+  "0,2,3,4,5,6,7,8,9,10,11,12,13,14": 1,
+  "2,3,4,6,8,9,10,11,12,13,14,15": 1,
+  "0,3,4,7,8,11,12": 1,
+  "0,4,10,12,14": 1,
+  "0,3,4,7,8,11,12,15": 1,
+  "0,4,12,14": 1,
+  "0,4,12": 1,
+  "0,4,7,8,10,11,12,14": 1,
+  "2,6,8,12": 1,
+  "0,2,4,5,6,8": 1,
+  "2,6,8,10,12": 1,
+  "0,2,4,6,8,12,13,14,15": 1,
+  "0,4,6,8,10,11,12": 1,
+  "0,4,8,10,11,12,13,14": 1,
+  "0,2,3,4,6,7,8,9,10,12,13,14,15": 1,
+  "0,2,4,5,6,8,9,10,11,12,13,14": 1,
+  "0,3,4,7,8,9,10,12,13": 1,
+  "0,1,2,4,6,7,8,9,10,12,13,14,15": 1,
+  "0,2,3,4,5,6,8,9,10,11,12,13,14": 1,
+  "0,4,6,7,8,10,12,14,15": 1,
+  "0,2,4,6,7,8,10,12,14,15": 1,
+  "0,1,2,3,4,5,7,8,10,11,12": 1,
+  "0,2,4,6,7,8,9,10,11,12,14": 1,
+  "0,1,2,4,5,6,7,8,10,12,14,15": 1,
+  "0,2,3,4,5,7,8,9,10,11,12": 1,
+  "0,2,3,4,6,7,8,10,11,12": 1,
+  "0,8,9,10,11,12,13,14,15": 1,
+  "14,15": 1,
+  "2,4,6,8,12": 1,
+  "2,4,8,10,12": 1,
+  "0,2,4,8,9,12,14": 1,
+  "0,4,5,8,9,12": 1,
+  "0,4,8,10,14": 1,
+  "0,6,7,12": 1,
+  "0,4,5,8,11,12,13": 1,
+  "0,2,4,8,9": 1,
+  "2,4,7,8,11,12": 1,
+  "0,4,7,8,11": 1,
+  "0,4,8,12,14,15": 1,
+  "0,1,2,4,5,6,7,8,9,10,12": 1,
+  "0,1,2,3,4,5,6,7,8,9,10,12": 1,
+  "0,2,3,4,5,6,7,8,9,10,12,13,14,15": 1,
+  "0,3,4,7,8,9,11,12": 1,
+  "0,1,2,3,4,5,6,7,8,10,11,12,13": 1,
+  "0,6,8,10,12": 1,
+  "0,2,3,4,6,8,10,11,12,14": 1,
+  "0,2,4,6,8,10,13": 1,
+  "2,6,8": 1,
+  "0,2,3,4,6,7,8,12,14": 1,
+  "2,4,6,8,10,14": 1,
+  "0,2,4": 1,
+  "0,2,4,5,6,7,8,9,10": 1,
+  "0,2,4,5,6,7,8,9,10,12,13,14": 1,
+  "0,3,6,10,14": 1,
+  "0,14,15": 1,
+  "0,6,7,12,14": 1,
+  "0,6,8,10,11,12,14": 1
 };
 
 // src/compose-keys.ts
@@ -13074,8 +13404,7 @@ var resolveComposeKey = (choice, rnd = Math.random) => {
   const target = COMPOSE_KEYS[pickedKeyId];
   const targetMood = COMPOSE_MOOD_GROUPS.find((m) => m.id === target.moodId);
   return {
-    mode: void 0,
-    // コード進行の長短制約は掛けず従来通りランダム
+    mode: target.mode,
     rootShift: target.rootShift,
     keyName: target.name,
     keyLabel: target.label,
@@ -13202,9 +13531,24 @@ var complementarity = (melody, submelody, opts) => {
   }
   return free / submelody.length;
 };
+var turnRatio = (notes) => {
+  const sorted = [...notes].sort((a, b) => a.startStep - b.startStep);
+  let turns = 0;
+  let intervals = 0;
+  let prevDir = 0;
+  for (let i2 = 1; i2 < sorted.length; i2++) {
+    const dir = Math.sign(sorted[i2].pitchSemi - sorted[i2 - 1].pitchSemi);
+    if (dir === 0) continue;
+    intervals++;
+    if (prevDir !== 0 && dir !== prevDir) turns++;
+    prevDir = dir;
+  }
+  return intervals === 0 ? 0 : turns / intervals;
+};
 var structureFeatures = (melody, submelody, opts) => {
   const sigs = barSignatures(melody, opts);
   return {
+    turnRatio: turnRatio(melody),
     sim1: selfSimilarity(sigs, 1),
     sim2: selfSimilarity(sigs, 2),
     sim4: selfSimilarity(sigs, 4),
@@ -13214,13 +13558,40 @@ var structureFeatures = (melody, submelody, opts) => {
     complementarity: complementarity(melody, submelody, opts)
   };
 };
+var barNoteCounts = (notes, opts) => {
+  const out = new Array(Math.max(1, opts.bars)).fill(0);
+  for (const n of notes) {
+    const bar = Math.floor(n.startStep / opts.stepsPerBar);
+    if (bar >= 0 && bar < out.length) out[bar]++;
+  }
+  return out;
+};
 var densityFeatures = (notes, opts) => {
-  if (notes.length === 0) return { notesPerBar: 0, shortNoteRatio: 0 };
+  if (notes.length === 0)
+    return {
+      notesPerBar: 0,
+      shortNoteRatio: 0,
+      barDensityCv: 0,
+      densityCliff: 0
+    };
   const eighth = opts.stepsPerBar / 8;
   const short = notes.filter((n) => n.durationSteps <= eighth).length;
+  const counts = barNoteCounts(notes, opts);
+  const sung = counts.filter((c) => c > 0);
+  const mean2 = sung.reduce((a, b) => a + b, 0) / Math.max(1, sung.length);
+  const variance = sung.reduce((a, b) => a + (b - mean2) ** 2, 0) / Math.max(1, sung.length);
+  let cliffs = 0;
+  let pairs = 0;
+  for (let i2 = 1; i2 < counts.length; i2++) {
+    if (counts[i2 - 1] < 3 || counts[i2] === 0) continue;
+    pairs++;
+    if (counts[i2] <= counts[i2 - 1] * 0.3) cliffs++;
+  }
   return {
     notesPerBar: notes.length / Math.max(1, opts.bars),
-    shortNoteRatio: short / notes.length
+    shortNoteRatio: short / notes.length,
+    barDensityCv: mean2 === 0 ? 0 : Math.sqrt(variance) / mean2,
+    densityCliff: pairs === 0 ? 0 : cliffs / pairs
   };
 };
 var tensionFeatures = (barTension, opts) => {
@@ -13516,8 +13887,8 @@ var sectionAt = (plan, bar) => {
 
 // src/compose.ts
 var STEP_SEMITONES = 2;
-var MAX_LEAP_SEMITONES = 12;
-var MAX_BAR_LEAP_SEMITONES = 12;
+var MAX_LEAP_SEMITONES = 10;
+var MAX_BAR_LEAP_SEMITONES = 10;
 var HARD = {
   /** メロディが1音も無い、音域が半音未満（同じ音を並べただけ）。 */
   minMelodyRange: 3,
@@ -13543,6 +13914,9 @@ var WEIGHTS = {
    */
   notesPerBar: 0.8,
   shortNoteRatio: 0.6,
+  /** 小節ごとの音数のばらつきと崖。平均だけを見ていて見逃していた偏り。 */
+  barDensityCv: 0.6,
+  densityCliff: 1,
   /** 順次進行の比率。跳躍率だけを見ていると、跳躍の帯の上端に張り付く。 */
   stepRatio: 0.8,
   /** 調の外の音。0のままだと全曲が同じ音階をなぞるだけになる。 */
@@ -13555,10 +13929,15 @@ var WEIGHTS = {
   sim4: 1.4,
   sim8: 1.4,
   phraseBreath: 1,
+  /** 折り返しの多さ。跳躍率・順次進行率が揃っていても、これは別に足りなくなる。 */
+  turnRatio: 0.8,
   climaxPosition: 1,
   climaxPeaks: 1,
   /** メロディとサブメロが呼応しているか。 */
   complementarity: 1,
+  /** サブメロの音数と、その崖。メロディと同じ物差しで見る。 */
+  subDensity: 0.6,
+  subDensityCliff: 0.5,
   // --- 和声（コードが要るのでコーパスからは較正できない） ---
   /** B部でテンションが上がるか。 */
   tensionRise: 1,
@@ -13634,6 +14013,10 @@ var FLAT_NOTE_NAMES = [
   "Bb",
   "B"
 ];
+var fifthsDistance = (semitones) => {
+  const steps = (semitones * 7 % 12 + 12) % 12;
+  return Math.min(steps, 12 - steps);
+};
 var SEMITONE_TO_FIFTH_SHIFT = [
   0,
   // 0: C
@@ -13786,6 +14169,22 @@ var SECTION_A_PROGRESSIONS = [
   // ジャズ寄りの2-5-1
   ["Dm7", "G7", "Em7", "Am7"],
   // 2-5-3-6
+  // --- ライン・クリシェ（内声が半音ずつ動く） ---
+  // 和音の1声だけを半音で動かして、和音記号は変わるのに響きは繋がったまま進む。
+  // J-POPのサビ後半やAメロの定番。
+  ["Am", "AmM7", "Am7", "Am6"],
+  // ラ→ソ#→ソ→ファ# の下行
+  ["C", "CM7", "C7", "F"],
+  // ド→シ→シb→ラ
+  ["Am", "AmM7", "Am7", "D7"],
+  // クリシェからドリアンのIVへ
+  ["F", "Fm", "CM7", "Am7"],
+  // サブドミナントマイナーのクリシェ
+  // --- ペダルポイント（ベースを保続する） ---
+  // ベースだけ動かさずに上の和音を変える。緊張感が出る。分数和音のルートを
+  // {@link chordTones} が先頭で返すので、ベースは自然に保続音になる。
+  ["C", "Am/C", "F/C", "G/C"],
+  ["Am", "Em/A", "F/A", "G/A"],
   // --- 借用和音（同主短調・ミクソリディアンから借りる） ---
   // **調の外の和音を進行そのものに持たせる。** ここまでの候補は全部ハ長調／イ短調の
   // ダイアトニックで、セカンダリドミナント以外に調の外の音が出てこなかった。
@@ -13842,10 +14241,34 @@ var SECTION_A2_DERIVATIONS = [
 var SECTION_A3_DERIVATIONS = [
   (a, t) => [a[0], a[1], "G7", t],
   (a, t) => [a[0], "Dm7", "G7", t],
-  (a, t) => [a[0], "F", "G7", t],
   (a, t) => [a[0], a[1], "Em7", t],
-  (a, t) => [a[0], "FM7", "G7", t]
+  // アーメン終止（IV→I）
+  (a, t) => [a[0], "G7", "F", t],
+  (a, t) => [a[0], "Dm7", "FM7", t],
+  // サブドミナントマイナー終止（IVm→I）
+  (a, t) => [a[0], "G7", "Fm", t],
+  (a, t) => [a[0], "F", "Fm", t]
 ];
+var SECTION_DECEPTIVE_DERIVATIONS = [
+  (a, t) => [a[0], a[1], "G7", t === "Am" ? "F" : "Am"],
+  (a, t) => [a[0], "Dm7", "G7", t === "Am" ? "FM7" : "Am7"],
+  (a, t) => [a[0], "F", "G7", t === "Am" ? "F" : "Am7"]
+];
+var MODAL_BORROW = {
+  F: "Fm",
+  // IV → IVm（サブドミナントマイナー。いちばん定番）
+  FM7: "Fm7",
+  Am: "Ab",
+  // VIm → ♭VI
+  Am7: "Ab",
+  G: "Bb",
+  // V → ♭VII（ミクソリディアン）
+  G7: "Bb",
+  Em7: "Eb",
+  // IIIm → ♭III
+  Dm7: "Dm7-5"
+  // IIm7 → IIm7♭5（エオリアン）
+};
 var CHORD_PATTERNS = [
   "block",
   "arpeggio",
@@ -13853,6 +14276,7 @@ var CHORD_PATTERNS = [
   "yatsume",
   "alternating"
 ];
+var chordPatternPool = (bpm) => bpm <= 130 ? [...CHORD_PATTERNS, "arpeggio-fast"] : CHORD_PATTERNS;
 var CHORD_TONE_WEIGHT = {
   0: 3,
   // ルート
@@ -14030,6 +14454,54 @@ var RHYTHM_CELLS = [
     density: "dense"
   }
 ];
+var PHRASE_END_CELLS = [
+  // 白玉で受けてから息を継ぐ（いちばん歌らしい終わり方）。
+  { value: [HALF, QUARTER, -QUARTER], density: "sparse" },
+  { value: [DOT_QUARTER, EIGHTH, HALF], density: "sparse" },
+  { value: [QUARTER, DOT_QUARTER, EIGHTH, -QUARTER], density: "sparse" },
+  // 2音で降りてから息を継ぐ。
+  { value: [QUARTER, QUARTER, -HALF], density: "sparse" },
+  { value: [DOT_QUARTER, EIGHTH, -HALF], density: "sparse" },
+  { value: [HALF, -QUARTER, QUARTER], density: "sparse" },
+  // 3音で言い切ってから息を継ぐ。
+  { value: [EIGHTH, EIGHTH, QUARTER, -HALF], density: "sparse" },
+  { value: [QUARTER, EIGHTH, EIGHTH, -HALF], density: "sparse" },
+  { value: [QUARTER, QUARTER, QUARTER, -QUARTER], density: "sparse" },
+  { value: [HALF, EIGHTH, EIGHTH, -QUARTER], density: "sparse" },
+  // 4音で言い切ってから息を継ぐ。周りが7音前後の曲では、2音まで落とすと崖になる。
+  { value: [EIGHTH, EIGHTH, EIGHTH, EIGHTH, -HALF], density: "sparse" },
+  { value: [QUARTER, EIGHTH, EIGHTH, QUARTER, -QUARTER], density: "sparse" },
+  { value: [EIGHTH, EIGHTH, QUARTER, QUARTER, -QUARTER], density: "sparse" }
+];
+var MID_BREATH_CELLS = [
+  { value: [QUARTER, EIGHTH, EIGHTH, QUARTER, -QUARTER], density: "medium" },
+  { value: [EIGHTH, EIGHTH, QUARTER, QUARTER, -QUARTER], density: "medium" },
+  { value: [DOT_QUARTER, EIGHTH, QUARTER, QUARTER], density: "medium" },
+  { value: [QUARTER, QUARTER, EIGHTH, EIGHTH, -QUARTER], density: "medium" },
+  { value: [EIGHTH, EIGHTH, EIGHTH, EIGHTH, HALF], density: "medium" },
+  { value: [QUARTER, EIGHTH, EIGHTH, DOT_QUARTER, EIGHTH], density: "medium" }
+];
+var CELL_GRID = BASE_STEPS_PER_BAR / 16;
+var onsetKeyOf = (value) => {
+  const on = [];
+  let at = 0;
+  for (const v of value) {
+    if (v > 0) on.push(Math.round(at / CELL_GRID));
+    at += Math.abs(v);
+  }
+  return on.join(",");
+};
+var UNSEEN_CELL_WEIGHT = 0.5;
+var cellEntryCount = /* @__PURE__ */ new Map();
+var cellWeightCache = /* @__PURE__ */ new Map();
+var cellWeight = (c) => {
+  const cached = cellWeightCache.get(c.value);
+  if (cached !== void 0) return cached;
+  const key = onsetKeyOf(c.value);
+  const w = (CORPUS_CELL_WEIGHTS[key] ?? UNSEEN_CELL_WEIGHT) / Math.max(1, cellEntryCount.get(key) ?? 1);
+  cellWeightCache.set(c.value, w);
+  return w;
+};
 var HALF_BAR_FIGURES = [
   [EIGHTH, EIGHTH, EIGHTH, EIGHTH],
   // タタタタ
@@ -14062,6 +14534,14 @@ var HALF_BAR_FIGURES = [
   // 2拍目裏からのアウフタクト（タタ）
   [QUARTER, -EIGHTH, EIGHTH],
   // ター・休タ（8分裏弱起）
+  // **3+3+2（トレシーヨ）。** 参考曲91本で最も多かった「語彙に無い形」で、
+  // 174小節ぶんの穴が空いていた（`scripts/compare-vocabulary.ts` の①）。
+  // 付点8分が `[DOT_EIGHTH, SIXTEENTH]` の対でしか入っておらず、
+  // 付点8分を2つ並べる形が作れなかった。界隈曲・ボカロの推進力の中心。
+  [DOT_EIGHTH, DOT_EIGHTH, EIGHTH],
+  [DOT_EIGHTH, DOT_EIGHTH, EIGHTH],
+  // 4分音符が全部8分裏に来る形（食い）。参考曲で67小節ぶん取りこぼしていた。
+  [-EIGHTH, QUARTER, EIGHTH],
   // 付点8分＋16分（タッカ）。歌モノで非常に多用される跳ね・推進力の型。
   [DOT_EIGHTH, SIXTEENTH, EIGHTH, EIGHTH],
   [EIGHTH, EIGHTH, DOT_EIGHTH, SIXTEENTH],
@@ -14227,9 +14707,21 @@ var MOTIF_CELLS = [
   ...buildMotifCells(),
   ...HAND_MOTIF_CELLS
 ];
+for (const c of [...MOTIF_CELLS, ...RHYTHM_CELLS]) {
+  const key = onsetKeyOf(c.value);
+  cellEntryCount.set(key, (cellEntryCount.get(key) ?? 0) + 1);
+}
 var groovyCells = (cells, groove, rnd) => {
   const hasSixteenth = (c) => c.value.some((v) => Math.abs(v) <= SIXTEENTH);
-  if (groove === "eighth") return cells.filter((c) => !hasSixteenth(c));
+  if (groove === "eighth") {
+    const plain = cells.filter((c) => !hasSixteenth(c));
+    const spiced = cells.filter(hasSixteenth);
+    if (spiced.length === 0) return plain;
+    const out = [...plain];
+    const take = Math.max(1, Math.round(plain.length * 0.1));
+    for (let i2 = 0; i2 < take; i2++) out.push(pick(spiced, rnd));
+    return out;
+  }
   const withSixteenth = cells.filter(hasSixteenth);
   return withSixteenth.length > 0 && rnd() < 0.75 ? withSixteenth : cells;
 };
@@ -14350,8 +14842,35 @@ var nearestChordTone = (targetSemi, tones, minWeight, preferColor = false) => {
   return best;
 };
 var MELODY_LOW = 60;
-var MELODY_HIGH = 84;
+var MELODY_HIGH = 81;
 var MELODY_CENTER = (MELODY_LOW + MELODY_HIGH) / 2;
+var harmonyPitch = (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;
+  let bestCost = Number.POSITIVE_INFINITY;
+  for (const tone of tones) {
+    const pc = pitchClass(tone.semi);
+    for (let oct = 0; oct <= 10; oct++) {
+      const semi = pc + oct * 12;
+      const delta = semi - melodySemi;
+      if (delta > hi || delta < lo) continue;
+      const move = prevHarmony === null ? 0 : Math.abs(semi - prevHarmony);
+      const stay = parallel ? move * 0.06 : move <= 2 ? move * 0.04 : 0.1 + (move - 2) * 0.9;
+      let clash = 0;
+      if (against !== null) {
+        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;
+      if (cost < bestCost) {
+        bestCost = cost;
+        best = { semi, fifth: tone.fifth };
+      }
+    }
+  }
+  return best ?? nearestChordTone(melodySemi + offset, tones, 2);
+};
 var SUBMELODY_LOW = 55;
 var SUBMELODY_HIGH = 74;
 var BASS_LOW = 33;
@@ -14533,9 +15052,12 @@ var barDegrees = (role, slots, tones, style, motifContour, startDegree, contourO
   }
   return out;
 };
-var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, pentatonic) => {
+var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, pentatonic, preferShift) => {
   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++) {
     const moved = degrees.map(
       (d) => pentatonic ? pentaToDegree(degreeToPenta(d) + shift) : d + shift
@@ -14557,12 +15079,19 @@ var fitMotif = (degrees, slots, tones, prevSemi, quarterSteps, pentatonic) => {
       MELODY_HIGH
     );
     score -= Math.max(0, Math.abs(head - prevSemi) - MAX_BAR_LEAP_SEMITONES);
+    if (shift === preferShift) {
+      preferScore = score;
+      preferMoved = moved;
+    }
     if (score > bestScore) {
       bestScore = score;
+      bestShift = shift;
       best = moved;
     }
   }
-  return best;
+  if (preferMoved !== null && preferScore >= bestScore - 3)
+    return { degrees: preferMoved, shift: preferShift };
+  return { degrees: best, shift: bestShift };
 };
 var shapeBar = (degrees, slots, tones, prevSemi, opts) => {
   const out = [];
@@ -14735,9 +15264,24 @@ var draw = (options, resolvedKey, rnd) => {
     options.template
   );
   const totalBars = sectionPlan.reduce((sum, s) => sum + s.bars, 0);
-  if (rnd() < 0.35) {
+  const relativeKinds = /* @__PURE__ */ new Set();
+  let relativeShift = 0;
+  if (rnd() < 0.25) {
+    for (const kind of pick(
+      [["prechorus"], ["bridge"], ["prechorus", "bridge"]],
+      rnd
+    ))
+      relativeKinds.add(kind);
+    if (rnd() < 0.33) relativeShift = resolvedKey.mode === "minor" ? -3 : 3;
+  }
+  const floating = rnd() < 0.12;
+  if (relativeKinds.size > 0 && relativeShift !== 0) {
+    for (const s of sectionPlan)
+      if (relativeKinds.has(s.kind)) s.keyShift = relativeShift;
+  }
+  if (relativeKinds.size === 0 && !floating && rnd() < 0.32) {
     const modType = pick(
-      ["chorus_up", "chorus_up", "prechorus_down"],
+      ["chorus_up", "chorus_up", "color", "dominant", "subdominant"],
       rnd
     );
     if (modType === "chorus_up") {
@@ -14746,15 +15290,83 @@ var draw = (options, resolvedKey, rnd) => {
       for (let i2 = 0; i2 < sectionPlan.length; i2++) {
         if (sectionPlan[i2].kind === "chorus") lastChorusIdx = i2;
       }
-      if (lastChorusIdx >= 0) {
-        for (let i2 = lastChorusIdx; i2 < sectionPlan.length; i2++) {
+      if (lastChorusIdx >= 0)
+        for (let i2 = lastChorusIdx; i2 < sectionPlan.length; i2++)
           sectionPlan[i2].keyShift = shift;
-        }
-      }
     } else {
-      const shift = pick([-2, 3], rnd);
-      for (const s of sectionPlan) {
-        if (s.kind === "prechorus") s.keyShift = shift;
+      const shift = modType === "dominant" ? 7 : modType === "subdominant" ? 5 : pick([-2, 3], rnd);
+      const kinds = pick(
+        [["prechorus"], ["bridge"], ["prechorus", "bridge"]],
+        rnd
+      );
+      for (const s of sectionPlan)
+        if (kinds.includes(s.kind)) s.keyShift = shift;
+    }
+  }
+  const harmonyFrom = pick(
+    ["chorus", "chorus", "prechorus"],
+    rnd
+  );
+  const harmonyParallel = rnd() < 0.45;
+  const harmonyCoverage = 0.7 + rnd() * 0.3;
+  const useHarmony2 = rnd() < 0.3;
+  const useOctaveLayer = !useHarmony2 && rnd() < 0.25;
+  const octaveCoverage = 0.3 + rnd() * 0.3;
+  const harmonyOffset = useHarmony2 ? (
+    // 3声のときは1声目を下〜ユニゾン側へ寄せ、2声目を上へ回して主旋律を挟む
+    // （参考: チョウチン少女 ch12/ch11/ch13）。
+    pick([-5, -3, 0, 0, 3], rnd)
+  ) : harmonyParallel ? pick([3, 4, 5, 9, 7, 0, -5], rnd) : pick([3, 4, 5, 0, -5, -4, -7], rnd);
+  let prevHarmony = null;
+  let prevHarmony2 = null;
+  const harmony2Offset = harmonyOffset + pick([9, 9, 9, 8, 7], rnd);
+  const harmonyKinds = harmonyFrom === "prechorus" ? ["prechorus", "chorus", "bridge"] : ["chorus"];
+  const duetStyle = pick(
+    [
+      "none",
+      "none",
+      "none",
+      "none",
+      "none",
+      "section",
+      "phrase",
+      "chorus",
+      "verse"
+    ],
+    rnd
+  );
+  const duetOwner = new Array(totalBars).fill(false);
+  if (duetStyle !== "none") {
+    let melodySection = 0;
+    for (const section of sectionPlan) {
+      if (!section.spec.melody) continue;
+      const isChorus = section.kind === "chorus" || section.kind === "drop_chorus";
+      const isVerse = section.kind === "verse";
+      const takeSection = melodySection % 2 === 1;
+      melodySection++;
+      const alternate = duetStyle === "phrase" ? !isChorus : duetStyle === "chorus" ? isChorus : duetStyle === "verse" ? isVerse : false;
+      if (!alternate && !(duetStyle === "section" && takeSection && !isChorus))
+        continue;
+      for (let b = section.startBar; b < section.startBar + section.bars; b++) {
+        if (alternate) {
+          if (Math.floor((b - section.startBar) / 2) % 2 === 1)
+            duetOwner[b] = true;
+        } else duetOwner[b] = true;
+      }
+    }
+  }
+  const duetSpans = [];
+  {
+    let from = -1;
+    for (let b = 0; b <= totalBars; b++) {
+      const owned = b < totalBars && duetOwner[b];
+      if (owned && from < 0) from = b;
+      if (!owned && from >= 0) {
+        const lead = from === 0 ? 0 : scaleStep(
+          pick([0, 0, EIGHTH, EIGHTH, QUARTER, DOT_QUARTER], rnd)
+        );
+        duetSpans.push([from * stepsPerBar - lead, b * stepsPerBar]);
+        from = -1;
       }
     }
   }
@@ -14765,41 +15377,114 @@ var draw = (options, resolvedKey, 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 withoutTonic = (pool, root) => {
+    const isTonic = (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 progA = pick(
+    floating ? withoutTonic(progAPool, homeRoot) : progAPool,
+    rnd
+  );
   const progBPool = SECTION_B_PROGRESSIONS.filter(
     (p) => p.join("|") !== progA.join("|")
   );
-  const progB = pick(progBPool, rnd);
+  const progB = pick(
+    floating ? withoutTonic(progBPool, homeRoot) : progBPool,
+    rnd
+  );
+  const progRelativePool = 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(
+    (p) => p.join("|") !== progA.join("|") && p.join("|") !== progB.join("|")
+  );
   const progC = pick(
-    SECTION_C_PROGRESSIONS.filter(
-      (p) => p.join("|") !== progA.join("|") && p.join("|") !== progB.join("|")
-    ),
+    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);
+  let lastChorusBar = -1;
+  for (const section of sectionPlan)
+    if (section.kind === "chorus" || section.kind === "outro")
+      lastChorusBar = section.startBar;
   const progression = [];
   for (const section of sectionPlan) {
-    const base = section.spec.progression === "c" ? progC : section.spec.progression === "b" ? progB : progA;
+    const base = relativeKinds.has(section.kind) ? progRelative : section.spec.progression === "c" ? progC : section.spec.progression === "b" ? progB : progA;
     for (let i2 = 0; i2 < section.bars; i2 += 4) {
       const isLastPhrase = i2 + 4 >= section.bars;
       if (!isLastPhrase) {
         progression.push(...base);
         continue;
       }
-      if (section.kind === "prechorus") progression.push(...progHalf);
+      if (relativeKinds.has(section.kind)) progression.push(...base);
+      else if (section.kind === "prechorus") progression.push(...progHalf);
       else if (section.kind === "chorus" || section.kind === "outro")
-        progression.push(...progFull);
+        progression.push(
+          ...floating ? progHalf : section.startBar === lastChorusBar ? progFull : progDeceptive
+        );
       else progression.push(...base);
     }
   }
   progression.length = totalBars;
+  const PIVOT_CHORDS = {
+    7: ["C", "Em7", "G", "Am"],
+    // 属調（ト長調）と共通
+    5: ["C", "Dm7", "F", "Am"]
+    // 下属調（ヘ長調）と共通
+  };
+  for (let bar = 1; bar < totalBars; bar++) {
+    const shift = barKeyShift[bar];
+    const prev = barKeyShift[bar - 1];
+    if (shift === prev) continue;
+    const distance = fifthsDistance(shift - prev);
+    if (distance >= 4) continue;
+    const prevSec = sectionAt(sectionPlan, bar - 1);
+    if (prevSec.kind === "prechorus" || prevSec.kind === "chorus" || prevSec.kind === "outro")
+      continue;
+    if (rnd() < 0.35) continue;
+    const pivots = PIVOT_CHORDS[((shift - prev) % 12 + 12) % 12];
+    if (distance <= 1 && pivots && rnd() < 0.6) {
+      progression[bar - 1] = pick(pivots, rnd);
+    } else {
+      progression[bar - 1] = transposeChordName("G7", shift - prev);
+    }
+  }
+  if (rnd() < 0.3) {
+    const tonicNames = tonic === "Am" ? ["Am", "Am7"] : ["C", "CM7"];
+    const spots = [];
+    for (let bar = 0; bar + 1 < totalBars; bar++) {
+      if (barKeyShift[bar] !== barKeyShift[bar + 1]) continue;
+      if (!MODAL_BORROW[progression[bar]]) continue;
+      if (!tonicNames.includes(progression[bar + 1])) continue;
+      spots.push(bar);
+    }
+    if (spots.length > 0) {
+      const at = pick(spots, rnd);
+      progression[at] = MODAL_BORROW[progression[at]];
+    }
+  }
   const chordProgression = progression.map((chord, bar) => transposeChordName(chord, barKeyShift[bar])).join("|");
-  const chordPattern = pick(CHORD_PATTERNS, rnd);
   const rootShift = resolvedKey.rootShift;
   const bpm = pick(BPM_CHOICES, rnd);
+  const chordPattern = pick(chordPatternPool(bpm), 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;
+    return landing;
+  };
   const units2 = [];
   for (const section of sectionPlan) {
     const unitCount = Math.max(1, Math.round(section.bars / 2));
@@ -14817,22 +15502,28 @@ var draw = (options, resolvedKey, rnd) => {
       const isLast = u === unitCount - 1;
       if (u % 2 === 0) {
         units2.push({
-          role: section.kind === "chorus" ? "climax" : src === "a2" || u > 0 ? "sequence" : "motif",
+          role: section.kind === "bridge" ? "step" : section.kind === "chorus" ? "climax" : src === "a2" || u > 0 ? "sequence" : "motif",
           source: src,
           landing: null,
           section
         });
       } else {
+        const landing = landingOf(section);
         units2.push({
-          role: isLast && section.spec.landing === 0 ? "cadence" : "answer",
+          role: isLast && landing === 0 ? "cadence" : "answer",
           source: "answer",
-          landing: isLast ? section.spec.landing : null,
+          landing: isLast ? landing : null,
           section
         });
       }
     }
   }
   const barRoles = units2.flatMap((u) => [u.role, u.role]);
+  for (const section of sectionPlan) {
+    if (section.kind !== "prechorus") continue;
+    const last = section.startBar + section.bars - 1;
+    if (last < barRoles.length) barRoles[last] = "run";
+  }
   const barInUnit = (bar) => bar % 2;
   const unitOf = (bar) => Math.floor(bar / 2);
   const restatementOf = (bar) => {
@@ -14863,8 +15554,9 @@ var draw = (options, resolvedKey, 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,
+    arcAmp: 2 + rnd() * 3,
+    // オクターブ跳躍は参考曲では音程の1.0%しかない。上げすぎると音域が広がる。
+    octaveAffinity: 0.06 + rnd() * 0.12,
     pentatonicMotif: rnd() < 0.55,
     runShape: pick(["scale", "turn", "broken", "zigzag"], rnd),
     stepShape: pick(
@@ -14876,10 +15568,14 @@ var draw = (options, resolvedKey, rnd) => {
       ["descend", "five-three-one", "leap-up", "hold-tonic"],
       rnd
     ),
-    // 人間の曲の跳躍率は p25〜p75 で 0.40〜0.55。上限が低いとその帯へ届かない。
-    leapAffinity: 0.08 + rnd() * 0.3,
+    // 参考曲の跳躍率は p25〜p75 で 0.28〜0.41、最大跳躍の中央値は9半音。
+    // 2声を交互に書いたチャンネルを主旋律と誤検出していた頃は 0.31〜0.65 に
+    // 見えており、それに合わせて上限を高く取っていた。
+    leapAffinity: 0.05 + rnd() * 0.2,
     // 界隈曲らしさ：調の外の音（クロマチック）や微小な逸脱を積極的に許容する。
-    chromaticAffinity: rnd() < 0.1 ? 0 : 0.3 + rnd() * 0.6,
+    // 刻みを細かくすると経過音の置き場所が増えるので、同じ係数でも変化音は増える。
+    // 参考曲の1.75倍まで伸びていたぶんを引く。
+    chromaticAffinity: rnd() < 0.2 ? 0 : 0.12 + rnd() * 0.33,
     barHeadWeight: rnd() < 0.5 ? 3 : 2,
     bassStyle: pick(
       [
@@ -14906,7 +15602,7 @@ var draw = (options, resolvedKey, rnd) => {
     subInterval: pick([3, 4, 8, 9], rnd)
   };
   const motifPool = groovyCells(MOTIF_CELLS, style.groove, rnd);
-  const targetNotesPerBar = 4 + rnd() * 4;
+  const targetNotesPerBar = 4.5 + rnd() * 4.5;
   const targetRestRatio = 0.02 + rnd() * 0.1;
   const cellNotes = (c) => c.value.filter((v) => v > 0).length;
   const cellRest = (c) => {
@@ -14919,17 +15615,27 @@ var draw = (options, resolvedKey, rnd) => {
     return total === 0 ? 0 : rest / total;
   };
   const cellDistance = (c, densityMul = 1) => Math.abs(cellNotes(c) - targetNotesPerBar * densityMul) + Math.abs(cellRest(c) - targetRestRatio / Math.max(0.5, densityMul)) * 8;
+  const weightedPick = (pool) => {
+    let total = 0;
+    for (const c of pool) total += cellWeight(c);
+    let r = rnd() * total;
+    for (const c of pool) {
+      r -= cellWeight(c);
+      if (r <= 0) return c;
+    }
+    return pool[pool.length - 1];
+  };
   const pickCell = (pool, densityMul = 1) => {
-    let best = pick(pool, rnd);
+    let best = weightedPick(pool);
     for (let i2 = 0; i2 < 2; i2++) {
-      const c = pick(pool, rnd);
+      const c = weightedPick(pool);
       if (cellDistance(c, densityMul) < cellDistance(best, densityMul))
         best = c;
     }
     return best;
   };
   const motifCell = pickCell(motifPool, 0.85);
-  const motifCell2 = rnd() < 0.45 ? motifCell : pickCell(
+  const motifCell2 = rnd() < 0.72 ? motifCell : pickCell(
     motifPool.filter((c) => c !== motifCell),
     0.85
   );
@@ -14947,7 +15653,7 @@ var draw = (options, resolvedKey, rnd) => {
     ),
     1.1
   );
-  const motifA22 = rnd() < 0.45 ? motifA2 : pickCell(
+  const motifA22 = rnd() < 0.72 ? motifA2 : pickCell(
     motifPool.filter((c) => c !== motifA2),
     1.1
   );
@@ -14957,7 +15663,7 @@ var draw = (options, resolvedKey, rnd) => {
     ),
     0.9
   );
-  const motifC2 = rnd() < 0.45 ? motifC : pickCell(
+  const motifC2 = rnd() < 0.72 ? motifC : pickCell(
     motifPool.filter((c) => c !== motifC),
     0.9
   );
@@ -14996,12 +15702,24 @@ var draw = (options, resolvedKey, rnd) => {
     ),
     rnd
   ).value;
-  const breathCell = pick(
-    RHYTHM_CELLS.filter(
-      (c) => c.density === "sparse" && c.value.some((v) => v < 0)
-    ),
-    rnd
-  );
+  const breathBySection = /* @__PURE__ */ new Map();
+  {
+    let prev = null;
+    for (const section of sectionPlan) {
+      if (!section.spec.melody) continue;
+      const pool = PHRASE_END_CELLS.filter((c) => c !== prev);
+      const cell = pick(pool.length > 0 ? pool : PHRASE_END_CELLS, rnd);
+      breathBySection.set(section.startBar, cell);
+      prev = cell;
+    }
+  }
+  const midBreathCell = pick(MID_BREATH_CELLS, rnd);
+  const breathBars = /* @__PURE__ */ new Set();
+  const phraseEndBars = /* @__PURE__ */ new Set();
+  for (const section of sectionPlan) {
+    if (!section.spec.melody) continue;
+    phraseEndBars.add(section.startBar + section.bars - 1);
+  }
   const barRhythms = [];
   for (let bar = 0; bar < totalBars; bar++) {
     const u = unitOf(bar);
@@ -15009,6 +15727,7 @@ var draw = (options, resolvedKey, rnd) => {
     const source = restatementOf(bar);
     if (source !== null) {
       barRhythms.push(barRhythms[source]);
+      if (breathBars.has(source)) breathBars.add(bar);
       continue;
     }
     const isB = units2[u].source === "b";
@@ -15026,7 +15745,14 @@ var draw = (options, resolvedKey, rnd) => {
       const prevSource = units2[u - 1]?.source;
       const [head, tail] = prevSource === "b" ? [motifB, motifB2] : prevSource === "a2" ? [motifA2, motifA22] : [motifCell, motifCell2];
       const answerVar = prevSource === "b" ? motifBVar : motifVar;
-      cell = half === 0 ? rnd() < 0.4 ? answerVar : head : isPeriodEnd ? breathCell : rnd() < 0.35 ? answerVar : tail;
+      if (half === 0) {
+        cell = rnd() < 0.15 ? answerVar : head;
+      } else if (isPeriodEnd) {
+        cell = breathBySection.get(units2[u].section.startBar) ?? tail;
+        breathBars.add(bar);
+      } else {
+        cell = rnd() < 0.28 ? midBreathCell : rnd() < 0.12 ? answerVar : tail;
+      }
     } else {
       const [head, tail] = pair();
       cell = half === 0 ? head : tail;
@@ -15047,10 +15773,12 @@ var draw = (options, resolvedKey, rnd) => {
     motifContour.push(baseDegree + archetype[idx]);
   }
   const plannedDegrees = new Array(totalBars).fill(null);
+  const motifShiftMemo = /* @__PURE__ */ new Map();
   const melody = [];
   const submelody = [];
   const bass = [];
   const harmony = [];
+  const harmony2 = [];
   const pad = [];
   const melodyDurations = [];
   const barTension = new Array(totalBars).fill(0);
@@ -15142,34 +15870,36 @@ var draw = (options, resolvedKey, rnd) => {
     if (landing !== null && barInUnit(bar) === 1) landOn(degrees, landing);
     plannedDegrees[bar] = [...degrees];
     const isMotifBar = source !== null || role === "motif" || role === "sequence" || role === "climax" || role === "answer";
-    const pitches = shapeBar(
-      isMotifBar ? fitMotif(
+    let fitted = degrees;
+    if (isMotifBar) {
+      const shiftKey = degrees.join(",");
+      const r = fitMotif(
         degrees,
         slots,
         tones,
         prevSemi,
         quarterSteps,
-        style.pentatonicMotif
-      ) : degrees,
-      slots,
-      tones,
-      prevSemi,
-      {
-        allowLeap: role === "climax",
-        allowArpeggio: role === "climax" || role === "run" && style.runShape === "broken" || role === "cadence" && style.cadenceShape !== "descend",
-        quarterSteps,
-        // モチーフの小節はオクターブ移動を入れない。モチーフは輪郭が命なので、
-        // 後から音を1つ跳ばすと「同じフレーズが返ってきた」と分からなくなる。
-        // モチーフ側は {@link MOTIF_ARCHETYPES} が自前でオクターブを持つ。
-        // モチーフ・セクエンツ・サビの小節はオクターブ移動を入れない
-        // （輪郭が命なので、後から音を1つ跳ばすと同じフレーズと分からなくなる）。
-        // 答えの小節は輪郭を借りているだけなので許す。
-        octaveAffinity: role === "motif" || role === "sequence" || role === "climax" ? 0 : style.octaveAffinity,
-        chromaticAffinity: style.chromaticAffinity,
-        rnd,
-        preserveContour: isMotifBar
-      }
-    );
+        style.pentatonicMotif,
+        motifShiftMemo.get(shiftKey) ?? null
+      );
+      fitted = r.degrees;
+      motifShiftMemo.set(shiftKey, r.shift);
+    }
+    const pitches = shapeBar(fitted, slots, tones, prevSemi, {
+      allowLeap: role === "climax",
+      allowArpeggio: role === "climax" || role === "run" && style.runShape === "broken" || role === "cadence" && style.cadenceShape !== "descend",
+      quarterSteps,
+      // モチーフの小節はオクターブ移動を入れない。モチーフは輪郭が命なので、
+      // 後から音を1つ跳ばすと「同じフレーズが返ってきた」と分からなくなる。
+      // モチーフ側は {@link MOTIF_ARCHETYPES} が自前でオクターブを持つ。
+      // モチーフ・セクエンツ・サビの小節はオクターブ移動を入れない
+      // （輪郭が命なので、後から音を1つ跳ばすと同じフレーズと分からなくなる）。
+      // 答えの小節は輪郭を借りているだけなので許す。
+      octaveAffinity: role === "motif" || role === "sequence" || role === "climax" ? 0 : style.octaveAffinity,
+      chromaticAffinity: style.chromaticAffinity,
+      rnd,
+      preserveContour: isMotifBar
+    });
     if (landing !== null && barInUnit(bar) === 1) landPitch(pitches, landing);
     const fifths = pitches.map(diatonicFifth);
     applyChromatic(pitches, fifths, slots, tones, {
@@ -15294,23 +16024,50 @@ var draw = (options, resolvedKey, rnd) => {
       pushSub(scaleStep(QUARTER), scaleStep(DOT_HALF), subSemi);
     }
     const barSec = sectionAt(sectionPlan, bar);
-    if (!silent && (barSec.kind === "chorus" || barSec.kind === "drop_chorus")) {
-      for (let i2 = 0; i2 < slots.length; i2++) {
-        const hSemi = pitches[i2] + 3;
-        const hTone = nearestChordTone(hSemi, tones, 2);
-        const hClamped = clampSemi(hTone.semi, MELODY_LOW, MELODY_HIGH);
-        const k = barKeyShift[bar];
-        const fifthShift = k === 0 ? 0 : SEMITONE_TO_FIFTH_SHIFT[(k % 12 + 12) % 12];
-        harmony.push({
-          startStep: barStart + slots[i2].at,
-          pitchUnits: spelledToUnits(
-            hClamped + k,
-            hTone.fifth + fifthShift,
-            edo
-          ),
-          durationSteps: slots[i2].value,
-          velocity: slots[i2].at === 0 ? 82 : 76
-        });
+    if (!silent && harmonyKinds.includes(barSec.kind)) {
+      const k = barKeyShift[bar];
+      const fifthShift = k === 0 ? 0 : SEMITONE_TO_FIFTH_SHIFT[(k % 12 + 12) % 12];
+      const writeHarmony = (out, prev, offset, against) => {
+        let last = prev;
+        const written = [];
+        for (let i2 = 0; i2 < slots.length; i2++) {
+          const hTone = harmonyPitch(
+            pitches[i2],
+            tones,
+            last,
+            offset,
+            harmonyParallel,
+            against?.[i2] ?? null
+          );
+          let hClamped = clampSemi(
+            hTone.semi,
+            MELODY_LOW - 12,
+            MELODY_HIGH + 7
+          );
+          while (hClamped - pitches[i2] > 12) hClamped -= 12;
+          while (hClamped - pitches[i2] < -12) hClamped += 12;
+          last = hClamped;
+          written.push(hClamped);
+          const keep = slots[i2].isStrong || slots[i2].value >= quarterSteps || rnd() < harmonyCoverage;
+          if (!keep) continue;
+          out.push({
+            startStep: barStart + slots[i2].at,
+            pitchUnits: spelledToUnits(
+              hClamped + k,
+              hTone.fifth + fifthShift,
+              edo
+            ),
+            durationSteps: slots[i2].value,
+            velocity: slots[i2].at === 0 ? 82 : 76
+          });
+        }
+        return written;
+      };
+      const h1 = writeHarmony(harmony, prevHarmony, harmonyOffset, null);
+      prevHarmony = h1[h1.length - 1] ?? prevHarmony;
+      if (useHarmony2) {
+        const h2 = writeHarmony(harmony2, prevHarmony2, harmony2Offset, h1);
+        prevHarmony2 = h2[h2.length - 1] ?? prevHarmony2;
       }
     }
     if (barSec.kind === "prechorus" || barSec.kind === "chorus" || barSec.kind === "bridge" || barSec.kind === "drop_chorus") {
@@ -15442,6 +16199,7 @@ var draw = (options, resolvedKey, rnd) => {
     for (const n of barBass) bass.push(n);
   }
   const eighthSteps = scaleStep(EIGHTH);
+  const tieMemo = /* @__PURE__ */ new Map();
   for (let i2 = 0; i2 < melody.length - 1; i2++) {
     const cur = melody[i2];
     const nxt = melody[i2 + 1];
@@ -15455,16 +16213,28 @@ var draw = (options, resolvedKey, rnd) => {
     const curSec = sectionAt(sectionPlan, barIdx - 1);
     const nextSec = sectionAt(sectionPlan, barIdx);
     if (!nextSec.spec.melody || curSec !== nextSec) continue;
+    if (breathBars.has(barIdx)) continue;
     const curSemi = Math.round(cur.pitchUnits / UNITS_PER_SEMITONE);
     const nxtSemi = Math.round(nxt.pitchUnits / UNITS_PER_SEMITONE);
     if (Math.abs(nxtSemi - curSemi) > 3) continue;
+    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;
+    }
     const nextRole = barRoles[barIdx];
-    let tieProb = 0.4;
-    if (nextRole === "motif") tieProb = 0.05;
-    else if (nextRole === "sequence") tieProb = 0.75;
-    else if (nextRole === "climax") tieProb = 0.9;
+    let tieProb = 0.3;
+    if (nextRole === "motif") tieProb = 0.1;
+    else if (nextRole === "sequence") tieProb = 0.35;
+    else if (nextRole === "climax") tieProb = 0.45;
     else if (nextRole === "cadence") tieProb = 0.1;
-    if (rnd() < tieProb) {
+    const tieKey = `${barRhythms[barIdx].join(",")}|${barInUnit(barIdx)}`;
+    let tie = tieMemo.get(tieKey);
+    if (tie === void 0) {
+      tie = rnd() < tieProb;
+      tieMemo.set(tieKey, tie);
+    }
+    if (tie) {
       cur.durationSteps += nxt.durationSteps;
       melody.splice(i2 + 1, 1);
       if (i2 < melodyDurations.length - 1) {
@@ -15480,15 +16250,32 @@ var draw = (options, resolvedKey, rnd) => {
       i2--;
     }
   }
+  const splitMemo = /* @__PURE__ */ new Map();
+  let splitLastBar = -1;
+  let splitIdxInBar = 0;
   for (let i2 = 0; i2 < melody.length; i2++) {
     const barIdx = Math.floor(melody[i2].startStep / stepsPerBar);
+    if (barIdx !== splitLastBar) {
+      splitLastBar = barIdx;
+      splitIdxInBar = 0;
+    } else splitIdxInBar++;
     if (barIdx >= totalBars) continue;
+    if (phraseEndBars.has(barIdx)) continue;
     const role = barRoles[barIdx];
-    let splitProb = 0.15;
+    let splitProb = 0.08;
     if (role === "motif" || role === "sequence") splitProb = 0;
-    else if (role === "climax") splitProb = 0.6;
+    else if (role === "climax") splitProb = 0.3;
     else if (role === "cadence") splitProb = 0;
-    if (rnd() < splitProb && melody[i2].durationSteps === quarterSteps) {
+    let doSplit = false;
+    if (melody[i2].durationSteps === quarterSteps) {
+      const key = `${barRhythms[barIdx].join(",")}|${barInUnit(barIdx)}|${role}|${splitIdxInBar}`;
+      const memo = splitMemo.get(key);
+      if (memo === void 0) {
+        doSplit = rnd() < splitProb;
+        splitMemo.set(key, doSplit);
+      } else doSplit = memo;
+    }
+    if (doSplit) {
       const half = scaleStep(EIGHTH);
       const newNote = {
         ...melody[i2],
@@ -15502,6 +16289,7 @@ var draw = (options, resolvedKey, rnd) => {
         melodyDurations.splice(i2 + 1, 0, half);
       }
       i2++;
+      splitIdxInBar++;
     }
   }
   const range = (notes) => {
@@ -15511,8 +16299,11 @@ var draw = (options, resolvedKey, rnd) => {
   };
   const shiftUnits = semitonesToUnits(rootShift, edo);
   if (shiftUnits !== 0)
-    for (const list of [melody, submelody, bass, harmony, pad])
+    for (const list of [melody, submelody, bass, harmony, harmony2, pad])
       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 {
     chordProgression,
     chordPattern,
@@ -15523,10 +16314,20 @@ var draw = (options, resolvedKey, rnd) => {
     bpm,
     sections: sectionPlan,
     bars: totalBars,
+    vocal: {
+      duetSpans,
+      duetStyle,
+      harmonyKinds,
+      harmony2: useHarmony2,
+      octaveLayer: useOctaveLayer
+    },
+    tonal: { relativeKinds: [...relativeKinds], relativeShift, floating },
     melody,
     submelody,
     bass,
     harmony,
+    harmony2,
+    octave,
     pad,
     melodyDurations,
     restSteps,
@@ -15598,6 +16399,8 @@ var evaluate = (d, recent) => {
     melodyRange: atc("melodyRange", d.melodyRange),
     notesPerBar: atc("notesPerBar", density.notesPerBar),
     shortNoteRatio: atc("shortNoteRatio", density.shortNoteRatio),
+    barDensityCv: atc("barDensityCv", density.barDensityCv),
+    densityCliff: atc("densityCliff", density.densityCliff),
     stepRatio: atc("stepRatio", d.stepRatio),
     chromaticRatio: atc("chromaticRatio", d.chromaticRatio),
     sim1: atc("sim1", structure.sim1),
@@ -15605,12 +16408,20 @@ var evaluate = (d, recent) => {
     sim4: atc("sim4", structure.sim4),
     sim8: atc("sim8", structure.sim8),
     phraseBreath: atc("phraseBreath", structure.phraseBreath),
+    turnRatio: atc("turnRatio", structure.turnRatio),
     climaxPosition: atc("climaxPosition", structure.climaxPosition),
     climaxPeaks: at(peakBand, structure.climaxPeaks),
     complementarity: at(HAND_BANDS.complementarity, structure.complementarity),
     subDensity: at(HAND_BANDS.subDensity, d.submelody.length / d.bars),
+    // サブメロにも同じ崖の物差しを当てる。帯はメロディから採ったものを流用する。
+    subDensityCliff: atc(
+      "densityCliff",
+      densityFeatures(fromMelody(toMetricNotes(d.submelody)), opts).densityCliff
+    ),
     tensionRise: tension.rise,
-    tensionResolve: tension.resolve,
+    // **浮遊感の曲に「終止で解決しろ」は要求しない。** 解決しないことが狙いなので、
+    // この項目で減点すると候補40本の選抜で必ず負けて、狙って引いた曲が出てこない。
+    tensionResolve: d.tonal.floating ? 1 : tension.resolve,
     novelty
   };
   let weighted = 0;
@@ -15673,10 +16484,14 @@ var composeSong = (options) => {
       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 }
     };
@@ -15691,7 +16506,10 @@ var composeSong = (options) => {
 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 ? ["4beat", "dance", "16beat", "disco"] : short >= 0.6 ? ["16beat", "dance", "4beat", "disco"] : song.bpm <= 110 && short < 0.4 ? ["bossa", "8beat"] : ["8beat", "4beat", "16beat"];
+  const dotted = song.melody.filter(
+    (n) => n.durationSteps === Math.round(BASE_STEPS_PER_BAR * 3 / 16)
+  ).length / Math.max(1, song.melody.length);
+  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 pickBuiltinInstrument = (song, rnd) => {
@@ -15705,7 +16523,7 @@ var pickBuiltinInstrument = (song, rnd) => {
     pool = song.bpm >= 150 ? ["cyber_punk", "synth_pop", "retro_game"] : ["synth_pop", "retro_game", "rock", "piano"];
   } else if (song.drum === "bossa") {
     pool = ["jazz_night", "acoustic", "piano"];
-  } else if (song.bpm <= 105 && short < 0.4) {
+  } else if (song.bpm <= 115) {
     pool = ["ambient_cloud", "acoustic", "orchestra", "piano", "fantasy_rpg"];
   } else if (song.bpm >= 145) {
     pool = ["rock", "synth_pop", "cyber_punk", "retro_game", "piano"];
@@ -15761,6 +16579,23 @@ var LYRIC_WORDS = [
   "\u305B\u304B\u3044",
   "\u304D\u305B\u3064"
 ];
+var alignLyrics = (source, lyrics, target, options) => {
+  const sorted = [...source].sort((a, b) => a.startStep - b.startStep);
+  const kana = [...lyrics].filter((c) => c !== "\u3001");
+  const at = /* @__PURE__ */ new Map();
+  for (let i2 = 0; i2 < sorted.length && i2 < kana.length; i2++)
+    at.set(sorted[i2].startStep, kana[i2]);
+  const { stepsPerBar } = options;
+  const tgt = [...target].sort((a, b) => a.startStep - b.startStep);
+  const out = [];
+  for (let i2 = 0; i2 < tgt.length; i2++) {
+    out.push(at.get(tgt[i2].startStep) ?? "\u30FC");
+    const next = tgt[i2 + 1];
+    if (next && Math.floor(tgt[i2].startStep / (stepsPerBar * 4)) !== Math.floor(next.startStep / (stepsPerBar * 4)))
+      out.push("\u3001");
+  }
+  return out.join("");
+};
 var composeLyrics = (melody, options) => {
   const rnd = options.random ?? Math.random;
   const { stepsPerBar } = options;
@@ -17055,56 +17890,95 @@ var exportMIDI = (options) => {
   const div = 480;
   const tickPerStep = div / STEPS_PER_BEAT3;
   const midiTracks = [];
-  const NOTE_CHANNELS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15];
-  const BEND_RANGE_SEMITONES = 2;
   const bendKey = (cents) => Math.round(cents * 100);
-  const bendUse = /* @__PURE__ */ new Map();
-  for (const track of tracks) {
-    for (const n of track.notes) {
+  const hasMicrotones = tracks.some(
+    (track) => track.notes.some((n) => {
       const { detuneCents } = unitsToMidiDetune(n.pitchUnits);
-      const k = bendKey(detuneCents);
-      bendUse.set(k, (bendUse.get(k) ?? 0) + 1);
-    }
-  }
-  const bendChannel = /* @__PURE__ */ new Map();
-  const ordered = [...bendUse.entries()].sort((a, b) => b[1] - a[1]);
-  for (const [k] of ordered) {
-    if (bendChannel.size >= NOTE_CHANNELS.length) break;
-    bendChannel.set(k, NOTE_CHANNELS[bendChannel.size]);
-  }
-  tracks.forEach((track) => {
-    if (track.notes.length === 0) return;
-    const events = [];
-    for (const n of track.notes) {
-      const { midi, detuneCents } = unitsToMidiDetune(n.pitchUnits);
-      const k = bendKey(detuneCents);
-      const channel = bendChannel.get(k) ?? bendChannel.get(0) ?? 0;
-      const note = Math.max(0, Math.min(127, midi));
-      const startTick = Math.round(n.startStep * tickPerStep);
-      const endTick = Math.round(
-        (n.startStep + (n.durationSteps || 1)) * tickPerStep
-      );
-      const vel = Math.round(
-        (n.velocity ?? DEFAULT_VELOCITY) * (track.volume ?? 100) / 100
-      );
-      events.push({ t: startTick, m: [144 | channel, note, vel] });
-      events.push({ t: endTick, m: [144 | channel, note, 0] });
-    }
-    events.sort((a, b) => a.t - b.t);
-    midiTracks.push(events);
-  });
+      return bendKey(detuneCents) !== 0;
+    })
+  );
   const bendSetup = [];
-  for (const [k, channel] of bendChannel) {
-    const cents = k / 100;
-    bendSetup.push({ t: 0, m: [176 | channel, 101, 0] });
-    bendSetup.push({ t: 0, m: [176 | channel, 100, 0] });
-    bendSetup.push({ t: 0, m: [176 | channel, 6, BEND_RANGE_SEMITONES] });
-    bendSetup.push({ t: 0, m: [176 | channel, 38, 0] });
-    bendSetup.push({ t: 0, m: [176 | channel, 101, 127] });
-    bendSetup.push({ t: 0, m: [176 | channel, 100, 127] });
-    const raw = 8192 + Math.round(cents / (BEND_RANGE_SEMITONES * 100) * 8192);
-    const v = Math.max(0, Math.min(16383, raw));
-    bendSetup.push({ t: 0, m: [224 | channel, v & 127, v >> 7 & 127] });
+  if (hasMicrotones) {
+    const NOTE_CHANNELS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15];
+    const BEND_RANGE_SEMITONES = 2;
+    const bendUse = /* @__PURE__ */ new Map();
+    for (const track of tracks) {
+      for (const n of track.notes) {
+        const { detuneCents } = unitsToMidiDetune(n.pitchUnits);
+        const k = bendKey(detuneCents);
+        bendUse.set(k, (bendUse.get(k) ?? 0) + 1);
+      }
+    }
+    const bendChannel = /* @__PURE__ */ new Map();
+    const ordered = [...bendUse.entries()].sort((a, b) => b[1] - a[1]);
+    for (const [k] of ordered) {
+      if (bendChannel.size >= NOTE_CHANNELS.length) break;
+      bendChannel.set(k, NOTE_CHANNELS[bendChannel.size]);
+    }
+    tracks.forEach((track) => {
+      if (track.notes.length === 0) return;
+      const events = [];
+      for (const n of track.notes) {
+        const { midi, detuneCents } = unitsToMidiDetune(n.pitchUnits);
+        const k = bendKey(detuneCents);
+        const channel = bendChannel.get(k) ?? bendChannel.get(0) ?? 0;
+        const note = Math.max(0, Math.min(127, midi));
+        const startTick = Math.round(n.startStep * tickPerStep);
+        const endTick = Math.round(
+          (n.startStep + (n.durationSteps || 1)) * tickPerStep
+        );
+        const vel = Math.round(
+          (n.velocity ?? DEFAULT_VELOCITY) * (track.volume ?? 100) / 100
+        );
+        events.push({ t: startTick, m: [144 | channel, note, vel] });
+        events.push({ t: endTick, m: [144 | channel, note, 0] });
+      }
+      events.sort((a, b) => a.t - b.t);
+      midiTracks.push(events);
+    });
+    for (const [k, channel] of bendChannel) {
+      const cents = k / 100;
+      bendSetup.push({ t: 0, m: [176 | channel, 101, 0] });
+      bendSetup.push({ t: 0, m: [176 | channel, 100, 0] });
+      bendSetup.push({ t: 0, m: [176 | channel, 6, BEND_RANGE_SEMITONES] });
+      bendSetup.push({ t: 0, m: [176 | channel, 38, 0] });
+      bendSetup.push({ t: 0, m: [176 | channel, 101, 127] });
+      bendSetup.push({ t: 0, m: [176 | channel, 100, 127] });
+      const raw = 8192 + Math.round(cents / (BEND_RANGE_SEMITONES * 100) * 8192);
+      const v = Math.max(0, Math.min(16383, raw));
+      bendSetup.push({ t: 0, m: [224 | channel, v & 127, v >> 7 & 127] });
+    }
+  } else {
+    tracks.forEach((track, trIdx) => {
+      if (track.notes.length === 0) return;
+      const channel = trIdx < 9 ? trIdx : trIdx + 1 & 15;
+      const events = [];
+      if (track.program !== void 0 && track.program >= 0 && track.program <= 127) {
+        events.push({ t: 0, m: [192 | channel, track.program] });
+      }
+      for (const n of track.notes) {
+        const { midi } = unitsToMidiDetune(n.pitchUnits);
+        const note = Math.max(0, Math.min(127, midi));
+        const startTick = Math.round(n.startStep * tickPerStep);
+        const endTick = Math.round(
+          (n.startStep + (n.durationSteps || 1)) * tickPerStep
+        );
+        const vel = Math.round(
+          (n.velocity ?? DEFAULT_VELOCITY) * (track.volume ?? 100) / 100
+        );
+        events.push({ t: startTick, m: [144 | channel, note, vel] });
+        events.push({ t: endTick, m: [144 | channel, note, 0] });
+      }
+      events.sort((a, b) => {
+        if (a.t !== b.t) return a.t - b.t;
+        const typeA = a.m[0] & 240;
+        const typeB = b.m[0] & 240;
+        if (typeA === 192 && typeB !== 192) return -1;
+        if (typeB === 192 && typeA !== 192) return 1;
+        return 0;
+      });
+      midiTracks.push(events);
+    });
   }
   const maxStep = Math.max(
     ...tracks.filter((t) => t.notes.length > 0).map(
@@ -18329,6 +19203,28 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
   };
 };
 
+// src/track1-state.ts
+var TRACK1_STORAGE_KEY = "dtm-track1:settings";
+var readTrack1Settings = () => {
+  try {
+    if (typeof localStorage === "undefined" || !localStorage) return null;
+    const raw = localStorage.getItem(TRACK1_STORAGE_KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object") return null;
+    return parsed;
+  } catch (_) {
+    return null;
+  }
+};
+var writeTrack1Settings = (settings) => {
+  try {
+    if (typeof localStorage === "undefined" || !localStorage) return;
+    localStorage.setItem(TRACK1_STORAGE_KEY, JSON.stringify(settings));
+  } catch (_) {
+  }
+};
+
 // src/daw.ts
 var CHORD_INFO_HTML2 = `
 <div class="dtm-modal-body-content">
@@ -18661,8 +19557,16 @@ var COMPOSE_INFO_HTML = `
     <li><strong>\u97F3\u306E\u5206\u5E03</strong>\u2014\u2014\u97F3\u4FA1\u306E\u3070\u3089\u3064\u304D\u30FB\u4F11\u7B26\u306E\u5272\u5408\u30FB\u8DF3\u8E8D\u306E\u5927\u304D\u3055\u3068\u6BD4\u7387\u30FB\u4F7F\u3063\u3066\u3044\u308B\u97F3\u57DF\u3002</li>
   </ul>
   <p>\u5404\u9805\u76EE\u306E\u5408\u683C\u30E9\u30A4\u30F3\u306F\u52D8\u3067\u6C7A\u3081\u305F\u3082\u306E\u3067\u306F\u306A\u304F\u3001<strong>\u4EBA\u9593\u304C\u66F8\u3044\u305FMIDI\u3092\u5B9F\u969B\u306B\u6E2C\u3063\u3066\u3001\u305D\u306E\u5206\u5E03\u306E\u771F\u3093\u4E2D\u3042\u305F\u308A\u3092\u6E80\u70B9\u306B\u3057\u3066\u3044\u307E\u3059</strong>\u3002\u305F\u3068\u3048\u3070\u4E3B\u65CB\u5F8B\u306E\u4F11\u7B26\u306F\u3001\u4EBA\u304C\u66F8\u3044\u305F\u66F2\u3067\u306F\u5168\u4F53\u306E15\u301C43%\u3092\u5360\u3081\u3066\u3044\u307E\u3057\u305F\u3002</p>
+  <h4>\u6B4C\u5165\u308A\u4F5C\u66F2\u306E\u30DC\u30FC\u30AB\u30EB</h4>
+  <p>\u4E3B\u65CB\u5F8B\u306B\u6B4C\u8A5E\u3092\u4ED8\u3051\u3066\u6B4C\u308F\u305B\u307E\u3059\u3002\u6B4C\u8A5E\u306B\u610F\u5473\u306F\u3042\u308A\u307E\u305B\u3093\uFF08\u30E1\u30ED\u30C7\u30A3\u306B\u6B63\u3057\u304F\u4E57\u308B\u3001\u767A\u97F3\u3067\u304D\u308B\u97F3\u306E\u4E26\u3073\u3060\u3051\u3092\u4F5C\u3063\u3066\u3044\u307E\u3059\uFF09\u3002<strong>\u4E0A\u7D1A\u8005\u30E2\u30FC\u30C9\uFF0815\u30C8\u30E9\u30C3\u30AF\uFF09\u3067\u306F\u3001\u3055\u3089\u306B\u30DC\u30FC\u30AB\u30EB\u30A2\u30EC\u30F3\u30B8\u307E\u3067\u5C55\u958B\u3057\u307E\u3059\u3002</strong>\u3069\u3053\u3067\u4F55\u3092\u3059\u308B\u304B\u306F\u66F2\u3054\u3068\u306B\u81EA\u52D5\u3067\u6C7A\u307E\u308B\u306E\u3067\u3001\u8A2D\u5B9A\u9805\u76EE\u306F\u3042\u308A\u307E\u305B\u3093\u3002</p>
+  <ul>
+    <li><strong>\u30CF\u30E2\u30EA</strong> \u2014 \u30B5\u30D3\u304B\u3089\u3001\u66F2\u306B\u3088\u3063\u3066\u306FB\u30E1\u30ED\u304B\u3089\u5165\u308A\u307E\u3059\u3002<strong>\u4E3B\u65CB\u5F8B\u3068\u540C\u3058\u58F0\u30FB\u540C\u3058\u6B4C\u8A5E\u3067\u9055\u3046\u9AD8\u3055\u3092\u91CD\u306D\u308B</strong>\u306E\u3067\u3001\u305D\u306E\u30D1\u30FC\u30C8\u304B\u3089\u58F0\u304C\u539A\u304F\u306A\u3063\u3066\u8C6A\u83EF\u306B\u805E\u3053\u3048\u307E\u3059\u30023\u5EA6\u304B6\u5EA6\u304C\u57FA\u672C\u3067\u3001\u6D6E\u3044\u3066\u805E\u3053\u3048\u308B\u5B8C\u51685\u5EA6\u306F\u907F\u3051\u307E\u3059\u3002\u4E3B\u65CB\u5F8B\u304C\u30C6\u30F3\u30B7\u30E7\u30F3\u97F3\uFF089th\u30FB11th \u306A\u3069\uFF09\u306B\u4E57\u3063\u3066\u3044\u308B\u3068\u3053\u308D\u3060\u30514\u5EA6\u3067\u5F53\u3066\u307E\u3059\u2014\u2014\u305D\u3053\u3067\u306F3\u5EA6\u30826\u5EA6\u3082\u548C\u97F3\u306E\u69CB\u6210\u97F3\u3078\u5C4A\u304B\u306A\u3044\u305F\u3081\u3067\u3059\u3002\u843D\u3061\u30B5\u30D3\u306F\u58F0\u3060\u3051\u3092\u805E\u304B\u305B\u308B\u5834\u6240\u306A\u306E\u3067\u5916\u3057\u307E\u3059\u3002</li>
+    <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>\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>
     <li>\u8ABF\u306F\u30CF\u9577\u8ABF\uFF08\u307E\u305F\u306F\u30A4\u77ED\u8ABF\uFF09\u3067\u56FA\u5B9A\u3067\u3059\u3002\u5225\u306E\u8ABF\u306B\u3057\u305F\u3044\u3068\u304D\u306F\u3001\u3053\u306E\u4E0B\u306E\u300C\u79FB\u8ABF\u300D\u3067\u52D5\u304B\u3057\u3066\u304F\u3060\u3055\u3044\u3002</li>
     <li>31\u5E73\u5747\u5F8B\u306E\u66F2\u3067\u3082\u4F7F\u3048\u307E\u3059\u3002\u548C\u97F3\u30FB\u30E1\u30ED\u30C7\u30A3\u3068\u308231\u5E73\u5747\u5F8B\u306E\u683C\u5B50\u306B\u4E57\u305B\u3066\u751F\u6210\u3057\u307E\u3059\u3002</li>
     <li><strong>\u30C9\u30E9\u30E0\u3082\u66F2\u306B\u5408\u308F\u305B\u3066\u7D44\u307F\u7ACB\u3066\u307E\u3059</strong>\u3002\u30C6\u30F3\u30DD\u3068\u30E1\u30ED\u30C7\u30A3\u306E\u523B\u307F\u304B\u30898\u30D3\u30FC\u30C8\uFF0F16\u30D3\u30FC\u30C8\uFF0F4\u3064\u6253\u3061\uFF0F\u30B7\u30E3\u30C3\u30D5\u30EB\uFF0F\u30D0\u30E9\u30FC\u30C9\uFF0F\u30ED\u30C3\u30AF\u306E\u3069\u308C\u304B\u3092\u9078\u3073\u3001A\u30FBA'\u30FB\u30B5\u30D3\u30FBA'' \u3067\u523B\u307F\u306E\u5F37\u3055\u3092\u5909\u3048\u30014\u5C0F\u7BC0\u3054\u3068\u306B\u30D5\u30A3\u30EB\u3001\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u982D\u306B\u30AF\u30E9\u30C3\u30B7\u30E5\u3092\u7F6E\u304D\u307E\u3059\u3002\u6C17\u306B\u5165\u3089\u306A\u3051\u308C\u3070\u300C\u30C9\u30E9\u30E0\u8A2D\u5B9A\u300D\u304B\u3089\u4ED6\u306E\u30EA\u30BA\u30E0\u3078\u5207\u308A\u66FF\u3048\u3089\u308C\u307E\u3059\u3002</li>
@@ -18937,7 +19841,14 @@ var ADVANCED_COMPOSE_LAYOUT = [
   { 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 }
+  { 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 = [
   {
@@ -19217,6 +20128,7 @@ var mountDAW = (target, options = {}) => {
   let currentDrumPattern = refs.drumSelect.value;
   const recentComposeFingerprints = [];
   let autoComposeVocal = null;
+  const autoComposeVocalTracks = /* @__PURE__ */ new Map();
   let currentDrumFont = options.drumFont ?? "FluidR3_GM_sf2_file:0";
   refs.drumFontSelect.value = currentDrumFont;
   const applyDrumPatternFont = (name) => {
@@ -19293,7 +20205,38 @@ var mountDAW = (target, options = {}) => {
   let trackStates = [];
   let suppressPatch = false;
   let lyricsDebounceTimer = null;
+  const persistTrack1 = (t) => {
+    if (trackStates.indexOf(t) !== 0) return;
+    const settings = {
+      volume: t.volume,
+      trackInstrument: t.trackInstrument,
+      trackOctave: t.trackOctave,
+      trackOctaveUnison: t.trackOctaveUnison,
+      trackCompression: t.trackCompression,
+      trackWidth: t.trackWidth,
+      trackReverbSend: t.trackReverbSend,
+      trackEqLow: t.trackEqLow,
+      trackEqMid: t.trackEqMid,
+      trackEqHigh: t.trackEqHigh,
+      trackPan: t.trackPan,
+      trackDelaySend: t.trackDelaySend,
+      lyricModel: t.lyricModel,
+      vocalVolume: t.vocalVolume,
+      vocalGate: t.vocalGate,
+      vocalPan: t.vocalPan,
+      vocalOctave: t.vocalOctave,
+      vocalVibrato: t.vocalVibrato,
+      vocalReverb: t.vocalReverb,
+      vocalDelay: t.vocalDelay,
+      vocalGender: t.vocalGender,
+      vocalBreathiness: t.vocalBreathiness,
+      vocalTension: t.vocalTension,
+      vocalOctaveUnison: t.vocalOctaveUnison
+    };
+    writeTrack1Settings(settings);
+  };
   const fireLyricsChange = (t) => {
+    persistTrack1(t);
     if (!options.onLyricsChange) return;
     const trackId = t.config.id;
     const data = {
@@ -19319,9 +20262,11 @@ var mountDAW = (target, options = {}) => {
   };
   const hiddenTracks = /* @__PURE__ */ new Set();
   const audioMutedTracks = /* @__PURE__ */ new Set();
+  const savedTrack1 = readTrack1Settings();
   const createTrackStates = () => {
-    trackStates = trackConfigs.map((config) => {
+    trackStates = trackConfigs.map((config, index) => {
       let prevNotes = [];
+      const t1 = index === 0 ? savedTrack1 : null;
       return {
         config,
         core: new MMLCore(
@@ -19366,35 +20311,35 @@ var mountDAW = (target, options = {}) => {
           config.volume,
           () => renderConfig
         ),
-        volume: config.volume,
+        volume: t1?.volume ?? config.volume,
         savedChordInput: "",
         savedChordPattern: "block",
         savedChordRoot: 0,
         lyrics: "",
-        lyricModel: "",
+        lyricModel: t1?.lyricModel ?? "",
         // 既定は「なし」（歌わない）
-        vocalVolume: DEFAULT_VOCAL_VOLUME,
-        vocalGate: 100,
-        vocalPan: 64,
-        trackOctave: 0,
-        trackOctaveUnison: "none",
-        vocalOctave: 0,
-        vocalVibrato: false,
-        vocalReverb: 0,
-        vocalDelay: 0,
-        vocalGender: 50,
-        vocalBreathiness: 50,
-        vocalTension: 50,
-        vocalOctaveUnison: "none",
-        trackInstrument: "",
-        trackCompression: 0,
-        trackWidth: 100,
-        trackReverbSend: 0,
-        trackEqLow: 0,
-        trackEqMid: 0,
-        trackEqHigh: 0,
-        trackPan: 64,
-        trackDelaySend: 0
+        vocalVolume: t1?.vocalVolume ?? DEFAULT_VOCAL_VOLUME,
+        vocalGate: t1?.vocalGate ?? 100,
+        vocalPan: t1?.vocalPan ?? 64,
+        trackOctave: t1?.trackOctave ?? 0,
+        trackOctaveUnison: t1?.trackOctaveUnison ?? "none",
+        vocalOctave: t1?.vocalOctave ?? 0,
+        vocalVibrato: t1?.vocalVibrato ?? false,
+        vocalReverb: t1?.vocalReverb ?? 0,
+        vocalDelay: t1?.vocalDelay ?? 0,
+        vocalGender: t1?.vocalGender ?? 50,
+        vocalBreathiness: t1?.vocalBreathiness ?? 50,
+        vocalTension: t1?.vocalTension ?? 50,
+        vocalOctaveUnison: t1?.vocalOctaveUnison ?? "none",
+        trackInstrument: t1?.trackInstrument ?? "",
+        trackCompression: t1?.trackCompression ?? 0,
+        trackWidth: t1?.trackWidth ?? 100,
+        trackReverbSend: t1?.trackReverbSend ?? 0,
+        trackEqLow: t1?.trackEqLow ?? 0,
+        trackEqMid: t1?.trackEqMid ?? 0,
+        trackEqHigh: t1?.trackEqHigh ?? 0,
+        trackPan: t1?.trackPan ?? 64,
+        trackDelaySend: t1?.trackDelaySend ?? 0
       };
     });
   };
@@ -20562,6 +21507,7 @@ var mountDAW = (target, options = {}) => {
       active.volume = Number.parseInt(volInput.value, 10);
       active.core.setVolume(active.volume);
       volLabel.textContent = String(active.volume);
+      persistTrack1(active);
     });
     const syncVelocityDisabled = () => {
       volInput.disabled = !!active.lyricModel;
@@ -20600,16 +21546,19 @@ var mountDAW = (target, options = {}) => {
       active.trackEqLow = Number.parseInt(trackEqLowInput.value, 10);
       trackEqLowLabel.textContent = fmtDb(active.trackEqLow);
       options.onTrackEqLowChange?.(active.config.id, active.trackEqLow);
+      persistTrack1(active);
     });
     trackEqMidInput.addEventListener("input", () => {
       active.trackEqMid = Number.parseInt(trackEqMidInput.value, 10);
       trackEqMidLabel.textContent = fmtDb(active.trackEqMid);
       options.onTrackEqMidChange?.(active.config.id, active.trackEqMid);
+      persistTrack1(active);
     });
     trackEqHighInput.addEventListener("input", () => {
       active.trackEqHigh = Number.parseInt(trackEqHighInput.value, 10);
       trackEqHighLabel.textContent = fmtDb(active.trackEqHigh);
       options.onTrackEqHighChange?.(active.config.id, active.trackEqHigh);
+      persistTrack1(active);
     });
     trackEqInfo.addEventListener("click", () => {
       showModal("EQ\uFF08\u30A4\u30B3\u30E9\u30A4\u30B6\u30FC\uFF09\u306E\u89E3\u8AAC", TRACK_EQ_INFO_HTML);
@@ -20643,11 +21592,13 @@ var mountDAW = (target, options = {}) => {
         active.config.id,
         active.trackCompression
       );
+      persistTrack1(active);
     });
     trackWidthInput.addEventListener("input", () => {
       active.trackWidth = Number.parseInt(trackWidthInput.value, 10);
       trackWidthLabel.textContent = `${active.trackWidth}%`;
       options.onTrackWidthChange?.(active.config.id, active.trackWidth);
+      persistTrack1(active);
     });
     trackCompInfo.addEventListener("click", () => {
       showModal("\u97F3\u5727\u5F37\u5316\u306E\u89E3\u8AAC", TRACK_COMPRESSION_INFO_HTML);
@@ -20671,6 +21622,7 @@ var mountDAW = (target, options = {}) => {
       active.trackPan = Number.parseInt(trackPanInput.value, 10);
       trackPanLabel.textContent = fmtTrackPan(active.trackPan);
       options.onTrackPanChange?.(active.config.id, active.trackPan);
+      persistTrack1(active);
     });
     trackPanInfo.addEventListener("click", () => {
       showModal("\u5B9A\u4F4D\u306E\u89E3\u8AAC", TRACK_PAN_INFO_HTML);
@@ -20693,6 +21645,7 @@ var mountDAW = (target, options = {}) => {
         active.config.id,
         active.trackReverbSend
       );
+      persistTrack1(active);
     });
     trackReverbSendInfo.addEventListener("click", () => {
       showModal("\u30EA\u30D0\u30FC\u30D6\u9001\u308A\u306E\u89E3\u8AAC", TRACK_REVERBSEND_INFO_HTML);
@@ -20712,6 +21665,7 @@ var mountDAW = (target, options = {}) => {
       active.trackDelaySend = Number.parseInt(trackDelaySendInput.value, 10);
       trackDelaySendLabel.textContent = `${active.trackDelaySend}%`;
       options.onTrackDelaySendChange?.(active.config.id, active.trackDelaySend);
+      persistTrack1(active);
     });
     trackDelaySendInfo.addEventListener("click", () => {
       showModal("\u30C7\u30A3\u30EC\u30A4\u9001\u308A\u306E\u89E3\u8AAC", TRACK_DELAYSEND_INFO_HTML);
@@ -20766,6 +21720,7 @@ var mountDAW = (target, options = {}) => {
       active.trackInstrument = instSel.value;
       const trackIndex = trackStates.indexOf(active);
       options.onTrackInstrumentChange?.(trackIndex, active.trackInstrument);
+      persistTrack1(active);
     });
     refs.trackBody.querySelector('[data-dtm="track-vol-row"]').prepend(instLabel, instSel);
     const octaveRow = refs.trackBody.querySelector(
@@ -20781,6 +21736,7 @@ var mountDAW = (target, options = {}) => {
     syncOctaveVisibility();
     octaveSel.addEventListener("change", () => {
       active.trackOctave = Number.parseInt(octaveSel.value, 10) || 0;
+      persistTrack1(active);
     });
     const unisonSel = refs.trackBody.querySelector(
       '[data-dtm="track-octave-unison"]'
@@ -20788,6 +21744,7 @@ var mountDAW = (target, options = {}) => {
     unisonSel.value = active.trackOctaveUnison;
     unisonSel.addEventListener("change", () => {
       active.trackOctaveUnison = unisonSel.value;
+      persistTrack1(active);
     });
     if (isAdvanced || active.config.id !== "chord") {
       const lyricDiv = document.createElement("div");
@@ -21939,16 +22896,32 @@ var mountDAW = (target, options = {}) => {
     updateTrackPanel();
     updateUndoRedo();
   };
-  const exportMIDI2 = () => exportMIDI({
-    tracks: trackStates.map((t) => ({
-      notes: playableNotes(t),
-      volume: t.volume
-    })),
-    getDrumPattern: (currentBar) => resolveDrumPattern(currentDrumPattern, drumPatterns, currentBar),
-    drumVolume,
-    bpm,
-    stepsPerBar: renderConfig.stepsPerBar
-  });
+  const exportMIDI2 = () => {
+    const autoPreset = INSTRUMENT_PRESETS[currentInstrument] ?? INSTRUMENT_PRESETS.piano;
+    return exportMIDI({
+      tracks: trackStates.map((t) => {
+        let program;
+        if (t.trackInstrument) {
+          const p = programOfInstrumentName(t.trackInstrument);
+          if (p !== null) program = p;
+        } else if (!t.lyricModel) {
+          const role = DECLARED_ROLE[t.config.id] ?? "melody";
+          const instName = autoPreset[role] ?? autoPreset.melody;
+          const p = programOfInstrumentName(instName);
+          if (p !== null) program = p;
+        }
+        return {
+          notes: playableNotes(t),
+          volume: t.volume,
+          program
+        };
+      }),
+      getDrumPattern: (currentBar) => resolveDrumPattern(currentDrumPattern, drumPatterns, currentBar),
+      drumVolume,
+      bpm,
+      stepsPerBar: renderConfig.stepsPerBar
+    });
+  };
   const setBpm = (value) => {
     bpm = value;
     refs.bpmInput.value = String(value);
@@ -22571,7 +23544,7 @@ var mountDAW = (target, options = {}) => {
           for (const layer of ADVANCED_COMPOSE_LAYOUT) {
             const track = trackStates[layer.index];
             if (!track) continue;
-            const notes = 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({
+            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",
@@ -22629,18 +23602,95 @@ var mountDAW = (target, options = {}) => {
           options.onInstrumentChange?.(song.instrument);
         }
         if (withVocal) {
+          autoComposeVocalTracks.clear();
           const melodyTrack = isAdvanced ? trackStates[0] : trackStates.find((t) => t.config.id === "melody");
           if (melodyTrack) {
             const current = melodyTrack.lyricModel.trim();
             if (!current || current === autoComposeVocal) {
+              if (!current && melodyTrack.vocalOctave === 0) {
+                melodyTrack.vocalOctave = -1;
+              }
               melodyTrack.lyricModel = pickComposeVocal(autoComposeVocal);
               autoComposeVocal = melodyTrack.lyricModel;
+              autoComposeVocalTracks.set(melodyTrack, melodyTrack.lyricModel);
             }
             melodyTrack.lyrics = composeLyrics(song.melody, {
               stepsPerBar: renderConfig.stepsPerBar
             });
             fireLyricsChange(melodyTrack);
           }
+          if (isAdvanced && melodyTrack) {
+            const stepsPerBar = renderConfig.stepsPerBar;
+            const spans = song.vocal.duetSpans;
+            const inDuet = (n) => spans.some(([a, b]) => n.startStep >= a && n.startStep < b);
+            const sing = (track, lyrics, voice) => {
+              if (!track) return;
+              track.lyricModel = voice;
+              autoComposeVocalTracks.set(track, voice);
+              if (track.vocalOctave === 0) track.vocalOctave = -1;
+              track.lyrics = lyrics;
+              fireLyricsChange(track);
+            };
+            const partnerVoice = pickComposeVocal(melodyTrack.lyricModel);
+            const duetting = spans.length > 0;
+            if (duetting) {
+              const mine = song.melody.filter((n) => !inDuet(n));
+              const yours = song.melody.filter((n) => inDuet(n));
+              writeTrackAt(0, mine);
+              writeTrackAt(11, yours);
+              const full = melodyTrack.lyrics;
+              sing(
+                melodyTrack,
+                alignLyrics(song.melody, full, mine, { stepsPerBar }),
+                melodyTrack.lyricModel
+              );
+              sing(
+                trackStates[11],
+                alignLyrics(song.melody, full, yours, { stepsPerBar }),
+                partnerVoice
+              );
+            }
+            const harmonyTrack = trackStates[2];
+            if (song.harmony.length > 0 && harmonyTrack) {
+              sing(
+                harmonyTrack,
+                alignLyrics(song.melody, melodyTrack.lyrics, song.harmony, {
+                  stepsPerBar
+                }),
+                duetting ? partnerVoice : melodyTrack.lyricModel
+              );
+            }
+            if (!duetting) {
+              if (song.harmony2.length > 0)
+                sing(
+                  trackStates[12],
+                  alignLyrics(song.melody, melodyTrack.lyrics, song.harmony2, {
+                    stepsPerBar
+                  }),
+                  melodyTrack.lyricModel
+                );
+              const octaveTrack = trackStates[13];
+              if (song.octave.length > 0 && octaveTrack) {
+                sing(
+                  octaveTrack,
+                  alignLyrics(song.melody, melodyTrack.lyrics, song.octave, {
+                    stepsPerBar
+                  }),
+                  melodyTrack.lyricModel
+                );
+                octaveTrack.vocalOctave = -2;
+              }
+            }
+          }
+        } else {
+          for (const [track, voice] of autoComposeVocalTracks) {
+            if (track.lyricModel === voice) {
+              track.lyrics = "";
+              track.lyricModel = "";
+              fireLyricsChange(track);
+            }
+          }
+          autoComposeVocalTracks.clear();
         }
         applyAutoMastering();
         if (refs.composeKeyHint) {
@@ -23777,7 +24827,10 @@ var mountDAW = (target, options = {}) => {
       t.vocalBreathiness = data.vocalBreathiness ?? 50;
       t.vocalTension = data.vocalTension ?? 50;
       t.vocalOctaveUnison = data.vocalOctaveUnison ?? "none";
-      if (t.config.id === activeTrackId) redrawAll();
+      if (t.config.id === activeTrackId) {
+        updateTrackPanel();
+        redrawAll();
+      }
     },
     applyTrackInstrument: (trackIndex, instrumentName) => {
       const t = trackStates[trackIndex];
@@ -26187,6 +27240,7 @@ var createDtmStudio = async (options = {}) => {
   playNote,
   playPlacements,
   playSingingMML,
+  programOfInstrumentName,
   readGlobalBool,
   readGlobalNumber,
   readGlobalSetting,