mr-magic-mcp-server 0.3.5 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mr-magic-mcp-server",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Lyrics MCP server connecting LRCLIB, Genius, Musixmatch, and Melon",
   "type": "module",
   "main": "src/index.js",

package/src/index.js

@@ -43,7 +43,9 @@ function rankRecord(record) {
 async function tryProviders(track, { syncedOnly = false, providerNames = [] } = {}) {
   const matches = [];
   let bestSynced = null;
-  let bestOverall = null;
+  // Only track candidates that have actual lyric text — metadata-only stubs
+  // (e.g. Melon returning a record with plainLyrics: null) never become best.
+  let bestWithContent = null;
   const chosenProviders =
     providerNames.length > 0
       ? providers.filter((provider) => providerNames.includes(provider.name))
@@ -56,15 +58,23 @@ async function tryProviders(track, { syncedOnly = false, providerNames = [] } =
     const scored = { provider: provider.name, result: candidate, score: rankRecord(candidate) };
     matches.push(scored);
 
-    if (!bestOverall || scored.score > bestOverall.score) {
-      bestOverall = scored;
+    // Only promote as best when the candidate actually has lyric content.
+    if (lyricContentScore(candidate) > 0) {
+      if (!bestWithContent || scored.score > bestWithContent.score) {
+        bestWithContent = scored;
+      }
     }
-    if (candidate.synced && (!bestSynced || scored.score > bestSynced.score)) {
+    if (
+      candidate.synced &&
+      lyricContentScore(candidate) > 0 &&
+      (!bestSynced || scored.score > bestSynced.score)
+    ) {
       bestSynced = scored;
     }
   }
 
-  const best = syncedOnly ? (bestSynced ?? null) : (bestSynced ?? bestOverall ?? null);
+  // best is null when no provider returned actual lyric content for this track.
+  const best = syncedOnly ? (bestSynced ?? null) : (bestSynced ?? bestWithContent ?? null);
   return {
     matches,
     best

package/src/tests/run-tests.js

@@ -259,6 +259,41 @@ function testAutoPickSyncedWithContentBeatsSyncedEmpty() {
   console.log('autoPick: synced+content beats synced+empty even with lower confidence: ok');
 }
 
+function testEmptyRecordNeverBecomesBest() {
+  // Simulate the tryProviders bestWithContent guard directly.
+  // When all candidates are metadata-only (no lyric text), bestWithContent must stay null.
+  const emptyRecords = [
+    { plainLyrics: null, syncedLyrics: null, synced: false, confidence: 0.5 }, // Melon stub
+    { plainLyrics: '', syncedLyrics: null, synced: false, confidence: 0.3 } // empty string
+  ];
+  let bestWithContent = null;
+  for (const candidate of emptyRecords) {
+    if (lyricContentScore(candidate) > 0) {
+      bestWithContent = candidate;
+    }
+  }
+  assert.ok(
+    bestWithContent === null,
+    'metadata-only records must not be promoted as best — bestWithContent should remain null'
+  );
+
+  // Contrast: a record with actual text IS selected
+  const withLyrics = { plainLyrics: 'line one\nline two', syncedLyrics: null, confidence: 0.1 };
+  let bestWithContentFromMixed = null;
+  for (const candidate of [...emptyRecords, withLyrics]) {
+    if (lyricContentScore(candidate) > 0) {
+      bestWithContentFromMixed = candidate;
+    }
+  }
+  assert.ok(
+    bestWithContentFromMixed === withLyrics,
+    'when a content-bearing record is present, it should be promoted over empty ones'
+  );
+
+  divider();
+  console.log('empty records never become best — content guard works: ok');
+}
+
 async function testBuildPayloadFromResultReturnsCacheKey() {
   // build a minimal find result with plain lyrics — no network call needed
   const best = {
@@ -273,7 +308,10 @@ async function testBuildPayloadFromResultReturnsCacheKey() {
   const context = buildActionContext({});
   const payload = await buildPayloadFromResult(result, context);
 
-  assert.ok(payload.lyricsCacheKey, 'buildPayloadFromResult should include lyricsCacheKey when best has plain lyrics');
+  assert.ok(
+    payload.lyricsCacheKey,
+    'buildPayloadFromResult should include lyricsCacheKey when best has plain lyrics'
+  );
   assert.equal(typeof payload.lyricsCacheKey, 'string', 'lyricsCacheKey should be a string');
 
   // Verify the cache was actually populated
@@ -283,7 +321,11 @@ async function testBuildPayloadFromResultReturnsCacheKey() {
 
   // Verify key stability — same artist/title always yields the same key
   const expectedKey = catalogCacheKey({ artist: 'Dylan Cotrone', title: 'Cigarette' });
-  assert.equal(payload.lyricsCacheKey, expectedKey, 'lyricsCacheKey should match catalogCacheKey for the track');
+  assert.equal(
+    payload.lyricsCacheKey,
+    expectedKey,
+    'lyricsCacheKey should match catalogCacheKey for the track'
+  );
 
   divider();
   console.log('buildPayloadFromResult returns lyricsCacheKey and populates cache: ok');
@@ -302,7 +344,10 @@ async function testBuildPayloadFromResultNoCacheKeyWhenNoLyrics() {
   const context = buildActionContext({});
   const payload = await buildPayloadFromResult(result, context);
 
-  assert.ok(!payload.lyricsCacheKey, 'buildPayloadFromResult should NOT include lyricsCacheKey when best has no lyrics');
+  assert.ok(
+    !payload.lyricsCacheKey,
+    'buildPayloadFromResult should NOT include lyricsCacheKey when best has no lyrics'
+  );
 
   divider();
   console.log('buildPayloadFromResult omits lyricsCacheKey when best has no lyrics: ok');
@@ -320,6 +365,7 @@ async function run() {
   testAutoPickPrefersContentOverEmpty();
   testAutoPickRicherContentWins();
   testAutoPickSyncedWithContentBeatsSyncedEmpty();
+  testEmptyRecordNeverBecomesBest();
   await testBuildPayloadFromResultReturnsCacheKey();
   await testBuildPayloadFromResultNoCacheKeyWhenNoLyrics();
   const toolNames = mcpToolDefinitions.map((tool) => tool.name);