@onjmin/dtm 2.1.3 → 2.1.5

package/dist/index.js

@@ -52,6 +52,7 @@ __export(index_exports, {
   KOE_VOICEBANK_LABELS: () => KOE_VOICEBANK_LABELS,
   KOE_VOICEBANK_TERMS: () => KOE_VOICEBANK_TERMS,
   LinkedList: () => LinkedList,
+  MACRO_STORAGE_KEYS: () => MACRO_STORAGE_KEYS,
   MAJOR_KEY_IDS: () => MAJOR_KEY_IDS,
   MAX_VOCAL_VOLUME: () => MAX_VOCAL_VOLUME,
   MICRO_STEP: () => MICRO_STEP,
@@ -154,6 +155,8 @@ __export(index_exports, {
   playNote: () => playNote,
   playPlacements: () => playPlacements,
   playSingingMML: () => playSingingMML,
+  readMacroSections: () => readMacroSections,
+  readMacroSetting: () => readMacroSetting,
   resolveComposeKey: () => resolveComposeKey,
   resolveDrumPattern: () => resolveDrumPattern,
   resolveLoopPoint: () => resolveLoopPoint,
@@ -176,7 +179,9 @@ __export(index_exports, {
   unitsToMidi: () => unitsToMidi,
   unitsToMidiDetune: () => unitsToMidiDetune,
   unitsToPitchV1: () => unitsToPitchV1,
-  vocalVolumeToGain: () => vocalVolumeToGain
+  vocalVolumeToGain: () => vocalVolumeToGain,
+  writeMacroSections: () => writeMacroSections,
+  writeMacroSetting: () => writeMacroSetting
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -4910,6 +4915,7 @@ var createSequencer = (options) => {
   let drumCursor = 0;
   let lastDrumStep = Number.NEGATIVE_INFINITY;
   let lastPlayStep = 0;
+  let maxTimelineEndSec = 0;
   const secondsPerStep = () => 60 / options.getBpm() / STEPS_PER_BEAT;
   const getWrappedPlayStep = (time, sps) => {
     if (!isLooping || loopDurationSec <= 0 || time < loopEndSec) {
@@ -4936,6 +4942,7 @@ var createSequencer = (options) => {
     }
     const startLimit = isLooping ? Math.min(fromStep, loopStartStep) : fromStep;
     let maxEndStep = 0;
+    maxTimelineEndSec = 0;
     for (const track of options.getTracks()) {
       trackVolumeMap.set(track.id, track.volume);
       for (const note of track.notes) {
@@ -4944,6 +4951,7 @@ var createSequencer = (options) => {
         const when = relativeStart * sps;
         const duration = note.durationSteps * sps;
         maxEndStep = Math.max(maxEndStep, note.startStep + note.durationSteps);
+        maxTimelineEndSec = Math.max(maxTimelineEndSec, when + duration);
         timeline.push({
           trackId: track.id,
           pitch: note.pitchUnits,
@@ -5069,10 +5077,7 @@ var createSequencer = (options) => {
       lastPlayStep = currentStep2;
     }
     if (!isLooping) {
-      const last = timeline[timeline.length - 1];
-      const lastWhen = last?.when ?? 0;
-      const lastDuration = last?.duration ?? 0;
-      if (nowIndex >= timeline.length && time > lastWhen + lastDuration + 0.1) {
+      if (nowIndex >= timeline.length && time > maxTimelineEndSec + 0.1) {
         stop();
         options.onEnd(false);
       }
@@ -8404,6 +8409,21 @@ var DAW_CSS = `
 .dtm-row { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; }
 .dtm-track-body { display: flex; flex-direction: column; gap: 10px; }
 
+/* \u2500\u2500\u2500 \u81EA\u52D5\u4F5C\u66F2\u30B3\u30F3\u30C6\u30CA\uFF08\u30DE\u30AF\u30ED\u30D1\u30CD\u30EB\u5185\u306E\u5C02\u7528\u30AB\u30FC\u30C9\u98A8\u30B0\u30EB\u30FC\u30D7\u67A0\uFF09 \u2500\u2500\u2500 */
+.dtm-compose-container {
+  background: var(--dtm-deep);
+  border: 2px solid var(--c-black);
+  box-shadow:
+    inset 0 0 0 1px var(--dtm-border2),
+    0 0 0 1px var(--dtm-success),
+    3px 3px 0 var(--c-black);
+  padding: 10px 12px 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  margin-bottom: 6px;
+}
+
 /* \u2500\u2500\u2500 \u30A2\u30AF\u30C6\u30A3\u30D6\u30C8\u30E9\u30C3\u30AF\u8272\uFF08\u500B\u5225\u30C8\u30E9\u30C3\u30AF\u8A2D\u5B9A\u30D1\u30CD\u30EB\u306E\u5DE6\u7AEF\u30E9\u30A4\u30F3\uFF09 \u2500\u2500\u2500 */
 .dtm-panel--track > summary::before,
 .dtm-panel--track[open] > summary::before {
@@ -13198,11 +13218,25 @@ var densityFeatures = (notes, opts) => {
     shortNoteRatio: short / notes.length
   };
 };
-var tensionFeatures = (barTension) => {
-  if (barTension.length < 16) return { rise: 0, resolve: 0 };
+var tensionFeatures = (barTension, opts) => {
+  if (barTension.length < 8) return { rise: 0, resolve: 0 };
   const mean2 = (xs) => xs.reduce((a2, b2) => a2 + b2, 0) / Math.max(1, xs.length);
-  const a = mean2(barTension.slice(0, 4));
-  const b = mean2(barTension.slice(8, 12));
+  let a;
+  let b;
+  if (opts?.verseBars && opts?.chorusBars && opts.verseBars.length > 0 && opts.chorusBars.length > 0) {
+    a = mean2(opts.verseBars.map((i2) => barTension[i2] ?? 0));
+    b = mean2(opts.chorusBars.map((i2) => barTension[i2] ?? 0));
+  } else if (barTension.length >= 16 && barTension.length <= 24) {
+    a = mean2(barTension.slice(0, 4));
+    b = mean2(barTension.slice(8, 12));
+  } else {
+    const q1Start = Math.floor(barTension.length * 0.15);
+    const q1End = Math.max(q1Start + 2, Math.floor(barTension.length * 0.35));
+    const q3Start = Math.floor(barTension.length * 0.55);
+    const q3End = Math.max(q3Start + 2, Math.floor(barTension.length * 0.75));
+    a = mean2(barTension.slice(q1Start, q1End));
+    b = mean2(barTension.slice(q3Start, q3End));
+  }
   const all = mean2(barTension);
   const last = barTension[barTension.length - 1];
   const rise = Math.max(0, Math.min(1, (b - a) / 0.5));
@@ -13249,6 +13283,8 @@ var SECTION_LABELS = {
   verse: "A\u30E1\u30ED",
   prechorus: "B\u30E1\u30ED",
   chorus: "\u30B5\u30D3",
+  bridge: "C\u30E1\u30ED",
+  drop_chorus: "\u843D\u3061\u30B5\u30D3",
   interlude: "\u9593\u594F",
   outro: "\u30A2\u30A6\u30C8\u30ED"
 };
@@ -13257,6 +13293,8 @@ var SECTION_ORDER = [
   "verse",
   "prechorus",
   "chorus",
+  "bridge",
+  "drop_chorus",
   "interlude",
   "outro"
 ];
@@ -13308,6 +13346,35 @@ var SECTION_SPECS = {
     // 主音へ全終止
     progression: "b"
   },
+  // Cメロ。Verse/Pre chorusとは違うメロディで、ラストのサビ前に緊張感を持たせる。
+  // 2番のサビの後に来ることが多い（参考: ONLIVE Studio blog）。
+  // 専用のコード進行 "c" を持ち、AメロともBメロとも雰囲気が違う。
+  bridge: {
+    bars: 4,
+    melody: true,
+    registerShift: 2,
+    density: 0.9,
+    drumLevel: 1,
+    landing: 1,
+    // 解決しない音で止めてラスサビへ渡す
+    progression: "c"
+  },
+  // 落ちサビ。サビのメロディを伴奏控えめに歌う。J-POPの王道パターン。
+  // density と drumLevel だけ下げ、メロディはサビと同じものを使う。
+  drop_chorus: {
+    bars: 4,
+    melody: true,
+    registerShift: 4,
+    // サビと同じ高さ
+    density: 0.6,
+    // 薄い（ここが「落ち」の実体）
+    drumLevel: 0,
+    // ドラム控えめ
+    landing: 0,
+    // 主音へ全終止
+    progression: "b"
+    // サビと同じ進行
+  },
   interlude: {
     bars: 4,
     melody: false,
@@ -13327,18 +13394,120 @@ var SECTION_SPECS = {
     progression: "a"
   }
 };
-var buildSectionPlan = (kinds) => {
-  const wanted = kinds.length > 0 ? kinds : DEFAULT_SECTIONS;
-  const ordered = SECTION_ORDER.filter((k) => wanted.includes(k));
+var STRUCTURE_TEMPLATES = [
+  // 1コーラス（現行デフォルト、短い曲・初心者向け）
+  {
+    name: "1chorus",
+    label: "1\u30B3\u30FC\u30E9\u30B9",
+    plan: ["intro", "verse", "prechorus", "chorus"]
+  },
+  // JPOP王道（マリーゴールド型）
+  // イントロ→Aメロ→Aメロ→Bメロ→サビ→Aメロ→Bメロ→サビ→Cメロ→間奏→サビ→アウトロ
+  {
+    name: "jpop_standard",
+    label: "JPOP\u738B\u9053",
+    plan: [
+      "intro",
+      "verse",
+      "verse",
+      "prechorus",
+      "chorus",
+      "verse",
+      "prechorus",
+      "chorus",
+      "bridge",
+      "interlude",
+      "chorus",
+      "outro"
+    ]
+  },
+  // 落ちサビ入り（J-POP王道の変形。ラスサビ前に落ちサビ）
+  {
+    name: "jpop_drop",
+    label: "\u843D\u3061\u30B5\u30D3\u5165\u308A",
+    plan: [
+      "intro",
+      "verse",
+      "verse",
+      "prechorus",
+      "chorus",
+      "verse",
+      "prechorus",
+      "chorus",
+      "bridge",
+      "drop_chorus",
+      "chorus",
+      "outro"
+    ]
+  },
+  // ボカロ王道（短め高速、Aメロ繰り返しなし）
+  {
+    name: "vocaloid",
+    label: "\u30DC\u30AB\u30ED\u738B\u9053",
+    plan: [
+      "intro",
+      "verse",
+      "prechorus",
+      "chorus",
+      "verse",
+      "prechorus",
+      "chorus",
+      "bridge",
+      "chorus",
+      "outro"
+    ]
+  },
+  // Verse-Chorus形式（Bメロなし、洋楽的）
+  {
+    name: "verse_chorus",
+    label: "Verse-Chorus",
+    plan: [
+      "intro",
+      "verse",
+      "chorus",
+      "verse",
+      "chorus",
+      "bridge",
+      "chorus",
+      "outro"
+    ]
+  }
+];
+var buildSectionPlan = (kinds, templateName) => {
+  let ordered;
+  if (templateName) {
+    const tmpl = STRUCTURE_TEMPLATES.find((t) => t.name === templateName);
+    ordered = tmpl ? tmpl.plan : DEFAULT_SECTIONS;
+  } else {
+    const wanted = kinds.length > 0 ? kinds : DEFAULT_SECTIONS;
+    ordered = SECTION_ORDER.filter((k) => wanted.includes(k));
+  }
   const plan = [];
   let bar = 0;
+  const seen = /* @__PURE__ */ new Map();
   for (const kind of ordered) {
     const spec = SECTION_SPECS[kind];
-    plan.push({ kind, startBar: bar, bars: spec.bars, spec, keyShift: 0 });
+    const count = seen.get(kind) ?? 0;
+    plan.push({
+      kind,
+      startBar: bar,
+      bars: spec.bars,
+      spec,
+      keyShift: 0,
+      restatement: count > 0
+    });
+    seen.set(kind, count + 1);
     bar += spec.bars;
   }
   return plan;
 };
+var sectionAt = (plan, bar) => {
+  for (const section of plan) {
+    if (bar >= section.startBar && bar < section.startBar + section.bars)
+      return section;
+  }
+  return plan[plan.length - 1];
+};
 
 // src/compose.ts
 var STEP_SEMITONES = 2;
@@ -13624,6 +13793,16 @@ var SECTION_A_PROGRESSIONS = [
   ["Am", "Dm7", "Bb", "E7"]
   // bVI からドミナントへ
 ];
+var SECTION_C_PROGRESSIONS = [
+  ["Am", "Em", "F", "C"],
+  ["Dm7", "Em7", "FM7", "G7"],
+  ["Am7", "Dm7", "G7", "CM7"],
+  ["F", "G", "Am", "G"],
+  ["Dm7", "G7", "Em7", "Am"],
+  ["FM7", "Em7", "Am7", "Dm7"],
+  ["Am", "G", "FM7", "E7"],
+  ["C", "Am", "FM7", "G7"]
+];
 var SECTION_B_PROGRESSIONS = [
   ["F", "G", "Em7", "Am"],
   ["Dm7", "G7", "CM7", "A7"],
@@ -13850,10 +14029,9 @@ var HALF_BAR_FIGURES = [
   [EIGHTH, EIGHTH, EIGHTH, EIGHTH],
   // タタタタ
   [EIGHTH, EIGHTH, EIGHTH, EIGHTH],
-  [EIGHTH, EIGHTH, EIGHTH, EIGHTH],
-  [EIGHTH, EIGHTH, EIGHTH, EIGHTH],
   [QUARTER, EIGHTH, EIGHTH],
   // ター・タタ
+  [QUARTER, EIGHTH, EIGHTH],
   [EIGHTH, EIGHTH, QUARTER],
   // タタ・ター
   [DOT_QUARTER, EIGHTH],
@@ -13861,8 +14039,24 @@ var HALF_BAR_FIGURES = [
   [DOT_QUARTER, EIGHTH],
   [EIGHTH, QUARTER, EIGHTH],
   // 頭抜き
+  // 4分音符主体・ロングトーン（J-POPの歌い上げるバラード〜ミドル向け。音数過多を是正）
+  [QUARTER, QUARTER],
+  // ター・ター
+  [QUARTER, QUARTER],
   [HALF],
-  // ロングトーン
+  // ターーー
+  [HALF],
+  [-QUARTER, QUARTER],
+  // 休・ター
+  [QUARTER, -QUARTER],
+  // ター・休
+  // 弱起（アウフタクト）パターン：末尾から次へ飛び込む言い回し
+  [-DOT_QUARTER, EIGHTH],
+  // 3拍半休みからの裏拍アウフタクト
+  [-QUARTER, EIGHTH, EIGHTH],
+  // 2拍目裏からのアウフタクト（タタ）
+  [QUARTER, -EIGHTH, EIGHTH],
+  // ター・休タ（8分裏弱起）
   // 付点8分＋16分（タッカ）。歌モノで非常に多用される跳ね・推進力の型。
   [DOT_EIGHTH, SIXTEENTH, EIGHTH, EIGHTH],
   [EIGHTH, EIGHTH, DOT_EIGHTH, SIXTEENTH],
@@ -14531,7 +14725,10 @@ var draw = (options, resolvedKey, rnd) => {
   };
   const quarterSteps = scaleStep(QUARTER);
   const strongStep = Math.max(1, Math.round(stepsPerBar / 2));
-  const sectionPlan = buildSectionPlan(options.sections ?? DEFAULT_SECTIONS);
+  const sectionPlan = buildSectionPlan(
+    options.sections ?? DEFAULT_SECTIONS,
+    options.template
+  );
   const totalBars = sectionPlan.reduce((sum, s) => sum + s.bars, 0);
   if (rnd() < 0.35) {
     const modType = pick(
@@ -14568,12 +14765,18 @@ var draw = (options, resolvedKey, rnd) => {
     (p) => p.join("|") !== progA.join("|")
   );
   const progB = pick(progBPool, rnd);
+  const progC = pick(
+    SECTION_C_PROGRESSIONS.filter(
+      (p) => p.join("|") !== progA.join("|") && p.join("|") !== progB.join("|")
+    ),
+    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 progression = [];
   for (const section of sectionPlan) {
-    const base = section.spec.progression === "b" ? progB : progA;
+    const base = 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) {
@@ -14591,7 +14794,7 @@ var draw = (options, resolvedKey, 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 sourceOf = (kind) => kind === "chorus" || kind === "interlude" || kind === "drop_chorus" ? "b" : kind === "prechorus" ? "a2" : kind === "bridge" ? "c" : "a";
   const units2 = [];
   for (const section of sectionPlan) {
     const unitCount = Math.max(1, Math.round(section.bars / 2));
@@ -14628,6 +14831,19 @@ var draw = (options, resolvedKey, rnd) => {
   const barInUnit = (bar) => bar % 2;
   const unitOf = (bar) => Math.floor(bar / 2);
   const restatementOf = (bar) => {
+    const curSec = sectionAt(sectionPlan, bar);
+    if (!curSec.spec.melody) return null;
+    if (curSec.restatement) {
+      const firstSec = sectionPlan.find(
+        (s) => s.kind === curSec.kind && !s.restatement
+      );
+      if (firstSec) {
+        const offset = bar - curSec.startBar;
+        if (offset < firstSec.bars) {
+          return firstSec.startBar + offset;
+        }
+      }
+    }
     const u = unitOf(bar);
     if (units2[u].source === "silent") return null;
     for (let v = 0; v < u; v++) {
@@ -14657,10 +14873,9 @@ var draw = (options, resolvedKey, rnd) => {
     ),
     // 人間の曲の跳躍率は p25〜p75 で 0.40〜0.55。上限が低いとその帯へ届かない。
     leapAffinity: 0.08 + rnd() * 0.3,
-    // 4曲に1曲は変化音を使わない曲にする（調の外の音は曲の性格そのものなので、
-    // 全曲に掛けると「どの曲も同じ味付け」になる）。
-    chromaticAffinity: rnd() < 0.25 ? 0 : 0.15 + rnd() * 0.45,
-    barHeadWeight: rnd() < 0.65 ? 3 : 2,
+    // 界隈曲らしさ：調の外の音（クロマチック）や微小な逸脱を積極的に許容する。
+    chromaticAffinity: rnd() < 0.1 ? 0 : 0.3 + rnd() * 0.6,
+    barHeadWeight: rnd() < 0.5 ? 3 : 2,
     bassStyle: pick(
       [
         "quarter",
@@ -14686,7 +14901,7 @@ var draw = (options, resolvedKey, rnd) => {
     subInterval: pick([3, 4, 8, 9], rnd)
   };
   const motifPool = groovyCells(MOTIF_CELLS, style.groove, rnd);
-  const targetNotesPerBar = 5.5 + rnd() * 2.5;
+  const targetNotesPerBar = 4 + rnd() * 4;
   const targetRestRatio = 0.02 + rnd() * 0.1;
   const cellNotes = (c) => c.value.filter((v) => v > 0).length;
   const cellRest = (c) => {
@@ -14698,27 +14913,49 @@ var draw = (options, resolvedKey, rnd) => {
     }
     return total === 0 ? 0 : rest / total;
   };
-  const cellDistance = (c) => Math.abs(cellNotes(c) - targetNotesPerBar) + Math.abs(cellRest(c) - targetRestRatio) * 8;
-  const pickCell = (pool) => {
+  const cellDistance = (c, densityMul = 1) => Math.abs(cellNotes(c) - targetNotesPerBar * densityMul) + Math.abs(cellRest(c) - targetRestRatio / Math.max(0.5, densityMul)) * 8;
+  const pickCell = (pool, densityMul = 1) => {
     let best = pick(pool, rnd);
     for (let i2 = 0; i2 < 2; i2++) {
       const c = pick(pool, rnd);
-      if (cellDistance(c) < cellDistance(best)) best = c;
+      if (cellDistance(c, densityMul) < cellDistance(best, densityMul))
+        best = c;
     }
     return best;
   };
-  const motifCell = pickCell(motifPool);
-  const motifCell2 = rnd() < 0.45 ? motifCell : pickCell(motifPool.filter((c) => c !== motifCell));
+  const motifCell = pickCell(motifPool, 0.85);
+  const motifCell2 = rnd() < 0.45 ? motifCell : pickCell(
+    motifPool.filter((c) => c !== motifCell),
+    0.85
+  );
   const motifB = pickCell(
-    motifPool.filter((c) => c !== motifCell && c !== motifCell2)
+    motifPool.filter((c) => c !== motifCell && c !== motifCell2),
+    1.2
+  );
+  const motifB2 = pickCell(
+    motifPool.filter((c) => c !== motifB),
+    1.2
   );
-  const motifB2 = pickCell(motifPool.filter((c) => c !== motifB));
   const motifA2 = pickCell(
     motifPool.filter(
       (c) => c !== motifCell && c !== motifCell2 && c !== motifB
-    )
+    ),
+    1.1
+  );
+  const motifA22 = rnd() < 0.45 ? motifA2 : pickCell(
+    motifPool.filter((c) => c !== motifA2),
+    1.1
+  );
+  const motifC = pickCell(
+    motifPool.filter(
+      (c) => c !== motifCell && c !== motifCell2 && c !== motifB && c !== motifA2
+    ),
+    0.9
+  );
+  const motifC2 = rnd() < 0.45 ? motifC : pickCell(
+    motifPool.filter((c) => c !== motifC),
+    0.9
   );
-  const motifA22 = rnd() < 0.45 ? motifA2 : pickCell(motifPool.filter((c) => c !== motifA2));
   const motifVar = pickCell(
     motifPool.filter((c) => c !== motifCell && c !== motifCell2)
   );
@@ -14771,12 +15008,13 @@ var draw = (options, resolvedKey, rnd) => {
     }
     const isB = units2[u].source === "b";
     const isA2 = units2[u].source === "a2";
+    const isC = units2[u].source === "c";
     const isPrechorusEnd = units2[u].section.kind === "prechorus" && bar === units2[u].section.startBar + units2[u].section.bars - 1;
     if (isPrechorusEnd) {
       barRhythms.push(scaleCell(buildUpCell.value));
       continue;
     }
-    const pair = () => isB ? [motifB, motifB2] : isA2 ? [motifA2, motifA22] : [motifCell, motifCell2];
+    const pair = () => isB ? [motifB, motifB2] : isA2 ? [motifA2, motifA22] : isC ? [motifC, motifC2] : [motifCell, motifCell2];
     let cell;
     if (units2[u].source === "answer") {
       const isPeriodEnd = units2[u].landing !== null;
@@ -14807,6 +15045,8 @@ var draw = (options, resolvedKey, rnd) => {
   const melody = [];
   const submelody = [];
   const bass = [];
+  const harmony = [];
+  const pad = [];
   const melodyDurations = [];
   const barTension = new Array(totalBars).fill(0);
   let restSteps = 0;
@@ -14853,13 +15093,22 @@ var draw = (options, resolvedKey, rnd) => {
       (bar + style.arcPhase) / style.arcPeriod * Math.PI * 2
     );
     const arcCenter = MELODY_CENTER + arc * style.arcAmp;
-    const headTarget = prevSemi + (arcCenter - prevSemi) * 0.5;
-    const headSemi = nearestChordTone(
-      headTarget,
-      tones,
-      headWeight,
-      isSectionB
-    ).semi;
+    const inUnit = barInUnit(bar);
+    let headSemi;
+    if (inUnit === 1 && bar > 0) {
+      headSemi = nearestChordTone(prevSemi, tones, headWeight, isSectionB).semi;
+      if (Math.abs(headSemi - prevSemi) > 4) {
+        headSemi = nearestChordTone(prevSemi, tones, 1, isSectionB).semi;
+      }
+    } else {
+      const headTarget = prevSemi + (arcCenter - prevSemi) * 0.5;
+      headSemi = nearestChordTone(
+        headTarget,
+        tones,
+        headWeight,
+        isSectionB
+      ).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") ? pick([-2, -1, 1, 2], rnd) : 0;
@@ -15039,6 +15288,48 @@ var draw = (options, resolvedKey, rnd) => {
     } else {
       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 (barSec.kind === "prechorus" || barSec.kind === "chorus" || barSec.kind === "bridge" || barSec.kind === "drop_chorus") {
+      const padTone = nearestChordTone(
+        MELODY_HIGH + 2,
+        // メロディの上の音域
+        tones,
+        2
+      );
+      const padSemi = clampSemi(padTone.semi, MELODY_HIGH - 4, MELODY_HIGH + 8);
+      const k = barKeyShift[bar];
+      const fifthShift = k === 0 ? 0 : SEMITONE_TO_FIFTH_SHIFT[(k % 12 + 12) % 12];
+      pad.push({
+        startStep: barStart,
+        pitchUnits: spelledToUnits(
+          padSemi + k,
+          padTone.fifth + fifthShift,
+          edo
+        ),
+        durationSteps: stepsPerBar,
+        // 小節全体を伸ばす
+        velocity: barSec.kind === "drop_chorus" ? 50 : 62
+      });
+    }
     const rootTone = tones[0];
     const fifthTone = tones.find((t) => t.weight === 3 && t !== rootTone);
     const thirdTone = tones.find((t) => t.weight === 2);
@@ -15145,6 +15436,69 @@ var draw = (options, resolvedKey, rnd) => {
     }
     for (const n of barBass) bass.push(n);
   }
+  const eighthSteps = scaleStep(EIGHTH);
+  for (let i2 = 0; i2 < melody.length - 1; i2++) {
+    const cur = melody[i2];
+    const nxt = melody[i2 + 1];
+    const curEnd = cur.startStep + cur.durationSteps;
+    const atBarBoundary = curEnd % stepsPerBar === 0 && nxt.startStep === curEnd;
+    if (!atBarBoundary) continue;
+    if (cur.durationSteps > eighthSteps) continue;
+    const barIdx = Math.floor(curEnd / stepsPerBar);
+    if (barIdx >= totalBars) continue;
+    if (i2 + 1 >= melody.length - 1) continue;
+    const curSec = sectionAt(sectionPlan, barIdx - 1);
+    const nextSec = sectionAt(sectionPlan, barIdx);
+    if (!nextSec.spec.melody || curSec !== nextSec) 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 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;
+    else if (nextRole === "cadence") tieProb = 0.1;
+    if (rnd() < tieProb) {
+      cur.durationSteps += nxt.durationSteps;
+      melody.splice(i2 + 1, 1);
+      if (i2 < melodyDurations.length - 1) {
+        melodyDurations[i2] += melodyDurations[i2 + 1];
+        melodyDurations.splice(i2 + 1, 1);
+      }
+      const hCurIdx = harmony.findIndex((h) => h.startStep === cur.startStep);
+      const hNxtIdx = harmony.findIndex((h) => h.startStep === nxt.startStep);
+      if (hCurIdx >= 0 && hNxtIdx >= 0) {
+        harmony[hCurIdx].durationSteps += harmony[hNxtIdx].durationSteps;
+        harmony.splice(hNxtIdx, 1);
+      }
+      i2--;
+    }
+  }
+  for (let i2 = 0; i2 < melody.length; i2++) {
+    const barIdx = Math.floor(melody[i2].startStep / stepsPerBar);
+    if (barIdx >= totalBars) continue;
+    const role = barRoles[barIdx];
+    let splitProb = 0.15;
+    if (role === "motif" || role === "sequence") splitProb = 0;
+    else if (role === "climax") splitProb = 0.6;
+    else if (role === "cadence") splitProb = 0;
+    if (rnd() < splitProb && melody[i2].durationSteps === quarterSteps) {
+      const half = scaleStep(EIGHTH);
+      const newNote = {
+        ...melody[i2],
+        startStep: melody[i2].startStep + half,
+        durationSteps: half
+      };
+      melody[i2].durationSteps = half;
+      melody.splice(i2 + 1, 0, newNote);
+      if (i2 < melodyDurations.length) {
+        melodyDurations[i2] = half;
+        melodyDurations.splice(i2 + 1, 0, half);
+      }
+      i2++;
+    }
+  }
   const range = (notes) => {
     if (notes.length === 0) return 0;
     const us = notes.map((n) => n.pitchUnits);
@@ -15152,7 +15506,7 @@ var draw = (options, resolvedKey, rnd) => {
   };
   const shiftUnits = semitonesToUnits(rootShift, edo);
   if (shiftUnits !== 0)
-    for (const list of [melody, submelody, bass])
+    for (const list of [melody, submelody, bass, harmony, pad])
       for (const n of list) n.pitchUnits = n.pitchUnits + shiftUnits;
   return {
     chordProgression,
@@ -15167,6 +15521,8 @@ var draw = (options, resolvedKey, rnd) => {
     melody,
     submelody,
     bass,
+    harmony,
+    pad,
     melodyDurations,
     restSteps,
     totalSteps: Math.max(1, sungBars) * stepsPerBar,
@@ -15202,7 +15558,16 @@ var evaluate = (d, recent) => {
     fromMelody(toMetricNotes(d.submelody)),
     opts
   );
-  const tension = tensionFeatures(d.barTension);
+  const verseBars = [];
+  const chorusBars = [];
+  for (const s of d.sections) {
+    for (let b = s.startBar; b < s.startBar + s.bars; b++) {
+      if (s.kind === "verse") verseBars.push(b);
+      else if (s.kind === "chorus" || s.kind === "drop_chorus")
+        chorusBars.push(b);
+    }
+  }
+  const tension = tensionFeatures(d.barTension, { verseBars, chorusBars });
   const density = densityFeatures(melodyFrom, opts);
   const fingerprint = featureVector({
     entropy,
@@ -15218,6 +15583,7 @@ var evaluate = (d, recent) => {
   );
   const at = (b, v) => band(v, b[0], b[1], b[2], b[3]);
   const atc = (key, v) => centeredBand(v, CORPUS_BANDS[key], CORPUS_MEDIANS[key]);
+  const peakBand = d.bars > 24 ? [0, 1, Math.round(d.bars / 16), Math.round(d.bars / 8) + 2] : HAND_BANDS.climaxPeaks;
   const scoreBreakdown = {
     entropy: atc("entropy", entropy),
     valueKinds: atc("valueKinds", valueKinds),
@@ -15235,7 +15601,7 @@ var evaluate = (d, recent) => {
     sim8: atc("sim8", structure.sim8),
     phraseBreath: atc("phraseBreath", structure.phraseBreath),
     climaxPosition: atc("climaxPosition", structure.climaxPosition),
-    climaxPeaks: at(HAND_BANDS.climaxPeaks, structure.climaxPeaks),
+    climaxPeaks: at(peakBand, structure.climaxPeaks),
     complementarity: at(HAND_BANDS.complementarity, structure.complementarity),
     subDensity: at(HAND_BANDS.subDensity, d.submelody.length / d.bars),
     tensionRise: tension.rise,
@@ -15289,9 +15655,10 @@ var composeSong = (options) => {
     bestScore = stats.score;
     bestIsValid = ok;
     best = {
-      // ドラムは勝った候補にだけ後から付ける（メロディに依存しないので
+      // ドラム・楽器は勝った候補にだけ後から付ける（メロディに依存しないので
       // 候補ごとに引いても採点は動かず、40本ぶん無駄になる）。
       drum: "",
+      instrument: "",
       chordProgression: d.chordProgression,
       chordPattern: d.chordPattern,
       rootShift: d.rootShift,
@@ -15304,6 +15671,8 @@ var composeSong = (options) => {
       melody: d.melody,
       submelody: d.submelody,
       bass: d.bass,
+      harmony: d.harmony,
+      pad: d.pad,
       stats: { ...stats, attempts: attempt, rejected }
     };
   }
@@ -15311,6 +15680,7 @@ var composeSong = (options) => {
   result.stats.attempts = count;
   result.stats.rejected = rejected;
   result.drum = pickBuiltinDrum(result, rnd);
+  result.instrument = pickBuiltinInstrument(result, rnd);
   return result;
 };
 var pickBuiltinDrum = (song, rnd) => {
@@ -15319,6 +15689,35 @@ var pickBuiltinDrum = (song, 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 pickBuiltinInstrument = (song, rnd) => {
+  const eighth = BASE_STEPS_PER_BAR / 8;
+  const short = song.melody.filter((n) => n.durationSteps <= eighth).length / Math.max(1, song.melody.length);
+  if (rnd() < 0.06) {
+    return pick(["japanese_wa", "arabic_exotic"], rnd);
+  }
+  let pool;
+  if (song.drum === "dance" || song.drum === "disco") {
+    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) {
+    pool = ["ambient_cloud", "acoustic", "orchestra", "piano", "fantasy_rpg"];
+  } else if (song.bpm >= 145) {
+    pool = ["rock", "synth_pop", "cyber_punk", "retro_game", "piano"];
+  } else if (song.stats.leapRatio >= 0.45) {
+    pool = ["fantasy_rpg", "orchestra", "acoustic", "piano"];
+  } else {
+    pool = [
+      "piano",
+      "acoustic",
+      "synth_pop",
+      "rock",
+      "jazz_night",
+      "fantasy_rpg"
+    ];
+  }
+  return pick(pool, rnd);
+};
 var LYRIC_WORDS = [
   "\u3042\u3055",
   "\u3072\u304B\u308A",
@@ -15720,74 +16119,89 @@ var buildUI = (target, options) => {
   <details class="dtm-panel" data-dtm-acc="macro">
     <summary>\u30DE\u30AF\u30ED</summary>
     <div class="dtm-panel-body">
-      <div class="dtm-row ${showCompose ? "" : "dtm-hidden"}" data-dtm="compose-row">
-        <button class="dtm-btn dtm-btn--success" data-dtm="macro-compose" title="\u30B3\u30FC\u30C9\u9032\u884C\u30FB\u30E1\u30ED\u30C7\u30A3\u30FB\u30B5\u30D6\u30E1\u30ED\u30FB\u30D9\u30FC\u30B9\u30FB\u4F34\u594F\u30FB\u30C9\u30E9\u30E0\u3092\u81EA\u52D5\u3067\u4F5C\u308A\u307E\u3059">\u4F5C\u66F2</button>
-        <button class="dtm-btn dtm-btn--success" data-dtm="macro-compose-vocal" title="\u4F5C\u66F2\u3057\u305F\u3046\u3048\u3067\u3001\u30E1\u30ED\u30C7\u30A3\u306B\u6B4C\u8A5E\u3092\u4ED8\u3051\u3066\u6B4C\u308F\u305B\u307E\u3059">\u6B4C\u5165\u308A\u4F5C\u66F2</button>
-        <button class="dtm-infobtn" data-dtm="macro-compose-info" title="\u4F5C\u66F2\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
-        <span class="dtm-grow"></span>
-      </div>
-      <div class="dtm-row ${showCompose ? "" : "dtm-hidden"}" data-dtm="compose-sections-row">
-        <span class="dtm-label">\u4F5C\u308B\u90E8\u5206</span>
-        <div class="dtm-checks" data-dtm="compose-sections">
-          <label class="dtm-check"><input type="checkbox" value="intro" checked>\u30A4\u30F3\u30C8\u30ED</label>
-          <label class="dtm-check"><input type="checkbox" value="verse" checked>A\u30E1\u30ED</label>
-          <label class="dtm-check"><input type="checkbox" value="prechorus" checked>B\u30E1\u30ED</label>
-          <label class="dtm-check"><input type="checkbox" value="chorus" checked>\u30B5\u30D3</label>
-          <label class="dtm-check"><input type="checkbox" value="interlude">\u9593\u594F</label>
-          <label class="dtm-check"><input type="checkbox" value="outro">\u30A2\u30A6\u30C8\u30ED</label>
+      <div class="dtm-compose-container ${showCompose ? "" : "dtm-hidden"}" data-dtm="compose-container">
+        <div class="dtm-row" data-dtm="compose-row">
+          <button class="dtm-btn dtm-btn--success" data-dtm="macro-compose" title="\u30B3\u30FC\u30C9\u9032\u884C\u30FB\u30E1\u30ED\u30C7\u30A3\u30FB\u30B5\u30D6\u30E1\u30ED\u30FB\u30D9\u30FC\u30B9\u30FB\u4F34\u594F\u30FB\u30C9\u30E9\u30E0\u3092\u81EA\u52D5\u3067\u4F5C\u308A\u307E\u3059">\u4F5C\u66F2</button>
+          <button class="dtm-btn dtm-btn--success" data-dtm="macro-compose-vocal" title="\u4F5C\u66F2\u3057\u305F\u3046\u3048\u3067\u3001\u30E1\u30ED\u30C7\u30A3\u306B\u6B4C\u8A5E\u3092\u4ED8\u3051\u3066\u6B4C\u308F\u305B\u307E\u3059">\u6B4C\u5165\u308A\u4F5C\u66F2</button>
+          <button class="dtm-infobtn" data-dtm="macro-compose-info" title="\u4F5C\u66F2\u306E\u89E3\u8AAC">${icon("info", 12)}</button>
+          <span class="dtm-grow"></span>
+        </div>
+        <div class="dtm-row" data-dtm="compose-template-row">
+          <span class="dtm-label">\u69CB\u6210</span>
+          <select class="dtm-select" data-dtm="compose-template" title="J-POP\u738B\u9053\u306A\u3069\u306E\u30D7\u30EA\u30BB\u30C3\u30C8\u69CB\u6210\u3092\u9078\u3073\u307E\u3059">
+            <option value="custom">\u81EA\u7531\u9078\u629E\uFF08\u4E0B\u8A18\u30C1\u30A7\u30C3\u30AF\uFF09</option>
+            <option value="1chorus">1\u30B3\u30FC\u30E9\u30B9\uFF08\u77ED\u3081\u30FB\u521D\u5FC3\u8005\u5411\u3051\uFF09</option>
+            <option value="jpop_standard">JPOP\u738B\u9053\uFF08\u30DE\u30EA\u30FC\u30B4\u30FC\u30EB\u30C9\u578B 2\u756A/C\u30E1\u30ED/\u30E9\u30B9\u30B5\u30D3\uFF09</option>
+            <option value="jpop_drop">\u843D\u3061\u30B5\u30D3\u5165\u308A\uFF08JPOP\u738B\u9053 + \u30E9\u30B9\u30B5\u30D3\u524D\u843D\u3061\u30B5\u30D3\uFF09</option>
+            <option value="vocaloid">\u30DC\u30AB\u30ED\u738B\u9053\uFF08\u75BE\u8D70\u30FB2\u756A/C\u30E1\u30ED/\u30E9\u30B9\u30B5\u30D3\uFF09</option>
+            <option value="verse_chorus">Verse-Chorus\uFF08B\u30E1\u30ED\u306A\u3057\u30FB\u6D0B\u697D\u98A8\uFF09</option>
+          </select>
+        </div>
+        <div class="dtm-row" data-dtm="compose-sections-row">
+          <span class="dtm-label">\u4F5C\u308B\u90E8\u5206</span>
+          <div class="dtm-checks" data-dtm="compose-sections">
+            <label class="dtm-check"><input type="checkbox" value="intro" checked>\u30A4\u30F3\u30C8\u30ED</label>
+            <label class="dtm-check"><input type="checkbox" value="verse" checked>A\u30E1\u30ED</label>
+            <label class="dtm-check"><input type="checkbox" value="prechorus" checked>B\u30E1\u30ED</label>
+            <label class="dtm-check"><input type="checkbox" value="chorus" checked>\u30B5\u30D3</label>
+            <label class="dtm-check"><input type="checkbox" value="bridge">C\u30E1\u30ED</label>
+            <label class="dtm-check"><input type="checkbox" value="drop_chorus">\u843D\u3061\u30B5\u30D3</label>
+            <label class="dtm-check"><input type="checkbox" value="interlude">\u9593\u594F</label>
+            <label class="dtm-check"><input type="checkbox" value="outro">\u30A2\u30A6\u30C8\u30ED</label>
+          </div>
+          <span class="dtm-grow"></span>
+          <span class="dtm-hint" data-dtm="compose-sections-len"></span>
+        </div>
+        <div class="dtm-row" 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>
-        <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>
@@ -15985,6 +16399,7 @@ var buildUI = (target, options) => {
     transposeApplyBtn: sel("transpose-apply"),
     transposeInfoBtn: sel("transpose-info"),
     macroCompose: sel("macro-compose"),
+    composeTemplate: sel("compose-template"),
     composeSections: sel("compose-sections"),
     composeSectionsLen: sel("compose-sections-len"),
     composeKey: sel("compose-key"),
@@ -16127,6 +16542,45 @@ var INSTRUMENT_PRESETS = {
   }
 };
 
+// src/macro-state.ts
+var MACRO_STORAGE_KEYS = {
+  template: "dtm-macro:template",
+  sections: "dtm-macro:sections",
+  key: "dtm-macro:key",
+  shift: "dtm-macro:shift",
+  transpose: "dtm-macro:transpose"
+};
+var readMacroSetting = (key) => {
+  try {
+    if (typeof localStorage === "undefined" || !localStorage) return null;
+    return localStorage.getItem(MACRO_STORAGE_KEYS[key]);
+  } catch (_) {
+    return null;
+  }
+};
+var writeMacroSetting = (key, value) => {
+  try {
+    if (typeof localStorage === "undefined" || !localStorage) return;
+    localStorage.setItem(MACRO_STORAGE_KEYS[key], value);
+  } catch (_) {
+  }
+};
+var readMacroSections = () => {
+  const raw = readMacroSetting("sections");
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed) && parsed.every((x2) => typeof x2 === "string")) {
+      return parsed;
+    }
+  } catch (_) {
+  }
+  return null;
+};
+var writeMacroSections = (sections) => {
+  writeMacroSetting("sections", JSON.stringify(sections));
+};
+
 // src/macros.ts
 var SCALES = [
   [0, 2, 4, 5, 7, 9, 11],
@@ -17794,8 +18248,10 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
   const getXY = (e) => {
     const { clientX, clientY } = e;
     const rect = g_grid_canvas.getBoundingClientRect();
-    const x2 = Math.floor(clientX - rect.left);
-    const y = Math.floor(clientY - rect.top);
+    const scaleX = rect.width > 0 ? g_grid_canvas.width / rect.width : 1;
+    const scaleY = rect.height > 0 ? g_grid_canvas.height / rect.height : 1;
+    const x2 = Math.floor((clientX - rect.left) * scaleX);
+    const y = Math.floor((clientY - rect.top) * scaleY);
     return [x2, y, e.buttons];
   };
   const getGridPosition = (e) => {
@@ -17829,7 +18285,7 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
         const absoluteY = y + g_draw_offset_y;
         const yIndex = Math.floor(absoluteY / keyHeight);
         const pitch = units(pitchRangeStart + (keyCount - 1 - yIndex) * upr);
-        if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount) {
+        if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount * upr) {
           requestAnimationFrame(() => callback(step, pitch));
         }
       },
@@ -18468,12 +18924,15 @@ var pickComposeVocal = (exclude) => {
 var ADVANCED_COMPOSE_LAYOUT = [
   { index: 0, part: "melody", octave: 0, volume: 104 },
   { index: 1, part: "melody", octave: 1, volume: 62 },
-  { index: 2, part: "submelody", octave: 0, volume: 88 },
-  { index: 3, part: "bass", octave: 0, volume: 92 },
-  { index: 4, part: "bass", octave: -1, volume: 58 },
-  { index: 5, part: "block", octave: 0, volume: 62 },
-  { index: 6, part: "arpeggio", octave: 0, volume: 54 },
-  { index: 7, part: "offbeat", octave: 0, volume: 50 }
+  { index: 2, part: "harmony", octave: 0, volume: 82 },
+  { index: 3, part: "submelody", octave: 0, volume: 86 },
+  { index: 4, part: "bass", octave: 0, volume: 92 },
+  { index: 5, part: "bass", octave: -1, volume: 58 },
+  { index: 6, part: "pad", octave: 0, volume: 64 },
+  { index: 7, part: "block", octave: 0, volume: 62 },
+  { index: 8, part: "arpeggio", octave: 0, volume: 54 },
+  { index: 9, part: "offbeat", octave: 0, volume: 50 },
+  { index: 10, part: "uwamono", octave: 1, volume: 56 }
 ];
 var LYRIC_MODEL_CATEGORIES = [
   {
@@ -18763,6 +19222,7 @@ var mountDAW = (target, options = {}) => {
     options.onDrumFontChange?.(font);
   };
   let currentInstrument = "";
+  let autoComposeInstrument = null;
   let activeTrackId = options.initialActiveTrack ?? trackConfigs[0].id;
   let trackFxAdvancedOpen = readPanelOpen("track-fx-advanced") ?? false;
   let lyricAdvancedOpen = readPanelOpen("lyric-advanced") ?? false;
@@ -19285,7 +19745,9 @@ var mountDAW = (target, options = {}) => {
       unitsPerRow: upr = UNITS_PER_SEMITONE
     } = renderConfig;
     const offset = renderer.getDrawOffset();
-    for (const note of active.core.getNotes()) {
+    const notes = active.core.getNotes();
+    for (let i2 = notes.length - 1; i2 >= 0; i2--) {
+      const note = notes[i2];
       const logicalX = note.startStep * stepWidth;
       const yIndex = keyCount - 1 - (note.pitchUnits - pitchRangeStart) / upr;
       const logicalY = yIndex * keyHeight;
@@ -19361,14 +19823,18 @@ var mountDAW = (target, options = {}) => {
       return;
     }
     hasDragged = false;
-    const existing = findActiveNoteAt(x2, y, TOUCH_HIT_MARGIN);
+    const hitMargin = event.pointerType === "mouse" ? 0 : Math.min(
+      TOUCH_HIT_MARGIN,
+      Math.max(0, Math.floor(renderConfig.keyHeight * 0.25))
+    );
+    const existing = findActiveNoteAt(x2, y, hitMargin);
     if (existing) {
       playPreview(existing.pitchUnits);
       const { stepWidth } = renderConfig;
       const offset = renderer.getDrawOffset();
       const renderX = existing.startStep * stepWidth - offset.x;
       const w = existing.durationSteps * stepWidth;
-      if (x2 >= renderX + w - resizeHandleWidth && x2 <= renderX + w) {
+      if (x2 >= renderX + w - resizeHandleWidth && x2 <= renderX + w + hitMargin) {
         dragState = {
           noteId: existing.id,
           mode: "resize",
@@ -19383,7 +19849,7 @@ var mountDAW = (target, options = {}) => {
           noteId: existing.id,
           mode: "move",
           dragOffsetStep: step - existing.startStep,
-          dragOffsetPitch: pitch - existing.pitchUnits,
+          dragOffsetPitch: 0,
           startStep: existing.startStep,
           durationSteps: existing.durationSteps,
           lastPreviewPitch: existing.pitchUnits
@@ -19498,7 +19964,7 @@ var mountDAW = (target, options = {}) => {
             const orig = selectedOriginal.find((o) => o.id === grab.id);
             if (orig) {
               const newGrab = units(orig.pitch + deltaPitch);
-              if (newGrab !== lastMultiPreviewPitch && newGrab >= 0 && newGrab < 128) {
+              if (newGrab !== lastMultiPreviewPitch && newGrab >= PITCH_RANGE_START && newGrab <= PITCH_RANGE_END) {
                 lastMultiPreviewPitch = newGrab;
                 playPreview(newGrab);
               }
@@ -19647,11 +20113,9 @@ var mountDAW = (target, options = {}) => {
     gridCanvas.addEventListener("dblclick", (event) => {
       event.preventDefault();
       if (isActiveLocked()) return;
-      const { step, pitch } = renderer.getGridPosition(event);
+      const { x: x2, y } = renderer.getGridPosition(event);
       const active = getActive();
-      const note = active.core.getNotes().find(
-        (n) => n.pitchUnits === pitch && step >= n.startStep && step < n.startStep + n.durationSteps
-      );
+      const note = findActiveNoteAt(x2, y);
       if (note) active.core.deleteNoteById(note.id);
     });
     gridCanvas.addEventListener(
@@ -19796,8 +20260,8 @@ var mountDAW = (target, options = {}) => {
       redrawAll();
     },
     onEnd: (interrupted) => {
-      options.onScheduleFade?.(null);
       if (interrupted) {
+        options.onScheduleFade?.(null);
         playbackState = "paused";
         pausedPlayStep = currentPlayStep;
       } else {
@@ -21929,6 +22393,10 @@ var mountDAW = (target, options = {}) => {
       }
       return ADVANCED_COMPOSE_LAYOUT.filter((l) => l.part === "bass").map((l) => trackStates[l.index]).filter((t) => !!t);
     };
+    const selectedComposeTemplate = () => {
+      const val = refs.composeTemplate?.value;
+      return val && val !== "custom" ? val : void 0;
+    };
     const selectedComposeSections = () => {
       const boxes = [
         ...refs.composeSections.querySelectorAll(
@@ -21939,11 +22407,97 @@ var mountDAW = (target, options = {}) => {
       return picked.length > 0 ? picked : DEFAULT_SECTIONS;
     };
     const updateComposeSectionsLen = () => {
-      const plan = buildSectionPlan(selectedComposeSections());
+      const tmpl = selectedComposeTemplate();
+      const plan = buildSectionPlan(selectedComposeSections(), tmpl);
       const bars = plan.reduce((sum, x2) => sum + x2.bars, 0);
       refs.composeSectionsLen.textContent = `${bars}\u5C0F\u7BC0`;
     };
-    refs.composeSections.addEventListener("change", updateComposeSectionsLen);
+    const savedTemplate = readMacroSetting("template");
+    if (savedTemplate && refs.composeTemplate) {
+      const hasOption = Array.from(refs.composeTemplate.options).some(
+        (opt) => opt.value === savedTemplate
+      );
+      if (hasOption) {
+        refs.composeTemplate.value = savedTemplate;
+      }
+    }
+    const savedSections = readMacroSections();
+    if (savedSections && refs.composeSections) {
+      const boxes = refs.composeSections.querySelectorAll(
+        'input[type="checkbox"]'
+      );
+      const validValues = new Set(savedSections);
+      for (const box of boxes) {
+        box.checked = validValues.has(box.value);
+      }
+    } else if (savedTemplate && savedTemplate !== "custom" && refs.composeSections) {
+      const tmpl = STRUCTURE_TEMPLATES.find((t) => t.name === savedTemplate);
+      if (tmpl) {
+        const planSet = new Set(tmpl.plan);
+        const boxes = refs.composeSections.querySelectorAll(
+          'input[type="checkbox"]'
+        );
+        for (const box of boxes) {
+          box.checked = planSet.has(box.value);
+        }
+      }
+    }
+    const savedKey = readMacroSetting("key");
+    if (savedKey && refs.composeKey) {
+      const hasOption = Array.from(refs.composeKey.options).some(
+        (opt) => opt.value === savedKey
+      );
+      if (hasOption) {
+        refs.composeKey.value = savedKey;
+      }
+    }
+    const savedShift = readMacroSetting("shift");
+    if (savedShift && refs.shiftSelect) {
+      const hasOption = Array.from(refs.shiftSelect.options).some(
+        (opt) => opt.value === savedShift
+      );
+      if (hasOption) {
+        refs.shiftSelect.value = savedShift;
+      }
+    }
+    const savedTranspose = readMacroSetting("transpose");
+    if (savedTranspose && refs.transposeSelect) {
+      const hasOption = Array.from(refs.transposeSelect.options).some(
+        (opt) => opt.value === savedTranspose
+      );
+      if (hasOption) {
+        refs.transposeSelect.value = savedTranspose;
+      }
+    }
+    refs.composeSections.addEventListener("change", () => {
+      if (refs.composeTemplate) {
+        refs.composeTemplate.value = "custom";
+        writeMacroSetting("template", "custom");
+      }
+      writeMacroSections(selectedComposeSections());
+      updateComposeSectionsLen();
+    });
+    const composeTemplate = refs.composeTemplate;
+    if (composeTemplate) {
+      composeTemplate.addEventListener("change", () => {
+        writeMacroSetting("template", composeTemplate.value);
+        const tmplName = selectedComposeTemplate();
+        if (tmplName) {
+          const tmpl = STRUCTURE_TEMPLATES.find((t) => t.name === tmplName);
+          if (tmpl) {
+            const planSet = new Set(tmpl.plan);
+            const boxes = refs.composeSections.querySelectorAll(
+              'input[type="checkbox"]'
+            );
+            for (const box of boxes) {
+              box.checked = planSet.has(box.value);
+            }
+          }
+        }
+        writeMacroSections(selectedComposeSections());
+        updateComposeSectionsLen();
+      });
+    }
     updateComposeSectionsLen();
     const updateComposeKeyHint = () => {
       if (!refs.composeKey || !refs.composeKeyHint) return;
@@ -21951,17 +22505,33 @@ var mountDAW = (target, options = {}) => {
       refs.composeKeyHint.textContent = desc;
       refs.composeKeyHint.title = desc;
     };
-    if (refs.composeKey) {
-      refs.composeKey.addEventListener("change", updateComposeKeyHint);
+    const composeKey = refs.composeKey;
+    if (composeKey) {
+      composeKey.addEventListener("change", () => {
+        writeMacroSetting("key", composeKey.value);
+        updateComposeKeyHint();
+      });
       updateComposeKeyHint();
     }
+    if (refs.shiftSelect) {
+      refs.shiftSelect.addEventListener("change", () => {
+        writeMacroSetting("shift", refs.shiftSelect.value);
+      });
+    }
+    if (refs.transposeSelect) {
+      refs.transposeSelect.addEventListener("change", () => {
+        writeMacroSetting("transpose", refs.transposeSelect.value);
+      });
+    }
     const runCompose = (withVocal) => {
       stop();
       overlayDuring(() => {
+        const tmpl = selectedComposeTemplate();
         const song = composeSong({
           stepsPerBar: renderConfig.stepsPerBar,
           edo: renderConfig.edo,
           sections: selectedComposeSections(),
+          template: tmpl,
           baseKey: refs.composeKey?.value ?? "any",
           // 直近に作った曲の特徴を渡すと、それらから離れた候補に加点される。
           // 「作曲」を続けて押したときに似た曲が並ぶのを防ぐ。
@@ -22000,7 +22570,19 @@ 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 === "submelody" ? song.submelody : layer.part === "bass" ? song.bass : buildChordPlacements({
+            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({
+              edo: renderConfig.edo,
+              chordStr: song.chordProgression,
+              patternType: "arpeggio",
+              rootShift: song.rootShift,
+              bpm: song.bpm,
+              stepsPerBar: renderConfig.stepsPerBar
+            }).map((p) => ({
+              startStep: p.startStep,
+              pitchUnits: p.pitchUnits,
+              durationSteps: p.durationSteps,
+              velocity: Math.max(30, p.velocity - 14)
+            })) : buildChordPlacements({
               edo: renderConfig.edo,
               chordStr: song.chordProgression,
               patternType: layer.part,
@@ -22039,6 +22621,12 @@ var mountDAW = (target, options = {}) => {
         refs.drumSelect.value = song.drum;
         options.onDrumChange?.(song.drum);
         applyDrumPatternFont(song.drum);
+        const shouldAutoInstrument = !currentInstrument || currentInstrument === "auto" || currentInstrument === autoComposeInstrument;
+        if (shouldAutoInstrument && song.instrument) {
+          currentInstrument = song.instrument;
+          autoComposeInstrument = song.instrument;
+          options.onInstrumentChange?.(song.instrument);
+        }
         for (const t of bassTracksForCompose()) {
           t.trackCompression = AUTO_ROLE_MIX.bass.compression;
           options.onTrackCompressionChange?.(t.config.id, t.trackCompression);
@@ -23549,7 +24137,7 @@ var createPianoRoll = (options, handlers) => {
       const h = keyHeight;
       const renderX = logicalX - offset.x;
       const renderY = logicalY - offset.y;
-      if (x2 >= renderX && x2 <= renderX + w && y >= renderY && y <= renderY + h) {
+      if (x2 >= renderX && x2 < renderX + w && y >= renderY && y < renderY + h) {
         return note;
       }
     }
@@ -24312,6 +24900,8 @@ var createDtmStudio = async (options = {}) => {
     if (fadeOutStartAt !== void 0 && fadeOutEndAt !== void 0) {
       fadeGain.gain.setValueAtTime(1, fadeOutStartAt);
       fadeGain.gain.linearRampToValueAtTime(0, fadeOutEndAt);
+      fadeGain.gain.setValueAtTime(0, fadeOutEndAt + 2);
+      fadeGain.gain.setValueAtTime(1, fadeOutEndAt + 2);
     }
   };
   const clipMeter = createClipMeter(audioCtx, glueMakeup);
@@ -24539,13 +25129,17 @@ var createDtmStudio = async (options = {}) => {
     }
     const select = doc.createElement("select");
     select.className = "dtm-select dtm-grow";
+    const autoOpt = doc.createElement("option");
+    autoOpt.value = "auto";
+    autoOpt.textContent = "\u2728 \u81EA\u52D5\uFF08\u66F2\u8ABF\u9023\u52D5\uFF09";
+    select.appendChild(autoOpt);
     for (const [key, p] of Object.entries(INSTRUMENT_PRESETS)) {
       const o = doc.createElement("option");
       o.value = key;
       o.textContent = p.displayName;
       select.appendChild(o);
     }
-    select.value = opts.value && INSTRUMENT_PRESETS[opts.value] ? opts.value : defaultPreset;
+    select.value = opts.value === "auto" || opts.value && INSTRUMENT_PRESETS[opts.value] ? opts.value : defaultPreset;
     wrapper.appendChild(select);
     let busy = false;
     const onChange = async () => {
@@ -24554,6 +25148,10 @@ var createDtmStudio = async (options = {}) => {
       busy = true;
       const key = select.value;
       opts.onChange?.(key);
+      if (key === "auto") {
+        busy = false;
+        return;
+      }
       const trackIds = opts.getTrackIds?.() ?? [...TRACK_ROLES];
       const isAdvanced = trackIds.includes("t0");
       const mode = isAdvanced ? "advanced" : "simple";
@@ -24571,7 +25169,7 @@ var createDtmStudio = async (options = {}) => {
       element: wrapper,
       select,
       setValue: (k) => {
-        if (INSTRUMENT_PRESETS[k]) select.value = k;
+        if (k === "auto" || INSTRUMENT_PRESETS[k]) select.value = k;
       },
       getValue: () => select.value,
       destroy: () => {
@@ -24583,8 +25181,15 @@ var createDtmStudio = async (options = {}) => {
   await listReady;
   nameToKey = await buildNameToKeyMapping();
   await Promise.all([drumReady, loadPreset(defaultPreset)]);
+  const restoreFadeGainIfMuted = () => {
+    if (fadeGain.gain.value < 1) {
+      fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
+      fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
+    }
+  };
   const playDrum = (e) => {
     if (!sfDrum.font) return;
+    if (e.when === 0) restoreFadeGainIfMuted();
     if (KICK_PITCHES.has(e.pitch)) duckBassForKick(e.when);
     sfDrum.play({
       ctx: audioCtx,
@@ -24628,6 +25233,7 @@ var createDtmStudio = async (options = {}) => {
       }
     }
     const playNote4 = (e) => {
+      if (e.when === 0) restoreFadeGainIfMuted();
       const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
       const overrideKey = trackIdx >= 0 ? trackInstOverrides.get(trackIdx) : void 0;
       let sfInst;
@@ -24653,12 +25259,33 @@ var createDtmStudio = async (options = {}) => {
         duration: e.duration
       });
     };
+    let daw;
     let presetSelect = null;
     const handleInstrumentChange = (key) => {
+      if (key === "auto") {
+        if (presetSelect) {
+          presetSelect.setValue("auto");
+        }
+        onInstrumentChange?.("auto");
+        return;
+      }
       editorPreset = key;
       if (presetSelect) {
         presetSelect.setValue(key);
       }
+      if (INSTRUMENT_PRESETS[key]) {
+        const wasPlaying = daw?.getPlaybackState() === "playing";
+        if (wasPlaying) daw.pause();
+        daw?.setLoading?.(true);
+        void loadPreset(
+          key,
+          trackIds,
+          isAdvancedMode ? "advanced" : "simple"
+        ).finally(() => {
+          daw?.setLoading?.(false);
+          if (wasPlaying) daw?.play();
+        });
+      }
       onInstrumentChange?.(key);
     };
     const handleTrackInstrumentChange = async (trackIndex, instrumentName) => {
@@ -24672,7 +25299,6 @@ var createDtmStudio = async (options = {}) => {
       trackInstOverrides.set(trackIndex, key);
       await loadInstrument(key);
     };
-    let daw;
     const base = {
       getAudioTime: () => audioCtx.currentTime,
       onResumeAudio: async () => {
@@ -25431,6 +26057,7 @@ var createDtmStudio = async (options = {}) => {
   KOE_VOICEBANK_LABELS,
   KOE_VOICEBANK_TERMS,
   LinkedList,
+  MACRO_STORAGE_KEYS,
   MAJOR_KEY_IDS,
   MAX_VOCAL_VOLUME,
   MICRO_STEP,
@@ -25533,6 +26160,8 @@ var createDtmStudio = async (options = {}) => {
   playNote,
   playPlacements,
   playSingingMML,
+  readMacroSections,
+  readMacroSetting,
   resolveComposeKey,
   resolveDrumPattern,
   resolveLoopPoint,
@@ -25555,5 +26184,7 @@ var createDtmStudio = async (options = {}) => {
   unitsToMidi,
   unitsToMidiDetune,
   unitsToPitchV1,
-  vocalVolumeToGain
+  vocalVolumeToGain,
+  writeMacroSections,
+  writeMacroSetting
 });