@hidechae/eztab-mcp 0.7.0 → 0.8.0

package/README.md

@@ -103,7 +103,7 @@ Run standalone for testing: `task mcp` (or `npx tsx mcp/server.ts`).
 | `set_tuning` | Replace tuning / string count (`track` で対象パートを指定) |
 | `add_track` / `remove_track` | パート(ベース・2本目のギターなど)の追加・削除。メインを含めて最大4、track 0(メイン)は削除不可 |
 | `set_tone` | パートの再生音色を設定する(`track` で対象パートを指定)。`add_track` でも `tone` を指定できる |
-| `set_backing_style` | 伴奏(コード)の音を設定する: `pad`(既定)/ `guitar` / `piano` / `bass`(ルートのみ) |
+| `set_backing_style` | 伴奏(コード)の音を設定する: `pad`(既定)/ `guitar` / `acoustic` / `piano` / `bass`(ルートのみ)/ `upright`(ルートのみ)/ `synth` / `strings` |
 
 ### 複数パート(トラック)
 
@@ -119,6 +119,14 @@ Run standalone for testing: `task mcp` (or `npx tsx mcp/server.ts`).
   対応上限を超える形式のタブは閲覧のみで、編集・送信できない。
   0.2.0以前のMCPは複数パートのタブを送り返せない(サーバが409で拒否する)。
 
+### チューニングの音名
+
+チューニングの開放弦は、オクターブの数字を付けた音名で指定します(標準のギターは `E4 B3 G3 D3 A2 E2`、
+4弦ベースは `G2 D2 A1 E1`)。数字の無い音名はすべて同じオクターブとして鳴ってしまうため、
+0.7.1以降は `new_tab` / `set_tuning` / `add_track` が、弦が上から下へ低くなるようにオクターブを補います
+(音名がプリセットと一致すればそのオクターブ)。音名として読めない値はエラーになります。
+アプリも、数字の無いチューニングを持つ既存のタブを開くときに同じ補正をします。
+
 ### パートの音色
 
 0.6.0以降はパートごとの再生音色(形式リビジョン7、docs/design/0010-track-tones.md)を扱えます。
@@ -137,6 +145,8 @@ Run standalone for testing: `task mcp` (or `npx tsx mcp/server.ts`).
 0.7.0以降は伴奏(コード)の音(docs/design/0011-backing-styles.md)を `set_backing_style` で設定できます。
 
 - `pad`(既定。従来の音)/ `guitar` / `piano` / `bass`(コードの構成音を鳴らさず、ルートだけをベースで弾く。分数コードは分母の音)
+- 0.8.0以降は `acoustic`(アコースティックギター)/ `upright`(ウッドベース。`bass` と同じくルートだけ)/ `synth` / `strings` も選べます。
+  0.7.x 以前の版でこれらの値のタブを開くと、値は取り除かれてパッドに戻ります
 - `get_tab` はパッド以外のとき、先頭行に `backing=guitar` のように表示する
 - 形式リビジョンは変わらない。0.6.1以前のMCPでも、設定されたタブを編集・送信でき、値は保持される
 

package/dist/server.js

@@ -28,7 +28,16 @@ function normalizeTone(raw) {
   return raw !== "clean" && TONES.includes(raw) ? raw : void 0;
 }
 var DEFAULT_MAIN_TRACK_NAME = "Guitar";
-var BACKING_STYLES = ["pad", "guitar", "piano", "bass"];
+var BACKING_STYLES = [
+  "pad",
+  "guitar",
+  "acoustic",
+  "piano",
+  "bass",
+  "upright",
+  "synth",
+  "strings"
+];
 function normalizeBackingStyle(raw) {
   return raw !== "pad" && BACKING_STYLES.includes(raw) ? raw : void 0;
 }
@@ -290,6 +299,7 @@ function normalizeDocument(data) {
   if (!data || !Array.isArray(data.tuning) || !Array.isArray(data.measures)) {
     throw new Error("Not a valid EZTab document");
   }
+  data.tuning = completeTuning(data.tuning, namedBass(data.mainTrack?.name));
   const memo = normalizeSongMemo(data.memo);
   if (memo === void 0) delete data.memo;
   else data.memo = memo;
@@ -344,10 +354,10 @@ function normalizeDocument(data) {
   data.version = TAB_FILE_VERSION;
   return data;
 }
-function normalizeTrackMeta(raw, fallbackName) {
+function normalizeTrackMeta(raw, fallbackName, missingIdPrefix = "") {
   const volume = Number(raw?.volume);
   const meta = {
-    id: typeof raw?.id === "string" && raw.id ? raw.id : newTabId(),
+    id: typeof raw?.id === "string" && raw.id ? raw.id : missingIdPrefix + newTabId(),
     name: typeof raw?.name === "string" && raw.name.trim() ? raw.name : fallbackName,
     volume: Number.isFinite(volume) ? Math.max(0, Math.min(1, volume)) : 1,
     muted: raw?.muted === true
@@ -372,11 +382,11 @@ function normalizeTracks(data) {
   }
   const measures = data.measures;
   data.tracks = rawTracks.slice(0, MAX_TRACKS - 1).map((t, i) => {
-    const tuning = Array.isArray(t?.tuning) && t.tuning.length > 0 && t.tuning.every((n) => typeof n === "string") ? [...t.tuning] : [...PRESET_TUNINGS["Guitar (6)"]];
+    const tuning = Array.isArray(t?.tuning) && t.tuning.length > 0 && t.tuning.every((n) => typeof n === "string") ? completeTuning([...t.tuning], namedBass(t?.name)) : [...PRESET_TUNINGS["Guitar (6)"]];
     const rawMeasures = Array.isArray(t?.measures) ? t.measures : [];
     if (rawMeasures.length !== measures.length) data.trackMismatch = true;
     return {
-      ...normalizeTrackMeta(t, `Track ${i + 2}`),
+      ...normalizeTrackMeta(t, `Track ${i + 2}`, "legacy:"),
       tuning,
       measures: measures.map((m, mi) => fitTrackMeasure(rawMeasures[mi], m, tuning.length))
     };
@@ -426,6 +436,51 @@ var PRESET_TUNING_GROUPS = [
 var PRESET_TUNINGS = Object.fromEntries(
   PRESET_TUNING_GROUPS.flatMap((g) => g.items.map((i) => [i.name, i.tuning]))
 );
+var OPEN_NOTE = /^([A-Ga-g])([#♯b♭]*)(-?\d+)?$/;
+var LETTER_SEMITONES = { C: 0, D: 2, E: 4, F: 5, G: 7, A: 9, B: 11 };
+function parseOpenNote(raw) {
+  const m = OPEN_NOTE.exec(typeof raw === "string" ? raw.trim() : "");
+  if (!m) return null;
+  let semis = LETTER_SEMITONES[m[1].toUpperCase()];
+  for (const ch of m[2]) semis += ch === "#" || ch === "\u266F" ? 1 : -1;
+  return {
+    name: m[1].toUpperCase() + m[2],
+    semis,
+    pc: (semis % 12 + 12) % 12,
+    midi: m[3] != null ? (parseInt(m[3], 10) + 1) * 12 + semis : null
+  };
+}
+function completeTuning(tuning, bass = false) {
+  const parsed = tuning.map(parseOpenNote);
+  if (parsed.some((n) => n === null) || parsed.every((n) => n?.midi != null)) return tuning;
+  const notes = parsed;
+  const spell = (i, midi) => notes[i].midi !== null ? tuning[i] : notes[i].name + ((midi - notes[i].semis) / 12 - 1);
+  const above = (pc, floor) => floor + ((pc - floor) % 12 + 12) % 12;
+  const below = (pc, ceil) => ceil - ((ceil - pc) % 12 + 12) % 12;
+  const midis = notes.map((n) => n.midi);
+  if (notes.every((n) => n.midi === null)) {
+    for (const preset of PRESET_TUNING_GROUPS.flatMap((g) => g.items)) {
+      const open = preset.tuning.map(parseOpenNote);
+      if (open.length === notes.length && open.every((o, i) => o?.pc === notes[i].pc)) {
+        return notes.map((_, i) => spell(i, open[i]?.midi));
+      }
+    }
+    const reference = bass || notes.length <= 5 ? 43 : 64;
+    const up = above(notes[0].pc, reference);
+    midis[0] = up - reference <= 6 ? up : up - 12;
+  }
+  const anchor = midis.findIndex((m) => m !== null);
+  for (let i = anchor - 1; i >= 0; i--) {
+    midis[i] = above(notes[i].pc, midis[i + 1] + 1);
+  }
+  for (let i = anchor + 1; i < midis.length; i++) {
+    if (midis[i] === null) midis[i] = below(notes[i].pc, midis[i - 1] - 1);
+  }
+  return notes.map((_, i) => spell(i, midis[i]));
+}
+function namedBass(name) {
+  return typeof name === "string" && /bass|ベース/i.test(name);
+}
 var DEFAULT_BEATS = 4;
 var DEFAULT_BEAT_UNIT = 4;
 var DEFAULT_SUBDIVISIONS = 2;
@@ -540,6 +595,9 @@ function noteToMidi(note) {
 // ../src/lib/playbackRate.ts
 var PLAYBACK_RATES = Array.from({ length: 36 }, (_, i) => (5 + i) / 20);
 
+// ../src/lib/strum.ts
+var MAX_SHARE = 1 / 6;
+
 // ../src/lib/tracks.ts
 function newUid() {
   return newTabId();
@@ -781,7 +839,7 @@ function storedSize(doc) {
 
 // ../src/lib/player.ts
 function instrumentOf(tuning, name = "") {
-  if (/bass|ベース/i.test(name)) return "bass";
+  if (namedBass(name)) return "bass";
   const open = tuning.map(noteToMidi).filter((m) => m != null);
   return open.length > 0 && Math.max(...open) < 50 ? "bass" : "guitar";
 }
@@ -804,6 +862,7 @@ var GUITAR_CLEAN = {
   cabHz: OPEN,
   cabQ: 0,
   lowCutHz: 70,
+  lowCutQ: 0,
   level: 1
 };
 var BASS_CLEAN = { ...GUITAR_CLEAN, pickupHz: 2600, pickupQ: 1, lowCutHz: 30 };
@@ -826,26 +885,33 @@ var CHAINS = {
       lowCutHz: 80,
       level: 0.26
     },
+    // A deep, soft high gain (a Friedman or a Hughes & Kettner rather than a
+    // bright Marshall): the lows mostly stay in, both stages are driven hard,
+    // and the top is rolled off early instead of pushed at the presence range.
     distortion: {
       ...GUITAR_CLEAN,
-      pickupQ: 2,
-      tightHz: 250,
-      pushDb: 6,
+      pickupHz: 3800,
+      pickupQ: 1,
+      tightHz: 140,
+      pushDb: 5,
       drive: 0.5,
-      stage1: { gain: 24, bias: 0.25 },
+      stage1: { gain: 30, bias: 0.2 },
       // The next tube stage is inverted, so it clips the other half harder.
       drive2: 1,
-      stage2: { gain: 5, bias: -0.35 },
-      interHpHz: 160,
-      interLpHz: 6500,
-      bodyHz: 2800,
-      bodyDb: 4,
-      cabHz: 4800,
-      cabQ: 3,
-      lowCutHz: 90,
-      level: 0.17
+      stage2: { gain: 8, bias: -0.3 },
+      interHpHz: 110,
+      interLpHz: 4200,
+      // Low mids for body, where the bright voicing had a presence peak.
+      bodyHz: 400,
+      bodyDb: 2,
+      cabHz: 3800,
+      cabQ: 1,
+      lowCutHz: 85,
+      lowCutQ: 2,
+      level: 0.15
     },
-    acoustic: { ...GUITAR_CLEAN, pickupHz: 9e3, pickupQ: 0, bodyDb: 5, level: 1.2 },
+    // The body is in the waveform itself (stringSynth's acousticParams).
+    acoustic: { ...GUITAR_CLEAN, pickupHz: 12e3, pickupQ: 0, level: 1.2 },
     piano: PIANO,
     synth: { ...DIRECT, level: 0.8 },
     strings: { ...DIRECT, level: 0.8 }
@@ -879,15 +945,8 @@ var CHAINS = {
       lowCutHz: 35,
       level: 0.15
     },
-    // Upright bass.
-    acoustic: {
-      ...BASS_CLEAN,
-      pickupHz: 3e3,
-      pickupQ: 0,
-      bodyHz: 100,
-      bodyDb: 6,
-      level: 1.4
-    },
+    // Upright bass. The body is in the waveform itself (stringSynth's uprightParams).
+    acoustic: { ...BASS_CLEAN, pickupHz: 5e3, pickupQ: 0, level: 1.4 },
     piano: PIANO,
     // Synth bass.
     synth: { ...DIRECT, level: 0.8 },
@@ -1234,7 +1293,7 @@ var state = {
   source: null
 };
 var server = new McpServer(
-  { name: "eztab", version: "0.7.0" },
+  { name: "eztab", version: "0.8.0" },
   {
     instructions: "All indices are 0-based: measure 0 is the first measure, string 0 is the top (highest) string, and column 0 is the first column. Notes and chords share the same column grid. Subdivisions are per beat and can differ within a measure (e.g. [2,2,3,2] mixes a triplet beat into straight eighths), so columns per measure = the sum of its per-beat subdivisions; get_tab's ruler shows the column indices. add_measures `at` is a 0-based insert position too. No need to ask the user about indexing. Exception: write_measures uses guitar string numbers (1 = top line), matching the labels get_tab prints. To write whole measures (e.g. transcribing a score or an image), prefer write_measures over set_cells \u2014 it takes one string per beat and does the column arithmetic for you. For transcribing from an image, follow the import_tab_from_image prompt. To deliver a result to the EZTab app, call send_to_eztab; to fix an existing tab, list_tabs \u2192 open_tab \u2192 edit \u2192 send_to_eztab. A tab can hold up to 4 tracks (parts, e.g. guitar + bass); track 0 is the main track. Tools that edit notes take an optional 0-based `track` (default 0). Measures and time signatures are shared by all tracks (adding/removing a measure affects every track); subdivisions are per track; chords belong to track 0 and use its columns."
   }
@@ -1285,6 +1344,9 @@ function setDoc(doc) {
   return text(render(state.doc));
 }
 var MISMATCH_NOTE = "Warning: this tab's extra tracks may be shifted against the main track \u2014 an older EZTab app added or removed measures without them. Check that the tracks line up (get_tab) and ask the user before sending it back.";
+var tuningParam = z.array(z.string().regex(/^[A-Ga-g][#♯b♭]*(-?\d+)?$/, "a note name such as E2, F#3 or Bb1")).min(1).describe(
+  'Open notes from the top (highest) string to the bottom (lowest), each WITH its octave, e.g. standard guitar ["E4","B3","G3","D3","A2","E2"], bass ["G2","D2","A1","E1"]. A missing octave is filled in so the strings run from high to low.'
+);
 var trackParam = z.number().int().min(0).optional().describe("0-based track (part) index from get_tab; default 0, the main track.");
 function assertMeasure(doc, m) {
   if (!Number.isInteger(m) || m < 0 || m >= doc.measures.length) {
@@ -1314,12 +1376,12 @@ server.tool(
     title: z.string().optional(),
     artist: z.string().optional(),
     preset: z.enum(["Guitar (6)", "Bass (4)", "Bass (5)", "Ukulele (4)"]).optional(),
-    tuning: z.array(z.string()).optional(),
+    tuning: tuningParam.optional(),
     measures: z.number().int().min(1).max(512).optional(),
     tempo: z.number().int().min(20).max(400).optional()
   },
   async (a) => {
-    const tuning = a.tuning ?? (a.preset ? PRESET_TUNINGS[a.preset] : void 0);
+    const tuning = a.tuning ? completeTuning(a.tuning) : a.preset ? PRESET_TUNINGS[a.preset] : void 0;
     const doc = createDocument(tuning, a.measures ?? 4);
     if (a.title) doc.title = a.title;
     if (a.artist) doc.artist = a.artist;
@@ -1717,11 +1779,15 @@ server.tool(
 server.tool(
   "set_tuning",
   "Replace the tuning / string count. Existing frets are preserved where strings overlap. Order is top (highest) to bottom (lowest).",
-  { tuning: z.array(z.string()).min(1), track: trackParam },
-  async (a) => applyEdit((doc) => {
-    doc.tuning = [...a.tuning];
-    doc.measures = doc.measures.map((m) => resizeMeasureStrings(m, a.tuning.length));
-  }, a.track)
+  { tuning: tuningParam, track: trackParam },
+  async (a) => {
+    const name = trackMetas(requireDoc())[a.track ?? 0]?.name;
+    const tuning = completeTuning(a.tuning, namedBass(name));
+    return applyEdit((doc) => {
+      doc.tuning = tuning;
+      doc.measures = doc.measures.map((m) => resizeMeasureStrings(m, tuning.length));
+    }, a.track);
+  }
 );
 var toneParam = z.enum(TONES).describe(
   "How the track sounds in playback. Guitar tracks: clean, crunch (light overdrive), distortion, acoustic, piano, synth, strings. Bass tracks (named or tuned like a bass): clean, crunch (overdrive), acoustic (upright bass), synth (synth bass) only."
@@ -1750,7 +1816,7 @@ server.tool(
 );
 server.tool(
   "set_backing_style",
-  "Set how the chord backing (the chords written with set_chords / @Name) sounds in playback: pad (the default soft pad), guitar, piano, or bass (only the root \u2014 or a slash chord's bass note \u2014 on a bass).",
+  "Set how the chord backing (the chords written with set_chords / @Name) sounds in playback: pad (the default soft pad), guitar (clean electric), acoustic (acoustic guitar), piano, synth, strings, or only the root \u2014 or a slash chord's bass note \u2014 on a bass (electric) or upright (upright bass).",
   { style: z.enum(BACKING_STYLES) },
   async (a) => {
     const doc = edit(0, () => {
@@ -1773,12 +1839,14 @@ server.tool(
   {
     name: z.string().min(1).describe("Shown in the app, e.g. 'Bass' or 'Guitar 2'."),
     preset: z.enum(TRACK_PRESETS).optional(),
-    tuning: z.array(z.string()).min(1).optional().describe("Top (highest) to bottom; overrides preset."),
+    tuning: tuningParam.optional().describe(
+      "Overrides preset. Open notes top (highest) to bottom, each WITH its octave (e.g. G2 D2 A1 E1)."
+    ),
     tone: toneParam.optional().describe("Playback tone (see set_tone); default clean.")
   },
   async (a) => {
     const before = trackMetas(requireDoc()).length;
-    const tuning = a.tuning ?? PRESET_TUNINGS[a.preset ?? "Bass (4)"];
+    const tuning = a.tuning ? completeTuning(a.tuning, namedBass(a.name)) : PRESET_TUNINGS[a.preset ?? "Bass (4)"];
     const doc = edit(0, () => {
     });
     const added = addTrack(doc, a.name, tuning);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hidechae/eztab-mcp",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "MCP server for EZTab — lets an AI agent build and edit guitar/bass tablature.",
   "type": "module",
   "bin": {