mcp-recipes 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 4.1.0
+
+- **Node.js 24.22.1 or later**, inside the Node.js 24 line. The package, the
+  extension manifest and the image all declare it.
+- **zod `^4.6.7`.** Below 4.6.6, zod can exhaust memory while
+  validating oversized constrained collections, and the range accepts none of
+  those versions.
+- **Dependency floors:** `@modelcontextprotocol/sdk` `^1.32.2`, `mcp-bbc-goodfood` `^1.1.0`, `mcp-marmiton` `^2.1.0`, `mcp-pequerecetas` `^1.1.0`, `mcp-supertoinette` `^1.1.0`, `mcp-wikibooks-cookbook` `^2.1.0`.
+
 ## 4.0.0
 
 - **The published client entry renames a field on `SourceProfile` and

package/README.md

@@ -65,7 +65,7 @@ Node 24 or later is required, and no environment variable has to be set.
   "mcpServers": {
     "recipes": {
       "command": "docker",
-      "args": ["run", "-i", "--rm", "ghcr.io/smeet666/mcp-recipes:4.0.0"]
+      "args": ["run", "-i", "--rm", "ghcr.io/smeet666/mcp-recipes:4.1.0"]
     }
   }
 }
@@ -79,7 +79,7 @@ nothing else: no volume, no port, no credential.
 
 ### Bundle, without npm
 
-Download `mcp-recipes-4.0.0.mcpb` from
+Download `mcp-recipes-4.1.0.mcpb` from
 [the latest release](https://github.com/smeet666/mcp-recipes/releases/latest) and
 open it. A client that supports MCP bundles installs it on its own, with no npm
 and no configuration file to edit. The bundle carries its dependencies, so
@@ -133,12 +133,12 @@ search says so, and `get_recipe` says what it read off the page.
 
 Searches every source with one question.
 
-| Argument           | Type                          | Required | What it does                                                     |
-| ------------------ | ----------------------------- | -------- | ---------------------------------------------------------------- |
-| `query`            | string, 1 to 200 characters   | yes      | The dish or the ingredient to look for.                          |
-| `limit_per_source` | integer, 1 to 25, default `5` | no       | Rows to keep from each source.                                   |
-| `sources`          | array of source ids           | no       | Ask these sources alone.                                         |
-| `fan_out`          | boolean, default `true`       | no       | Ask every source rather than stopping at the first that answers. |
+| Argument           | Type                          | Required | What it does                                                      |
+| ------------------ | ----------------------------- | -------- | ----------------------------------------------------------------- |
+| `query`            | string, 1 to 200 characters   | yes      | The dish or the ingredient to look for.                           |
+| `limit_per_source` | integer, 1 to 25, default `5` | no       | Rows to keep from each source.                                    |
+| `sources`          | array of source ids           | no       | Ask these sources alone.                                          |
+| `fan_out`          | boolean, default `true`       | no       | Also send each source shorter wordings derived from the question. |
 
 **In return:** `results`, rows carrying `id`, which `get_recipe` takes;
 `source` and `source_name` saying which site published the row; `title`; `url`;
@@ -314,11 +314,11 @@ Each site keeps its own pace, and the floors hold here as well.
 
 ## Pacing and attribution
 
-Each site is paced on its own, one request at a time with at least a second
-between two, and the floor of half a second holds however the server is
-configured. Two of the sites ask for more, three seconds between two requests,
-and they get it: a setting posted for every source can raise a site's spacing
-and never lower it. Asking every site at once therefore costs each of them one request,
+Each site is paced on its own, one request at a time. Every site holds a floor
+of its own that no configuration goes under: half a second for Marmiton and the
+Cookbook, one second for Ptitchef and BBC Good Food, three seconds for
+Supertoinette and Pequerecetas. A setting posted for every source can raise a
+site's spacing and never lower it. Asking every site at once therefore costs each of them one request,
 never two. The `User-Agent` always ends with the project identity and an address
 where a person can be reached.
 
@@ -438,7 +438,7 @@ renseigner.
   "mcpServers": {
     "recipes": {
       "command": "docker",
-      "args": ["run", "-i", "--rm", "ghcr.io/smeet666/mcp-recipes:4.0.0"]
+      "args": ["run", "-i", "--rm", "ghcr.io/smeet666/mcp-recipes:4.1.0"]
     }
   }
 }
@@ -452,7 +452,7 @@ rien d'autre : aucun volume, aucun port, aucun identifiant.
 
 ### Bundle, sans npm
 
-Téléchargez `mcp-recipes-4.0.0.mcpb` depuis
+Téléchargez `mcp-recipes-4.1.0.mcpb` depuis
 [la dernière publication](https://github.com/smeet666/mcp-recipes/releases/latest)
 et ouvrez-le. Un client qui gère les bundles MCP l'installe seul, sans npm et
 sans fichier de configuration à modifier. Le bundle emporte ses dépendances, donc
@@ -508,12 +508,12 @@ page.
 
 Cherche dans toutes les sources avec une seule question.
 
-| Argument           | Type                             | Requis | Ce qu'il fait                                                           |
-| ------------------ | -------------------------------- | ------ | ----------------------------------------------------------------------- |
-| `query`            | chaîne, 1 à 200 caractères       | oui    | Le plat ou l'ingrédient cherché.                                        |
-| `limit_per_source` | entier, 1 à 25, défaut `5`       | non    | Lignes à garder de chaque source.                                       |
-| `sources`          | tableau d'identifiants de source | non    | N'interroger que ces sources.                                           |
-| `fan_out`          | booléen, défaut `true`           | non    | Interroger chaque source plutôt que s'arrêter à la première qui répond. |
+| Argument           | Type                             | Requis | Ce qu'il fait                                                                      |
+| ------------------ | -------------------------------- | ------ | ---------------------------------------------------------------------------------- |
+| `query`            | chaîne, 1 à 200 caractères       | oui    | Le plat ou l'ingrédient cherché.                                                   |
+| `limit_per_source` | entier, 1 à 25, défaut `5`       | non    | Lignes à garder de chaque source.                                                  |
+| `sources`          | tableau d'identifiants de source | non    | N'interroger que ces sources.                                                      |
+| `fan_out`          | booléen, défaut `true`           | non    | Envoyer aussi à chaque source des formulations plus courtes tirées de la question. |
 
 **En retour :** `results`, des lignes portant `id`, que `get_recipe` reprend ;
 `source` et `source_name` qui disent quel site a publié la ligne ; `title` ;
@@ -695,11 +695,11 @@ Chaque site garde son propre rythme, et les planchers tiennent également ici.
 
 ## Rythme et attribution
 
-Chaque site est cadencé pour lui-même, une requête à la fois avec au moins une
-seconde entre deux, et le plancher d'une demi-seconde tient quelle que soit la
-configuration. Deux des sites en demandent davantage, trois secondes entre deux
-requêtes, et ils l'obtiennent : un réglage posé pour toutes les sources peut
-élargir l'écart d'un site, jamais le réduire. Les interroger toutes à la fois coûte donc à chacune une requête,
+Chaque site est cadencé pour lui-même, une requête à la fois. Chaque site tient
+un plancher qui lui est propre et sous lequel aucune configuration ne descend :
+une demi-seconde pour Marmiton et le Cookbook, une seconde pour Ptitchef et BBC
+Good Food, trois secondes pour Supertoinette et Pequerecetas. Un réglage posé
+pour toutes les sources peut élargir l'écart d'un site, jamais le réduire. Les interroger toutes à la fois coûte donc à chacune une requête,
 jamais deux. Le `User-Agent` se termine toujours par l'identité du projet et une
 adresse où joindre une personne.
 

package/dist/index.js

@@ -11,7 +11,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import process from "process";
 
 // src/version.ts
-var PKG_VERSION = "4.0.0";
+var PKG_VERSION = "4.1.0";
 var REPO_URL = "https://github.com/smeet666/mcp-recipes";
 var ISSUES_URL = "https://github.com/smeet666/mcp-recipes/issues";
 
@@ -174,6 +174,7 @@ function fromSource(error, sourceName) {
 
 // src/sources/adapter.ts
 var NUMBER_AND_REST = /^\s*(\d+(?:[.,]\d+)?)\s*(.*)$/;
+var NUMBER_INSIDE = /^\D*?(\d+(?:[.,]\d+)?)\s*(.*)$/;
 var RANGE_AND_REST = /^\s*(\d+(?:[.,]\d+)?)\s*(?:à|a|to|-|–|—|ou|or)\s*(\d+(?:[.,]\d+)?)\s*(.*)$/i;
 function text(value) {
   return typeof value === "string" && value.trim() !== "" ? value : null;
@@ -237,6 +238,14 @@ function readYieldSpan(published) {
       return { count: value, max: null, unit: text(single[2]) };
     }
   }
+  const inside = NUMBER_INSIDE.exec(published);
+  if (inside) {
+    const [figure = ""] = inside.slice(1);
+    const value = Number(figure.replace(",", "."));
+    if (Number.isFinite(value)) {
+      return { count: value, max: null, unit: text(inside[2]) };
+    }
+  }
   return { count: null, max: null, unit: null };
 }
 function detailBase(source) {
@@ -609,8 +618,10 @@ function marmitonAdapter(reader) {
         skipped,
         // Rows on the page, including the ones this server could not read: the
         // site saw them, and reporting only the readable ones would understate
-        // what it holds.
-        reportedTotal: rows.length + skipped,
+        // what it holds. A page carrying none is a page this server counted
+        // nothing on, and "Marmiton reported 0" is a sentence Marmiton never
+        // said.
+        reportedTotal: rows.length + skipped === 0 ? null : rows.length + skipped,
         reportedTotalMeans: "rows on the single page of results Marmiton serves; the site disallows paging, so this is not a catalogue count",
         cached: outcome.cached
       };
@@ -1096,7 +1107,8 @@ function supertoinetteDetail(payload) {
 }
 
 // src/sources/registry.ts
-var PAGE_READ_BOUNDS = { maxBodyBytes: 8e6, budgetMs: 6e4 };
+var MAX_BODY_BYTES = 8e6;
+var PTITCHEF_BUDGET_MS = 6e4;
 var PACING_FLOOR_MS = {
   marmiton: 500,
   cookbook: 500,
@@ -1116,6 +1128,7 @@ function pacedConfig(config, source) {
     minIntervalMs: pacingFor(source, config.minIntervalMs),
     timeoutMs: config.timeoutMs,
     maxRetries: config.maxRetries,
+    maxBodyBytes: MAX_BODY_BYTES,
     cacheTtlMs: config.cacheTtlMs,
     cacheMaxEntries: config.cacheMaxEntries,
     logLevel: config.logLevel
@@ -1126,7 +1139,7 @@ function buildSources(config, readers, logger) {
   const marmitonOptions = { config: paced(MARMITON_PROFILE.id) };
   const cookbookOptions = { config: paced(COOKBOOK_PROFILE.id) };
   const ptitchefOptions = {
-    config: { ...paced(PTITCHEF_PROFILE.id), ...PAGE_READ_BOUNDS },
+    config: { ...paced(PTITCHEF_PROFILE.id), budgetMs: PTITCHEF_BUDGET_MS },
     logger
   };
   const goodfoodOptions = { config: paced(GOODFOOD_PROFILE.id), logger };
@@ -1806,13 +1819,16 @@ function deriveWordings(question) {
   );
   return wordings.slice(0, MAX_WORDINGS_PER_SOURCE);
 }
-function namesDish(title, question) {
+function sharesDishWord(title, question) {
   const words = namingWords(question);
   if (words.length === 0) {
     return true;
   }
   return dishWordsMissing(title, question).length < words.length;
 }
+function carriesDish(title, question) {
+  return dishWordsMissing(title, question).length === 0;
+}
 function dishWordsMissing(title, question) {
   const haystack = ` ${fold(title)} `;
   return namingWords(question).filter((word) => !haystack.includes(` ${fold(word)}`));
@@ -1894,7 +1910,7 @@ function reportOf(attempt, rows, question) {
     preferredByName: attempt.preferredByName,
     // Counted over the rows this answer holds, so it is read against `count`
     // and never against a number of rows nobody was shown.
-    namesTheDish: rows.filter((row) => namesDish(row.title, question)).length
+    namesTheDish: rows.filter((row) => carriesDish(row.title, question)).length
   };
 }
 function heldBack(wording, because) {
@@ -1918,7 +1934,7 @@ function keepNewRows(read, seen, rows, question) {
     seen.add(row.id);
     rows.push(row);
     added += 1;
-    if (namesDish(row.title, question)) {
+    if (sharesDishWord(row.title, question)) {
       onTopic += 1;
     }
   }
@@ -1982,8 +1998,9 @@ var RecipesClient = class {
    */
   deadlineFor(source) {
     const attempts = this.config.maxRetries + 1;
-    const between = pacingFor(source, this.config.minIntervalMs) + LONGEST_WAIT_BETWEEN_TRIES_MS;
-    return this.config.timeoutMs * attempts + between * this.config.maxRetries;
+    const spacing = pacingFor(source, this.config.minIntervalMs) * attempts;
+    const backoff = LONGEST_WAIT_BETWEEN_TRIES_MS * this.config.maxRetries;
+    return this.config.timeoutMs * attempts + spacing + backoff;
   }
   /**
    * Ask every source the same question and merge the rows.
@@ -2123,8 +2140,8 @@ var RecipesClient = class {
         failure = reason;
       }
     }
-    const onTopicRows = rows.filter((row) => namesDish(row.title, question));
-    const ordered = [...onTopicRows, ...rows.filter((row) => !namesDish(row.title, question))];
+    const onTopicRows = rows.filter((row) => sharesDishWord(row.title, question));
+    const ordered = [...onTopicRows, ...rows.filter((row) => !sharesDishWord(row.title, question))];
     return {
       source,
       rows: ordered,
@@ -5058,9 +5075,17 @@ function labelNote(label, note) {
 function answeredNotes(report) {
   const notes = [];
   const sent = report.wordings.filter((attempt) => attempt.ran && attempt.error === null);
+  const failed = report.wordings.filter((attempt) => attempt.error !== null);
   if (report.count === 0) {
     notes.push(nothingOfferedNote(report, sent));
   }
+  if (failed.length > 0) {
+    notes.push(
+      mustKeep(
+        `${report.name} did not answer ${failed.map((attempt) => `"${quoteForeign(attempt.query)}" ([${attempt.error?.code}])`).join(", ")}, so nothing here is a statement about ${failed.length > 1 ? "those wordings" : "that wording"}.`
+      )
+    );
+  }
   if (sent.length > 1) {
     notes.push(
       `${report.name} was asked ${sent.length} wordings and these rows are their union: ${sent.map((attempt) => `"${quoteForeign(attempt.query)}" (${attempt.count ?? 0})`).join(", ")}. Those counts are per wording and are never added.`
@@ -5225,7 +5250,7 @@ function truncate(text2, maxChars) {
 }
 function renderRows(rows) {
   return rows.map((row, index) => {
-    const head = `${index + 1}. ${quoteForeign(row.title)} \xB7 ${quoteForeign(row.source_name)} \xB7 id: ${row.id}`;
+    const head = `${index + 1}. ${quoteForeign(row.title)} \xB7 ${quoteForeign(row.source_name)} \xB7 id: ${quoteForeign(row.id)}`;
     return `${head}
    ${quoteForeign(row.url)}`;
   }).join("\n");
@@ -5235,7 +5260,7 @@ function creditLine(contributors) {
     return "No source contributed to this answer.";
   }
   const names2 = contributors.map(
-    (entry) => entry.url ? `${entry.attribution} \u2014 ${quoteForeign(entry.url)}` : entry.attribution
+    (entry) => entry.url ? `${entry.attribution} (${quoteForeign(entry.url)})` : entry.attribution
   );
   return names2.join("\n");
 }
@@ -5538,16 +5563,21 @@ function buildRecipeView(recipe, options) {
     attribution: recipe.attribution,
     sections_returned: [...options.sections],
     sections_omitted: omitted,
-    scaling_summary: {
-      // A tool line is counted apart, so the four counts add up to the lines in
-      // the list. It carries "unscaled" like a line with no figure on it, and
-      // merging the two would say this server found no quantity where it found
-      // one and declined it.
-      scaled_count: ingredients.filter((entry) => entry.scaling === "scaled" && !entry.isEquipment).length,
+    // The counts are over the lines this answer carries. Counting the lines a
+    // recipe holds while the list is empty would say the answer scaled and
+    // returned them.
+    scaling_summary: wants("ingredients") ? {
+      // A tool line is counted apart, so the four counts add up to the lines
+      // in the list. It carries "unscaled" like a line with no figure on it,
+      // and merging the two would say this server found no quantity where it
+      // found one and declined it.
+      scaled_count: ingredients.filter(
+        (entry) => entry.scaling === "scaled" && !entry.isEquipment
+      ).length,
       rounded_count: rounded.length,
       unscaled_count: unscaled.length,
       equipment_count: equipment.length
-    }
+    } : { scaled_count: 0, rounded_count: 0, unscaled_count: 0, equipment_count: 0 }
   };
   if (options.label) {
     const label = quoteForeign(options.label);
@@ -5645,10 +5675,13 @@ function editDistance(left, right) {
 }
 
 // src/tools/compareRecipes.ts
-function nothingWasCompared(someWereUnread, dish) {
+function nothingWasCompared(someWereUnread, dish, answeredCount) {
   if (someWereUnread) {
     return `Every version of "${quoteForeign(dish)}" that was offered could not be read, so nothing was compared.`;
   }
+  if (answeredCount === 0) {
+    return `No source answered for "${quoteForeign(dish)}", so nothing here says whether such a recipe exists.`;
+  }
   return `No source offered a recipe for "${quoteForeign(dish)}".`;
 }
 var compareRecipesDescription = [
@@ -5656,7 +5689,7 @@ var compareRecipesDescription = [
   "Each source's closest match is read in full, and all of them can be rescaled to the same number of servings so the ingredient lists stand comparison.",
   "The answer states what differs and leaves it there: the quantities each asks for, what each measures in, what each yields, and which fields each source publishes at all.",
   "No version is ranked above another. Some sources carry reader ratings and some have no author and no rating by nature, so there is no score they share.",
-  "When only one source answers, the answer says so and shows that one rather than presenting part of a comparison as the whole of it."
+  "When only one source answers, the answer names that source and shows its version, so a single version is read as the one it is."
 ].join(" ");
 var compareRecipesInput = strictInput({
   dish: z4.string().min(1).max(200).describe("The dish to compare, in any of the languages the sources publish in."),
@@ -5685,7 +5718,7 @@ function weighTitlesAgainstTheDish(payloads, dish, notes) {
     payload,
     missing: dishWordsMissing(payload.title, dish)
   }));
-  const carriesDish = weighed.some((one) => one.missing.length === 0);
+  const carriesDish2 = weighed.some((one) => one.missing.length === 0);
   for (const { payload, missing } of weighed) {
     if (missing.length === 0) {
       continue;
@@ -5696,12 +5729,12 @@ function weighTitlesAgainstTheDish(payloads, dish, notes) {
       )
     );
   }
-  if (payloads.length > 0 && !carriesDish) {
+  if (payloads.length > 0 && !carriesDish2) {
     notes.push(
       `No version here carries the whole of "${quoteForeign(dish)}" in its title. These are the closest rows each source returned for that spelling, so read them as candidates to check rather than as that dish.`
     );
   }
-  if (payloads.length === 1 && carriesDish) {
+  if (payloads.length === 1 && carriesDish2) {
     notes.push(
       mustKeep(
         "This is one version rather than a comparison. Read it as what that one source publishes."
@@ -5922,7 +5955,11 @@ ${shownDifferences.map((line) => `- ${line}`).join("\n")}${moreDifferences > 0 ?
       }
       return lines.join("\n");
     });
-    const body = payloads.length === 0 ? nothingWasCompared(unread.size > 0, args.dish) : versionBlocks.join("\n\n");
+    const body = payloads.length === 0 ? nothingWasCompared(
+      unread.size > 0,
+      args.dish,
+      merged.reports.filter((report) => report.error === null).length
+    ) : versionBlocks.join("\n\n");
     const summary = `${differencesBlock}${body}`;
     return ok(
       {
@@ -5957,7 +5994,7 @@ import { z as z5 } from "zod";
 var getRecipeDescription = [
   "Read one recipe in full: its ingredients, its steps, what it yields, and whatever times, rating and nutrition its source publishes.",
   "'id' must come from search_recipes. It names the source, so this reads the right one without guessing; an identifier no source would have minted is refused, because sending it anywhere would answer about the wrong dish.",
-  "Pass 'servings' to rescale. Quantities land where a kitchen can follow them: an egg stays whole, anything that pours or cuts can halve, a small measurement moves to a smaller unit before it is rounded, and anything unmultipliable is flagged rather than scaled.",
+  "Pass 'servings' to rescale. Quantities land where a kitchen can follow them: an egg stays whole, anything that pours or cuts can halve, a small measurement moves to a smaller unit before it is rounded, and anything unmultipliable comes back flagged.",
   "A page that states no number of servings comes back as published and says so, because dividing by a yield nobody wrote would answer for a number of people the page never claimed.",
   "Read 'kind' first. Some sources publish articles gathering other recipes at the same kind of address as a recipe, and such an answer carries 'collection' with the recipes it points at and no 'recipe' at all: there is nothing to cook from that page, and the recipes it lists are read with get_recipe.",
   "A part this answer holds nothing for says which of two things happened: the page showed no sign of it, or this server failed to read what the page carries. An empty ingredient list is never evidence that an ingredient is absent from the dish.",
@@ -6024,7 +6061,10 @@ async function runGetRecipe(client, args) {
       if (entry.is_equipment) {
         return `- ${quoteForeign(entry.text)} (a tool)`;
       }
-      return entry.scaling === "unscaled" ? `- ${quoteForeign(entry.text)} (no quantity)` : `- ${quoteForeign(entry.text)}`;
+      if (entry.scaling !== "unscaled") {
+        return `- ${quoteForeign(entry.text)}`;
+      }
+      return entry.note ? `- ${quoteForeign(entry.text)} (${quoteForeign(entry.note)})` : `- ${quoteForeign(entry.text)} (no quantity)`;
     });
     const stepLines = payload.steps.map((step, index) => `${index + 1}. ${quoteForeign(step)}`);
     const room = roomForBody({ notes, credit }) - head.join("\n").length;
@@ -6110,9 +6150,7 @@ var scaleIngredientsDescription = [
   "No quantity is converted between measuring systems: grams stay grams and cups stay cups, because a conversion changes what the recipe said."
 ].join(" ");
 var scaleIngredientsInput = strictInput({
-  ingredients: z6.array(z6.string().max(500)).min(1).max(200).describe(
-    "The lines as written, one ingredient each, such as '200 g de farine' or '3 eggs'. One line, not a whole recipe."
-  ),
+  ingredients: z6.array(z6.string().max(500)).min(1).max(200).describe("The lines as written, one ingredient each, such as '200 g de farine' or '3 eggs'."),
   factor: z6.number().gt(0).max(1e3).optional().describe(
     "What to multiply by. Give exactly one of: 'factor', or both 'from_servings' and 'to_servings'."
   ),
@@ -6185,7 +6223,7 @@ function runScaleIngredients(args) {
     }
     if (counts.unscaled_count > 0) {
       notes.push(
-        `${counts.unscaled_count} line(s) carry no quantity to multiply and are repeated as given.`
+        `${counts.unscaled_count} line(s) came back as given: they carry no figure to multiply, or one this server declined to multiply and named on the line itself.`
       );
     }
     if (counts.equipment_count > 0) {
@@ -6209,7 +6247,10 @@ function runScaleIngredients(args) {
     const body = scaled.map((entry, index) => `${index + 1}. ${quoteForeign(entry.text)}`).join("\n");
     return ok(
       {
-        factor: statedFactor(factor),
+        // The multiplier the quantities were worked out with, so a caller
+        // recomputing one from it lands where this answer landed. The block
+        // below states a shortened one, which is for reading.
+        factor,
         language: args.language,
         ingredients: scaled.map(toIngredientPayload),
         ...counts,
@@ -6237,10 +6278,11 @@ function howTheRowsAreOrdered(contributed) {
   return "No source contributed a row.";
 }
 function nothingCameBack(answeredCount, query, alsoSent) {
+  const asked = quoteForeign(query);
   if (answeredCount === 0) {
-    return `No source answered for "${query}", so nothing here says whether such a recipe exists.`;
+    return `No source answered for "${asked}", so nothing here says whether such a recipe exists.`;
   }
-  return `Nothing came back for "${query}".${alsoSent}`;
+  return `Nothing came back for "${asked}".${alsoSent}`;
 }
 var searchRecipesDescription = [
   "Search every recipe source this server reads, at the same time, for a dish or an ingredient, and get one merged list.",
@@ -6251,7 +6293,7 @@ var searchRecipesDescription = [
   "Ask in a whole sentence if that is the question. These indexes answer the words they are handed, so a sentence is also sent as the words naming the dish and as the dish word alone, and the rows are the union; 'per_source' lists every wording and what it returned.",
   "What the question says the recipe must not hold is set aside from those shorter wordings rather than searched for, and named back in the notes: a negation, an allergy stated as one, a diet named in one word, and the number of people at the table. No source filters on any of it, so open a row with get_recipe and read the ingredient list before calling it suitable.",
   "A condition is read with the food on whichever side of it the sentence put one, so 'allergique aux noix' and 'peanut allergy' both name the nut. Where a sentence puts a food on neither side, the notes say a condition was stated and that its food was not read, because naming the wrong word would hide a dish and search for the food being avoided at once.",
-  "Rows are interleaved one source at a time rather than ranked, because the sources share no score that could order them against each other."
+  "Rows are interleaved one source at a time, since the sources share no score that could order them against each other."
 ].join(" ");
 var searchRecipesInput = strictInput({
   query: z7.string().min(1).max(200).describe("A dish or an ingredient, in any of the languages the sources publish in."),
@@ -6342,12 +6384,13 @@ async function runSearchRecipes(client, args) {
         )
       );
     }
-    if (results.length > 0 && !results.some((row) => namesDish(row.title, args.query))) {
+    if (results.length > 0 && !results.some((row) => sharesDishWord(row.title, args.query))) {
       notes.push(
-        `No title here carries a word of "${args.query}". These rows are what the sources ranked for that spelling, so read them as candidates to check rather than as recipes for the dish.`
+        `No title here carries a word of "${quoteForeign(args.query)}". These rows are what the sources ranked for that spelling, so read them as candidates to check rather than as recipes for the dish.`
       );
     }
-    if (results.length === 0 && answered.length === merged.reports.length) {
+    const allReadable = merged.reports.every((report) => report.skipped === 0);
+    if (results.length === 0 && answered.length === merged.reports.length && allReadable) {
       notes.push(
         mustKeep(
           "Every source answered and none holds anything under this wording. Try the dish's name in another language, or name a main ingredient instead."
@@ -6364,7 +6407,7 @@ async function runSearchRecipes(client, args) {
     const alsoSent = derived.length > 0 ? `
 Also searched for: ${derived.map((wording) => `"${quoteForeign(wording)}"`).join(", ")}.` : "";
     const anyNamesTheDish = merged.reports.some((report) => report.namesTheDish > 0);
-    const body = results.length > 0 ? `${results.length} ${anyNamesTheDish ? "recipes" : "rows"} for "${args.query}":
+    const body = results.length > 0 ? `${results.length} ${anyNamesTheDish ? "recipes" : "rows"} for "${quoteForeign(args.query)}":
 ${renderRows(results)}${alsoSent}` : nothingCameBack(answered.length, args.query, alsoSent);
     return ok(
       {