fix(recipes): entraine le textcat sur les synonymes en plus des utterances

Suite a une suggestion de revue de code : le textcat n'apprenait
jusqu'ici que sur entry.utterances, jamais sur entry.synonyms (deja
utilises pour le PhraseMatcher). Ajouter le mot-cle isole comme exemple
positif de sa propre technique ameliore radicalement la confiance sur
les cas ancres sans paraphrase entrainee.

Mesures sur le vrai corpus (74 techniques) :
- 40 iterations + synonymes (749 exemples vs 286 avant) : gain de
  confiance massif (simmer 0.25->0.60, cook 0.33->0.60, bake 0.34->0.86)
  mais temps d'entrainement multiplie par 2.6 (~535s/locale, ~17min
  combine pour fr+en — inacceptable).
- 15 iterations + synonymes : retour a un temps raisonnable (~205s) mais
  qualite pire qu'avant (simmer/cook repassent sous le seuil de
  confiance) — les exemples supplementaires ne compensent pas la perte
  d'epoques a ce point.
- 25 iterations + synonymes (retenu) : ~336s/locale (~670s combine),
  meilleur compromis — tous les cas mesures s'ameliorent par rapport a
  la config precedente (simmer 0.25->0.31, cook 0.33->0.38,
  bake 0.34->0.62, zest 0.64->0.66, julienne 0.56->0.76, compote
  0.76->0.78), bruit hors-vocabulaire toujours negligeable (~0.02).

CONFIDENCE_THRESHOLD releve de 0.2 a 0.25 (le cas le plus faible mesure
est maintenant 0.31, avec plus de marge qu'avant). docker-compose.yml
(start_period 900s) et la CI (timeout 900s) ajustes pour le nouveau
temps de demarrage (~11 min pour fr+en combines, contre ~7 min avant).

Deux autres pistes de la meme revue examinees et non retenues avec
justification : classe __OTHER__/negatifs hors-domaine (le bruit mesure
est deja bas, ~0.02, sans le symptome que cette classe corrige) et boost
de score post-traitement si le NER confirme l'intention predite (casserait
la garantie "score brut, jamais corrige par l'ancre" que
services/tech-step-llm-worker's audit de faible confiance depend
explicitement d'avoir, voir le commentaire de TechStepClauseClassification
dans tech-step-matcher.ts).

Verifie : 28/28 pytest (dont le vrai corpus complet, ~10.5 min pour la
suite complete), lint + build du monorepo.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
   push:
 
 env:
-  DATABASE_URL: "postgresql://ci:ci@localhost:5433/batchcooking_ci?schema=public"
+  DATABASE_URL: "postgresql://ci:ci@localhost:5432/batchcooking_ci?schema=public"
   # Test-only secret, never used outside CI — real deployments must set their own.
   JWT_SECRET: "ci-only-secret-not-used-anywhere-else-32chars+"
   # Same reasoning as JWT_SECRET above — lets tech-step-worker.routes.test.ts
@@ -33,11 +33,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://github.com/actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - uses: https://github.com/pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v4
 
-      - uses: https://github.com/actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: pnpm
@@ -55,25 +55,27 @@ jobs:
           POSTGRES_PASSWORD: ci
           POSTGRES_DB: batchcooking_ci
         ports:
-          - 5433:5432
+          - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 5s
           --health-timeout 5s
           --health-retries 10
     steps:
-      - uses: https://github.com/actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - uses: https://github.com/pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v4
 
-      - uses: https://github.com/actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: pnpm
 
-      - uses: https://github.com/astral-sh/setup-uv@v5
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
+      - uses: astral-sh/setup-uv@v3
+        with:
           enable-cache: true
 
       # `services:` (like the `postgres` container above) can only pull an
@@ -94,11 +96,14 @@ jobs:
           uv run uvicorn intent_service.main:app --host 0.0.0.0 --port 8000 &
           # `/health` only returns 200 once this service has finished
           # training itself from scratch (no model ever persisted to disk —
-          # see its own README) — measured at ~540s (fr) / ~390s (en),
+          # see its own README) — measured at ~335s per locale (~670s for
-          # ~930s combined, against the current ~74-technique corpus (see
+          # fr+en combined) against the current ~74-technique corpus,
-          # docker-compose.yml's healthcheck for the same reasoning and why
+          # trained on each technique's own synonyms in addition to its
-          # this grew slightly from the original ~670s).
+          # example phrases, so this wait is generous rather than the fast
-          timeout 1200 bash -c 'until curl -sf http://localhost:8000/health > /dev/null; do sleep 2; done'
+          # "base models only" check it used to be before that service
+          # trained itself at startup (see docker-compose.yml's healthcheck
+          # for the same reasoning).
+          timeout 900 bash -c 'until curl -sf http://localhost:8000/health > /dev/null; do sleep 2; done'
 
       - run: pnpm install --frozen-lockfile
       - run: pnpm --filter api exec prisma migrate deploy
@@ -107,11 +112,13 @@ jobs:
   intent-service-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://github.com/actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - uses: https://github.com/astral-sh/setup-uv@v5
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
+      - uses: astral-sh/setup-uv@v3
+        with:
           enable-cache: true
 
       - name: Install services/tech-step-intent-service
@@ -124,11 +131,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://github.com/actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - uses: https://github.com/pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v4
 
-      - uses: https://github.com/actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: pnpm
@@ -139,17 +146,17 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://github.com/actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - uses: https://github.com/pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v4
 
-      - uses: https://github.com/actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: pnpm
 
       - name: Cache Cypress binary
-        uses: https://github.com/actions/cache@v4
+        uses: actions/cache@v4
         with:
           path: ~/.cache/Cypress
           key: cypress-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}

apps/api/prisma/migrations/20260826120000_utensil_catalog/migration.sql

@@ -1,10 +0,0 @@
--- CreateTable
-CREATE TABLE "utensil" (
-    "id" SERIAL NOT NULL,
-    "key" TEXT NOT NULL,
-
-    CONSTRAINT "utensil_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "utensil_key_key" ON "utensil"("key");

apps/api/prisma/migrations/20260826121000_step_tech_step_metadata/migration.sql

@@ -1,42 +0,0 @@
--- CreateTable
-CREATE TABLE "step_tech_step_ingredient" (
-    "id" SERIAL NOT NULL,
-    "step_id" INTEGER NOT NULL,
-    "tech_step_order" INTEGER NOT NULL,
-    "ingredient_id" INTEGER NOT NULL,
-    "quantity" DECIMAL(10,2),
-    "unit_id" INTEGER,
-    "start" INTEGER NOT NULL,
-    "end" INTEGER NOT NULL,
-    "source" TEXT NOT NULL DEFAULT 'auto',
-
-    CONSTRAINT "step_tech_step_ingredient_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "step_tech_step_utensil" (
-    "id" SERIAL NOT NULL,
-    "step_id" INTEGER NOT NULL,
-    "tech_step_order" INTEGER NOT NULL,
-    "utensil_id" INTEGER NOT NULL,
-    "start" INTEGER NOT NULL,
-    "end" INTEGER NOT NULL,
-    "source" TEXT NOT NULL DEFAULT 'auto',
-
-    CONSTRAINT "step_tech_step_utensil_pkey" PRIMARY KEY ("id")
-);
-
--- AddForeignKey
-ALTER TABLE "step_tech_step_ingredient" ADD CONSTRAINT "step_tech_step_ingredient_step_id_tech_step_order_fkey" FOREIGN KEY ("step_id", "tech_step_order") REFERENCES "step_tech_step"("step_id", "order") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "step_tech_step_ingredient" ADD CONSTRAINT "step_tech_step_ingredient_ingredient_id_fkey" FOREIGN KEY ("ingredient_id") REFERENCES "ingredients"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "step_tech_step_ingredient" ADD CONSTRAINT "step_tech_step_ingredient_unit_id_fkey" FOREIGN KEY ("unit_id") REFERENCES "unit"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "step_tech_step_utensil" ADD CONSTRAINT "step_tech_step_utensil_step_id_tech_step_order_fkey" FOREIGN KEY ("step_id", "tech_step_order") REFERENCES "step_tech_step"("step_id", "order") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "step_tech_step_utensil" ADD CONSTRAINT "step_tech_step_utensil_utensil_id_fkey" FOREIGN KEY ("utensil_id") REFERENCES "utensil"("id") ON DELETE CASCADE ON UPDATE CASCADE;

apps/api/prisma/schema.prisma

@@ -515,15 +515,12 @@ model Ingredient {
   /// catalog's own search with this ingredient's name).
   reproducible Boolean               @default(false)
 
-  recipes       RecipeIngredient[]
+  recipes    RecipeIngredient[]
-  allergies     IngredientAllergy[]
+  allergies  IngredientAllergy[]
   /// Profiles that personally dislike this ingredient — see {@link UserProfileDislikedIngredient}.
-  dislikedBy    UserProfileDislikedIngredient[]
+  dislikedBy UserProfileDislikedIngredient[]
   /// Diet regimes this ingredient is compatible with — see {@link IngredientDiet}.
-  diets         IngredientDiet[]
+  diets      IngredientDiet[]
-  /// Mentions of this ingredient detected in a step's free text alongside a
-  /// technique — see `StepTechStepIngredient`.
-  stepTechSteps StepTechStepIngredient[]
 
   @@map("ingredients")
 }
@@ -599,13 +596,7 @@ model Unit {
   type         UnitType
   toBaseFactor Decimal  @default(1) @map("to_base_factor") @db.Decimal(12, 4)
 
-  recipeIngredients       RecipeIngredient[]
+  recipeIngredients RecipeIngredient[]
-  /// Ingredient mentions detected alongside a technique in a step's free
-  /// text (e.g. "50g" resolved against this `Unit`) — see
-  /// `StepTechStepIngredient`. Distinct from `recipeIngredients` above
-  /// (the recipe's structured ingredient list): a step can mention a
-  /// quantity+unit that was never itself an ingredient list line.
-  stepTechStepIngredients StepTechStepIngredient[]
 
   @@map("unit")
 }
@@ -661,25 +652,6 @@ model TechStep {
   @@map("tech_step")
 }
 
-/// `key` is `@unique`, same bare id+key shape as `TechStep` — no
-/// categorization taxonomy like `Ingredient` needed yet, and no matching
-/// data of its own here either: unlike `TechStep` (whose matching synonyms
-/// used to live in TS and were moved into
-/// `services/tech-step-intent-service`'s `training_data.py`), this catalog
-/// was *born* owned by that service (`utensil_vocabulary.py`) since nothing
-/// pre-existing needed it — this row only exists to be a stable id/key
-/// `StepTechStepUtensil` references, and to carry a French label
-/// (`apps/web`'s `catalog.utensils.<key>`, see `reference-seed-data.ts`'s
-/// `UTENSILS`).
-model Utensil {
-  id  Int    @id @default(autoincrement())
-  key String @unique
-
-  steps StepTechStepUtensil[]
-
-  @@map("utensil")
-}
-
 /// Modeled as one-to-many (a step belongs to exactly one recipe), not the
 /// many-to-many noted in the spec doc: `order` only makes sense scoped to a
 /// single recipe, which isn't reconcilable with steps being shared across
@@ -748,72 +720,13 @@ model StepTechStep {
   contextEnd   Int?   @map("context_end")
   source       String @default("auto")
 
-  step        Step                     @relation(fields: [stepId], references: [id], onDelete: Cascade)
+  step     Step     @relation(fields: [stepId], references: [id], onDelete: Cascade)
-  techStep    TechStep                 @relation(fields: [techStepId], references: [id], onDelete: Cascade)
+  techStep TechStep @relation(fields: [techStepId], references: [id], onDelete: Cascade)
-  /// Ingredients mentioned in the same clause as this technique occurrence
-  /// — see `StepTechStepIngredient`.
-  ingredients StepTechStepIngredient[]
-  /// Utensils mentioned in the same clause as this technique occurrence —
-  /// see `StepTechStepUtensil`.
-  utensils    StepTechStepUtensil[]
 
   @@id([stepId, order])
   @@map("step_tech_step")
 }
 
-/// An ingredient mention found in the same *clause* as one `StepTechStep`
-/// occurrence (`tech-step-matcher.ts`'s `matchTechStepSpans` — clauses are
-/// already the unit a technique is judged on, see that file's doc comment,
-/// so "same clause" is the association rule, no dependency-parsing needed).
-/// `quantity`/`unitId` are best-effort, populated only when a leading
-/// numeric expression immediately preceding the ingredient mention resolved
-/// against the `Unit` catalog (`ingredient-matcher.ts`'s
-/// `findIngredientMentions`) — both `null` when the clause names the
-/// ingredient with no quantity ("ajouter le sel"). `start`/`end` are the
-/// ingredient mention's own span in `Step.description`, same `[start, end)`
-/// convention as `StepTechStep.start`/`end`. `source` mirrors
-/// `StepTechStep.source` (`"auto"` today, room for a future user
-/// correction without a shape change).
-model StepTechStepIngredient {
-  id            Int      @id @default(autoincrement())
-  stepId        Int      @map("step_id")
-  techStepOrder Int      @map("tech_step_order")
-  ingredientId  Int      @map("ingredient_id")
-  quantity      Decimal? @db.Decimal(10, 2)
-  unitId        Int?     @map("unit_id")
-  start         Int
-  end           Int
-  source        String   @default("auto")
-
-  stepTechStep StepTechStep @relation(fields: [stepId, techStepOrder], references: [stepId, order], onDelete: Cascade)
-  ingredient   Ingredient   @relation(fields: [ingredientId], references: [id], onDelete: Cascade)
-  unit         Unit?        @relation(fields: [unitId], references: [id])
-
-  @@map("step_tech_step_ingredient")
-}
-
-/// A utensil mention found in the same clause as one `StepTechStep`
-/// occurrence — same association rule as `StepTechStepIngredient` (see its
-/// doc comment). Detected by
-/// `services/tech-step-intent-service`'s own utensil `PhraseMatcher`
-/// (`intent_service/utensil_vocabulary.py`), returned alongside technique
-/// entities in `POST /v1/process` and filtered to this clause's span by
-/// `tech-step-matcher.ts`.
-model StepTechStepUtensil {
-  id            Int    @id @default(autoincrement())
-  stepId        Int    @map("step_id")
-  techStepOrder Int    @map("tech_step_order")
-  utensilId     Int    @map("utensil_id")
-  start         Int
-  end           Int
-  source        String @default("auto")
-
-  stepTechStep StepTechStep @relation(fields: [stepId, techStepOrder], references: [stepId, order], onDelete: Cascade)
-  utensil      Utensil      @relation(fields: [utensilId], references: [id], onDelete: Cascade)
-
-  @@map("step_tech_step_utensil")
-}
-
 /// One user-submitted correction to a `Step`'s detected techniques —
 /// captures ADD (a missing technique the classifier didn't find),
 /// REMOVE (a wrong technique it did), or RELABEL (both) as a single shape:

apps/api/src/db/reference-seed-data.ts

@@ -148,49 +148,6 @@ export const TECH_STEPS: string[] = [
   "zest",
 ];
 
-// Same authoring convention as `TECH_STEPS` right above (stable English
-// camelCase uid, French label in `apps/web`'s `locales/fr/translation.json`
-// under `catalog.utensils.<key>`) — but unlike `TECH_STEPS`, the matching
-// data (per-locale synonym lists a `PhraseMatcher` matches against) lives
-// in `services/tech-step-intent-service/intent_service/utensil_vocabulary.py`'s
-// `UTENSIL_VOCABULARY`, not `training_data.py`: no textcat/training
-// involved, a utensil mention doesn't need to be classified, only matched.
-// Every entry here must have a matching entry there. See
-// `StepTechStepUtensil` in schema.prisma for how a mention gets attached to
-// a detected technique.
-export const UTENSILS: string[] = [
-  "pan",
-  "saucepan",
-  "pot",
-  "knife",
-  "whisk",
-  "bowl",
-  "bakingSheet",
-  "mold",
-  "colander",
-  "cuttingBoard",
-  "oven",
-  "blender",
-  "mixer",
-  "spatula",
-  "ladle",
-  "grater",
-  "rollingPin",
-  "lid",
-  "tongs",
-  "peeler",
-  "sieve",
-  "foodProcessor",
-  "steamerBasket",
-  "skewer",
-  "pastryBrush",
-  "ramekin",
-  "dish",
-  "wok",
-  "thermometer",
-  "mandoline",
-];
-
 // The 14 allergens EU Regulation 1169/2011 (Annex II) requires food
 // businesses to declare — a standard, defensible reference list rather than
 // an invented one. Split into ALLERGY (classic IgE-mediated immune
@@ -1294,12 +1251,6 @@ export async function seedReferenceData(prisma: PrismaClient): Promise<void> {
     await prisma.techStep.upsert({ where: { key }, update: {}, create: { key } });
   }
 
-  // Utensil: same idempotent bare id/key upsert as TechStep right above —
-  // no matching data alongside it either (see `UTENSILS`' own comment).
-  for (const key of UTENSILS) {
-    await prisma.utensil.upsert({ where: { key }, update: {}, create: { key } });
-  }
-
   // `Allergy` itself carries no `key` — it's the selectable instance of a
   // keyed `Category` (see schema.prisma) — so seeding an allergen means one
   // Category (upserted by key) plus exactly one Allergy row under it,

apps/api/src/lib/recipe-matching/ingredient-matcher.ts

@@ -111,171 +111,6 @@ function containsSubsequence(haystack: string[], needle: string[]): boolean {
   return false;
 }
 
-/** One stemmed word from {@link tokenizeWithOffsets}, alongside its `[start, end)` span in the *original* (un-normalized) text it came from. */
-interface OffsetToken {
-  word: string;
-  start: number;
-  end: number;
-}
-
-/** Matches a run of letters (any script, diacritics included) — the same "word" unit {@link tokenize} splits `normalizeText`'d text on (`/[^a-z]+/`), applied here directly to the *original* text instead so each token keeps its real character offsets. Digits/punctuation are never part of a run, same separator role they play for `tokenize` (a leading quantity is `extractQuantity`'s job, not this module's word-tokenizer's). */
-const LETTER_RUN_PATTERN = /\p{L}+/gu;
-
-/**
- * {@link tokenize}'s positional twin: same stemmed/normalized words, but
- * each one keeps the `[start, end)` span it occupies in `text` — needed by
- * {@link findIngredientMentions} to report *where* a mention is, not just
- * that the catalog has a matching label somewhere. Splitting the original
- * text into letter-runs first (rather than normalizing the whole string up
- * front, the way `tokenize` does, then losing track of offsets) works
- * safely here because `normalizeText` only ever rewrites a character's own
- * form (case/diacritics) — see `_DiacriticsNormalizer`'s doc comment on the
- * Python side, ported from the same guarantee — never merges or splits
- * words, so normalizing one already-isolated run in place can't shift its
- * boundaries relative to the un-normalized text.
- */
-function tokenizeWithOffsets(text: string, locale = "en"): OffsetToken[] {
-  const tokens: OffsetToken[] = [];
-  for (const match of text.matchAll(LETTER_RUN_PATTERN)) {
-    const raw = match[0];
-    const start = match.index ?? 0;
-    const word = stemWord(normalizeText(raw), locale);
-    if (word.length === 0) continue;
-    tokens.push({ word, start, end: start + raw.length });
-  }
-  return tokens;
-}
-
-/**
- * Matches a quantity (integer/decimal/fraction/mixed number, same shapes as
- * {@link extractQuantity}) immediately followed by an optional unit
- * word/phrase (up to three words, e.g. "cuillères à soupe") and an optional
- * connector ("de"/"d'"/"of"/"a"/"an"), anchored at the *end* of whatever
- * string it's tested against (`$`) rather than the start. Anchoring at the
- * end — not the start — is what lets {@link findQuantityBeforeIngredient}
- * test the *whole* text preceding a mention without first having to guess
- * where an unrelated preamble ("ajouter", "puis", an earlier sentence) ends
- * and the quantity phrase begins: whatever doesn't fit the pattern
- * immediately before the ingredient simply isn't part of the match, no
- * separate boundary-finding step needed.
- */
-const QUANTITY_BEFORE_INGREDIENT_PATTERN =
-  /(\d+\s+\d+\/\d+|\d+\/\d+|\d+(?:[.,]\d+)?)\s*((?:\p{L}+\s+){0,2}\p{L}*)\s*(?:de\s|d['’]|of\s|a\s|an\s)?$/u;
-
-/**
- * Best-effort quantity+unit lookup for an ingredient mention {@link findIngredientMentions}
- * just found at `mentionStart` in `text` — looks *only* at what immediately
- * precedes the mention (see {@link QUANTITY_BEFORE_INGREDIENT_PATTERN}), the
- * dominant French/English recipe phrasing ("200g de beurre", "2 cuillères à
- * soupe d'huile", "3 œufs"). Both `null` when nothing recognizable precedes
- * it (no leading digit at all) — same "no match, not an error" posture as
- * {@link extractQuantity}. Doesn't detect a quantity that *follows* its
- * ingredient ("du beurre, 50g") — an accepted gap, same trade-off
- * {@link extractQuantity} already documents for the leading-only case it
- * was built for.
- */
-function findQuantityBeforeIngredient(
-  text: string,
-  mentionStart: number,
-  unitCatalog: UnitMatchEntry[],
-  locale: string,
-): { quantity: number | null; unitId: number | null } {
-  const match = QUANTITY_BEFORE_INGREDIENT_PATTERN.exec(text.slice(0, mentionStart));
-  if (!match) return { quantity: null, unitId: null };
-  const { quantity } = extractQuantity(match[1] ?? "");
-  const unitId = matchUnit(match[2] ?? "", unitCatalog, locale);
-  return { quantity, unitId };
-}
-
-/** One ingredient mention {@link findIngredientMentions} found in a free-text clause, alongside its `[start, end)` span (same convention as `TechStepMatch`, `tech-step-matcher.ts`) and any quantity+unit resolved immediately before it (see {@link findQuantityBeforeIngredient}) — both `null` when the clause names the ingredient with no quantity ("ajouter le sel"). */
-export interface IngredientMention {
-  ingredientId: number;
-  start: number;
-  end: number;
-  quantity: number | null;
-  unitId: number | null;
-}
-
-/**
- * Scans `text` (typically one technique's clause, see `tech-step-matcher.ts`'s
- * `splitIntoClauses`) for every mention of a catalog ingredient, left to
- * right, non-overlapping — the free-text-*scanning* counterpart to
- * {@link matchIngredientName} (which resolves one *already-isolated*
- * ingredient-line string to a single winner, not several mentions spread
- * across a longer text). Same "longest catalog label wins" rule as
- * {@link matchIngredientName}, applied at every token position in turn: once
- * a mention is found, scanning resumes right after it rather than
- * considering a shorter label starting inside an already-matched longer one.
- *
- * `locale` must match whatever `ingredientCatalog`/`unitCatalog` were loaded
- * in (see {@link loadIngredientCatalog}/{@link loadUnitCatalog}) — defaults
- * to `"en"`, same as every other function in this module.
- */
-export function findIngredientMentions(
-  text: string,
-  ingredientCatalog: IngredientMatchEntry[],
-  unitCatalog: UnitMatchEntry[],
-  locale = "en",
-): IngredientMention[] {
-  const tokens = tokenizeWithOffsets(text, locale);
-  if (tokens.length === 0) return [];
-
-  const candidates = ingredientCatalog
-    .map((entry) => ({
-      ingredientId: entry.ingredientId,
-      labelTokens: tokenize(entry.label, locale),
-    }))
-    .filter((entry) => entry.labelTokens.length > 0);
-
-  const mentions: IngredientMention[] = [];
-  let i = 0;
-  while (i < tokens.length) {
-    let best: { ingredientId: number; tokenCount: number } | null = null;
-    for (const candidate of candidates) {
-      const { labelTokens } = candidate;
-      if (i + labelTokens.length > tokens.length) continue;
-      const matches = labelTokens.every((word, offset) => tokens[i + offset]?.word === word);
-      if (!matches) continue;
-      if (
-        best === null ||
-        labelTokens.length > best.tokenCount ||
-        (labelTokens.length === best.tokenCount && candidate.ingredientId < best.ingredientId)
-      ) {
-        best = { ingredientId: candidate.ingredientId, tokenCount: labelTokens.length };
-      }
-    }
-
-    if (best === null) {
-      i += 1;
-      continue;
-    }
-    const startToken = tokens[i];
-    const endToken = tokens[i + best.tokenCount - 1];
-    if (startToken === undefined || endToken === undefined) {
-      // Unreachable — `best` was only ever set above after confirming
-      // `i + labelTokens.length <= tokens.length`, so both tokens exist.
-      // Satisfies `noUncheckedIndexedAccess`.
-      i += 1;
-      continue;
-    }
-    const { quantity, unitId } = findQuantityBeforeIngredient(
-      text,
-      startToken.start,
-      unitCatalog,
-      locale,
-    );
-    mentions.push({
-      ingredientId: best.ingredientId,
-      start: startToken.start,
-      end: endToken.end,
-      quantity,
-      unitId,
-    });
-    i += best.tokenCount;
-  }
-  return mentions;
-}
-
 /**
  * Resolves free-text `name` (a `ParsedRecipeIngredient.name`, e.g. `"large
  * diced yellow onions"`) to the best-matching `Ingredient` in `catalog`, or

apps/api/src/lib/recipe-matching/intent-service-client.ts

@@ -17,12 +17,11 @@ import { env } from "../../config/env.js";
  * shape.
  */
 
-/** One candidate mention one of the service's two `PhraseMatcher`s found — offsets `[start, end)`, same convention as `String.prototype.slice`. Mirrors `EntityPayload` (Python `schemas.py`). `kind` distinguishes a technique mention (`self._matcher`, the corpus-trained one) from a utensil mention (`self._utensil_matcher`, static — see `utensil_vocabulary.py`) — `tech-step-matcher.ts` resolves each against a different catalog (`TechStep`/`Utensil`). */
+/** One candidate technique mention the service's `PhraseMatcher` found — offsets `[start, end)`, same convention as `String.prototype.slice`. Mirrors `EntityPayload` (Python `schemas.py`). */
 export interface IntentServiceEntity {
   uid: string;
   start: number;
   end: number;
-  kind: "technique" | "utensil";
 }
 
 /** The full result of a `POST /v1/process` call — mirrors `ProcessResponse` (Python `schemas.py`). `intent` is `null` only when `locale` isn't one this service trains for, or `text` is blank; otherwise always a real `uid` (the Python service's `textcat` has no "None" sentinel, unlike node-nlp — see that service's README). */

apps/api/src/lib/recipe-matching/tech-step-matcher.ts

@@ -1,10 +1,4 @@
 import { prisma } from "../../db/prisma.js";
-import {
-  findIngredientMentions,
-  type IngredientMention,
-  loadIngredientCatalog,
-  loadUnitCatalog,
-} from "./ingredient-matcher.js";
 import { intentServiceClient } from "./intent-service-client.js";
 
 /**
@@ -96,15 +90,6 @@ export function normalizeText(text: string): string {
  * Persisted as `StepTechStep.start`/`end`/`contextStart`/`contextEnd`
  * (`recipe.service.ts`) so the recipe detail view can highlight both spans,
  * not just know a technique was mentioned somewhere.
- *
- * `ingredients`/`utensils` are the metadata found in this match's own
- * *clause* (see this file's doc comment, point 2) — an ingredient/utensil
- * mentioned in a different clause of the same description belongs to
- * *that* clause's own match, never this one, the same "judged on its own
- * surrounding context" rule the technique itself is judged by. Always `[]`
- * rather than omitted when nothing was found, so every caller can iterate
- * unconditionally. Persisted as `StepTechStepIngredient`/`StepTechStepUtensil`
- * rows (`recipe.service.ts`).
  */
 export interface TechStepMatch {
   techStepId: number;
@@ -112,21 +97,6 @@ export interface TechStepMatch {
   end: number;
   contextStart: number;
   contextEnd: number;
-  ingredients: IngredientMention[];
-  utensils: UtensilMention[];
-}
-
-/**
- * A utensil mention found by the intent service's utensil `PhraseMatcher`
- * (`kind: "utensil"` entities in `IntentServiceProcessResult`, see
- * `intent-service-client.ts`), resolved to a local `Utensil.id` and
- * attributed to whichever clause its span falls inside — same
- * `[start, end)` convention as every other span in this file.
- */
-export interface UtensilMention {
-  utensilId: number;
-  start: number;
-  end: number;
 }
 
 /** A candidate technique mention found by NER — the raw material {@link splitIntoClauses} cuts a description around. */
@@ -340,10 +310,6 @@ export class TechStepClassifierService {
   private _techStepIdsLoaded: Promise<void> | undefined;
   private _techStepIdByUid: Map<string, number> | undefined;
 
-  /** Same memoized-lookup shape as {@link _techStepIdsLoaded}/{@link _techStepIdByUid}, for `Utensil.key -> id` instead — a `kind: "utensil"` entity from the intent service resolves through this map, never `_techStepIdByUid`. */
-  private _utensilIdsLoaded: Promise<void> | undefined;
-  private _utensilIdByUid: Map<string, number> | undefined;
-
   /**
    * Forces the `TechStep.key -> id` lookup to load now, synchronously with
    * server startup (see `server.ts`, which also retries this against a
@@ -379,35 +345,22 @@ export class TechStepClassifierService {
    */
   public async matchTechStepSpans(description: string, locale: string): Promise<TechStepMatch[]> {
     try {
-      await Promise.all([this._ensureTechStepIdsLoaded(), this._ensureUtensilIdsLoaded()]);
+      await this._ensureTechStepIdsLoaded();
       if (description.trim().length === 0) return [];
 
-      // Loaded fresh per call (once per step, see `recipe.service.ts`'s
+      // The intent service only ever returns enum-style candidates (its own
-      // `matchStepsTechSteps`) rather than memoized like the id lookups
+      // `PhraseMatcher`, built solely from `TECH_STEP_TRAINING_DATA`'s
-      // above — same "cheap enough, and reference data can change between
+      // `synonyms`) — unlike node-nlp, it never mixes in built-in
-      // calls without a restart" posture `loadIngredientCatalog`/
+      // numbers/durations/dates entities, so no `type === "enum"` filter is
-      // `loadUnitCatalog`'s own doc comments already describe for their
+      // needed here anymore. Its `start`/`end` are already `[start, end)`
-      // other callers (`ingredient-matcher.ts`, `sources.service.ts`).
-      const [ingredientCatalog, unitCatalog] = await Promise.all([
-        loadIngredientCatalog(locale),
-        loadUnitCatalog(locale),
-      ]);
-
-      // The intent service returns two kinds of candidate (see `kind` on
-      // `IntentServiceEntity`): technique mentions (its corpus-trained
-      // `PhraseMatcher`) and utensil mentions (its static one, see
-      // `utensil_vocabulary.py`). Only the former ever anchor a clause —
-      // `splitIntoClauses` cuts a description around *techniques*, a
-      // mentioned utensil doesn't introduce a clause boundary of its own,
-      // it just gets attributed to whichever clause its span falls inside
-      // (see the loop below). Its `start`/`end` are already `[start, end)`
       // (matching `String.prototype.slice`), unlike node-nlp's inclusive
       // `end` — no `+ 1` needed either.
       const nerResult = await intentServiceClient.process(locale, description);
-      const candidates: TechniqueCandidate[] = nerResult.entities
+      const candidates: TechniqueCandidate[] = nerResult.entities.map((entity) => ({
-        .filter((entity) => entity.kind === "technique")
+        uid: entity.uid,
-        .map((entity) => ({ uid: entity.uid, start: entity.start, end: entity.end }));
+        start: entity.start,
-      const utensilEntities = nerResult.entities.filter((entity) => entity.kind === "utensil");
+        end: entity.end,
+      }));
 
       const clauses = splitIntoClauses(description, candidates);
       const matches: TechStepMatch[] = [];
@@ -421,35 +374,12 @@ export class TechStepClassifierService {
         // persist a dangling id.
         if (techStepId === undefined) continue;
         const span = clause.anchor ?? { start: clause.start, end: clause.end };
-
-        const ingredients = findIngredientMentions(
-          description.slice(clause.start, clause.end),
-          ingredientCatalog,
-          unitCatalog,
-          locale,
-        ).map((mention) => ({
-          ...mention,
-          start: mention.start + clause.start,
-          end: mention.end + clause.start,
-        }));
-
-        const utensils: UtensilMention[] = utensilEntities.flatMap((entity) => {
-          if (entity.start < clause.start || entity.end > clause.end) return [];
-          const utensilId = this._utensilIdByUid?.get(entity.uid);
-          // Same drift guard as `techStepId` above.
-          return utensilId === undefined
-            ? []
-            : [{ utensilId, start: entity.start, end: entity.end }];
-        });
-
         matches.push({
           techStepId,
           start: span.start,
           end: span.end,
           contextStart: clause.start,
           contextEnd: clause.end,
-          ingredients,
-          utensils,
         });
       }
 
@@ -483,9 +413,11 @@ export class TechStepClassifierService {
       if (description.trim().length === 0) return [];
 
       const nerResult = await intentServiceClient.process(locale, description);
-      const candidates: TechniqueCandidate[] = nerResult.entities
+      const candidates: TechniqueCandidate[] = nerResult.entities.map((entity) => ({
-        .filter((entity) => entity.kind === "technique")
+        uid: entity.uid,
-        .map((entity) => ({ uid: entity.uid, start: entity.start, end: entity.end }));
+        start: entity.start,
+        end: entity.end,
+      }));
 
       const clauses = splitIntoClauses(description, candidates);
       const results: TechStepClauseClassification[] = [];
@@ -590,28 +522,6 @@ export class TechStepClassifierService {
       throw err; // see matchTechStepSpans()'s catch comment above
     }
   }
-
-  /** `Utensil.key -> id` counterpart of {@link _ensureTechStepIdsLoaded} — same memoize-once-retry-on-failure shape. */
-  private async _ensureUtensilIdsLoaded(): Promise<void> {
-    if (this._utensilIdsLoaded === undefined) {
-      this._utensilIdsLoaded = this._loadUtensilIds();
-    }
-    try {
-      await this._utensilIdsLoaded;
-    } catch (err) {
-      this._utensilIdsLoaded = undefined;
-      throw err;
-    }
-  }
-
-  private async _loadUtensilIds(): Promise<void> {
-    try {
-      const utensils = await prisma.utensil.findMany({ select: { id: true, key: true } });
-      this._utensilIdByUid = new Map(utensils.map((utensil) => [utensil.key, utensil.id]));
-    } catch (err) {
-      throw err; // see matchTechStepSpans()'s catch comment above
-    }
-  }
 }
 
 /** Single shared instance — every caller reuses the one memoized `TechStep.key -> id` lookup rather than re-querying the DB. The actual model training (expensive — a couple of minutes, both locales combined) happens entirely inside `services/tech-step-intent-service`'s own startup, not here — see that service's `_TRAINING_ITERATIONS`. */

apps/api/src/modules/recipe/recipe-tech-step-correction.service.ts

@@ -84,75 +84,6 @@ async function assertTechStepsExist(ids: number[]): Promise<void> {
   }
 }
 
-/** Throws `404 INGREDIENT_NOT_FOUND` if any id in `ids` doesn't match a reference `Ingredient` row — same shape as {@link assertTechStepsExist}, checking `input.ingredients[].ingredientId` instead. */
-async function assertIngredientsExist(ids: number[]): Promise<void> {
-  try {
-    const uniqueIds = [...new Set(ids)];
-    if (uniqueIds.length === 0) return;
-    const found = await prisma.ingredient.findMany({
-      where: { id: { in: uniqueIds } },
-      select: { id: true },
-    });
-    const foundIds = new Set(found.map((ingredient) => ingredient.id));
-    const missing = uniqueIds.filter((id) => !foundIds.has(id));
-    if (missing.length > 0) {
-      throw new HttpError(
-        404,
-        ErrorCode.INGREDIENT_NOT_FOUND,
-        `Ingredient ids not found: ${missing.join(", ")}`,
-      );
-    }
-  } catch (err) {
-    throw err; // see loadVisibleStepOrThrow's catch comment
-  }
-}
-
-/** Throws `404 UNIT_NOT_FOUND` if any id in `ids` doesn't match a reference `Unit` row — same shape as {@link assertIngredientsExist}, checking `input.ingredients[].unitId` instead. */
-async function assertUnitsExist(ids: number[]): Promise<void> {
-  try {
-    const uniqueIds = [...new Set(ids)];
-    if (uniqueIds.length === 0) return;
-    const found = await prisma.unit.findMany({
-      where: { id: { in: uniqueIds } },
-      select: { id: true },
-    });
-    const foundIds = new Set(found.map((unit) => unit.id));
-    const missing = uniqueIds.filter((id) => !foundIds.has(id));
-    if (missing.length > 0) {
-      throw new HttpError(
-        404,
-        ErrorCode.UNIT_NOT_FOUND,
-        `Unit ids not found: ${missing.join(", ")}`,
-      );
-    }
-  } catch (err) {
-    throw err; // see loadVisibleStepOrThrow's catch comment
-  }
-}
-
-/** Throws `404 UTENSIL_NOT_FOUND` if any id in `ids` doesn't match a reference `Utensil` row — same shape as {@link assertIngredientsExist}, checking `input.utensils[].utensilId` instead. */
-async function assertUtensilsExist(ids: number[]): Promise<void> {
-  try {
-    const uniqueIds = [...new Set(ids)];
-    if (uniqueIds.length === 0) return;
-    const found = await prisma.utensil.findMany({
-      where: { id: { in: uniqueIds } },
-      select: { id: true },
-    });
-    const foundIds = new Set(found.map((utensil) => utensil.id));
-    const missing = uniqueIds.filter((id) => !foundIds.has(id));
-    if (missing.length > 0) {
-      throw new HttpError(
-        404,
-        ErrorCode.UTENSIL_NOT_FOUND,
-        `Utensil ids not found: ${missing.join(", ")}`,
-      );
-    }
-  } catch (err) {
-    throw err; // see loadVisibleStepOrThrow's catch comment
-  }
-}
-
 /**
  * Renumbers every one of `stepId`'s `StepTechStep` rows' `order` by
  * ascending `start` (nulls-still-possible legacy rows, see that model's
@@ -194,20 +125,6 @@ export async function renumberStepTechSteps(
   }
 }
 
-/** One ingredient/utensil mention the viewer themselves selected, ready to persist — see {@link applyManualCorrection}'s own doc comment for the "manual replaces all" semantics these are written under. */
-interface ManualIngredientMention {
-  ingredientId: number;
-  quantity: number | null;
-  unitId: number | null;
-  start: number;
-  end: number;
-}
-interface ManualUtensilMention {
-  utensilId: number;
-  start: number;
-  end: number;
-}
-
 /**
  * Applies a correction's *effect* on `stepId`'s real `StepTechStep`
  * sequence, immediately — not just recorded as a pending suggestion for
@@ -225,28 +142,13 @@ interface ManualUtensilMention {
  *   `contextEnd` — a correction only ever carries the tight span the user
  *   themselves selected/clicked, nothing wider to highlight around it.
  * - `previousTechStepId` alone (remove, `correctedTechStepId: null`): the
- *   matching existing entry is deleted outright (cascading away any
+ *   matching existing entry is deleted outright. A no-op if none matches
- *   ingredient/utensil metadata attached to it, auto or manual — nothing
+ *   (nothing to remove).
- *   left to attach metadata to once the technique itself is gone). A
- *   no-op if none matches (nothing to remove).
- *
- * `metadata`, when given (only ever alongside a real `correctedTechStepId`
- * — enforced by `submitTechStepCorrectionSchema`, not re-checked here),
- * replaces *every* `StepTechStepIngredient`/`StepTechStepUtensil` row on
- * this occurrence — `source: "auto"` (the classifier's own detection) and
- * any earlier `"manual"` set alike — with the newly-submitted one. This is
- * "le manuel remplace tout" (confirmed with the user): the resolved
- * `order` this technique ends up at (whichever branch above produced it)
- * is the same `techStepOrder` both metadata tables key on, so the same
- * `deleteMany` + `createMany` pair below is correct whether this call just
- * updated an existing row (which may already carry auto-detected
- * metadata) or created a brand new one (nothing to delete yet — a no-op
- * `deleteMany`, not a special case).
  *
  * Runs inside the same transaction {@link submitTechStepCorrection} uses
- * for the audit-trail insert, so a request never leaves any of these
+ * for the audit-trail insert, so a request never leaves the two effects
- * effects (the permanent correction record, the live sequence change, the
+ * (the permanent correction record, the live sequence change) only
- * metadata replacement) only partially applied.
+ * partially applied.
  */
 async function applyManualCorrection(
   tx: Prisma.TransactionClient,
@@ -254,7 +156,6 @@ async function applyManualCorrection(
   span: { start: number; end: number },
   previousTechStepId: number | null,
   correctedTechStepId: number | null,
-  metadata?: { ingredients: ManualIngredientMention[]; utensils: ManualUtensilMention[] },
 ): Promise<void> {
   const existing = await tx.stepTechStep.findMany({ where: { stepId } });
 
@@ -271,12 +172,9 @@ async function applyManualCorrection(
       : undefined;
 
   if (correctedTechStepId !== null) {
-    const order = target
-      ? target.order
-      : existing.reduce((max, row) => Math.max(max, row.order), -1) + 1;
     if (target) {
       await tx.stepTechStep.update({
-        where: { stepId_order: { stepId, order } },
+        where: { stepId_order: { stepId, order: target.order } },
         data: {
           techStepId: correctedTechStepId,
           start: span.start,
@@ -287,48 +185,18 @@ async function applyManualCorrection(
         },
       });
     } else {
+      const nextOrder = existing.reduce((max, row) => Math.max(max, row.order), -1) + 1;
       await tx.stepTechStep.create({
         data: {
           stepId,
           techStepId: correctedTechStepId,
-          order,
+          order: nextOrder,
           start: span.start,
           end: span.end,
           source: "manual",
         },
       });
     }
-
-    if (metadata !== undefined) {
-      await tx.stepTechStepIngredient.deleteMany({ where: { stepId, techStepOrder: order } });
-      await tx.stepTechStepUtensil.deleteMany({ where: { stepId, techStepOrder: order } });
-      if (metadata.ingredients.length > 0) {
-        await tx.stepTechStepIngredient.createMany({
-          data: metadata.ingredients.map((ingredient) => ({
-            stepId,
-            techStepOrder: order,
-            ingredientId: ingredient.ingredientId,
-            quantity: ingredient.quantity,
-            unitId: ingredient.unitId,
-            start: ingredient.start,
-            end: ingredient.end,
-            source: "manual",
-          })),
-        });
-      }
-      if (metadata.utensils.length > 0) {
-        await tx.stepTechStepUtensil.createMany({
-          data: metadata.utensils.map((utensil) => ({
-            stepId,
-            techStepOrder: order,
-            utensilId: utensil.utensilId,
-            start: utensil.start,
-            end: utensil.end,
-            source: "manual",
-          })),
-        });
-      }
-    }
   } else if (target) {
     await tx.stepTechStep.delete({ where: { stepId_order: { stepId, order: target.order } } });
   }
@@ -364,12 +232,9 @@ function toCorrectionView(correction: CorrectionWithTechSteps): StepTechStepCorr
  *
  * @throws {HttpError} `404 STEP_NOT_FOUND`/`404 RECIPE_NOT_FOUND` — see
  *   {@link loadVisibleStepOrThrow}. `400 INVALID_CORRECTION_SPAN` if
- *   `start`/`end` (the correction's own span, or any of
+ *   `start`/`end` fall outside the step's current `description` (it may
- *   `input.ingredients`/`input.utensils`' own spans) fall outside the
+ *   have been edited since the user last saw it). `404 TECH_STEP_NOT_FOUND`
- *   step's current `description` (it may have been edited since the user
+ *   if either tech-step id doesn't exist.
- *   last saw it). `404 TECH_STEP_NOT_FOUND`/`404 INGREDIENT_NOT_FOUND`/
- *   `404 UNIT_NOT_FOUND`/`404 UTENSIL_NOT_FOUND` if any referenced id
- *   doesn't exist.
  */
 export async function submitTechStepCorrection(
   recipeId: number,
@@ -381,32 +246,18 @@ export async function submitTechStepCorrection(
   try {
     const step = await loadVisibleStepOrThrow(recipeId, stepId, correctorId, viewerHouseId);
 
-    const spans = [
+    if (input.start >= step.descriptionLength || input.end > step.descriptionLength) {
-      { start: input.start, end: input.end },
+      throw new HttpError(
-      ...(input.ingredients ?? []),
+        400,
-      ...(input.utensils ?? []),
+        ErrorCode.INVALID_CORRECTION_SPAN,
-    ];
+        `Span [${input.start}, ${input.end}) falls outside step ${stepId}'s description (length ${step.descriptionLength})`,
-    for (const span of spans) {
+      );
-      if (span.start >= step.descriptionLength || span.end > step.descriptionLength) {
-        throw new HttpError(
-          400,
-          ErrorCode.INVALID_CORRECTION_SPAN,
-          `Span [${span.start}, ${span.end}) falls outside step ${stepId}'s description (length ${step.descriptionLength})`,
-        );
-      }
     }
 
     const techStepIds = [input.previousTechStepId, input.correctedTechStepId].filter(
       (id): id is number => id !== null && id !== undefined,
     );
     await assertTechStepsExist(techStepIds);
-    await assertIngredientsExist((input.ingredients ?? []).map((i) => i.ingredientId));
-    await assertUnitsExist(
-      (input.ingredients ?? []).flatMap((i) =>
-        i.unitId !== null && i.unitId !== undefined ? [i.unitId] : [],
-      ),
-    );
-    await assertUtensilsExist((input.utensils ?? []).map((u) => u.utensilId));
 
     const { correction, techSteps } = await prisma.$transaction(async (tx) => {
       const createdCorrection = await tx.stepTechStepCorrection.create({
@@ -427,46 +278,12 @@ export async function submitTechStepCorrection(
         { start: input.start, end: input.end },
         input.previousTechStepId ?? null,
         input.correctedTechStepId ?? null,
-        input.ingredients === undefined && input.utensils === undefined
-          ? undefined
-          : {
-              ingredients: (input.ingredients ?? []).map((ingredient) => ({
-                ingredientId: ingredient.ingredientId,
-                quantity: ingredient.quantity ?? null,
-                unitId: ingredient.unitId ?? null,
-                start: ingredient.start,
-                end: ingredient.end,
-              })),
-              utensils: (input.utensils ?? []).map((utensil) => ({
-                utensilId: utensil.utensilId,
-                start: utensil.start,
-                end: utensil.end,
-              })),
-            },
       );
 
-      // Same nested `ingredients`/`utensils` include as `recipe.service.ts`'s
-      // `recipeInclude` — `toStepTechStepViews` (reused below) expects it,
-      // so the fresh sequence read right after a manual correction resolves
-      // exactly the same way a normal `GET /recipes/:id` would.
       const freshTechSteps = await tx.stepTechStep.findMany({
         where: { stepId: step.id },
         orderBy: { order: "asc" },
-        include: {
+        include: { techStep: true },
-          techStep: true,
-          ingredients: {
-            include: {
-              ingredient: {
-                include: {
-                  allergies: { include: { allergy: { include: { category: true } } } },
-                  diets: { include: { diet: true } },
-                },
-              },
-              unit: true,
-            },
-          },
-          utensils: { include: { utensil: true } },
-        },
       });
 
       return { correction: createdCorrection, techSteps: freshTechSteps };

apps/api/src/modules/recipe/recipe.service.ts

@@ -45,29 +45,7 @@ function recipeInclude(viewerId: number) {
     steps: {
       orderBy: { order: "asc" },
       include: {
-        techSteps: {
+        techSteps: { orderBy: { order: "asc" }, include: { techStep: true } },
-          orderBy: { order: "asc" },
-          include: {
-            techStep: true,
-            // Same `allergies`/`diets` nesting as this function's own
-            // top-level `ingredients` include above — reused by
-            // `toIngredientView` so a mentioned ingredient resolves to the
-            // exact same `IngredientView` shape as the recipe's main
-            // ingredient list, not a second, thinner shape.
-            ingredients: {
-              include: {
-                ingredient: {
-                  include: {
-                    allergies: { include: { allergy: { include: { category: true } } } },
-                    diets: { include: { diet: true } },
-                  },
-                },
-                unit: true,
-              },
-            },
-            utensils: { include: { utensil: true } },
-          },
-        },
       },
     },
     diets: { include: { diet: true } },
@@ -167,8 +145,7 @@ export function toStepTechStepViews(
 ): StepTechStepView[] {
   const views: StepTechStepView[] = [];
   for (const stepTechStep of techSteps) {
-    const { start, end, contextStart, contextEnd, techStep, source, ingredients, utensils } =
+    const { start, end, contextStart, contextEnd, techStep, source } = stepTechStep;
-      stepTechStep;
     if (start === null || end === null) continue;
     views.push({
       techStep: { id: techStep.id, key: techStep.key },
@@ -182,22 +159,6 @@ export function toStepTechStepViews(
       // `StepTechStepView.source` to the frontend.
       source: source === "manual" ? "manual" : "auto",
       ...(contextStart !== null && contextEnd !== null ? { contextStart, contextEnd } : {}),
-      ingredients: ingredients.map((stepTechStepIngredient) => ({
-        ingredient: toIngredientView(stepTechStepIngredient.ingredient),
-        quantity:
-          stepTechStepIngredient.quantity === null ? null : Number(stepTechStepIngredient.quantity),
-        unit: stepTechStepIngredient.unit === null ? null : toUnitView(stepTechStepIngredient.unit),
-        start: stepTechStepIngredient.start,
-        end: stepTechStepIngredient.end,
-        // Same narrowing posture as the technique's own `source` above.
-        source: stepTechStepIngredient.source === "manual" ? "manual" : "auto",
-      })),
-      utensils: utensils.map((stepTechStepUtensil) => ({
-        utensil: { id: stepTechStepUtensil.utensil.id, key: stepTechStepUtensil.utensil.key },
-        start: stepTechStepUtensil.start,
-        end: stepTechStepUtensil.end,
-        source: stepTechStepUtensil.source === "manual" ? "manual" : "auto",
-      })),
     });
   }
   return views;
@@ -592,22 +553,6 @@ async function createRecipeInternal(
                 contextStart: match.contextStart,
                 contextEnd: match.contextEnd,
                 order,
-                ingredients: {
-                  create: match.ingredients.map((ingredient) => ({
-                    ingredientId: ingredient.ingredientId,
-                    quantity: ingredient.quantity,
-                    unitId: ingredient.unitId,
-                    start: ingredient.start,
-                    end: ingredient.end,
-                  })),
-                },
-                utensils: {
-                  create: match.utensils.map((utensil) => ({
-                    utensilId: utensil.utensilId,
-                    start: utensil.start,
-                    end: utensil.end,
-                  })),
-                },
               })),
             },
           })),

apps/api/src/modules/reference/reference.routes.ts

@@ -7,7 +7,6 @@ import {
   getSources,
   getTechSteps,
   getUnits,
-  getUtensils,
 } from "./reference.service.js";
 
 /**
@@ -56,13 +55,6 @@ referenceRouter.get(
   }),
 );
 
-referenceRouter.get(
-  "/utensils",
-  wrapAsyncHandler(async (_req, res) => {
-    res.status(200).json(await getUtensils());
-  }),
-);
-
 referenceRouter.get(
   "/sources",
   wrapAsyncHandler(async (_req, res) => {

apps/api/src/modules/reference/reference.service.ts

@@ -5,7 +5,6 @@ import type {
   SourceView,
   TechStepView,
   UnitView,
-  UtensilView,
 } from "@batch-cooking/shared";
 import { prisma } from "../../db/prisma.js";
 
@@ -86,19 +85,6 @@ export async function getTechSteps(): Promise<TechStepView[]> {
   }
 }
 
-/**
- * All reference cooking utensils, ordered by key (see {@link getDiets} for
- * why) — small, static list (see `reference-seed-data.ts`'s `UTENSILS`),
- * same bare `id`/`key` shape as {@link getTechSteps}.
- */
-export async function getUtensils(): Promise<UtensilView[]> {
-  try {
-    return await prisma.utensil.findMany({ orderBy: { key: "asc" } });
-  } catch (err) {
-    throw err; // see getDiets()'s catch comment above
-  }
-}
-
 /**
  * Every implemented recipe source, ordered by name (not `key` — unlike
  * every other reference catalog, `name` here *is* the display string a

apps/api/src/modules/sources/sources.service.ts

@@ -27,7 +27,7 @@ import { RecipeSourceError } from "../../lib/recipe-sources/recipe-source-errors
 import { getRecipeSource } from "../../lib/recipe-sources/recipe-source-registry.js";
 import { getHouseSourceIds } from "../house/house.service.js";
 import { createImportedRecipe } from "../recipe/recipe.service.js";
-import { getIngredients, getUnits, getUtensils } from "../reference/reference.service.js";
+import { getIngredients, getUnits } from "../reference/reference.service.js";
 
 /**
  * Browsing, previewing, and importing a household's *enabled* external
@@ -190,14 +190,9 @@ export async function previewSourceItem(
       unitCatalog,
       adapter.locale,
     );
-    const [ingredientViews, unitViews, utensilViews] = await Promise.all([
+    const [ingredientViews, unitViews] = await Promise.all([getIngredients(), getUnits()]);
-      getIngredients(),
-      getUnits(),
-      getUtensils(),
-    ]);
     const ingredientById = new Map(ingredientViews.map((view) => [view.id, view]));
     const unitById = new Map(unitViews.map((view) => [view.id, view]));
-    const utensilById = new Map(utensilViews.map((view) => [view.id, view]));
 
     // A source's raw ingredient lines aren't deduplicated by the matcher —
     // two different lines (e.g. "Egg Yolks"/"Eggs") can resolve to the same
@@ -236,30 +231,6 @@ export async function previewSourceItem(
                 // comment) — always the classifier's own live match,
                 // never a correction, so always "auto".
                 source: "auto",
-                ingredients: match.ingredients.flatMap((mention) => {
-                  const ingredient = ingredientById.get(mention.ingredientId);
-                  // Same drift guard as `techStep` above — an ingredientId
-                  // the matcher resolved but that's since vanished from the
-                  // catalog is dropped rather than shown with a hole in it.
-                  if (!ingredient) return [];
-                  return [
-                    {
-                      ingredient,
-                      quantity: mention.quantity,
-                      unit: mention.unitId !== null ? (unitById.get(mention.unitId) ?? null) : null,
-                      start: mention.start,
-                      end: mention.end,
-                      // Same reasoning as this match's own `source` above — a draft preview only ever holds live classifier output.
-                      source: "auto" as const,
-                    },
-                  ];
-                }),
-                utensils: match.utensils.flatMap((mention) => {
-                  const utensil = utensilById.get(mention.utensilId);
-                  return utensil
-                    ? [{ utensil, start: mention.start, end: mention.end, source: "auto" as const }]
-                    : [];
-                }),
               },
             ]
           : [];

apps/api/test/recipe-matching/ingredient-matcher.test.ts

@@ -3,7 +3,6 @@ import { expect } from "chai";
 import { prisma } from "../../src/db/prisma.js";
 import {
   extractQuantity,
-  findIngredientMentions,
   type IngredientMatchEntry,
   loadIngredientCatalog,
   loadUnitCatalog,
@@ -267,100 +266,6 @@ describe("ingredient-matcher", () => {
     });
   });
 
-  describe("findIngredientMentions", () => {
-    const butter: IngredientMatchEntry = { ingredientId: 1, label: "Butter" };
-    const flour: IngredientMatchEntry = { ingredientId: 2, label: "Flour" };
-    const egg: IngredientMatchEntry = { ingredientId: 3, label: "Egg" };
-    const catalog = [butter, flour, egg];
-    const gram: UnitMatchEntry = { unitId: 1, synonyms: ["g", "gram", "grams"] };
-    const unitCatalog = [gram];
-
-    it("finds a single mention with no quantity or unit", () => {
-      const text = "melt the butter";
-      const mentions = findIngredientMentions(text, catalog, unitCatalog);
-      expect(mentions).to.have.length(1);
-      const [mention] = mentions;
-      expect(mention?.ingredientId).to.equal(butter.ingredientId);
-      expect(text.slice(mention?.start, mention?.end)).to.equal("butter");
-      expect(mention?.quantity).to.equal(null);
-      expect(mention?.unitId).to.equal(null);
-    });
-
-    it('resolves a quantity and unit glued directly to the ingredient ("200g butter")', () => {
-      const text = "add 200g butter";
-      const [mention] = findIngredientMentions(text, catalog, unitCatalog);
-      expect(mention?.ingredientId).to.equal(butter.ingredientId);
-      expect(mention?.quantity).to.equal(200);
-      expect(mention?.unitId).to.equal(gram.unitId);
-    });
-
-    it("finds several mentions in reading order, non-overlapping", () => {
-      const text = "melt the butter then add the flour and an egg";
-      const mentions = findIngredientMentions(text, catalog, unitCatalog);
-      expect(mentions.map((mention) => mention.ingredientId)).to.deep.equal([
-        butter.ingredientId,
-        flour.ingredientId,
-        egg.ingredientId,
-      ]);
-    });
-
-    it("is case- and accent-insensitive", () => {
-      const text = "MELT THE BUTTER";
-      const [mention] = findIngredientMentions(text, catalog, unitCatalog);
-      expect(mention?.ingredientId).to.equal(butter.ingredientId);
-    });
-
-    it("ignores an unrelated number earlier in the text (e.g. an oven temperature)", () => {
-      const text = "preheat to 180 degrees then add the egg";
-      const [mention] = findIngredientMentions(text, catalog, unitCatalog);
-      expect(mention?.ingredientId).to.equal(egg.ingredientId);
-      expect(mention?.quantity).to.equal(null);
-    });
-
-    it("returns an empty array when nothing in the catalog is mentioned", () => {
-      expect(findIngredientMentions("stir well", catalog, unitCatalog)).to.deep.equal([]);
-    });
-
-    it("returns an empty array for empty text", () => {
-      expect(findIngredientMentions("", catalog, unitCatalog)).to.deep.equal([]);
-    });
-
-    describe("locale: fr", () => {
-      const beurre: IngredientMatchEntry = { ingredientId: 10, label: "Beurre" };
-      const farine: IngredientMatchEntry = { ingredientId: 11, label: "Farine" };
-      const frCatalog = [beurre, farine];
-      const gramme: UnitMatchEntry = { unitId: 40, synonyms: ["g", "gr", "gramme", "grammes"] };
-      const cuillereASoupe: UnitMatchEntry = {
-        unitId: 41,
-        synonyms: ["cuillère à soupe", "cuillères à soupe", "càs"],
-      };
-      const frUnitCatalog = [gramme, cuillereASoupe];
-
-      it("resolves a quantity and unit before the ingredient, connected by 'de'", () => {
-        const text = "faire fondre 50g de beurre";
-        const [mention] = findIngredientMentions(text, frCatalog, frUnitCatalog, "fr");
-        expect(mention?.ingredientId).to.equal(beurre.ingredientId);
-        expect(mention?.quantity).to.equal(50);
-        expect(mention?.unitId).to.equal(gramme.unitId);
-        expect(text.slice(mention?.start, mention?.end)).to.equal("beurre");
-      });
-
-      it('resolves a multi-word unit connected by "d\'"', () => {
-        const text = "ajouter 2 cuillères à soupe de farine";
-        const [mention] = findIngredientMentions(text, frCatalog, frUnitCatalog, "fr");
-        expect(mention?.ingredientId).to.equal(farine.ingredientId);
-        expect(mention?.quantity).to.equal(2);
-        expect(mention?.unitId).to.equal(cuillereASoupe.unitId);
-      });
-
-      it("is accent-insensitive", () => {
-        const text = "FAIRE FONDRE LE BEURRE";
-        const [mention] = findIngredientMentions(text, frCatalog, frUnitCatalog, "fr");
-        expect(mention?.ingredientId).to.equal(beurre.ingredientId);
-      });
-    });
-  });
-
   describe("loadIngredientCatalog / loadUnitCatalog", () => {
     beforeEach(async () => {
       await resetDatabase();

apps/api/test/recipe-matching/tech-step-matcher.test.ts

@@ -135,36 +135,18 @@ describe("tech-step-matcher", () => {
     let meltId: number;
     let boilId: number;
     let chopId: number;
-    // Real seeded catalog entries that also happen to be mentioned by
-    // several fixtures below now that `matchTechStepSpans` also resolves
-    // ingredient/utensil metadata — see `matchTechStepSpans`'s own describe
-    // block for where each of these gets used.
-    let panId: number;
-    let butterId: number;
-    let onionId: number;
-    let walnutsId: number;
 
     beforeEach(async () => {
       await resetDatabase();
-      const [simmer, cook, bake, preheat, melt, boil, chop, pan, butter, onion, walnuts] =
+      const [simmer, cook, bake, preheat, melt, boil, chop] = await Promise.all([
-        await Promise.all([
+        prisma.techStep.findFirstOrThrow({ where: { key: "simmer" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "simmer" } }),
+        prisma.techStep.findFirstOrThrow({ where: { key: "cook" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "cook" } }),
+        prisma.techStep.findFirstOrThrow({ where: { key: "bake" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "bake" } }),
+        prisma.techStep.findFirstOrThrow({ where: { key: "preheat" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "preheat" } }),
+        prisma.techStep.findFirstOrThrow({ where: { key: "melt" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "melt" } }),
+        prisma.techStep.findFirstOrThrow({ where: { key: "boil" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "boil" } }),
+        prisma.techStep.findFirstOrThrow({ where: { key: "chop" } }),
-          prisma.techStep.findFirstOrThrow({ where: { key: "chop" } }),
+      ]);
-          prisma.utensil.findFirstOrThrow({ where: { key: "pan" } }),
-          prisma.ingredient.findFirstOrThrow({ where: { key: "butter" } }),
-          prisma.ingredient.findFirstOrThrow({ where: { key: "onion" } }),
-          // "Noix" (walnuts) — turns out to also be a real seeded ingredient
-          // label, and "noix" is literally the French word for "a pat of
-          // butter" ("une noix de beurre") used in one of the fixtures
-          // below, so it's a genuine (if slightly comical) second match
-          // alongside "beurre" in that clause, not a fixture bug.
-          prisma.ingredient.findFirstOrThrow({ where: { key: "walnuts" } }),
-        ]);
       simmerId = simmer.id;
       cookId = cook.id;
       bakeId = bake.id;
@@ -172,10 +154,6 @@ describe("tech-step-matcher", () => {
       meltId = melt.id;
       boilId = boil.id;
       chopId = chop.id;
-      panId = pan.id;
-      butterId = butter.id;
-      onionId = onion.id;
-      walnutsId = walnuts.id;
     });
 
     after(async () => {
@@ -277,15 +255,7 @@ describe("tech-step-matcher", () => {
         const text = "Faire mijoter à feu doux";
         const result = await techStepClassifier.matchTechStepSpans(text, "fr");
         expect(result).to.deep.equal([
-          {
+          { techStepId: simmerId, start: 6, end: 13, contextStart: 0, contextEnd: text.length },
-            techStepId: simmerId,
-            start: 6,
-            end: 13,
-            contextStart: 0,
-            contextEnd: text.length,
-            ingredients: [],
-            utensils: [],
-          },
         ]);
         expect(text.slice(6, 13).toLowerCase()).to.equal("mijoter");
       });
@@ -335,12 +305,6 @@ describe("tech-step-matcher", () => {
           end: 21,
           contextStart: 0,
           contextEnd: 22,
-          // "poêle" (the pan) sits inside this very clause — a separate
-          // utensil mention from `preheat`'s own "poêle chaude" keyword
-          // span above, found by the intent service's *other* PhraseMatcher
-          // (see `IntentServiceEntity.kind`).
-          ingredients: [],
-          utensils: [{ utensilId: panId, start: 9, end: 14 }],
         });
         expect(result[1]).to.deep.equal({
           techStepId: meltId,
@@ -348,15 +312,6 @@ describe("tech-step-matcher", () => {
           end: 37,
           contextStart: 22,
           contextEnd: text.length,
-          // Two mentions in this clause: "noix" (walnuts — also a real
-          // seeded ingredient, and literally the French word this phrase
-          // uses for "a pat of [butter]") *and* "beurre" itself, in
-          // reading order.
-          ingredients: [
-            { ingredientId: walnutsId, start: 42, end: 46, quantity: null, unitId: null },
-            { ingredientId: butterId, start: 50, end: 56, quantity: null, unitId: null },
-          ],
-          utensils: [],
         });
         expect(text.slice(result[0].start, result[0].end)).to.equal("poêle chaude");
         expect(text.slice(result[0].contextStart, result[0].contextEnd)).to.equal(
@@ -378,15 +333,6 @@ describe("tech-step-matcher", () => {
             end: text.length,
             contextStart: 0,
             contextEnd: text.length,
-            // "beurre" and "poêle" are both mentioned in this same
-            // anchor-less clause (there's no literal `melt` keyword here at
-            // all — the whole point of this test, see its own title) —
-            // still resolved, since ingredient/utensil scanning doesn't
-            // depend on the clause having a technique anchor of its own.
-            ingredients: [
-              { ingredientId: butterId, start: 18, end: 24, quantity: null, unitId: null },
-            ],
-            utensils: [{ utensilId: panId, start: 45, end: 50 }],
           },
         ]);
       });
@@ -395,33 +341,10 @@ describe("tech-step-matcher", () => {
         const text = "Chop the onions finely";
         const result = await techStepClassifier.matchTechStepSpans(text, "en");
         expect(result).to.deep.equal([
-          {
+          { techStepId: chopId, start: 0, end: 4, contextStart: 0, contextEnd: text.length },
-            techStepId: chopId,
-            start: 0,
-            end: 4,
-            contextStart: 0,
-            contextEnd: text.length,
-            ingredients: [
-              { ingredientId: onionId, start: 9, end: 15, quantity: null, unitId: null },
-            ],
-            utensils: [],
-          },
         ]);
         expect(text.slice(0, 4)).to.equal("Chop");
       });
-
-      // Quantity+unit extraction itself (the leading-number-before-a-mention
-      // heuristic) is covered in full, deterministically, by
-      // `findIngredientMentions`'s own tests (`ingredient-matcher.test.ts`)
-      // — deliberately not re-exercised here through a brand-new invented
-      // sentence: a novel combination of words the real `textcat` (trained
-      // on a fixed, finite corpus, see `training_data.py`) has never seen
-      // together can land on a confidently-wrong technique for reasons
-      // that have nothing to do with this file's own logic, making such a
-      // test flaky against corpus/threshold changes rather than a
-      // trustworthy regression guard. The two tests above/below already
-      // demonstrate technique+ingredient+utensil co-occurring in one
-      // clause using sentences already proven reliable by this suite.
     });
   });
 });

apps/api/test/recipe/recipe-tech-step-correction.test.ts

@@ -25,24 +25,6 @@ async function techStepId(key: string): Promise<number> {
   return techStep.id;
 }
 
-/** Same as {@link techStepId}, for a reference `Ingredient`. */
-async function ingredientId(key: string): Promise<number> {
-  const ingredient = await prisma.ingredient.findFirstOrThrow({ where: { key } });
-  return ingredient.id;
-}
-
-/** Same as {@link techStepId}, for a reference `Unit`. */
-async function unitId(key: string): Promise<number> {
-  const unit = await prisma.unit.findFirstOrThrow({ where: { key } });
-  return unit.id;
-}
-
-/** Same as {@link techStepId}, for a reference `Utensil`. */
-async function utensilId(key: string): Promise<number> {
-  const utensil = await prisma.utensil.findFirstOrThrow({ where: { key } });
-  return utensil.id;
-}
-
 describe("Recipe tech-step corrections", () => {
   const app = createApp();
 
@@ -116,14 +98,7 @@ describe("Recipe tech-step corrections", () => {
       // away — not just the permanent audit record above (see
       // `applyManualCorrection`, `recipe-tech-step-correction.service.ts`).
       expect(res.body.techSteps).to.deep.equal([
-        {
+        { techStep: { id: simmerId, key: "simmer" }, start: 6, end: 13, source: "manual" },
-          techStep: { id: simmerId, key: "simmer" },
-          start: 6,
-          end: 13,
-          source: "manual",
-          ingredients: [],
-          utensils: [],
-        },
       ]);
     });
 
@@ -149,14 +124,7 @@ describe("Recipe tech-step corrections", () => {
       // Still exactly one entry — the relabel updated the existing row
       // rather than adding a second one alongside it.
       expect(res.body.techSteps).to.deep.equal([
-        {
+        { techStep: { id: boilId, key: "boil" }, start: 6, end: 13, source: "manual" },
-          techStep: { id: boilId, key: "boil" },
-          start: 6,
-          end: 13,
-          source: "manual",
-          ingredients: [],
-          utensils: [],
-        },
       ]);
     });
 
@@ -277,244 +245,6 @@ describe("Recipe tech-step corrections", () => {
     });
   });
 
-  describe("POST /recipes/:id/steps/:stepId/corrections — ingredients/utensils metadata", () => {
-    it("attaches manually-selected ingredients and utensils to a corrected technique", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-      const simmerId = await techStepId("simmer");
-      const butterId = await ingredientId("butter");
-      const gramId = await unitId("gram");
-      const panId = await utensilId("pan");
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        correctedTechStepId: simmerId,
-        ingredients: [{ ingredientId: butterId, quantity: 50, unitId: gramId, start: 0, end: 6 }],
-        utensils: [{ utensilId: panId, start: 14, end: 23 }],
-      });
-
-      expect(res.status).to.equal(201);
-      expect(res.body.techSteps).to.deep.equal([
-        {
-          techStep: { id: simmerId, key: "simmer" },
-          start: 6,
-          end: 13,
-          source: "manual",
-          ingredients: [
-            {
-              ingredient: res.body.techSteps[0].ingredients[0].ingredient,
-              quantity: 50,
-              unit: res.body.techSteps[0].ingredients[0].unit,
-              start: 0,
-              end: 6,
-              source: "manual",
-            },
-          ],
-          utensils: [
-            {
-              utensil: res.body.techSteps[0].utensils[0].utensil,
-              start: 14,
-              end: 23,
-              source: "manual",
-            },
-          ],
-        },
-      ]);
-      expect(res.body.techSteps[0].ingredients[0].ingredient.id).to.equal(butterId);
-      expect(res.body.techSteps[0].ingredients[0].unit.id).to.equal(gramId);
-      expect(res.body.techSteps[0].utensils[0].utensil).to.deep.equal({ id: panId, key: "pan" });
-    });
-
-    it("attaches an ingredient with no quantity/unit (both omitted)", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-      const simmerId = await techStepId("simmer");
-      const butterId = await ingredientId("butter");
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        correctedTechStepId: simmerId,
-        ingredients: [{ ingredientId: butterId, start: 0, end: 6 }],
-      });
-
-      expect(res.status).to.equal(201);
-      expect(res.body.techSteps[0].ingredients[0].quantity).to.equal(null);
-      expect(res.body.techSteps[0].ingredients[0].unit).to.equal(null);
-    });
-
-    it("replaces both auto-detected and previously-manual metadata on the same occurrence — never accumulates", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-      const simmerId = await techStepId("simmer");
-      const boilId = await techStepId("boil");
-      const butterId = await ingredientId("butter");
-      const carrotId = await ingredientId("carrot");
-      const panId = await utensilId("pan");
-      const saucepanId = await utensilId("saucepan");
-
-      // First correction creates the occurrence (order 0) — simulate an
-      // auto-detected ingredient already sitting on it, exactly as
-      // tech-step-matcher.ts would have written one at save time (bypassed
-      // here for a deterministic fixture, not dependent on the real
-      // classifier's own output for this text).
-      await agent
-        .post(`/recipes/${recipeId}/steps/${stepId}/corrections`)
-        .send({ start: 6, end: 13, correctedTechStepId: simmerId });
-      await prisma.stepTechStepIngredient.create({
-        data: {
-          stepId,
-          techStepOrder: 0,
-          ingredientId: butterId,
-          start: 0,
-          end: 6,
-          source: "auto",
-        },
-      });
-      await prisma.stepTechStepUtensil.create({
-        data: { stepId, techStepOrder: 0, utensilId: panId, start: 14, end: 23, source: "auto" },
-      });
-
-      // Second correction — relabels the technique *and* submits a whole
-      // new, disjoint metadata set.
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        previousTechStepId: simmerId,
-        correctedTechStepId: boilId,
-        ingredients: [{ ingredientId: carrotId, start: 0, end: 6 }],
-        utensils: [{ utensilId: saucepanId, start: 14, end: 23 }],
-      });
-
-      expect(res.status).to.equal(201);
-      expect(res.body.techSteps).to.have.length(1);
-      // Neither the auto-detected butter/pan nor an empty leftover row
-      // survive — only the freshly-submitted carrot/saucepan.
-      expect(
-        res.body.techSteps[0].ingredients.map(
-          (i: { ingredient: { id: number } }) => i.ingredient.id,
-        ),
-      ).to.deep.equal([carrotId]);
-      expect(
-        res.body.techSteps[0].utensils.map((u: { utensil: { id: number } }) => u.utensil.id),
-      ).to.deep.equal([saucepanId]);
-    });
-
-    it("leaves existing metadata untouched when ingredients/utensils are omitted from the request", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-      const simmerId = await techStepId("simmer");
-      const boilId = await techStepId("boil");
-      const butterId = await ingredientId("butter");
-
-      await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        correctedTechStepId: simmerId,
-        ingredients: [{ ingredientId: butterId, start: 0, end: 6 }],
-      });
-
-      // Relabels the technique again, but says nothing about metadata at all.
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        previousTechStepId: simmerId,
-        correctedTechStepId: boilId,
-      });
-
-      expect(res.status).to.equal(201);
-      expect(res.body.techSteps[0].ingredients).to.have.length(1);
-      expect(res.body.techSteps[0].ingredients[0].ingredient.id).to.equal(butterId);
-    });
-
-    it("rejects metadata submitted alongside correctedTechStepId: null with 400 VALIDATION_ERROR", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-      const simmerId = await techStepId("simmer");
-      const butterId = await ingredientId("butter");
-      await agent
-        .post(`/recipes/${recipeId}/steps/${stepId}/corrections`)
-        .send({ start: 6, end: 13, correctedTechStepId: simmerId });
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        previousTechStepId: simmerId,
-        correctedTechStepId: null,
-        ingredients: [{ ingredientId: butterId, start: 0, end: 6 }],
-      });
-
-      expect(res.status).to.equal(400);
-      expect(res.body.code).to.equal(ErrorCode.VALIDATION_ERROR);
-    });
-
-    it("rejects an unknown ingredientId with 404 INGREDIENT_NOT_FOUND", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        correctedTechStepId: await techStepId("simmer"),
-        ingredients: [{ ingredientId: 999_999, start: 0, end: 6 }],
-      });
-
-      expect(res.status).to.equal(404);
-      expect(res.body.code).to.equal(ErrorCode.INGREDIENT_NOT_FOUND);
-    });
-
-    it("rejects an unknown unitId with 404 UNIT_NOT_FOUND", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        correctedTechStepId: await techStepId("simmer"),
-        ingredients: [
-          { ingredientId: await ingredientId("butter"), unitId: 999_999, start: 0, end: 6 },
-        ],
-      });
-
-      expect(res.status).to.equal(404);
-      expect(res.body.code).to.equal(ErrorCode.UNIT_NOT_FOUND);
-    });
-
-    it("rejects an unknown utensilId with 404 UTENSIL_NOT_FOUND", async () => {
-      const { agent, profileId } = await signup();
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId);
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 6,
-        end: 13,
-        correctedTechStepId: await techStepId("simmer"),
-        utensils: [{ utensilId: 999_999, start: 0, end: 6 }],
-      });
-
-      expect(res.status).to.equal(404);
-      expect(res.body.code).to.equal(ErrorCode.UTENSIL_NOT_FOUND);
-    });
-
-    it("rejects a metadata span past the end of the step's description with 400 INVALID_CORRECTION_SPAN", async () => {
-      const { agent, profileId } = await signup();
-      const description = "Court.";
-      const { recipeId, stepId } = await createPublicRecipeWithStep(profileId, description);
-
-      const res = await agent.post(`/recipes/${recipeId}/steps/${stepId}/corrections`).send({
-        start: 0,
-        end: description.length,
-        correctedTechStepId: await techStepId("simmer"),
-        ingredients: [
-          { ingredientId: await ingredientId("butter"), start: 0, end: description.length + 10 },
-        ],
-      });
-
-      expect(res.status).to.equal(400);
-      expect(res.body.code).to.equal(ErrorCode.INVALID_CORRECTION_SPAN);
-    });
-  });
-
   describe("GET /recipes/:id/steps/:stepId/corrections", () => {
     it("returns every correction submitted for the step, most recent first", async () => {
       const { agent, profileId } = await signup();

apps/api/test/reference.test.ts

@@ -3,7 +3,7 @@ import request from "supertest";
 import { createApp } from "../src/app.js";
 import { prisma } from "../src/db/prisma.js";
 import { syncRecipeSources } from "../src/db/recipe-source-sync.js";
-import { seedReferenceData, TECH_STEPS, UTENSILS } from "../src/db/reference-seed-data.js";
+import { seedReferenceData, TECH_STEPS } from "../src/db/reference-seed-data.js";
 import type { RecipeSourceAdapter } from "../src/lib/recipe-sources/recipe-source-adapter.js";
 import {
   clearRecipeSources,
@@ -161,31 +161,6 @@ describe("Reference data", () => {
     });
   });
 
-  describe("GET /reference/utensils", () => {
-    it("returns the seeded utensils, no session required", async () => {
-      const res = await request(app).get("/reference/utensils");
-
-      expect(res.status).to.equal(200);
-      expect(res.body).to.have.length(UTENSILS.length);
-      expect(res.body.map((u: { key: string }) => u.key)).to.include("pan");
-      expect(res.body[0]).to.have.keys(["id", "key"]);
-    });
-
-    it("orders utensils alphabetically by key", async () => {
-      const res = await request(app).get("/reference/utensils");
-
-      const keys = res.body.map((u: { key: string }) => u.key);
-      expect(keys).to.deep.equal([...keys].sort());
-    });
-
-    it("reseeding is idempotent — no duplicate utensils", async () => {
-      await seedReferenceData(prisma);
-
-      const res = await request(app).get("/reference/utensils");
-      expect(res.body).to.have.length(UTENSILS.length);
-    });
-  });
-
   describe("GET /reference/sources", () => {
     afterEach(() => {
       clearRecipeSources();

apps/web/cypress/component/TechStepCorrectionPopover.cy.tsx

@@ -1,4 +1,3 @@
-import { useState } from "react";
 import "../../src/i18n/i18n";
 import { TechStepCorrectionPopover } from "../../src/features/recipes/steps/TechStepCorrectionPopover";
 
@@ -12,40 +11,15 @@ import { TechStepCorrectionPopover } from "../../src/features/recipes/steps/Tech
 
 const cook = { id: 1, key: "cook" };
 const simmer = { id: 3, key: "simmer" };
-const butter = { id: 10, key: "butter" };
-const pan = { id: 20, key: "pan" };
-const gram = { id: 30, key: "gram" };
 
-/**
+function mountPopover(
- * A real `StepDescription` resolves `onRequestSpan` into a fresh
+  overrides: Partial<{
- * `resolvedMetadataSpan` via an actual browser text selection — out of
+    previousTechStepId: number | null;
- * scope for a component test of the popover alone (covered by the e2e
+    onClose: () => void;
- * scenario instead). This harness fakes that round-trip with a fixed
+    onSubmitted: (correction: unknown) => void;
- * span, so tests here can exercise everything the popover itself is
+  }> = {},
- * responsible for once a span comes back, without needing a real
+) {
- * `StepDescription` in the tree.
+  cy.mount(
- */
-function Harness({
-  previousTechStepId = null,
-  existingIngredients = [],
-  existingUtensils = [],
-  onClose = () => {},
-  onSubmitted = () => {},
-}: Partial<{
-  previousTechStepId: number | null;
-  existingIngredients: unknown[];
-  existingUtensils: unknown[];
-  onClose: () => void;
-  onSubmitted: (result: unknown) => void;
-}>) {
-  const [resolvedMetadataSpan, setResolvedMetadataSpan] = useState<{
-    nonce: number;
-    kind: "ingredient" | "utensil";
-    range: { start: number; end: number };
-    text: string;
-  } | null>(null);
-
-  return (
     <div>
       {/* A genuinely separate sibling to click for the "outside click closes it" test — clicking blindly at a viewport coordinate would risk still landing inside the popover, which fills most of the mounted area on its own. */}
       <div data-testid="outside-popover" style={{ height: 20 }} />
@@ -54,25 +28,11 @@ function Harness({
         stepId={2}
         selectedText="Cuire"
         range={{ start: 0, end: 5 }}
-        previousTechStepId={previousTechStepId}
+        previousTechStepId={overrides.previousTechStepId ?? null}
-        // biome-ignore lint/suspicious/noExplicitAny: test harness stands in for real StepTechStepIngredientView/UtensilView props — precise typing isn't the point here.
+        onClose={overrides.onClose ?? (() => {})}
-        existingIngredients={existingIngredients as any}
+        onSubmitted={overrides.onSubmitted ?? (() => {})}
-        // biome-ignore lint/suspicious/noExplicitAny: see above.
-        existingUtensils={existingUtensils as any}
-        resolvedMetadataSpan={resolvedMetadataSpan}
-        onRequestSpan={(kind) =>
-          setResolvedMetadataSpan({
-            nonce: Date.now(),
-            kind,
-            range: { start: 20, end: 26 },
-            text: "Beurre",
-          })
-        }
-        onClose={onClose}
-        // biome-ignore lint/suspicious/noExplicitAny: see above.
-        onSubmitted={onSubmitted as any}
       />
-    </div>
+    </div>,
   );
 }
 
@@ -81,75 +41,32 @@ describe("TechStepCorrectionPopover", () => {
     cy.intercept("GET", "**/reference/tech-steps", { statusCode: 200, body: [cook, simmer] }).as(
       "getTechSteps",
     );
-    cy.intercept("GET", "**/reference/ingredients", { statusCode: 200, body: [butter] }).as(
-      "getIngredients",
-    );
-    cy.intercept("GET", "**/reference/units", { statusCode: 200, body: [gram] }).as("getUnits");
-    cy.intercept("GET", "**/reference/utensils", { statusCode: 200, body: [pan] }).as(
-      "getUtensils",
-    );
   });
 
-  it("shows the selected text, the technique catalog (searchable) and the metadata sections all together", () => {
+  it("shows the selected text and every technique option once loaded", () => {
-    cy.mount(<Harness />);
+    mountPopover();
     cy.wait("@getTechSteps");
 
     cy.contains(".tech-step-correction-popover__selection", "Cuire").should("be.visible");
-    // Merged editor (see TechStepCorrectionPopover's own doc comment) — no
+    cy.get(".tech-step-correction-popover__list button").should("have.length", 2);
-    // separate "pick, then metadata reveals itself" step, both render at
-    // once, and the technique catalog goes through the same searchable
-    // `CatalogSearchPicker` as the ingredient/utensil sub-flows (a plain
-    // unfiltered list of the real ~74-entry catalog isn't browsable).
-    cy.get(
-      ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
-    ).should("have.length", 2);
-    cy.contains("h4", "Ingrédients").should("be.visible");
-    cy.contains("h4", "Ustensiles").should("be.visible");
-    cy.contains("button", "Valider").should("be.visible");
   });
 
-  it("offers a 'no technique here' option, and marks the current pick, only when correcting an existing match", () => {
+  it("offers a 'no technique here' option only when correcting an existing match", () => {
-    cy.mount(<Harness previousTechStepId={null} />);
+    mountPopover({ previousTechStepId: null });
     cy.wait("@getTechSteps");
     cy.get(".tech-step-correction-popover__remove").should("not.exist");
-    cy.contains(".tech-step-correction-popover__chosen-technique", "Aucune technique sélectionnée");
 
-    cy.mount(<Harness previousTechStepId={cook.id} />);
+    mountPopover({ previousTechStepId: cook.id });
     cy.wait("@getTechSteps");
     cy.get(".tech-step-correction-popover__remove").should("exist");
-    cy.contains(".tech-step-correction-popover__chosen-technique", "Cuire");
-    cy.contains(".catalog-search-picker__list button", "Cuire").should(
-      "have.class",
-      "catalog-search-picker__item--selected",
-    );
   });
 
-  it("picking a technique from the catalog selects it without submitting immediately", () => {
+  it("submits the selected technique and calls onSubmitted", () => {
-    cy.mount(<Harness />);
+    // Asserting on the resolved `@submitCorrection` interception below,
-    cy.wait("@getTechSteps");
+    // rather than inside this handler — a Chai assertion failing *inside*
-
+    // a `cy.intercept` callback surfaces as an opaque "onResponse cannot be
-    cy.contains(
+    // called twice" Cypress internal error instead of a normal assertion
-      ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
+    // failure, found while writing this exact test.
-      "Mijoter",
-    ).click();
-
-    cy.contains(".tech-step-correction-popover__chosen-technique", "Mijoter");
-    cy.contains("button", "Valider").should("be.visible");
-  });
-
-  it("Valider stays disabled until a technique is actually picked", () => {
-    cy.mount(<Harness />);
-    cy.wait("@getTechSteps");
-
-    cy.contains("button", "Valider").should("be.disabled");
-    cy.contains(
-      ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
-      "Mijoter",
-    ).click();
-    cy.contains("button", "Valider").should("not.be.disabled");
-  });
-
-  it("submits the selected technique (no metadata touched) with ingredients/utensils omitted from the request", () => {
     cy.intercept("POST", "**/recipes/2/steps/2/corrections", {
       statusCode: 201,
       body: {
@@ -162,14 +79,10 @@ describe("TechStepCorrectionPopover", () => {
       },
     }).as("submitCorrection");
     const onSubmitted = cy.stub().as("onSubmitted");
-    cy.mount(<Harness onSubmitted={onSubmitted} />);
+    mountPopover({ onSubmitted });
     cy.wait("@getTechSteps");
 
-    cy.contains(
+    cy.contains(".tech-step-correction-popover__list button", "Mijoter").click();
-      ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
-      "Mijoter",
-    ).click();
-    cy.contains("button", "Valider").click();
 
     cy.wait("@submitCorrection").its("request.body").should("deep.equal", {
       start: 0,
@@ -180,85 +93,16 @@ describe("TechStepCorrectionPopover", () => {
     cy.get("@onSubmitted").should("have.been.calledOnce");
   });
 
-  it("adds an ingredient with quantity/unit via the span-selection flow, included in the submitted request", () => {
-    cy.intercept("POST", "**/recipes/2/steps/2/corrections", {
-      statusCode: 201,
-      body: {
-        id: 1,
-        start: 0,
-        end: 5,
-        previousTechStep: null,
-        correctedTechStep: simmer,
-        createdAt: new Date().toISOString(),
-      },
-    }).as("submitCorrection");
-    cy.mount(<Harness />);
-    cy.wait("@getTechSteps");
-    cy.wait(["@getIngredients", "@getUnits", "@getUtensils"]);
-
-    cy.contains(
-      ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
-      "Mijoter",
-    ).click();
-    cy.contains("button", "+ Ajouter un ingrédient").click();
-
-    cy.contains(".catalog-search-picker button", "Beurre").click();
-    cy.get('input[type="number"]').type("50");
-    cy.get("select").select(String(gram.id));
-    cy.contains("button", "Ajouter").click();
-
-    cy.contains(".tech-step-correction-popover__chip", "50 g Beurre").should("be.visible");
-    cy.contains("button", "Valider").click();
-
-    cy.wait("@submitCorrection")
-      .its("request.body")
-      .should("deep.equal", {
-        start: 0,
-        end: 5,
-        previousTechStepId: null,
-        correctedTechStepId: simmer.id,
-        ingredients: [
-          { ingredientId: butter.id, quantity: 50, unitId: gram.id, start: 20, end: 26 },
-        ],
-        utensils: [],
-      });
-  });
-
-  it("pre-seeds existing ingredients/utensils, removable via their own chip", () => {
-    cy.mount(
-      <Harness
-        previousTechStepId={cook.id}
-        existingIngredients={[
-          { ingredient: butter, quantity: 50, unit: gram, start: 0, end: 6, source: "auto" },
-        ]}
-        existingUtensils={[{ utensil: pan, start: 14, end: 23, source: "auto" }]}
-      />,
-    );
-    // An existing match starts pre-selected on itself (see
-    // TechStepCorrectionPopover's own doc comment) — the metadata sections,
-    // pre-seeded from `existingIngredients`/`existingUtensils`, are visible
-    // immediately, no need to re-pick "Cuire" from a list first.
-    cy.wait("@getTechSteps");
-    cy.wait(["@getIngredients", "@getUnits", "@getUtensils"]);
-
-    cy.contains(".tech-step-correction-popover__chip", "50 g Beurre").find("button").click();
-    cy.contains(".tech-step-correction-popover__chip", "Beurre").should("not.exist");
-  });
-
   it("shows an error message and stays open when the submission fails", () => {
     cy.intercept("POST", "**/recipes/2/steps/2/corrections", {
       statusCode: 404,
       body: { code: 4051, message: "TechStep not found" },
     }).as("submitCorrection");
     const onClose = cy.stub().as("onClose");
-    cy.mount(<Harness onClose={onClose} />);
+    mountPopover({ onClose });
     cy.wait("@getTechSteps");
 
-    cy.contains(
+    cy.contains(".tech-step-correction-popover__list button", "Cuire").click();
-      ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
-      "Cuire",
-    ).click();
-    cy.contains("button", "Valider").click();
 
     cy.wait("@submitCorrection");
     cy.get(".field-error").should("be.visible");
@@ -267,7 +111,7 @@ describe("TechStepCorrectionPopover", () => {
 
   it("calls onClose on an outside click", () => {
     const onClose = cy.stub().as("onClose");
-    cy.mount(<Harness onClose={onClose} />);
+    mountPopover({ onClose });
     cy.wait("@getTechSteps");
 
     cy.get('[data-testid="outside-popover"]').click();

apps/web/cypress/e2e/recipes.ts

@@ -88,16 +88,7 @@ Given('correcting step 2\'s "Cuire" match will succeed', () => {
         correctedTechStep: { id: 3, key: "simmer" },
         createdAt: new Date().toISOString(),
       },
-      techSteps: [
+      techSteps: [{ techStep: { id: 3, key: "simmer" }, start: 0, end: 5, source: "manual" }],
-        {
-          techStep: { id: 3, key: "simmer" },
-          start: 0,
-          end: 5,
-          source: "manual",
-          ingredients: [],
-          utensils: [],
-        },
-      ],
     },
   }).as("correction");
 });
@@ -110,21 +101,8 @@ Then("I should see the technique correction options", () => {
   cy.get(".tech-step-correction-popover").should("be.visible");
 });
 
-// Picking a technique only *selects* it — it takes a separate "Valider"
-// click to actually submit (room was made for attaching ingredient/utensil
-// metadata alongside it, see `TechStepCorrectionPopover.tsx`'s own doc
-// comment on its merged editor) — folded into this one step since nothing
-// in this scenario cares about that intermediate state on its own. The
-// technique catalog is picked via the same searchable `CatalogSearchPicker`
-// the ingredient/utensil sub-flows use, scoped to
-// `__technique-section` since that same search-and-pick component is
-// reused inside this popover for more than just techniques.
 When("I choose {string} as the correct technique", (label: string) => {
-  cy.contains(
+  cy.contains(".tech-step-correction-popover__list button", label).click();
-    ".tech-step-correction-popover__technique-section .catalog-search-picker__list button",
-    label,
-  ).click();
-  cy.contains(".tech-step-correction-popover__confirm-button", "Valider").click();
 });
 
 Then(

apps/web/src/api/client.ts

@@ -27,7 +27,6 @@ import {
   type ThemePreference,
   type UnitView,
   type UpdateRecipeInput,
-  type UtensilView,
 } from "@batch-cooking/shared";
 
 /**
@@ -202,11 +201,6 @@ export class ApiClient {
     return this._request("/reference/tech-steps");
   }
 
-  /** Reference list of cooking utensils — static, non-administrable (`TechStepCorrectionPopover`'s utensil picker, once a technique is selected). Public — no session required. */
-  public getUtensils(): Promise<UtensilView[]> {
-    return this._request("/reference/utensils");
-  }
-
   /** Reference list of implemented recipe sources (onboarding wizard's source step, `/parametres/foyer`) — empty until a concrete source is registered. Public — no session required. */
   public getSources(): Promise<SourceView[]> {
     return this._request("/reference/sources");

apps/web/src/features/recipes/recipes.scss

@@ -729,38 +729,40 @@
     margin: 0 0 var(--space-sm);
   }
 
-  // Technique picker + Ingrédients/Ustensiles render together as one
+  &__list {
-  // screen now (see `TechStepCorrectionPopover.tsx`'s own doc comment) —
-  // this section just needs its own small header row, the actual picker
-  // is `.catalog-search-picker` (below), reused as-is from the ingredient/
-  // utensil sub-flows.
-  &__technique-section {
-    h4 {
-      margin: 0 0 var(--space-xs);
-      font-size: var(--font-size-sm);
-      color: var(--color-text-muted);
-    }
-  }
-
-  &__technique-header {
     display: flex;
-    align-items: baseline;
+    flex-wrap: wrap;
-    justify-content: space-between;
+    gap: var(--space-xs);
-    gap: var(--space-sm);
+    list-style: none;
-  }
+    margin: 0 0 var(--space-sm);
+    padding: 0;
 
-  &__remove {
+    button {
-    padding: 0.2rem 0.5rem;
+      padding: 0.3rem 0.6rem;
-    font-size: var(--font-size-sm);
+      font-size: var(--font-size-sm);
-    color: var(--color-error);
+      color: var(--color-text);
-    background: none;
+      background: var(--color-surface);
-    border: 1px solid var(--color-error);
+      border: 1px solid var(--color-border);
-    border-radius: var(--radius-pill);
+      border-radius: var(--radius-pill);
-    cursor: pointer;
+      cursor: pointer;
 
-    &:disabled {
+      &:hover:not(:disabled) {
-      opacity: 0.5;
+        background: color-mix(in srgb, var(--color-primary) 14%, transparent);
-      cursor: not-allowed;
+        border-color: var(--color-primary);
+      }
+
+      &:disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+      }
+    }
+
+    // Nested (rather than a sibling `&__remove` block) so its border-color
+    // wins over the plain `button` rule above by class-count specificity,
+    // no `!important` needed.
+    .tech-step-correction-popover__remove {
+      color: var(--color-error);
+      border-color: var(--color-error);
     }
   }
 
@@ -773,180 +775,6 @@
     padding: 0;
     font-size: var(--font-size-sm);
   }
-
-  // Shown in place of the technique list/metadata sections while
-  // `StepDescription` is waiting on a second text selection (see
-  // `TechStepCorrectionPopover.tsx`'s own doc comment) — same styling
-  // intent as `.recipe-detail-panel__tech-step-hint`, a small muted aside.
-  &__hint {
-    margin: 0 0 var(--space-sm);
-    color: var(--color-text-muted);
-    font-style: italic;
-  }
-
-  &__span-picker {
-    display: flex;
-    flex-direction: column;
-    gap: var(--space-sm);
-  }
-
-  &__quantity-line {
-    display: flex;
-    align-items: center;
-    gap: var(--space-xs);
-
-    input[type="number"] {
-      width: 5rem;
-    }
-  }
-
-  &__confirm {
-    display: flex;
-    flex-direction: column;
-    gap: var(--space-sm);
-  }
-
-  // "Aucune technique sélectionnée."/"Technique retenue : X" — no button
-  // here anymore (re-picking happens directly through the search picker
-  // right below, see `TechStepCorrectionPopover.tsx`'s doc comment on the
-  // merged editor), just a small status line.
-  &__chosen-technique {
-    margin: 0 0 var(--space-xs);
-    font-weight: 600;
-  }
-
-  &__metadata-section {
-    margin-top: var(--space-sm);
-
-    h4 {
-      margin: 0 0 var(--space-xs);
-      font-size: var(--font-size-sm);
-      color: var(--color-text-muted);
-    }
-
-    // "+ Ajouter…" button — deliberately a plain text-link style, not
-    // another pill button (`.catalog-search-picker__list button`) — this
-    // is a secondary action inside an already-open popover, not a
-    // top-level choice competing with the chips above it.
-    > button {
-      background: none;
-      border: none;
-      color: var(--color-primary);
-      cursor: pointer;
-      padding: 0;
-      font-size: var(--font-size-sm);
-    }
-  }
-
-  &__chips {
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--space-xs);
-    list-style: none;
-    margin: 0 0 var(--space-xs);
-    padding: 0;
-  }
-
-  &__chip {
-    display: flex;
-    align-items: center;
-    gap: var(--space-xs);
-    padding: 0.3rem 0.6rem;
-    font-size: var(--font-size-sm);
-    background: var(--color-surface);
-    border: 1px solid var(--color-border);
-    border-radius: var(--radius-pill);
-
-    button {
-      background: none;
-      border: none;
-      color: var(--color-text-muted);
-      cursor: pointer;
-      padding: 0;
-      line-height: 1;
-
-      &:hover:not(:disabled) {
-        color: var(--color-error);
-      }
-    }
-  }
-
-  &__confirm-button {
-    align-self: flex-start;
-    padding: 0.4rem 1rem;
-    font-size: var(--font-size-sm);
-    color: var(--color-surface);
-    background: var(--color-primary);
-    border: none;
-    border-radius: var(--radius-md);
-    cursor: pointer;
-
-    &:disabled {
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-  }
-}
-
-// Reused by both the ingredient and utensil "attach to this correction"
-// sub-flows (`TechStepCorrectionPopover.tsx`) — deliberately lighter than
-// `.ingredient-picker` (no category/subcategory grid, no allergen/diet
-// toggles), sized for a small popover rather than a full recipe form.
-.catalog-search-picker {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-xs);
-
-  &__input {
-    width: 100%;
-  }
-
-  &__empty {
-    margin: 0;
-    color: var(--color-text-muted);
-    font-size: var(--font-size-sm);
-  }
-
-  &__list {
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--space-xs);
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    // Raised from the original 8rem — this component is now also the
-    // technique picker (~74 entries, see this file's own doc comment),
-    // where 8rem left only a couple of rows visible before scrolling.
-    max-height: 14rem;
-    overflow-y: auto;
-
-    button {
-      padding: 0.3rem 0.6rem;
-      font-size: var(--font-size-sm);
-      color: var(--color-text);
-      background: var(--color-surface);
-      border: 1px solid var(--color-border);
-      border-radius: var(--radius-pill);
-      cursor: pointer;
-
-      &:hover {
-        background: color-mix(in srgb, var(--color-primary) 14%, transparent);
-        border-color: var(--color-primary);
-      }
-
-      // The technique picker's current pick (`selectedId` prop) — stays
-      // visually marked even while filtered/scrolled past, so re-opening
-      // this popover's picker doesn't read as "nothing chosen yet" when
-      // something already is. Unused by the ingredient/utensil sub-flows
-      // (they never pass `selectedId` — each pick there just appends a
-      // fresh mention, nothing to mark as "current").
-      &.catalog-search-picker__item--selected {
-        background: color-mix(in srgb, var(--color-primary) 20%, transparent);
-        border-color: var(--color-primary);
-        font-weight: 600;
-      }
-    }
-  }
 }
 
 // --- Favorite star toggle (detail panel header) -----------------------------

apps/web/src/features/recipes/steps/CatalogSearchPicker.tsx

@@ -1,71 +0,0 @@
-import { useState } from "react";
-
-/**
- * Small search-and-pick list — a lighter alternative to `IngredientPicker.tsx`
- * (category/subcategory grid + allergen/diet toggles) for a context that
- * doesn't have room for that: `TechStepCorrectionPopover.tsx`'s ingredient/
- * utensil/**technique** pickers, all embedded in a small popover rather than
- * a full recipe form. Reused for all three — an ingredient, a utensil, and a
- * technique are all "search a reference list by translated label, pick one"
- * from this component's point of view, the only difference is which
- * `items`/labels the caller passes in. The technique catalog in particular
- * (~74 entries) is exactly the case a plain unfiltered list stops being
- * readable at — the original motivation for adding search here at all.
- *
- * Deliberately just `{ id, label }` in, `id` out — no `IngredientView`/
- * `UtensilView`/`TechStepView` dependency here, so this stays reusable for
- * any future "search this small reference catalog" need without growing a
- * new prop per catalog shape.
- */
-export function CatalogSearchPicker({
-  items,
-  selectedId,
-  onSelect,
-  placeholder,
-  emptyLabel,
-}: {
-  items: { id: number; label: string }[];
-  /** The currently-picked item, if any — marked with a distinct modifier class so it stays visible at a glance while browsing/filtering a longer list (e.g. `TechStepCorrectionPopover`'s ~74-entry technique catalog), not just implied by whatever's selected elsewhere on screen. Omit for a picker with no notion of a "current" pick (the ingredient/utensil span sub-flows — each `onSelect` there just appends a brand-new mention, nothing to mark as already chosen). */
-  selectedId?: number;
-  onSelect: (id: number) => void;
-  placeholder: string;
-  emptyLabel: string;
-}) {
-  const [query, setQuery] = useState("");
-  const normalizedQuery = query.trim().toLowerCase();
-  const visible =
-    normalizedQuery.length === 0
-      ? items
-      : items.filter((item) => item.label.toLowerCase().includes(normalizedQuery));
-
-  return (
-    <div className="catalog-search-picker">
-      <input
-        type="text"
-        value={query}
-        onChange={(e) => setQuery(e.target.value)}
-        placeholder={placeholder}
-        className="catalog-search-picker__input"
-      />
-      {visible.length === 0 ? (
-        <p className="catalog-search-picker__empty">{emptyLabel}</p>
-      ) : (
-        <ul className="catalog-search-picker__list">
-          {visible.map((item) => (
-            <li key={item.id}>
-              <button
-                type="button"
-                className={
-                  item.id === selectedId ? "catalog-search-picker__item--selected" : undefined
-                }
-                onClick={() => onSelect(item.id)}
-              >
-                {item.label}
-              </button>
-            </li>
-          ))}
-        </ul>
-      )}
-    </div>
-  );
-}

apps/web/src/features/recipes/steps/StepDescription.tsx

@@ -76,45 +76,10 @@ export function StepDescription({
     previousTechStepId: number | null;
   } | null>(null);
 
-  // Routes the *next* text selection to the open `TechStepCorrectionPopover`
-  // (as an ingredient/utensil mention span) instead of opening a brand-new
-  // correction — set when that popover calls `onRequestSpan`, cleared once
-  // `handleMouseUp` resolves the selection below. See
-  // `TechStepCorrectionPopover.tsx`'s own doc comment for why this can live
-  // entirely alongside the still-visible, still-selectable description
-  // rather than needing the popover itself to move/hide.
-  const [pendingSpanRequest, setPendingSpanRequest] = useState<"ingredient" | "utensil" | null>(
-    null,
-  );
-  const [resolvedMetadataSpan, setResolvedMetadataSpan] = useState<{
-    nonce: number;
-    kind: "ingredient" | "utensil";
-    range: TextSelectionRange;
-    text: string;
-  } | null>(null);
-  const nextMetadataSpanNonce = useRef(0);
-
-  function closeActiveCorrection() {
-    setActiveCorrection(null);
-    setPendingSpanRequest(null);
-    setResolvedMetadataSpan(null);
-  }
-
   function handleMouseUp() {
     if (!editable) return;
     const range = getSelectionRange();
     if (!range) return;
-    if (pendingSpanRequest !== null) {
-      nextMetadataSpanNonce.current += 1;
-      setResolvedMetadataSpan({
-        nonce: nextMetadataSpanNonce.current,
-        kind: pendingSpanRequest,
-        range,
-        text: description.slice(range.start, range.end),
-      });
-      setPendingSpanRequest(null);
-      return;
-    }
     setActiveCorrection({
       range,
       selectedText: description.slice(range.start, range.end),
@@ -126,21 +91,6 @@ export function StepDescription({
     setLiveTechSteps(result.techSteps);
   }
 
-  // The occurrence `activeCorrection` is currently open for, matched by its
-  // exact `[start, end)` (not just `techStep.id` — the same technique can
-  // legitimately occur more than once in one description) — whatever
-  // ingredients/utensils it already carries seed
-  // `TechStepCorrectionPopover`'s own pending lists. `undefined` (not an
-  // empty array) for a brand-new selection, same as "nothing to look up
-  // yet".
-  const activeStepTechStep = activeCorrection
-    ? liveTechSteps.find(
-        (techStep) =>
-          techStep.start === activeCorrection.range.start &&
-          techStep.end === activeCorrection.range.end,
-      )
-    : undefined;
-
   // Tracks each segment's own absolute start offset into `description` as
   // the map below walks them in order — segments are contiguous and cover
   // the whole description (see `splitDescriptionByTechSteps`'s doc
@@ -204,19 +154,12 @@ export function StepDescription({
                 data-offset={editable ? start : undefined}
                 onClick={
                   editable
-                    ? () => {
+                    ? () =>
-                        // Clears any in-progress ingredient/utensil
-                        // span-selection from whatever correction was open
-                        // before — opening a *different* one has nothing
-                        // left to resolve that selection into.
-                        setPendingSpanRequest(null);
-                        setResolvedMetadataSpan(null);
                         setActiveCorrection({
                           range: { start, end },
                           selectedText: segment.text,
                           previousTechStepId: techStep.id,
-                        });
+                        })
-                      }
                     : undefined
                 }
               >
@@ -233,11 +176,7 @@ export function StepDescription({
           range={activeCorrection.range}
           selectedText={activeCorrection.selectedText}
           previousTechStepId={activeCorrection.previousTechStepId}
-          existingIngredients={activeStepTechStep?.ingredients ?? []}
+          onClose={() => setActiveCorrection(null)}
-          existingUtensils={activeStepTechStep?.utensils ?? []}
-          resolvedMetadataSpan={resolvedMetadataSpan}
-          onRequestSpan={setPendingSpanRequest}
-          onClose={closeActiveCorrection}
           onSubmitted={handleSubmitted}
         />
       )}

apps/web/src/features/recipes/steps/TechStepCorrectionPopover.tsx

@@ -1,48 +1,14 @@
 import {
   ErrorCode,
-  type IngredientView,
-  type StepTechStepIngredientView,
-  type StepTechStepUtensilView,
   type SubmitTechStepCorrectionResult,
   type TechStepView,
-  type UnitView,
-  type UtensilView,
 } from "@batch-cooking/shared";
 import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { ApiError, apiClient } from "../../../api/client";
 import { errorMessageService } from "../../../services/error-message.service";
-import { CatalogSearchPicker } from "./CatalogSearchPicker";
 import type { TextSelectionRange } from "./use-text-selection";
 
-/** One ingredient the viewer has attached (or is about to submit) — the trimmed-down shape `POST .../corrections`'s `ingredients[]` expects, kept separately from `StepTechStepIngredientView` since a pending one has no resolved `IngredientView`/`UnitView` to carry yet, only ids. */
-interface PendingIngredient {
-  ingredientId: number;
-  quantity: number | null;
-  unitId: number | null;
-  start: number;
-  end: number;
-}
-/** Same as {@link PendingIngredient}, for a utensil (no quantity/unit — nothing to measure). */
-interface PendingUtensil {
-  utensilId: number;
-  start: number;
-  end: number;
-}
-
-function toPendingIngredient(view: StepTechStepIngredientView): PendingIngredient {
-  return {
-    ingredientId: view.ingredient.id,
-    quantity: view.quantity,
-    unitId: view.unit?.id ?? null,
-    start: view.start,
-    end: view.end,
-  };
-}
-function toPendingUtensil(view: StepTechStepUtensilView): PendingUtensil {
-  return { utensilId: view.utensil.id, start: view.start, end: view.end };
-}
-
 /**
  * Small non-modal popover letting a viewer assign a technique to a selected
  * span of a step's description, or clear/relabel an existing match —
@@ -55,29 +21,14 @@ function toPendingUtensil(view: StepTechStepUtensilView): PendingUtensil {
  * `StepDescription.tsx`), not floating anchored at the selection's exact
  * position — simpler and more robust than tracking a caret-anchored
  * position across scroll/resize, at the cost of a little visual distance
- * from the selected text itself. That placement matters beyond cosmetics
+ * from the selected text itself.
- * here: it's *why* the "attach an ingredient/utensil" flow below can ask
- * the viewer to select a second span of text without closing this popover
- * first — the description stays fully visible and selectable the whole
- * time, nothing overlays it.
  *
- * **One merged editor, not a wizard**: picking a technique
+ * Submitting takes effect immediately — the API applies it to the step's
- * (`CatalogSearchPicker`, searchable — the reference catalog is ~74
+ * real `StepTechStep` sequence as it records the correction (a `"manual"`-
- * entries, an unfiltered flat list wasn't browsable) and editing its
+ * tagged entry, see `StepTechStepCorrection`'s schema doc comment) and
- * Ingrédients/Ustensiles metadata render together on the same screen,
+ * returns the fresh sequence, which `onSubmitted` hands back to
- * always — there's no separate "pick, then a metadata step reveals
+ * `StepDescription` to render right away, styled differently from an
- * itself" sequence to go through, and no dead end where metadata is
+ * `"auto"` match.
- * technically attachable but not visible until some other action happens
- * first. A single "Valider" submits everything at once; disabled until a
- * technique is actually selected (there's nothing to attach metadata to
- * otherwise). **Removing** a match (`submit(null)`) stays its own
- * immediate action next to the picker — nothing to attach when removing.
- *
- * The two metadata sections are pre-seeded from `existingIngredients`/
- * `existingUtensils` (whatever's already attached to this occurrence, auto-
- * or manually-sourced — `[]` for a brand-new technique) and editable via
- * add/remove — see `metadataTouched` below for why what's *displayed* here
- * isn't automatically what gets *submitted*.
  */
 export function TechStepCorrectionPopover({
   recipeId,
@@ -85,10 +36,6 @@ export function TechStepCorrectionPopover({
   selectedText,
   range,
   previousTechStepId,
-  existingIngredients,
-  existingUtensils,
-  resolvedMetadataSpan,
-  onRequestSpan,
   onClose,
   onSubmitted,
 }: {
@@ -99,74 +46,12 @@ export function TechStepCorrectionPopover({
   range: TextSelectionRange;
   /** Set when correcting an already-detected match (opened from clicking its highlight) rather than a fresh selection — passed through as-is on submit, and offers a "remove" option `null` doesn't. */
   previousTechStepId: number | null;
-  /** Whatever ingredients/utensils already sit on this occurrence (both `"auto"` and `"manual"` sourced) — `[]` for a brand-new technique, nothing to pre-seed. */
-  existingIngredients: StepTechStepIngredientView[];
-  existingUtensils: StepTechStepUtensilView[];
-  /**
-   * A text span `StepDescription` just resolved on this popover's behalf,
-   * after a call to `onRequestSpan` below — `null` until then. Identified
-   * by `nonce` (not by value) so this popover's own `useEffect` reliably
-   * fires once per fresh selection, even if the exact same span is
-   * selected twice in a row.
-   */
-  resolvedMetadataSpan: {
-    nonce: number;
-    kind: "ingredient" | "utensil";
-    range: TextSelectionRange;
-    text: string;
-  } | null;
-  /** Tells `StepDescription` "the next text selection in the description is for an ingredient/utensil mention, not a new technique correction" — see this component's own doc comment. */
-  onRequestSpan: (kind: "ingredient" | "utensil") => void;
   onClose: () => void;
   onSubmitted: (result: SubmitTechStepCorrectionResult) => void;
 }) {
   const { t } = useTranslation();
   const popoverRef = useRef<HTMLDivElement>(null);
   const [techSteps, setTechSteps] = useState<TechStepView[] | null>(null);
-  // Opening this popover on an *already-detected* match (`previousTechStepId
-  // !== null`, i.e. the user clicked an existing highlight rather than
-  // selecting fresh text) starts pre-selected on that same technique, its
-  // name shown next to the picker right away — since the picker and the
-  // metadata sections render together regardless (see this component's own
-  // doc comment), this just saves re-picking the technique that's already
-  // correct before its metadata becomes editable.
-  const [selectedTechStepId, setSelectedTechStepId] = useState<number | null>(previousTechStepId);
-  const [catalogs, setCatalogs] = useState<{
-    ingredients: IngredientView[];
-    units: UnitView[];
-    utensils: UtensilView[];
-  } | null>(null);
-
-  const [pendingIngredients, setPendingIngredients] = useState<PendingIngredient[]>(() =>
-    existingIngredients.map(toPendingIngredient),
-  );
-  const [pendingUtensils, setPendingUtensils] = useState<PendingUtensil[]>(() =>
-    existingUtensils.map(toPendingUtensil),
-  );
-  // Flips true the moment the viewer adds/removes a pending entry — never
-  // from the initial seeding above. `submit()` below only includes
-  // `ingredients`/`utensils` in the request when this is true, so
-  // relabeling/confirming a technique without ever opening either section
-  // leaves existing metadata completely alone server-side (see
-  // `submitTechStepCorrectionSchema`'s own doc comment, `packages/shared`,
-  // for why an *omitted* field — not an empty array — is what "don't
-  // touch it" means over the wire).
-  const [metadataTouched, setMetadataTouched] = useState(false);
-
-  const [awaitingSpanFor, setAwaitingSpanFor] = useState<"ingredient" | "utensil" | null>(null);
-  const [activeSpan, setActiveSpan] = useState<{
-    kind: "ingredient" | "utensil";
-    range: TextSelectionRange;
-    text: string;
-  } | null>(null);
-  // Only meaningful while `activeSpan?.kind === "ingredient"` — the
-  // ingredient sub-flow is itself two steps (pick the ingredient, then its
-  // quantity/unit), this is where the first step's choice waits until the
-  // second is confirmed.
-  const [pickedIngredientId, setPickedIngredientId] = useState<number | null>(null);
-  const [spanQuantity, setSpanQuantity] = useState("");
-  const [spanUnitId, setSpanUnitId] = useState<number | null>(null);
-
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -185,46 +70,6 @@ export function TechStepCorrectionPopover({
     };
   }, []);
 
-  // Fetched unconditionally on mount — the Ingrédients/Ustensiles sections
-  // render alongside the technique picker from the start (see this
-  // component's own doc comment on the merged editor), so there's no later
-  // point to defer this to anymore.
-  useEffect(() => {
-    if (catalogs !== null) return;
-    let cancelled = false;
-    Promise.all([apiClient.getIngredients(), apiClient.getUnits(), apiClient.getUtensils()])
-      .then(([ingredients, units, utensils]) => {
-        if (!cancelled) setCatalogs({ ingredients, units, utensils });
-      })
-      .catch(() => {
-        if (!cancelled) setCatalogs({ ingredients: [], units: [], utensils: [] });
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [catalogs]);
-
-  // Consumes a span `StepDescription` just resolved on this popover's
-  // behalf (see `resolvedMetadataSpan`'s own doc comment above) — opens the
-  // matching sub-picker and clears the "awaiting a selection" hint.
-  useEffect(() => {
-    if (resolvedMetadataSpan === null) return;
-    setActiveSpan({
-      kind: resolvedMetadataSpan.kind,
-      range: resolvedMetadataSpan.range,
-      text: resolvedMetadataSpan.text,
-    });
-    setAwaitingSpanFor(null);
-    setPickedIngredientId(null);
-    setSpanQuantity("");
-    setSpanUnitId(null);
-    // Depends on the whole object, not just `.nonce` — `StepDescription`
-    // only ever calls its setter with a brand-new object (never mutates
-    // one in place), so reference equality alone already gives this the
-    // "fires once per fresh selection" behavior `nonce` documents, with no
-    // need to silence the exhaustive-deps lint to get there.
-  }, [resolvedMetadataSpan]);
-
   useEffect(() => {
     function handleClickOutside(e: MouseEvent) {
       if (popoverRef.current && !popoverRef.current.contains(e.target as Node)) {
@@ -235,7 +80,7 @@ export function TechStepCorrectionPopover({
     return () => document.removeEventListener("mousedown", handleClickOutside);
   }, [onClose]);
 
-  async function removeMatch() {
+  async function submit(correctedTechStepId: number | null) {
     setIsSubmitting(true);
     setError(null);
     try {
@@ -243,7 +88,7 @@ export function TechStepCorrectionPopover({
         start: range.start,
         end: range.end,
         previousTechStepId,
-        correctedTechStepId: null,
+        correctedTechStepId,
       });
       onSubmitted(result);
       onClose();
@@ -254,260 +99,40 @@ export function TechStepCorrectionPopover({
     }
   }
 
-  async function confirm() {
-    if (selectedTechStepId === null) return;
-    setIsSubmitting(true);
-    setError(null);
-    try {
-      const result = await apiClient.submitTechStepCorrection(recipeId, stepId, {
-        start: range.start,
-        end: range.end,
-        previousTechStepId,
-        correctedTechStepId: selectedTechStepId,
-        ...(metadataTouched ? { ingredients: pendingIngredients, utensils: pendingUtensils } : {}),
-      });
-      onSubmitted(result);
-      onClose();
-    } catch (err) {
-      const code = err instanceof ApiError ? err.code : ErrorCode.INTERNAL_ERROR;
-      setError(errorMessageService.getLabel(code));
-      setIsSubmitting(false);
-    }
-  }
-
-  function requestSpan(kind: "ingredient" | "utensil") {
-    setAwaitingSpanFor(kind);
-    onRequestSpan(kind);
-  }
-
-  function cancelSpanSelection() {
-    setAwaitingSpanFor(null);
-    setActiveSpan(null);
-    setPickedIngredientId(null);
-  }
-
-  function confirmIngredientSpan() {
-    if (activeSpan === null || pickedIngredientId === null) return;
-    const trimmed = spanQuantity.trim();
-    const parsedQuantity = trimmed.length > 0 ? Number(trimmed) : null;
-    setPendingIngredients((prev) => [
-      ...prev,
-      {
-        ingredientId: pickedIngredientId,
-        quantity:
-          parsedQuantity !== null && Number.isFinite(parsedQuantity) ? parsedQuantity : null,
-        unitId: spanUnitId,
-        start: activeSpan.range.start,
-        end: activeSpan.range.end,
-      },
-    ]);
-    setMetadataTouched(true);
-    setActiveSpan(null);
-    setPickedIngredientId(null);
-  }
-
-  function confirmUtensilSpan(utensilId: number) {
-    if (activeSpan === null) return;
-    setPendingUtensils((prev) => [
-      ...prev,
-      { utensilId, start: activeSpan.range.start, end: activeSpan.range.end },
-    ]);
-    setMetadataTouched(true);
-    setActiveSpan(null);
-  }
-
-  function removeIngredient(index: number) {
-    setPendingIngredients((prev) => prev.filter((_, i) => i !== index));
-    setMetadataTouched(true);
-  }
-  function removeUtensil(index: number) {
-    setPendingUtensils((prev) => prev.filter((_, i) => i !== index));
-    setMetadataTouched(true);
-  }
-
-  const ingredientById = new Map((catalogs?.ingredients ?? []).map((i) => [i.id, i]));
-  const unitById = new Map((catalogs?.units ?? []).map((u) => [u.id, u]));
-  const utensilById = new Map((catalogs?.utensils ?? []).map((u) => [u.id, u]));
-
   return (
     <div className="tech-step-correction-popover" ref={popoverRef}>
       <p className="tech-step-correction-popover__selection">
         {t("recipes.techStepCorrection.selectionLabel", { text: selectedText })}
       </p>
-
+      {techSteps === null ? (
-      {awaitingSpanFor !== null ? (
-        <p className="tech-step-correction-popover__hint">
-          {t("recipes.techStepCorrection.selectSpanHint")}
-        </p>
-      ) : activeSpan !== null ? (
-        <div className="tech-step-correction-popover__span-picker">
-          <p className="tech-step-correction-popover__selection">
-            {t("recipes.techStepCorrection.selectionLabel", { text: activeSpan.text })}
-          </p>
-          {activeSpan.kind === "ingredient" ? (
-            pickedIngredientId === null ? (
-              <CatalogSearchPicker
-                items={(catalogs?.ingredients ?? []).map((ingredient) => ({
-                  id: ingredient.id,
-                  label: t(`catalog.ingredients.${ingredient.key}`),
-                }))}
-                onSelect={setPickedIngredientId}
-                placeholder={t("recipes.form.searchIngredientPlaceholder")}
-                emptyLabel={t("recipes.form.noIngredientFound")}
-              />
-            ) : (
-              <div className="tech-step-correction-popover__quantity-line">
-                <input
-                  type="number"
-                  min="0"
-                  step="any"
-                  value={spanQuantity}
-                  onChange={(e) => setSpanQuantity(e.target.value)}
-                  aria-label={t("recipes.form.quantityLabel")}
-                />
-                <select
-                  value={spanUnitId ?? ""}
-                  onChange={(e) => setSpanUnitId(e.target.value ? Number(e.target.value) : null)}
-                  aria-label={t("recipes.form.unitLabel")}
-                >
-                  <option value="">{t("recipes.form.unitPlaceholder")}</option>
-                  {(catalogs?.units ?? []).map((unit) => (
-                    <option key={unit.id} value={unit.id}>
-                      {t(`catalog.units.${unit.key}`)}
-                    </option>
-                  ))}
-                </select>
-                <button type="button" onClick={confirmIngredientSpan}>
-                  {t("recipes.techStepCorrection.addToList")}
-                </button>
-              </div>
-            )
-          ) : (
-            <CatalogSearchPicker
-              items={(catalogs?.utensils ?? []).map((utensil) => ({
-                id: utensil.id,
-                label: t(`catalog.utensils.${utensil.key}`),
-              }))}
-              onSelect={confirmUtensilSpan}
-              placeholder={t("recipes.techStepCorrection.searchUtensilPlaceholder")}
-              emptyLabel={t("recipes.techStepCorrection.noUtensilFound")}
-            />
-          )}
-          <button
-            type="button"
-            className="tech-step-correction-popover__cancel"
-            onClick={cancelSpanSelection}
-          >
-            {t("recipes.techStepCorrection.cancelSpanSelection")}
-          </button>
-        </div>
-      ) : techSteps === null ? (
         <p>{t("recipes.loading")}</p>
       ) : (
-        <div className="tech-step-correction-popover__confirm">
+        <ul className="tech-step-correction-popover__list">
-          <section className="tech-step-correction-popover__technique-section">
+          {previousTechStepId !== null && (
-            <div className="tech-step-correction-popover__technique-header">
+            <li>
-              <h4>{t("recipes.techStepCorrection.techniqueSection")}</h4>
+              <button
-              {previousTechStepId !== null && (
+                type="button"
-                <button
+                disabled={isSubmitting}
-                  type="button"
+                onClick={() => submit(null)}
-                  disabled={isSubmitting}
+                className="tech-step-correction-popover__remove"
-                  onClick={removeMatch}
+              >
-                  className="tech-step-correction-popover__remove"
+                {t("recipes.techStepCorrection.removeMatch")}
-                >
+              </button>
-                  {t("recipes.techStepCorrection.removeMatch")}
+            </li>
-                </button>
+          )}
-              )}
+          {techSteps.map((techStep) => (
-            </div>
+            <li key={techStep.id}>
-            <p className="tech-step-correction-popover__chosen-technique">
+              <button
-              {selectedTechStepId !== null
+                type="button"
-                ? t("recipes.techStepCorrection.currentTechnique", {
+                disabled={isSubmitting || techStep.id === previousTechStepId}
-                    technique: t(
+                onClick={() => submit(techStep.id)}
-                      `catalog.techSteps.${techSteps.find((ts) => ts.id === selectedTechStepId)?.key ?? ""}`,
+              >
-                    ),
+                {t(`catalog.techSteps.${techStep.key}`)}
-                  })
+              </button>
-                : t("recipes.techStepCorrection.noTechniqueSelected")}
+            </li>
-            </p>
+          ))}
-            <CatalogSearchPicker
+        </ul>
-              items={techSteps.map((techStep) => ({
-                id: techStep.id,
-                label: t(`catalog.techSteps.${techStep.key}`),
-              }))}
-              selectedId={selectedTechStepId ?? undefined}
-              onSelect={setSelectedTechStepId}
-              placeholder={t("recipes.techStepCorrection.searchTechniquePlaceholder")}
-              emptyLabel={t("recipes.techStepCorrection.noTechniqueFound")}
-            />
-          </section>
-
-          <section className="tech-step-correction-popover__metadata-section">
-            <h4>{t("recipes.techStepCorrection.ingredientsSection")}</h4>
-            <ul className="tech-step-correction-popover__chips">
-              {pendingIngredients.map((ingredient, index) => {
-                const view = ingredientById.get(ingredient.ingredientId);
-                const unit =
-                  ingredient.unitId !== null ? unitById.get(ingredient.unitId) : undefined;
-                const label = view ? t(`catalog.ingredients.${view.key}`) : "…";
-                return (
-                  // biome-ignore lint/suspicious/noArrayIndexKey: `pendingIngredients` has no other stable identity (an ingredient can appear more than once, each with its own span) — always fully rebuilt on add/remove, never reordered in place.
-                  <li key={index} className="tech-step-correction-popover__chip">
-                    {ingredient.quantity !== null ? `${ingredient.quantity} ` : ""}
-                    {unit ? `${t(`catalog.units.${unit.key}`)} ` : ""}
-                    {label}
-                    <button
-                      type="button"
-                      onClick={() => removeIngredient(index)}
-                      title={t("recipes.techStepCorrection.removeIngredient")}
-                      disabled={isSubmitting}
-                    >
-                      ✕
-                    </button>
-                  </li>
-                );
-              })}
-            </ul>
-            <button type="button" onClick={() => requestSpan("ingredient")} disabled={isSubmitting}>
-              {t("recipes.techStepCorrection.addIngredient")}
-            </button>
-          </section>
-
-          <section className="tech-step-correction-popover__metadata-section">
-            <h4>{t("recipes.techStepCorrection.utensilsSection")}</h4>
-            <ul className="tech-step-correction-popover__chips">
-              {pendingUtensils.map((utensil, index) => {
-                const view = utensilById.get(utensil.utensilId);
-                return (
-                  // biome-ignore lint/suspicious/noArrayIndexKey: same reasoning as the ingredient chip list above.
-                  <li key={index} className="tech-step-correction-popover__chip">
-                    {view ? t(`catalog.utensils.${view.key}`) : "…"}
-                    <button
-                      type="button"
-                      onClick={() => removeUtensil(index)}
-                      title={t("recipes.techStepCorrection.removeUtensil")}
-                      disabled={isSubmitting}
-                    >
-                      ✕
-                    </button>
-                  </li>
-                );
-              })}
-            </ul>
-            <button type="button" onClick={() => requestSpan("utensil")} disabled={isSubmitting}>
-              {t("recipes.techStepCorrection.addUtensil")}
-            </button>
-          </section>
-
-          <button
-            type="button"
-            className="tech-step-correction-popover__confirm-button"
-            onClick={confirm}
-            disabled={isSubmitting || selectedTechStepId === null}
-          >
-            {t("recipes.techStepCorrection.confirm")}
-          </button>
-        </div>
       )}
-
       {error && <p className="field-error">{error}</p>}
       <button
         type="button"

apps/web/src/locales/fr/translation.json

@@ -44,7 +44,6 @@
     "SOURCE_NOT_FOUND": "Une des sources sélectionnées n'existe pas",
     "STEP_NOT_FOUND": "Cette étape n'existe pas",
     "TECH_STEP_NOT_FOUND": "Cette technique n'existe pas",
-    "UTENSIL_NOT_FOUND": "Un des ustensiles sélectionnés n'existe pas",
     "INVALID_CORRECTION_SPAN": "La sélection ne correspond plus au texte de l'étape",
     "INTERNAL_ERROR": "Une erreur est survenue, réessayez plus tard"
   },
@@ -169,24 +168,7 @@
       "removeMatch": "Aucune technique ici",
       "cancel": "Annuler",
       "manualTooltip": "{{technique}} (correction manuelle)",
-      "discoverabilityHint": "💡 Sélectionnez du texte, ou cliquez sur une technique surlignée, pour la corriger.",
+      "discoverabilityHint": "💡 Sélectionnez du texte, ou cliquez sur une technique surlignée, pour la corriger."
-      "confirm": "Valider",
-      "techniqueSection": "Technique",
-      "currentTechnique": "Technique retenue : {{technique}}",
-      "noTechniqueSelected": "Aucune technique sélectionnée.",
-      "searchTechniquePlaceholder": "Rechercher une technique…",
-      "noTechniqueFound": "Aucune technique trouvée.",
-      "ingredientsSection": "Ingrédients",
-      "utensilsSection": "Ustensiles",
-      "addIngredient": "+ Ajouter un ingrédient",
-      "addUtensil": "+ Ajouter un ustensile",
-      "removeIngredient": "Retirer cet ingrédient",
-      "removeUtensil": "Retirer cet ustensile",
-      "selectSpanHint": "Sélectionnez le passage de texte concerné dans la description ci-dessus…",
-      "cancelSpanSelection": "Annuler la sélection",
-      "searchUtensilPlaceholder": "Rechercher un ustensile…",
-      "noUtensilFound": "Aucun ustensile trouvé.",
-      "addToList": "Ajouter"
     },
     "tabs": {
       "favoris": "Favoris",
@@ -493,38 +475,6 @@
       "toast": "Torréfier",
       "zest": "Zester"
     },
-    "utensils": {
-      "pan": "Poêle",
-      "saucepan": "Casserole",
-      "pot": "Marmite",
-      "knife": "Couteau",
-      "whisk": "Fouet",
-      "bowl": "Saladier",
-      "bakingSheet": "Plaque de cuisson",
-      "mold": "Moule",
-      "colander": "Passoire",
-      "cuttingBoard": "Planche à découper",
-      "oven": "Four",
-      "blender": "Blender",
-      "mixer": "Batteur",
-      "spatula": "Spatule",
-      "ladle": "Louche",
-      "grater": "Râpe",
-      "rollingPin": "Rouleau à pâtisserie",
-      "lid": "Couvercle",
-      "tongs": "Pince de cuisine",
-      "peeler": "Économe",
-      "sieve": "Tamis",
-      "foodProcessor": "Robot ménager",
-      "steamerBasket": "Panier vapeur",
-      "skewer": "Brochette",
-      "pastryBrush": "Pinceau de cuisine",
-      "ramekin": "Ramequin",
-      "dish": "Plat",
-      "wok": "Wok",
-      "thermometer": "Thermomètre",
-      "mandoline": "Mandoline"
-    },
     "allergens": {
       "gluten": "Gluten",
       "crustaceans": "Crustacés",

docker-compose.yml

@@ -94,17 +94,15 @@ services:
       # This service trains itself from scratch on every start (no model
       # ever persisted to disk, see its own README) — `/health` only
       # returns 200 once that's done, not just once the base spaCy models
-      # are loaded. Measured at ~540s (fr) / ~390s (en), ~930s combined,
+      # are loaded. Measured at ~335s per locale (~670s for fr+en combined)
-      # against the current ~74-technique corpus — each technique now has
+      # against the current ~74-technique corpus, trained on each
-      # the *same* number of `utterances` per locale as every other
+      # technique's own synonyms in addition to its example phrases
-      # (equalized to the corpus's own pre-existing max, 7/5 — see
+      # (`intent_service/locale_pipeline.py`'s `_TRAINING_ITERATIONS`) —
-      # `training_data.py`'s own doc comment for why a flat, larger target
+      # `start_period` generous enough that failing checks during that
-      # like 20 was tried and reverted) — `start_period` generous enough
+      # whole window never count against `retries` (which would otherwise
-      # that failing checks during that whole window never count against
+      # flip this container to "unhealthy" mid-training, blocking `app`'s
-      # `retries` (which would otherwise flip this container to
+      # own `depends_on: condition: service_healthy` indefinitely).
-      # "unhealthy" mid-training, blocking `app`'s own `depends_on:
+      start_period: 900s
-      # condition: service_healthy` indefinitely).
-      start_period: 1200s
 
   # Deliberately its own image, not built into `app`'s (see
   # services/tech-step-llm-worker/Dockerfile's own doc comment) — a

packages/shared/src/errors/error-codes.ts

@@ -68,8 +68,6 @@ export enum ErrorCode {
   STEP_NOT_FOUND = 4050,
   /** A tech-step correction's `previousTechStepId`/`correctedTechStepId` doesn't match any reference `TechStep` row. */
   TECH_STEP_NOT_FOUND = 4051,
-  /** A tech-step correction's manually-attached `utensils[].utensilId` doesn't match any reference `Utensil` row. */
-  UTENSIL_NOT_FOUND = 4052,
   /** A tech-step correction's `start`/`end` span falls outside the target step's `description`, or `start >= end`. */
   INVALID_CORRECTION_SPAN = 4002,
   /** Unexpected/unhandled failure — the catch-all, always logged server-side. */

packages/shared/src/schemas/recipe.ts

@@ -117,41 +117,6 @@ export const listRecipesSchema = z.object({
 /** Inferred TS type for {@link listRecipesSchema}'s validated output. */
 export type ListRecipesInput = z.infer<typeof listRecipesSchema>;
 
-/**
- * One ingredient mention the user themselves points at while correcting a
- * technique — `start`/`end` is *their own* selection of the exact passage
- * of `description` that names it (a separate selection from the
- * correction's own `[start, end)`, see `TechStepCorrectionPopover.tsx`),
- * not derived from anything the classifier found. `quantity`/`unitId`
- * are optional — a mention with no quantity attached ("ajouter le sel")
- * is still worth recording. See `submitTechStepCorrectionSchema`'s own
- * doc comment for how `ingredients` as a whole behaves.
- */
-const manualStepTechStepIngredientInputSchema = z
-  .object({
-    ingredientId: z.number().int().positive(),
-    quantity: z.number().positive("La quantité doit être positive").nullable().optional(),
-    unitId: z.number().int().positive().nullable().optional(),
-    start: z.number().int().nonnegative(),
-    end: z.number().int().nonnegative(),
-  })
-  .refine((ingredient) => ingredient.end > ingredient.start, {
-    message: "end must be greater than start",
-    path: ["end"],
-  });
-
-/** A utensil mention the user points at while correcting a technique — same `start`/`end` convention as {@link manualStepTechStepIngredientInputSchema}, no quantity/unit (nothing to measure for a utensil). */
-const manualStepTechStepUtensilInputSchema = z
-  .object({
-    utensilId: z.number().int().positive(),
-    start: z.number().int().nonnegative(),
-    end: z.number().int().nonnegative(),
-  })
-  .refine((utensil) => utensil.end > utensil.start, {
-    message: "end must be greater than start",
-    path: ["end"],
-  });
-
 /**
  * Payload accepted by `POST /recipes/:id/steps/:stepId/corrections` — a
  * user asserting what technique a `[start, end)` span of a step's
@@ -164,19 +129,6 @@ const manualStepTechStepUtensilInputSchema = z
  * (`recipe-tech-step-correction.service.ts`) — needs the target step's
  * `description` length to validate `start`/`end` against, which this shape
  * alone can't see.
- *
- * `ingredients`/`utensils` let the user attach metadata to the technique
- * they're asserting (`correctedTechStepId`), same `source: "manual"`
- * distinction the technique itself gets. **Omitted (`undefined`) means
- * "leave whatever metadata already exists on this occurrence alone" —
- * an explicit array, even `[]`, means "this is now the complete set,
- * replace everything that was there" (auto-detected included; see
- * `applyManualCorrection`'s own doc comment). This is why neither field
- * has a `.default([])`: that would silently turn every plain relabel into
- * a metadata wipe.** Only meaningful alongside a real `correctedTechStepId`
- * — enforced by this schema's own refine below, since there's no live
- * `StepTechStep` row to attach to otherwise (removing a match, or a
- * request with neither id set).
  */
 export const submitTechStepCorrectionSchema = z
   .object({
@@ -184,8 +136,6 @@ export const submitTechStepCorrectionSchema = z
     end: z.number().int().nonnegative(),
     previousTechStepId: z.number().int().positive().nullable().optional(),
     correctedTechStepId: z.number().int().positive().nullable().optional(),
-    ingredients: z.array(manualStepTechStepIngredientInputSchema).optional(),
-    utensils: z.array(manualStepTechStepUtensilInputSchema).optional(),
   })
   .refine((input) => input.end > input.start, {
     message: "end must be greater than start",
@@ -198,15 +148,6 @@ export const submitTechStepCorrectionSchema = z
       message: "at least one of previousTechStepId/correctedTechStepId is required",
       path: ["correctedTechStepId"],
     },
-  )
-  .refine(
-    (input) =>
-      (input.ingredients === undefined && input.utensils === undefined) ||
-      (input.correctedTechStepId ?? null) !== null,
-    {
-      message: "ingredients/utensils require a correctedTechStepId to attach to",
-      path: ["correctedTechStepId"],
-    },
   );
 /** Inferred TS type for {@link submitTechStepCorrectionSchema}'s validated output. */
 export type SubmitTechStepCorrectionInput = z.infer<typeof submitTechStepCorrectionSchema>;

packages/shared/src/types/recipe.ts

@@ -1,11 +1,4 @@
-import type {
+import type { AllergyView, DietView, IngredientView, TechStepView, UnitView } from "./reference.js";
-  AllergyView,
-  DietView,
-  IngredientView,
-  TechStepView,
-  UnitView,
-  UtensilView,
-} from "./reference.js";
 
 /**
  * Who can *read* a recipe — mirrors `RecipeVisibility` in schema.prisma.
@@ -56,11 +49,6 @@ export interface RecipeIngredientView {
  * immediately (`recipe-tech-step-correction.service.ts`'s
  * `applyManualCorrection`). `StepDescription.tsx` renders the two with a
  * different highlight color so a viewer can tell which is which.
- *
- * `ingredients`/`utensils` are the metadata found in this technique's own
- * clause (see `tech-step-matcher.ts`'s `TechStepMatch` — same source data,
- * just resolved to full reference views here instead of bare ids) — `[]`
- * when nothing was mentioned alongside this technique.
  */
 export interface StepTechStepView {
   techStep: TechStepView;
@@ -69,38 +57,6 @@ export interface StepTechStepView {
   contextStart?: number;
   contextEnd?: number;
   source: "auto" | "manual";
-  ingredients: StepTechStepIngredientView[];
-  utensils: StepTechStepUtensilView[];
-}
-
-/**
- * An ingredient mentioned in the same clause as a detected technique (see
- * {@link StepTechStepView.ingredients}) — `quantity`/`unit` are `null` when
- * none was recognized immediately before the mention (e.g. "ajouter le
- * sel"), same "best-effort, not always present" contract as
- * `tech-step-matcher.ts`'s `IngredientMention`. `start`/`end` are the
- * mention's own span in the step's `description`, same `[start, end)`
- * convention as {@link StepTechStepView.start}.
- *
- * `source` mirrors {@link StepTechStepView.source} — `"auto"` is the
- * classifier's own detection, `"manual"` is a viewer's own selection
- * (`SubmitTechStepCorrectionInput.ingredients`, `TechStepCorrectionPopover.tsx`).
- */
-export interface StepTechStepIngredientView {
-  ingredient: IngredientView;
-  quantity: number | null;
-  unit: UnitView | null;
-  start: number;
-  end: number;
-  source: "auto" | "manual";
-}
-
-/** A utensil mentioned in the same clause as a detected technique (see {@link StepTechStepView.utensils}) — `source` mirrors {@link StepTechStepIngredientView.source}. */
-export interface StepTechStepUtensilView {
-  utensil: UtensilView;
-  start: number;
-  end: number;
-  source: "auto" | "manual";
 }
 
 /**

packages/shared/src/types/reference.ts

@@ -210,24 +210,6 @@ export interface TechStepView {
   key: string;
 }
 
-/**
- * A cooking utensil, as returned by `GET /reference/utensils` — reference
- * data (`Utensil`, seeded via `reference-seed-data.ts`'s `UTENSILS`), same
- * bare `id`+`key` shape and static/non-administrable status as
- * {@link TechStepView}. Detected in a step's free text the same way
- * techniques are (see `StepTechStepUtensilView`), but via a static
- * `PhraseMatcher` rather than a trained classifier — see
- * `services/tech-step-intent-service`'s `utensil_vocabulary.py`.
- *
- * `key` is a stable English camelCase uid (e.g. `"pan"`), not a display
- * label — resolved via `t(\`catalog.utensils.${key}\`)`, same as
- * {@link TechStepView.key}.
- */
-export interface UtensilView {
-  id: number;
-  key: string;
-}
-
 /**
  * An implemented recipe source, as returned by `GET /reference/sources` —
  * reference data (`Source`, kept in sync with the adapter registry by

services/tech-step-intent-service/README.md

@@ -11,12 +11,6 @@ pipeline `node-nlp` qui vivait dans `apps/api`
    de la technique qu'une clause de texte *signifie*, entraîné sur les
    `utterances` de chaque technique (y compris des paraphrases n'utilisant
    jamais le mot-clé lui-même).
-3. **NER par phrases, ustensiles** (`spacy.matcher.PhraseMatcher`, second
-   matcher indépendant) — trouve les mentions d'un ustensile de cuisine
-   (`intent_service/utensil_vocabulary.py`, `UTENSIL_VOCABULARY`), sans
-   `textcat` associé : contrairement à une technique, un ustensile mentionné
-   n'a pas besoin d'être interprété selon le contexte. Renvoyé dans la même
-   liste `entities` que les techniques, discriminé par `kind`.
 
 Basé sur **spaCy** (`fr_core_news_md`/`en_core_web_md`) plutôt que node-nlp —
 écosystème NLP plus robuste/maintenu, avec l'ambition à terme (hors scope de
@@ -40,18 +34,7 @@ de `POST /v1/train`, supprimé).
 Workflow mainteneur pour changer le corpus :
 
 1. Éditer `intent_service/training_data.py` à la main (informé par le
-   rapport de `apps/api/src/scripts/list-pending-training-suggestions.ts`)
+   rapport de `apps/api/src/scripts/list-pending-training-suggestions.ts`).
-   pour une technique, ou `intent_service/utensil_vocabulary.py` pour un
-   ustensile (pas de rapport équivalent pour ce dernier — pas de mécanisme
-   de correction utilisateur sur les ustensiles aujourd'hui). Chaque
-   technique doit garder le même nombre d'`utterances` que les autres, par
-   locale (voir `training_data.py`'s own doc comment) — une technique
-   ajoutée avec moins que le max courant, exécuter `augment_utterances.py`
-   (racine de ce service) pour rééquilibrer, puis **impérativement**
-   relancer l'étape 3 ci-dessous avant de committer : chaque tentative
-   passée d'élargir ce corpus (voir l'historique Git de
-   `training_data.py`) a dû être ajustée ou annulée après coup faute
-   d'avoir vérifié le F1 avant de pousser.
 2. **Redémarrer ce service** (`docker compose restart tech-step-intent-service`,
    ou simplement redéployer) — le nouveau corpus n'a d'effet qu'une fois
    réentraîné au démarrage, contrairement à l'ancienne version qui pouvait
@@ -78,10 +61,7 @@ Voir `intent_service/schemas.py` pour le détail exact. En résumé :
   entièrement prêt : modèles spaCy de base chargés **et** les deux locales
   entraînées (pas de lazy-load, voir `intent_service/main.py`) — voir
   "Temps de démarrage" plus bas pour ce que ça implique en pratique.
-- `POST /v1/process` — `{ locale, text }` → `{ entities: [{ uid, start, end, kind }], intent, score }`,
+- `POST /v1/process` — `{ locale, text }` → `{ entities: [{ uid, start, end }], intent, score }`.
-  `kind` valant `"technique"` ou `"utensil"` selon le `PhraseMatcher` qui a
-  trouvé la mention (voir point 3 ci-dessus). `apps/api`'s `tech-step-matcher.ts`
-  filtre par `kind` pour savoir laquelle des deux résoudre (`TechStep`/`Utensil`).
 
 `/v1/process` exige le header `X-Intent-Service-Secret` (voir
 `intent_service/security.py`), qui doit matcher `INTENT_SERVICE_SECRET`
@@ -93,14 +73,11 @@ côté `apps/api`.
 node-nlp (entraînement quasi instantané), entraîner le `textcat` sur le
 corpus réel (~74 techniques, chaque technique entraînée sur ses `synonyms`
 en plus de ses `utterances` — voir `locale_pipeline.py`) prend de l'ordre
-de 540 secondes pour `fr` / 390 secondes pour `en` (mesuré localement,
+de 335 secondes par locale (mesuré localement, sans GPU), donc environ 670
-sans GPU), donc environ 930 secondes (~15-16 minutes) pour `fr`+`en`
+secondes (~11 minutes) pour `fr`+`en` combinés à chaque démarrage du
-combinés à chaque démarrage du process — chaque technique a désormais le
+process. `docker-compose.yml` et
-même nombre d'`utterances` par locale (voir `training_data.py`'s own doc
+`.github/workflows/ci.yml` ont un `start_period`/timeout d'attente
-comment), légèrement plus qu'avant ce rééquilibrage. `docker-compose.yml`
+généreux pour ça — voir leurs propres commentaires. C'est un compromis
-et `.github/workflows/ci.yml` ont un `start_period`/timeout d'attente
-généreux pour ça (`1200s`) — voir leurs propres commentaires. C'est un
-compromis
 assumé, pas un défaut de configuration à corriger : moins d'itérations
 entraîne plus vite mais laisse des verdicts corrects sous
 `CONFIDENCE_THRESHOLD` (voir le commentaire de cette constante,
@@ -119,7 +96,7 @@ et son output complets, `pipeline_registry.py` journalise le déroulement de
 l'entraînement au démarrage :
 
 ```json
-{"timestamp": "...", "level": "info", "message": "tech-step NLP process", "locale": "fr", "text": "faire fondre le beurre", "entities": [{"uid": "melt", "start": 6, "end": 13, "kind": "technique"}], "intent": "melt", "score": 0.93}
+{"timestamp": "...", "level": "info", "message": "tech-step NLP process", "locale": "fr", "text": "faire fondre le beurre", "entities": [{"uid": "melt", "start": 6, "end": 13}], "intent": "melt", "score": 0.93}
 ```
 
 Le chatter interne de spaCy (`"spacy"` logger — chargement de vocabulaire,
@@ -161,9 +138,6 @@ uv run pytest
 exacts et d'insensibilité accents/casse de
 `apps/api/test/recipe-matching/tech-step-matcher.test.ts` — le point de
 fidélité le plus critique de ce service (voir le plan de migration).
-`tests/test_utensil_matching.py` couvre le second `PhraseMatcher`
-(ustensiles) de la même façon, contre le vocabulaire réel (statique, pas
-besoin d'un jeu de test dédié comme pour les techniques).
 `tests/conftest.py`'s fixture `client` (scope "session") ne s'entraîne
 qu'une seule fois pour toute la suite — c'est *le vrai corpus complet*,
 pas un jeu jouet, donc la première utilisation de cette fixture prend le
@@ -177,7 +151,7 @@ vraie instance de ce service tournant (voir `apps/api/.env.test`), conforme
 
 ## Limitations connues
 
-- **Démarrage lent** (~15-16 minutes) — voir "Temps de démarrage" ci-dessus.
+- **Démarrage lent** (~11 minutes) — voir "Temps de démarrage" ci-dessus.
   Une optimisation possible non explorée : parallélisation de
   l'entraînement `fr`/`en` (actuellement séquentiel,
   `PipelineRegistry.initialize`).

services/tech-step-intent-service/augment_utterances.py

@@ -1,282 +0,0 @@
-"""Maintainer script — equalizes every technique's `utterances` count
-(per locale) to the corpus's own current maximum for that locale, never a
-fixed number picked in the abstract. Preserves every existing utterance,
-synonym, and comment verbatim; only ever *adds*, never rewrites or removes.
-
-**Why "equalize to the current max", not "pad everyone to 20"** — this
-script's own history: three earlier attempts forced every technique up to
-a flat 20 `utterances`/locale (12-17 new ones per technique on average).
-All three measurably *failed*
-`test/recipe-matching/tech-step-eval.test.ts`'s F1 >= 0.8 regression gate
-(0.7999 -> 0.791 -> 0.744, each attempt worse than the last), regardless of
-whether the added content was mostly generic modal-frame padding ("il
-faut ...") or mostly synonym substitution. The common factor across all
-three wasn't *how* the filler was generated, it was *how much*: this
-corpus's real per-technique max was only 7 (fr) / 5 (en) before any of
-this — forcing every technique up to 20 meant most of them tripled or
-quadrupled in size on synthetic content alone, which measurably hurt
-inter-class separability more than it helped. Equalizing to the corpus's
-*own* current max instead means at most a few new utterances per
-technique (most need 1-4), which is a small enough addition to plausibly
-preserve the F1 gate while still satisfying "same amount of signal per
-class" (the actual goal — consistent detection quality across techniques,
-not a specific round number).
-
-**Generation strategy** — synonym substitution first (see
-`_synonym_variants`): for every existing utterance whose leading phrase
-exactly matches one of the technique's own `synonyms`, swap in every
-*other* synonym from the same list (e.g. `melt`'s "faire fondre le
-beurre" -> "liquéfier le beurre") — genuinely technique-distinguishing
-vocabulary, not filler shared across every class. A technique whose
-`synonyms` only ever appear *mid-sentence* (the "cut style" techniques —
-`julienne`, `brunoise`, `mirepoix`, `paysanne`... — e.g. "couper les
-carottes en julienne" doesn't *start* with any of `julienne`'s own
-synonyms) has no leading-phrase match to substitute, so a small modal-frame
-fallback (`_FR_FRAMES`/`_EN_FRAMES`, 2 per locale — much smaller than the
-12/10 used in the failed 20-target attempts) closes the remainder. Safe at
-this scale specifically *because* the gap being closed is small (equalizing
-to the corpus's own current max, 1-4 utterances short per technique, not
-13-17) — see this module's own doc comment above for why volume, not
-generation method, was the real problem in every failed attempt.
-
-Run from `services/tech-step-intent-service/` (this directory):
-`./.venv/Scripts/python.exe augment_utterances.py`. Rewrites
-`training_data.py` in place by textual splicing (AST only to *locate* each
-`utterances=[...]` list's line range — never to regenerate the file). Safe
-to re-run: a technique already at the current per-locale max is left
-untouched, and the max itself is recomputed from the file's *current*
-state each time (so re-running after a manual edit re-equalizes against
-whatever the new max is, not a stale one).
-"""
-
-import ast
-import sys
-
-SRC_PATH = "intent_service/training_data.py"
-
-# Minimal fallback pool — only ever used for the small remainder synonym
-# substitution can't reach (see this module's own doc comment for why 2,
-# not the 12/10 tried in earlier, failed attempts).
-_FR_FRAMES = ["il faut {u}", "veillez à {u}"]
-_EN_FRAMES = ["make sure to {u}", "remember to {u}"]
-
-
-def _is_fr_infinitive_led(u: str) -> bool:
-    first = u.split(" ", 1)[0].lower()
-    return first.endswith(("er", "ir", "re")) and len(first) > 2
-
-
-_EN_VERB_WHITELIST = {
-    "make", "add", "pour", "mix", "stir", "cut", "place", "cover", "remove", "heat", "let",
-    "keep", "turn", "cook", "bake", "roast", "grill", "fry", "boil", "simmer", "whisk", "fold",
-    "chop", "mince", "peel", "drain", "season", "rest", "plate", "coat", "melt", "sauté", "saute",
-    "braise", "blanch", "marinate", "brown", "glaze", "thicken", "reduce", "dilute", "loosen",
-    "moisten", "sift", "toast", "zest", "scald", "pod", "shell", "hollow", "shock", "emulsify",
-    "decant", "dust", "sweat", "rub", "punch", "confit", "caramelize", "score", "line", "clarify",
-    "stew", "dice", "fillet", "proof", "poach", "pasteurize", "sterilize", "can", "preserve",
-    "tie", "truss", "baste", "spoon", "brush", "whip", "beat", "work", "sear", "flatten", "press",
-    "knead", "run", "cool", "warm", "combine", "blend", "arrange", "present", "sprinkle", "strain",
-    "separate", "bring", "grate", "continue", "deglaze", "scrape", "char", "break", "slice", "set",
-    "adjust", "switch", "secure", "mark", "butter", "crush", "julienne", "reheat", "smother",
-    "build", "scoop", "plunge", "increase", "pass", "collect", "have", "salt", "soak",
-}
-_EN_ADVERB_SKIP = {
-    "coarsely", "roughly", "finely", "quickly", "lightly", "briefly", "gently", "carefully",
-    "gradually", "very", "thoroughly", "evenly", "generously", "slowly", "thinly", "deep", "blind",
-    "dry",
-}
-
-
-def _is_en_imperative_led(u: str) -> bool:
-    words = u.lower().replace(",", "").split()
-    if not words:
-        return False
-    first = words[0]
-    if first in _EN_VERB_WHITELIST:
-        return True
-    if first in _EN_ADVERB_SKIP and len(words) > 1:
-        return words[1] in _EN_VERB_WHITELIST
-    return False
-
-
-def _frame_variants(existing: list[str], frames: list[str], is_led) -> list[str]:
-    sources = [u for u in existing if is_led(u)]
-    if not sources:
-        return []
-    seen = set(existing)
-    out: list[str] = []
-    for frame in frames:
-        for u in sources:
-            candidate = frame.format(u=u)
-            if candidate in seen:
-                continue
-            seen.add(candidate)
-            out.append(candidate)
-    return out
-
-
-def _synonym_variants(existing: list[str], synonyms: list[str], locale: str) -> list[str]:
-    """Substitutes every *other* synonym in place of whichever synonym an
-    existing utterance's leading phrase exactly matches — see this
-    module's own doc comment for why this is the primary generation
-    strategy.
-
-    Both the matched *and* the replacement synonym must independently pass
-    `_is_fr_infinitive_led`/`_is_en_imperative_led` — a technique's
-    `synonyms` list mixes genuine verb forms ("mijoter", "frémir") with
-    noun/adjective phrases used the same way a keyword-matcher needs them
-    but never as a sentence's own leading verb ("à petit feu", "gros
-    bouillons", "huile de friture") — without this check, swapping the
-    verb "frémir" for the noun phrase "à petit feu" inside "laisser
-    frémir..." produces a syntactically broken sentence ("à petit feu
-    ..."), not just a stylistically different one. Filtering the
-    replacement pool to the same grammatical shape as the ones this
-    function already accepts as *sources* keeps every substitution a
-    like-for-like swap."""
-    if len(synonyms) < 2:
-        return []
-    is_led = _is_fr_infinitive_led if locale == "fr" else _is_en_imperative_led
-    seen = set(existing)
-    sorted_synonyms = sorted({syn for syn in synonyms if is_led(syn)}, key=len, reverse=True)
-    if len(sorted_synonyms) < 2:
-        return []
-    out: list[str] = []
-    for u in existing:
-        lower_u = u.lower()
-        matched = next(
-            (
-                syn
-                for syn in sorted_synonyms
-                if lower_u == syn.lower() or lower_u.startswith(f"{syn.lower()} ")
-            ),
-            None,
-        )
-        if matched is None:
-            continue
-        rest = u[len(matched) :]
-        for syn in sorted_synonyms:
-            if syn == matched:
-                continue
-            candidate = f"{syn}{rest}"
-            if candidate in seen:
-                continue
-            seen.add(candidate)
-            out.append(candidate)
-    return out
-
-
-def top_up(existing: list[str], synonyms: list[str], target: int, locale: str) -> list[str]:
-    if len(existing) >= target:
-        return []
-    needed = target - len(existing)
-    pool = _synonym_variants(existing, synonyms, locale)
-    if len(pool) < needed:
-        frames = _FR_FRAMES if locale == "fr" else _EN_FRAMES
-        is_led = _is_fr_infinitive_led if locale == "fr" else _is_en_imperative_led
-        already = set(existing) | set(pool)
-        for candidate in _frame_variants(existing, frames, is_led):
-            if candidate in already:
-                continue
-            pool.append(candidate)
-            already.add(candidate)
-    return pool[:needed]
-
-
-def main() -> None:
-    with open(SRC_PATH, encoding="utf-8") as f:
-        source = f.read()
-    tree = ast.parse(source)
-    lines = source.splitlines(keepends=True)
-
-    module_body = tree.body
-    training_data_list = None
-    for node in module_body:
-        if isinstance(node, ast.AnnAssign) and isinstance(node.target, ast.Name):
-            if node.target.id == "TECH_STEP_TRAINING_DATA":
-                training_data_list = node.value
-                break
-    if training_data_list is None or not isinstance(training_data_list, ast.List):
-        print("Could not locate TECH_STEP_TRAINING_DATA list", file=sys.stderr)
-        sys.exit(1)
-
-    # First pass: collect every entry's current per-locale utterance/synonym
-    # lists and find each locale's own current max — the equalization
-    # target, not a number picked separately from the corpus itself.
-    parsed: list[tuple[str, str, ast.List, list[str], list[str]]] = []
-    targets = {"fr": 0, "en": 0}
-    for entry_call in training_data_list.elts:
-        assert isinstance(entry_call, ast.Call)
-        uid = None
-        for kw in entry_call.keywords:
-            if kw.arg == "uid":
-                assert isinstance(kw.value, ast.Constant)
-                uid = kw.value.value
-        for kw in entry_call.keywords:
-            if kw.arg not in ("fr", "en"):
-                continue
-            locale = kw.arg
-            locale_call = kw.value
-            assert isinstance(locale_call, ast.Call)
-            utterances_list_node = None
-            synonyms_list_node = None
-            for inner_kw in locale_call.keywords:
-                if inner_kw.arg == "utterances":
-                    utterances_list_node = inner_kw.value
-                elif inner_kw.arg == "synonyms":
-                    synonyms_list_node = inner_kw.value
-            if utterances_list_node is None:
-                continue
-            assert isinstance(utterances_list_node, ast.List)
-            existing = [
-                elt.value for elt in utterances_list_node.elts if isinstance(elt, ast.Constant)
-            ]
-            synonyms = (
-                [elt.value for elt in synonyms_list_node.elts if isinstance(elt, ast.Constant)]
-                if isinstance(synonyms_list_node, ast.List)
-                else []
-            )
-            targets[locale] = max(targets[locale], len(existing))
-            parsed.append((uid, locale, utterances_list_node, existing, synonyms))
-
-    print(f"Equalizing to the corpus's own current max — fr: {targets['fr']}, en: {targets['en']}")
-
-    insertions: list[tuple[int, str, list[str]]] = []
-    total_added = 0
-    shortfalls: list[tuple[str, str, int]] = []
-
-    for uid, locale, utterances_list_node, existing, synonyms in parsed:
-        target = targets[locale]
-        new_ones = top_up(existing, synonyms, target, locale)
-        final_count = len(existing) + len(new_ones)
-        if final_count < target:
-            shortfalls.append((uid, locale, final_count))
-        if not new_ones:
-            continue
-        last_elt = utterances_list_node.elts[-1]
-        insert_after_line = last_elt.end_lineno - 1
-        indent = lines[insert_after_line][
-            : len(lines[insert_after_line]) - len(lines[insert_after_line].lstrip())
-        ]
-        new_lines = [f'{indent}"{s}",\n' for s in new_ones]
-        insertions.append((insert_after_line, uid, new_lines))
-        total_added += len(new_ones)
-
-    insertions.sort(key=lambda t: t[0], reverse=True)
-    for line_idx, uid, new_lines in insertions:
-        lines[line_idx + 1 : line_idx + 1] = new_lines
-
-    with open(SRC_PATH, "w", encoding="utf-8", newline="\n") as f:
-        f.writelines(lines)
-
-    print(f"Added {total_added} new utterances across {len(insertions)} (technique, locale) pairs.")
-    if shortfalls:
-        print(f"{len(shortfalls)} (uid, locale) pair(s) still below their locale's target — not")
-        print("enough synonym variety to reach full equalization:")
-        for uid, locale, count in shortfalls:
-            print(f"  {uid} ({locale}): {count}/{targets[locale]}")
-    else:
-        print("Every technique now has exactly the same utterance count as every other, per locale.")
-
-
-if __name__ == "__main__":
-    main()

services/tech-step-intent-service/intent_service/locale_pipeline.py

@@ -30,7 +30,6 @@ from spacy.tokens import Doc, Span
 from spacy.training import Example
 from spacy.util import filter_spans, fix_random_seed, minibatch
 
-from . import utensil_vocabulary
 from .text_normalization import normalize_text
 
 logger = logging.getLogger(__name__)
@@ -168,18 +167,12 @@ class TrainEntry:
 
 @dataclass
 class Entity:
-    """Une mention candidate trouvée par un `PhraseMatcher` — offsets
+    """Une mention candidate trouvée par le `PhraseMatcher` — offsets
-    caractère `[start, end)`, miroir de `EntityPayload` (`schemas.py`).
+    caractère `[start, end)`, miroir de `EntityPayload` (`schemas.py`)."""
-    `kind` distingue de quel `PhraseMatcher` la mention vient (`"technique"`
-    — `self._matcher`, entraîné depuis `training_data.py` — ou `"utensil"`
-    — `self._utensil_matcher`, statique, voir `utensil_vocabulary.py`) :
-    `apps/api`'s `tech-step-matcher.ts` a besoin de savoir laquelle des deux
-    résoudre (`TechStep.key` vs `Utensil.key`)."""
 
     uid: str
     start: int
     end: int
-    kind: str = "technique"
 
 
 @dataclass
@@ -217,11 +210,6 @@ class LocalePipeline:
         # comportement testé côté `apps/api` pour "une locale jamais
         # entraînée".
         self._matcher: PhraseMatcher | None = None
-        # Construit une seule fois par `preload()`, jamais par `train()` —
-        # contrairement à `self._matcher`, ce vocabulaire est statique
-        # (`utensil_vocabulary.py`), il n'a pas de contrepartie "corpus
-        # poussé par un appelant" à reconstruire.
-        self._utensil_matcher: PhraseMatcher | None = None
         self._trained = False
 
     @property
@@ -229,18 +217,10 @@ class LocalePipeline:
         return self._trained
 
     def preload(self) -> None:
-        """Charge le modèle spaCy de base (tokenizer + vecteurs), le
+        """Charge le modèle spaCy de base (tokenizer + vecteurs) et le
-        composant `diacritics_normalizer`, et construit le `PhraseMatcher`
+        composant `diacritics_normalizer` — idempotent, sans effet si déjà
-        d'ustensiles — idempotent, sans effet si déjà chargé. Appelé au
+        chargé. Appelé au démarrage du process pour les deux locales
-        démarrage du process pour les deux locales connues (voir
+        connues (voir `main.py`), pas paresseusement au premier `train()`.
-        `main.py`), pas paresseusement au premier `train()`.
-
-        Le matcher d'ustensiles est construit ici, pas dans `train()` :
-        contrairement au `PhraseMatcher` de techniques (reconstruit à
-        chaque `train()` depuis les `entries` reçues), le vocabulaire
-        d'ustensiles est statique (`utensil_vocabulary.py`) — rien ne le
-        fait jamais varier d'un appel à l'autre, donc rien ne justifie de
-        payer son coût de construction plus d'une fois par démarrage.
         """
         if self._base_nlp is not None:
             return
@@ -248,15 +228,6 @@ class LocalePipeline:
         nlp.add_pipe("diacritics_normalizer", first=True)
         self._base_nlp = nlp
 
-        diacritics_normalizer = nlp.get_pipe("diacritics_normalizer")
-        utensil_matcher = PhraseMatcher(nlp.vocab, attr="NORM")
-        for uid, synonyms in utensil_vocabulary.synonyms_for_locale(self._locale).items():
-            if not synonyms:
-                continue
-            patterns = [diacritics_normalizer(nlp.make_doc(synonym)) for synonym in synonyms]
-            utensil_matcher.add(uid, patterns)
-        self._utensil_matcher = utensil_matcher
-
     def train(self, entries: list[TrainEntry]) -> tuple[int, int, int]:
         """Reconstruit le `textcat` et le `PhraseMatcher` de ce pipeline à
         partir de `entries` (le tokenizer/les vecteurs restent ceux chargés
@@ -438,41 +409,13 @@ class LocalePipeline:
         matched_spans = [
             Span(doc, start, end, label=match_id) for match_id, start, end in self._matcher(doc)
         ]
-        technique_entities = [
+        entities = sorted(
-            Entity(
+            (
-                uid=self._base_nlp.vocab.strings[span.label],
+                Entity(uid=self._base_nlp.vocab.strings[span.label], start=span.start_char, end=span.end_char)
-                start=span.start_char,
+                for span in filter_spans(matched_spans)
-                end=span.end_char,
+            ),
-                kind="technique",
+            key=lambda entity: entity.start,
-            )
+        )
-            for span in filter_spans(matched_spans)
-        ]
-
-        # Second, independent `PhraseMatcher` pass for ustensiles — run and
-        # `filter_spans`-resolved *separately* from the technique pass
-        # above: the two matchers' candidates never compete for the same
-        # position (a longer utensil match must never swallow/be swallowed
-        # by a technique match the way two overlapping technique synonyms
-        # do), only overlaps *within* the same matcher are the known
-        # problem `filter_spans` exists for (see the technique pass's own
-        # comment above).
-        utensil_entities: list[Entity] = []
-        if self._utensil_matcher is not None:
-            utensil_spans = [
-                Span(doc, start, end, label=match_id)
-                for match_id, start, end in self._utensil_matcher(doc)
-            ]
-            utensil_entities = [
-                Entity(
-                    uid=self._base_nlp.vocab.strings[span.label],
-                    start=span.start_char,
-                    end=span.end_char,
-                    kind="utensil",
-                )
-                for span in filter_spans(utensil_spans)
-            ]
-
-        entities = sorted(technique_entities + utensil_entities, key=lambda entity: entity.start)
 
         cats = doc.cats
         if not cats:

services/tech-step-intent-service/intent_service/routes/process.py

@@ -30,20 +30,14 @@ def process(request: ProcessRequest) -> ProcessResponse:
         extra={
             "locale": request.locale,
             "text": request.text,
-            "entities": [
+            "entities": [{"uid": entity.uid, "start": entity.start, "end": entity.end} for entity in result.entities],
-                {"uid": entity.uid, "start": entity.start, "end": entity.end, "kind": entity.kind}
-                for entity in result.entities
-            ],
             "intent": result.intent,
             "score": result.score,
         },
     )
 
     return ProcessResponse(
-        entities=[
+        entities=[EntityPayload(uid=entity.uid, start=entity.start, end=entity.end) for entity in result.entities],
-            EntityPayload(uid=entity.uid, start=entity.start, end=entity.end, kind=entity.kind)
-            for entity in result.entities
-        ],
         intent=result.intent,
         score=result.score,
     )

services/tech-step-intent-service/intent_service/schemas.py

@@ -7,8 +7,6 @@ depuis `training_data.py` (voir `pipeline_registry.py`/`main.py`), plus
 besoin d'un contrat HTTP pour ça.
 """
 
-from typing import Literal
-
 from pydantic import BaseModel
 
 # ---------------------------------------------------------------------------
@@ -22,21 +20,14 @@ class ProcessRequest(BaseModel):
 
 
 class EntityPayload(BaseModel):
-    """Une mention candidate — technique ou ustensile, voir `kind` — offsets
+    """Une mention candidate d'une technique — offsets caractère `[start, end)`
-    caractère `[start, end)` dans `text`, convention identique à
+    dans `text`, convention identique à `String.prototype.slice` côté
-    `String.prototype.slice` côté `apps/api` (pas de décalage `+1` à
+    `apps/api` (pas de décalage `+1` à appliquer côté Node, contrairement à
-    appliquer côté Node, contrairement à l'ancien `NlpManager` de
+    l'ancien `NlpManager` de node-nlp)."""
-    node-nlp).
-
-    `kind` distingue de quel `PhraseMatcher` la mention vient (voir
-    `locale_pipeline.py`'s `Entity`) — `apps/api`'s `tech-step-matcher.ts`
-    en a besoin pour savoir laquelle des deux résoudre (`TechStep.key` vs
-    `Utensil.key`)."""
 
     uid: str
     start: int
     end: int
-    kind: Literal["technique", "utensil"] = "technique"
 
 
 class ProcessResponse(BaseModel):

services/tech-step-intent-service/intent_service/utensil_vocabulary.py

@@ -1,197 +0,0 @@
-"""Vocabulaire du `PhraseMatcher` d'ustensiles — contrairement à
-`training_data.py`, ce catalogue n'a jamais existé côté `apps/api` avant ce
-service : il est *né* ici, pas rapatrié depuis TypeScript. Chaque `uid`
-ci-dessous doit avoir une entrée `UTENSILS` correspondante
-(`reference-seed-data.ts` côté `apps/api`) et un libellé
-`catalog.utensils.<uid>` (`apps/web`'s `locales/fr/translation.json`).
-
-Un seul type de contenu par ustensile/locale (contrairement à
-`TechStepTrainingEntry`'s `synonyms`/`utterances`) : un ustensile mentionné
-n'a pas besoin d'être *interprété* comme une technique peut l'être
-(`préchauffer` vs `chauffer` dépend du contexte ; `poêle` n'en dépend pas) —
-juste reconnu, comme les `synonyms` de `training_data.py` alimentent le
-`PhraseMatcher` de techniques. Pas de `textcat` équivalent ici, voir
-`LocalePipeline`'s propre commentaire sur `_utensil_matcher`.
-"""
-
-from dataclasses import dataclass, field
-
-
-@dataclass(frozen=True)
-class UtensilLocaleVocabulary:
-    synonyms: list[str] = field(default_factory=list)
-
-
-@dataclass(frozen=True)
-class UtensilEntry:
-    """`uid` doit correspondre à un `Utensil.key`."""
-
-    uid: str
-    fr: UtensilLocaleVocabulary
-    en: UtensilLocaleVocabulary
-
-
-UTENSIL_VOCABULARY: list[UtensilEntry] = [
-    UtensilEntry(
-        uid="pan",
-        fr=UtensilLocaleVocabulary(synonyms=["poêle", "sauteuse", "poêle antiadhésive"]),
-        en=UtensilLocaleVocabulary(synonyms=["pan", "frying pan", "skillet"]),
-    ),
-    UtensilEntry(
-        uid="saucepan",
-        fr=UtensilLocaleVocabulary(synonyms=["casserole", "petite casserole"]),
-        en=UtensilLocaleVocabulary(synonyms=["saucepan", "sauce pan"]),
-    ),
-    UtensilEntry(
-        uid="pot",
-        fr=UtensilLocaleVocabulary(synonyms=["marmite", "faitout", "cocotte"]),
-        en=UtensilLocaleVocabulary(synonyms=["pot", "stockpot", "dutch oven"]),
-    ),
-    UtensilEntry(
-        uid="knife",
-        fr=UtensilLocaleVocabulary(synonyms=["couteau", "couteau de cuisine", "couteau d'office"]),
-        en=UtensilLocaleVocabulary(synonyms=["knife", "kitchen knife", "chef's knife"]),
-    ),
-    UtensilEntry(
-        uid="whisk",
-        fr=UtensilLocaleVocabulary(synonyms=["fouet"]),
-        en=UtensilLocaleVocabulary(synonyms=["whisk"]),
-    ),
-    UtensilEntry(
-        uid="bowl",
-        fr=UtensilLocaleVocabulary(synonyms=["saladier", "bol", "cul-de-poule"]),
-        en=UtensilLocaleVocabulary(synonyms=["bowl", "mixing bowl"]),
-    ),
-    UtensilEntry(
-        uid="bakingSheet",
-        fr=UtensilLocaleVocabulary(synonyms=["plaque de cuisson", "plaque à pâtisserie", "plaque du four"]),
-        en=UtensilLocaleVocabulary(synonyms=["baking sheet", "baking tray", "sheet pan"]),
-    ),
-    UtensilEntry(
-        uid="mold",
-        fr=UtensilLocaleVocabulary(synonyms=["moule", "moule à gâteau", "moule à cake"]),
-        en=UtensilLocaleVocabulary(synonyms=["mold", "mould", "baking pan"]),
-    ),
-    UtensilEntry(
-        uid="colander",
-        fr=UtensilLocaleVocabulary(synonyms=["passoire", "égouttoir"]),
-        en=UtensilLocaleVocabulary(synonyms=["colander", "strainer"]),
-    ),
-    UtensilEntry(
-        uid="cuttingBoard",
-        fr=UtensilLocaleVocabulary(synonyms=["planche à découper"]),
-        en=UtensilLocaleVocabulary(synonyms=["cutting board", "chopping board"]),
-    ),
-    UtensilEntry(
-        uid="oven",
-        fr=UtensilLocaleVocabulary(synonyms=["four"]),
-        en=UtensilLocaleVocabulary(synonyms=["oven"]),
-    ),
-    UtensilEntry(
-        uid="blender",
-        fr=UtensilLocaleVocabulary(synonyms=["blender", "mixeur plongeant", "mixeur girafe"]),
-        en=UtensilLocaleVocabulary(synonyms=["blender", "immersion blender"]),
-    ),
-    UtensilEntry(
-        uid="mixer",
-        fr=UtensilLocaleVocabulary(synonyms=["batteur", "batteur électrique", "robot pâtissier"]),
-        en=UtensilLocaleVocabulary(synonyms=["mixer", "stand mixer", "hand mixer"]),
-    ),
-    UtensilEntry(
-        uid="spatula",
-        fr=UtensilLocaleVocabulary(synonyms=["spatule", "maryse"]),
-        en=UtensilLocaleVocabulary(synonyms=["spatula"]),
-    ),
-    UtensilEntry(
-        uid="ladle",
-        fr=UtensilLocaleVocabulary(synonyms=["louche"]),
-        en=UtensilLocaleVocabulary(synonyms=["ladle"]),
-    ),
-    UtensilEntry(
-        uid="grater",
-        fr=UtensilLocaleVocabulary(synonyms=["râpe"]),
-        en=UtensilLocaleVocabulary(synonyms=["grater"]),
-    ),
-    UtensilEntry(
-        uid="rollingPin",
-        fr=UtensilLocaleVocabulary(synonyms=["rouleau à pâtisserie"]),
-        en=UtensilLocaleVocabulary(synonyms=["rolling pin"]),
-    ),
-    UtensilEntry(
-        uid="lid",
-        fr=UtensilLocaleVocabulary(synonyms=["couvercle"]),
-        en=UtensilLocaleVocabulary(synonyms=["lid"]),
-    ),
-    UtensilEntry(
-        uid="tongs",
-        fr=UtensilLocaleVocabulary(synonyms=["pince", "pince de cuisine"]),
-        en=UtensilLocaleVocabulary(synonyms=["tongs"]),
-    ),
-    UtensilEntry(
-        uid="peeler",
-        fr=UtensilLocaleVocabulary(synonyms=["économe", "éplucheur"]),
-        en=UtensilLocaleVocabulary(synonyms=["peeler", "vegetable peeler"]),
-    ),
-    UtensilEntry(
-        uid="sieve",
-        fr=UtensilLocaleVocabulary(synonyms=["tamis", "chinois"]),
-        en=UtensilLocaleVocabulary(synonyms=["sieve"]),
-    ),
-    UtensilEntry(
-        uid="foodProcessor",
-        fr=UtensilLocaleVocabulary(synonyms=["robot ménager", "robot de cuisine", "robot culinaire"]),
-        en=UtensilLocaleVocabulary(synonyms=["food processor"]),
-    ),
-    UtensilEntry(
-        uid="steamerBasket",
-        fr=UtensilLocaleVocabulary(synonyms=["panier vapeur", "cuit-vapeur"]),
-        en=UtensilLocaleVocabulary(synonyms=["steamer basket", "steamer"]),
-    ),
-    UtensilEntry(
-        uid="skewer",
-        fr=UtensilLocaleVocabulary(synonyms=["brochette", "pique en bois"]),
-        en=UtensilLocaleVocabulary(synonyms=["skewer"]),
-    ),
-    UtensilEntry(
-        uid="pastryBrush",
-        fr=UtensilLocaleVocabulary(synonyms=["pinceau de cuisine", "pinceau à pâtisserie"]),
-        en=UtensilLocaleVocabulary(synonyms=["pastry brush", "basting brush"]),
-    ),
-    UtensilEntry(
-        uid="ramekin",
-        fr=UtensilLocaleVocabulary(synonyms=["ramequin"]),
-        en=UtensilLocaleVocabulary(synonyms=["ramekin"]),
-    ),
-    UtensilEntry(
-        uid="dish",
-        fr=UtensilLocaleVocabulary(synonyms=["plat", "plat à gratin", "plat allant au four"]),
-        en=UtensilLocaleVocabulary(synonyms=["dish", "baking dish", "gratin dish"]),
-    ),
-    UtensilEntry(
-        uid="wok",
-        fr=UtensilLocaleVocabulary(synonyms=["wok"]),
-        en=UtensilLocaleVocabulary(synonyms=["wok"]),
-    ),
-    UtensilEntry(
-        uid="thermometer",
-        fr=UtensilLocaleVocabulary(synonyms=["thermomètre", "thermomètre de cuisson"]),
-        en=UtensilLocaleVocabulary(synonyms=["thermometer"]),
-    ),
-    UtensilEntry(
-        uid="mandoline",
-        fr=UtensilLocaleVocabulary(synonyms=["mandoline"]),
-        en=UtensilLocaleVocabulary(synonyms=["mandoline"]),
-    ),
-]
-
-
-def synonyms_for_locale(locale: str) -> dict[str, list[str]]:
-    """Aplati {@link UTENSIL_VOCABULARY} en `{uid: synonyms}` pour une seule
-    locale — la forme que `LocalePipeline.preload()` attend pour construire
-    son `PhraseMatcher` d'ustensiles. Miroir de `training_data.entries_for_locale`,
-    en plus simple (pas d'`utterances`, un seul champ à extraire)."""
-    return {
-        entry.uid: getattr(entry, locale).synonyms
-        for entry in UTENSIL_VOCABULARY
-        if hasattr(entry, locale)
-    }

services/tech-step-intent-service/tests/test_locale_pipeline_entities.py

@@ -84,16 +84,10 @@ def test_untrained_locale_returns_empty_without_error():
 
 
 def test_detects_two_techniques_with_exact_tight_spans_reading_order(fr_pipeline: LocalePipeline):
-    # This text's "poêle" is now *also* a real utensil match ("pan", see
-    # `utensil_vocabulary.py`) — filtered out here by `kind` since this test
-    # is specifically about technique-candidate ordering, not the full
-    # mixed entity list (see `test_utensil_matching.py` for the utensil
-    # matcher's own coverage).
     text = "Préchauffer la poêle, puis faire fondre le beurre"
     result = fr_pipeline.process(text)
 
-    technique_entities = [entity for entity in result.entities if entity.kind == "technique"]
+    uids_by_start = sorted(((entity.start, entity.uid) for entity in result.entities))
-    uids_by_start = sorted(((entity.start, entity.uid) for entity in technique_entities))
     assert [uid for _, uid in uids_by_start] == ["preheat", "melt"]
 
     preheat_entity = next(e for e in result.entities if e.uid == "preheat")

services/tech-step-intent-service/tests/test_training_data_balance.py

@@ -1,22 +0,0 @@
-"""Garde-fou de non-régression pour l'équilibrage du corpus (voir
-`training_data.py`'s propre commentaire de tête) : chaque technique doit
-avoir exactement le même nombre d'`utterances` que chaque autre, par
-locale — un déséquilibre entre classes est une source réelle de
-classifications confiantes mais fausses sur une phrase jamais vue (constaté
-en pratique — voir l'historique Git de ce fichier, trois tentatives
-d'équilibrer vers un nombre plus élevé ont toutes dégradé le F1 agrégé de
-`test/recipe-matching/tech-step-eval.test.ts` avant que la stratégie
-actuelle — équilibrer vers le maximum déjà présent dans le corpus, pas un
-nombre choisi dans l'absolu — ne passe cette même gate)."""
-
-from intent_service.training_data import TECH_STEP_TRAINING_DATA
-
-
-def test_every_technique_has_the_same_utterance_count_per_locale():
-    for locale in ("fr", "en"):
-        counts = {entry.uid: len(getattr(entry, locale).utterances) for entry in TECH_STEP_TRAINING_DATA}
-        distinct = set(counts.values())
-        assert len(distinct) == 1, (
-            f"utterance counts for locale {locale!r} aren't uniform across techniques "
-            f"(run augment_utterances.py to re-equalize): {counts}"
-        )

services/tech-step-intent-service/tests/test_utensil_matching.py

@@ -1,78 +0,0 @@
-"""Couvre `LocalePipeline`'s second `PhraseMatcher` (ustensiles,
-`utensil_vocabulary.py`) — même style que `test_locale_pipeline_entities.py`
-(offsets exacts, insensibilité accents/casse), mais contre le vocabulaire
-*réel* (`UTENSIL_VOCABULARY`, statique, construit par `preload()` — pas
-besoin d'un jeu de test dédié comme pour les techniques, voir
-`LocalePipeline.preload`'s own comment)."""
-
-from intent_service.locale_pipeline import LocalePipeline, TrainEntry
-
-# Un `train()` minimal suffit — le `PhraseMatcher` d'ustensiles est
-# construit par `preload()` (appelé par `train()`), indépendamment du
-# `TrainEntry` de techniques passé ici (voir `preload()`'s own comment sur
-# pourquoi les deux ne sont pas couplés).
-_MINIMAL_ENTRIES = [
-    TrainEntry(uid="melt", synonyms=["fondre"], utterances=["faire fondre le beurre"]),
-    TrainEntry(uid="simmer", synonyms=["mijoter"], utterances=["faire mijoter à feu doux"]),
-]
-
-
-def _fr_pipeline() -> LocalePipeline:
-    pipeline = LocalePipeline("fr")
-    pipeline.train(_MINIMAL_ENTRIES)
-    return pipeline
-
-
-def test_matches_a_real_utensil_with_exact_span():
-    pipeline = _fr_pipeline()
-    text = "Dans une poêle chaude, faire fondre le beurre"
-    result = pipeline.process(text)
-
-    pan_entities = [e for e in result.entities if e.uid == "pan"]
-    assert len(pan_entities) == 1
-    entity = pan_entities[0]
-    assert entity.kind == "utensil"
-    assert text[entity.start : entity.end] == "poêle"
-
-
-def test_is_case_and_accent_insensitive():
-    pipeline = _fr_pipeline()
-    result = pipeline.process("Verser dans la POÊLE")
-    utensil_uids = [e.uid for e in result.entities if e.kind == "utensil"]
-    assert utensil_uids == ["pan"]
-
-
-def test_matches_a_multi_word_synonym():
-    pipeline = _fr_pipeline()
-    text = "Découper les légumes sur la planche à découper"
-    result = pipeline.process(text)
-    board_entities = [e for e in result.entities if e.uid == "cuttingBoard"]
-    assert len(board_entities) == 1
-    assert text[board_entities[0].start : board_entities[0].end] == "planche à découper"
-
-
-def test_technique_and_utensil_are_both_returned_without_interfering():
-    pipeline = _fr_pipeline()
-    text = "Dans une casserole, faire mijoter à feu doux"
-    result = pipeline.process(text)
-
-    kinds_by_uid = {e.uid: e.kind for e in result.entities}
-    assert kinds_by_uid.get("simmer") == "technique"
-    assert kinds_by_uid.get("saucepan") == "utensil"
-
-
-def test_returns_no_utensil_entities_when_none_are_mentioned():
-    pipeline = _fr_pipeline()
-    result = pipeline.process("Laisser reposer la pâte une heure")
-    assert [e for e in result.entities if e.kind == "utensil"] == []
-
-
-def test_matches_english_utensils_too():
-    pipeline = LocalePipeline("en")
-    pipeline.train([TrainEntry(uid="chop", synonyms=["chop"], utterances=["chop the onions finely"])])
-    text = "Heat the pan before adding the onions"
-    result = pipeline.process(text)
-    pan_entities = [e for e in result.entities if e.uid == "pan"]
-    assert len(pan_entities) == 1
-    assert pan_entities[0].kind == "utensil"
-    assert text[pan_entities[0].start : pan_entities[0].end] == "pan"

specs/backend-architecture.md

@@ -555,32 +555,6 @@ combien de temps ça prend).
   ("préchauffer") ne matche jamais sa forme normalisée dans le texte cible
   (voir le commentaire dans `locale_pipeline.py`'s `train()`).
 
-**Métadonnées d'action — ingrédients, quantités, ustensiles.** Chaque
-occurrence de technique (`TechStepMatch`) porte aussi ce qui a été détecté
-dans sa propre *clause* (celle calculée à l'étape 2 ci-dessus) :
-- **Ingrédients** — `ingredient-matcher.ts`'s `findIngredientMentions` scanne
-  le texte de la clause contre le catalogue `Ingredient` *existant*
-  (`INGREDIENT_LABELS_FR`/`_EN`, `packages/shared` — le même que
-  `matchIngredientName` utilise déjà pour les listes structurées), plutôt que
-  de dupliquer ce catalogue côté service Python. Une quantité+unité
-  immédiatement avant la mention est résolue au mieux (regex ancrée sur la
-  *fin* du texte précédent, voir `QUANTITY_BEFORE_INGREDIENT_PATTERN`) —
-  `null`/`null` sinon, jamais une erreur.
-- **Ustensiles** — contrairement aux ingrédients, ce catalogue n'existait
-  nulle part avant cette fonctionnalité : il est né directement côté service
-  Python (`intent_service/utensil_vocabulary.py`), via un second
-  `PhraseMatcher` indépendant du premier (pas de `textcat` — un ustensile
-  mentionné n'a pas besoin d'être interprété, contrairement à une technique).
-  `POST /v1/process` renvoie donc deux types d'entité discriminés par
-  `kind: "technique" | "utensil"` dans la même liste `entities`.
-
-Dans les deux cas, l'association à une technique se fait par appartenance à
-la même clause — pas d'analyse syntaxique (le `parser` spaCy reste exclu du
-pipeline, voir `_EXCLUDED_COMPONENTS`), juste "cette mention tombe dans
-`[clause.start, clause.end)`". Persisté comme `StepTechStepIngredient`/
-`StepTechStepUtensil`, deux tables référençant `StepTechStep` par sa clé
-composite `(stepId, order)`.
-
 ### Résolution ingrédients/unités — `ingredient-matcher.ts`
 
 **Anglais uniquement** aujourd'hui (commit "matching anglais pour les tech

specs/batch-cooking-modele.md

@@ -18,9 +18,6 @@ d'ingrédients/unités normalisé, techniques détectées, visibilité) :
 - **Planification** — `Planning`, `PlanningItem`
 - **Recettes** — `Recipe`, `RecipeIngredient`, `Step`, `TechStep`,
   `StepTechStep`, `RecipeDiet`, `RecipeFavorite`
-- **Métadonnées d'action** — `Utensil`, `StepTechStepIngredient`,
-  `StepTechStepUtensil` (ingrédients/quantités/ustensiles associés à une
-  technique détectée, voir plus bas)
 - **Sources externes** — `Source`, `HouseSource`
 - **Catalogue ingrédients/unités** — `Ingredient`, `Unit`, `IngredientDiet`,
   `IngredientAllergy`, `UserProfileDislikedIngredient`
@@ -374,17 +371,6 @@ surlignage tant que sa recette n'est pas resauvegardée) sont le span détecté
 dans `Step.description`, utilisé pour le surlignage côté web
 (`highlight-tech-steps.ts`).
 
-Chaque `step_tech_step` porte en plus les métadonnées trouvées dans sa propre
-clause : `step_tech_step_ingredient` (ingrédient résolu contre le catalogue
-`ingredients` existant, `quantity`/`unit_id` optionnels quand une quantité a
-pu être extraite juste avant la mention) et `step_tech_step_utensil`
-(ustensile résolu contre un nouveau catalogue `utensil`, même forme
-minimale `id`/`key` que `tech_step` — voir
-[backend-architecture.md](./backend-architecture.md#détection-des-techniques--tech-step-matcherts)
-pour comment chacun est détecté). Les deux référencent `step_tech_step` par
-sa clé composite `(step_id, order)`, `onDelete: Cascade` comme le reste de
-cette chaîne.
-
 ---
 
 ## Relations