diff --git a/diagnose_formats.py b/diagnose_formats.py
new file mode 100644
index 000000000..fb2966569
--- /dev/null
+++ b/diagnose_formats.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+"""Diagnostic script to check product formats in database."""
+
+import json
+import sys
+
+from sqlalchemy import select
+
+# Add src to path
+sys.path.insert(0, "/Users/brianokelley/Developer/salesagent/.conductor/atlanta-v1")
+
+from src.core.database.database_session import get_db_session
+from src.core.database.models import Product
+
+
+def diagnose_product_formats(product_id: str = None):
+    """Check product formats in database."""
+    with get_db_session() as session:
+        if product_id:
+            # Check specific product
+            stmt = select(Product).where(Product.product_id == product_id)
+            products = [session.scalars(stmt).first()]
+            if not products[0]:
+                print(f"Product {product_id} not found")
+                return
+        else:
+            # Check all products
+            stmt = select(Product).order_by(Product.name).limit(5)
+            products = session.scalars(stmt).all()
+
+        print(f"\n{'='*80}")
+        print("PRODUCT FORMATS DIAGNOSTIC")
+        print(f"{'='*80}\n")
+
+        for product in products:
+            print(f"Product: {product.product_id} - {product.name}")
+            print(f"  Tenant: {product.tenant_id}")
+            print(f"  Formats type: {type(product.formats)}")
+            print(f"  Formats value: {product.formats}")
+
+            if product.formats:
+                if isinstance(product.formats, list):
+                    print(f"  Formats count: {len(product.formats)}")
+                    for i, fmt in enumerate(product.formats[:3]):  # Show first 3
+                        print(f"    [{i}] {fmt}")
+                elif isinstance(product.formats, str):
+                    try:
+                        parsed = json.loads(product.formats)
+                        print(f"  Formats (JSON string): {len(parsed)} items")
+                        for i, fmt in enumerate(parsed[:3]):
+                            print(f"    [{i}] {fmt}")
+                    except:
+                        print("  ERROR: formats is string but not valid JSON")
+                else:
+                    print(f"  ERROR: Unexpected formats type: {type(product.formats)}")
+            else:
+                print("  ⚠️  Formats is empty/None")
+
+            print(f"{'-'*80}\n")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        diagnose_product_formats(sys.argv[1])
+    else:
+        print("Checking last 5 products...")
+        diagnose_product_formats()
diff --git a/src/admin/blueprints/products.py b/src/admin/blueprints/products.py
index fee70c567..a35081da2 100644
--- a/src/admin/blueprints/products.py
+++ b/src/admin/blueprints/products.py
@@ -321,10 +321,11 @@ def list_products(tenant_id):
                 )
 
                 # Debug: Log raw formats data
-                if formats_data:
-                    logger.info(
-                        f"[DEBUG] Product {product.product_id} formats_data: {formats_data[:2]}"
-                    )  # First 2 for brevity
+                logger.info(f"[DEBUG] Product {product.product_id} raw product.formats from DB: {product.formats}")
+                logger.info(f"[DEBUG] Product {product.product_id} formats_data after parsing: {formats_data}")
+                logger.info(
+                    f"[DEBUG] Product {product.product_id} formats_data type: {type(formats_data)}, len: {len(formats_data)}"
+                )
 
                 # Resolve format names from creative agent registry
                 resolved_formats = []
@@ -421,6 +422,11 @@ def list_products(tenant_id):
                         )
 
                 logger.info(f"[DEBUG] Product {product.product_id} resolved {len(resolved_formats)} formats")
+                if formats_data and not resolved_formats:
+                    logger.error(
+                        f"[DEBUG] Product {product.product_id} ERROR: Had {len(formats_data)} formats but resolved 0! "
+                        f"This means format resolution failed."
+                    )
 
                 product_dict = {
                     "product_id": product.product_id,
@@ -846,6 +852,10 @@ def edit_product(tenant_id, product_id):
                 pricing_fields = {k: v for k, v in form_data.items() if "pricing" in k or "rate_" in k or "floor_" in k}
                 logger.info(f"[DEBUG] Pricing form fields for product {product_id}: {pricing_fields}")
 
+                # Debug: Log ALL form keys to diagnose format submission
+                logger.info(f"[DEBUG] ALL form keys: {list(request.form.keys())}")
+                logger.info(f"[DEBUG] Form data dict keys: {list(form_data.keys())}")
+
                 # Update basic fields
                 product.name = form_data.get("name", product.name)
                 product.description = form_data.get("description", product.description)
@@ -853,6 +863,8 @@ def edit_product(tenant_id, product_id):
                 # Parse formats - expecting multiple checkbox values in format "agent_url|format_id"
                 formats_raw = request.form.getlist("formats")
                 logger.info(f"[DEBUG] Edit product {product_id}: formats_raw from form = {formats_raw}")
+                logger.info(f"[DEBUG] formats_raw length: {len(formats_raw)}")
+                logger.info(f"[DEBUG] formats_raw bool: {bool(formats_raw)}")
                 if formats_raw:
                     # Convert from "agent_url|format_id" to FormatId dict structure
                     formats = []
@@ -1018,9 +1030,17 @@ def edit_product(tenant_id, product_id):
                 logger.info(f"[DEBUG] About to commit product {product_id}")
                 logger.info(f"[DEBUG] product.formats = {product.formats}")
                 logger.info(f"[DEBUG] product.formats type = {type(product.formats)}")
+                logger.info(f"[DEBUG] SQLAlchemy dirty objects: {db_session.dirty}")
+                logger.info(
+                    f"[DEBUG] SQLAlchemy modified attributes: {[attr for obj in db_session.dirty for attr in db_session.get_attribute_history(obj, 'formats').added]}"
+                )
 
                 db_session.commit()
 
+                # Debug: Verify formats after commit by re-querying
+                db_session.refresh(product)
+                logger.info(f"[DEBUG] After commit - product.formats from DB: {product.formats}")
+
                 flash(f"Product '{product.name}' updated successfully", "success")
                 return redirect(url_for("products.list_products", tenant_id=tenant_id))