Wire canonical foods search into event logging pipeline

Connect the existing search-foods Edge Function to the product search
flow so generic foods like "banana" surface canonical entries (with prep
states and real serving sizes) instead of only branded catalog products.

- Add searchCanonicalAndAdapt() to productSearch.ts that calls the Edge
  Function, batch-fetches product_servings, and maps to ProductSearchResult
- Modify searchAllProducts() pipeline: canonical search as Priority 3,
  catalog fallback as Priority 4, merged results deduped by name
- Pass canonical_food_id and preparation_state through confirm flow into
  saved event data and user_product_registry
- Add canonicalFoodId parameter to updateUserProductRegistry()
- Recreate ivfflat vector index dropped in earlier index cleanup migration

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: schwaaamp

docs/planning/canonical-foods-strategy.md

@@ -376,7 +376,8 @@ describe('voiceEventParser', () => {
         'food',
         'Apple',
         'Organic',
-        undefined // productCatalogId defaults to null, converted to undefined via ??
+        undefined, // productCatalogId defaults to null, converted to undefined via ??
+        null // canonicalFoodId
       );
     });
 
@@ -402,7 +403,8 @@ describe('voiceEventParser', () => {
         'supplement',
         'Vitamin D',
         'NOW',
-        undefined // productCatalogId defaults to null, converted to undefined via ??
+        undefined, // productCatalogId defaults to null, converted to undefined via ??
+        null // canonicalFoodId
       );
     });
 
@@ -428,7 +430,8 @@ describe('voiceEventParser', () => {
         'medication',
         'Advil',
         null,
-        undefined // productCatalogId defaults to null, converted to undefined via ??
+        undefined, // productCatalogId defaults to null, converted to undefined via ??
+        null // canonicalFoodId
       );
     });
 
@@ -512,7 +515,8 @@ describe('voiceEventParser', () => {
         'food',
         'Protein Bar',
         null,
-        'catalog-uuid-456'
+        'catalog-uuid-456',
+        null // canonicalFoodId
       );
     });
 
@@ -547,7 +551,8 @@ describe('voiceEventParser', () => {
         'supplement',
         'Fish Oil',
         null,
-        undefined // productCatalogId defaults to null, converted to undefined via ??
+        undefined, // productCatalogId defaults to null, converted to undefined via ??
+        null // canonicalFoodId
       );
     });
 

mobile/__tests__/utils/voiceEventParser.test.ts

@@ -296,6 +296,9 @@ export function ProductSelectionFlow({
         if (product.nutrients?.carbs) updatedData.carbs = product.nutrients.carbs;
         if (product.nutrients?.fat) updatedData.fat = product.nutrients.fat;
         if (product.servingSize) updatedData.serving_size = product.servingSize;
+        if (product.canonical_food_id) {
+          updatedData.canonical_food_id = product.canonical_food_id;
+        }
 
         // Match user quantity/unit to serving options
         const userQuantity = parseFloat(parsedData.event_data?.value as string);
@@ -453,13 +456,42 @@ export function ProductSelectionFlow({
 
       const eventTime = calculateEventTime(parsedData.time_info);
 
+      // Calculate final nutrients from selected serving/prep state
+      const confirmedEventData = { ...finalEventData };
+      if (selectedProduct !== null && selectedProduct !== 'manual') {
+        const selectedProductData =
+          typeof selectedProduct === 'number' ? productOptions[selectedProduct] : null;
+        if (selectedProductData) {
+          const calculated = calculateNutrients(selectedProductData, selectedProduct as number);
+          if (calculated) {
+            confirmedEventData.calories = calculated.calories;
+            confirmedEventData.protein = calculated.protein;
+            confirmedEventData.carbs = calculated.carbs;
+            confirmedEventData.fat = calculated.fat;
+            confirmedEventData.serving_grams = calculated.totalGrams;
+            if (calculated.prepState) {
+              confirmedEventData.preparation_state = calculated.prepState;
+            }
+          }
+        }
+      }
+
+      // For canonical sources, pass null as productCatalogId (canonicals aren't catalog entries)
+      const selectedProductForCatalogId =
+        typeof selectedProduct === 'number' ? productOptions[selectedProduct] : null;
+      const productCatalogId =
+        selectedProductForCatalogId?.source === 'canonical'
+          ? null
+          : selectedProductForCatalogId?.id || null;
+
       await createVoiceEvent(
         user.id,
         parsedData.event_type as EventType,
-        finalEventData,
+        confirmedEventData,
         eventTime,
         auditId,
-        captureMethod
+        captureMethod,
+        productCatalogId
       );
 
       if (auditId !== null) {
@@ -495,6 +527,7 @@ export function ProductSelectionFlow({
     confidence,
     auditId,
     captureMethod,
+    calculateNutrients,
     onCheckPatterns,
     onComplete,
   ]);

mobile/src/components/confirm/flows/ProductSelectionFlow.tsx

@@ -148,7 +148,7 @@ interface SearchFoodsResult {
   error?: string;
 }
 
-interface PreparationState {
+export interface PreparationState {
   state: string;
   is_default: boolean;
   calories_per_100g?: number | null;
@@ -158,7 +158,7 @@ interface PreparationState {
   [key: string]: unknown;
 }
 
-interface CanonicalSearchResult {
+export interface CanonicalSearchResult {
   canonical: {
     id: string;
     display_name: string;

mobile/src/utils/productCatalog.ts

@@ -284,7 +284,8 @@ export async function updateUserProductRegistry(
   eventType: string,
   productName: string,
   brand: string | null | undefined = null,
-  productCatalogId: string | null | undefined = null
+  productCatalogId: string | null | undefined = null,
+  canonicalFoodId: string | null | undefined = null
 ): Promise<boolean> {
   if (!userId || !eventType || !productName) {
     await Logger.error('registry', 'Missing required parameters for registry update', {
@@ -323,9 +324,10 @@ export async function updateUserProductRegistry(
         .update({
           times_logged: existing.times_logged + 1,
           last_logged_at: new Date().toISOString(),
-          // Update brand/catalog ID if provided
+          // Update brand/catalog ID/canonical ID if provided
           ...(brand && { brand }),
-          ...(productCatalogId && { product_catalog_id: productCatalogId })
+          ...(productCatalogId && { product_catalog_id: productCatalogId }),
+          ...(canonicalFoodId && { canonical_food_id: canonicalFoodId })
         })
         .eq('id', existing.id);
 
@@ -354,6 +356,7 @@ export async function updateUserProductRegistry(
           product_name: productName,
           brand,
           product_catalog_id: productCatalogId,
+          ...(canonicalFoodId && { canonical_food_id: canonicalFoodId }),
           times_logged: 1
         });