sync

.env.example

@@ -66,7 +66,16 @@ DATABASE_URL=postgresql://adcp_user:secure_password_change_me@postgres:5432/adcp
 # ============================================
 # Only needed if using real ad server adapters
 
-# Google Ad Manager
+# Google Ad Manager OAuth (for GAM Admin UI configuration)
+GAM_OAUTH_CLIENT_ID=your-gam-oauth-client-id.apps.googleusercontent.com
+GAM_OAUTH_CLIENT_SECRET=your-gam-oauth-client-secret
+
+# Google Cloud Platform (for auto-provisioning service accounts)
+# Required if you want to use the "Create Service Account" feature in Admin UI
+# This is the GCP project ID where service accounts will be created
+# GCP_PROJECT_ID=your-gcp-project-id
+
+# Legacy: Manual GAM configuration (not needed if using Admin UI)
 # GAM_NETWORK_CODE=123456789
 # GAM_SERVICE_ACCOUNT_JSON='{"type":"service_account"...}'
 

.gitignore

@@ -16,6 +16,10 @@ gam_ad_units.json
 client_secret*.json
 credentials*.json
 
+# GCP Service Account Keys
+*-key.json
+adcp-manager-key.json
+
 # Build artifacts
 *.egg-info/
 *.egg-info
@@ -44,6 +48,12 @@ Thumbs.db
 
 # Python
 *.pyc
+
+# Diagnostic scripts (one-off debugging tools)
+check_*.py
+diagnose_*.py
+fix_*.py
+test_sync.py
 *.pyo
 *.pyd
 .Python
@@ -91,7 +101,4 @@ test_*.db
 test_*.db-*
 test_*[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]/
 .env.test
-
-# Schema cache metadata (ETag tracking)
-# Don't commit .meta files - they're local cache metadata
-tests/e2e/schemas/**/*.meta
+test_sync.py

.pre-commit-config.yaml

@@ -237,6 +237,10 @@ repos:
         files: '^(src/core/schemas\.py|src/core/main\.py)$'
         pass_filenames: false
 
+      # Check generated schemas are in sync with JSON schemas
+      # NOTE: Removed this hook - script doesn't exist and check_schema_sync.py
+      # already validates schema alignment (runs on every commit via adcp-schema-sync)
+
       # Test MCP endpoints (requires server running)
       - id: mcp-endpoint-tests
         name: Test MCP endpoints

AGENTS.md

@@ -0,0 +1 @@
+CLAUDE.md

CLAUDE.md

@@ -37,10 +37,11 @@ pytest tests/unit/test_adcp_contract.py -v
 ```
 
 **Current Schema Version:**
-- AdCP Version: v2.4
+- AdCP Version: 2.2.0 (official spec version)
 - Schema Version: v1
-- Last Verified: 2025-09-02
+- Last Verified: 2025-10-22
 - Source: https://adcontextprotocol.org/schemas/v1/index.json
+- Note: Internal "v2.4" references in codebase refer to feature evolution, not official spec versions
 
 ---
 
@@ -307,6 +308,10 @@ def create_media_buy_raw(promoted_offering: str, ...) -> CreateMediaBuyResponse:
 - PostgreSQL (production and testing)
 - We'll support your deployment approach as best we can
 
+**Known Test Agent Issues:**
+- **`create_media_buy` auth failure** (2025-10-04): Rejects valid auth tokens. See [postmortem](docs/testing/postmortems/2025-10-04-test-agent-auth-bug.md)
+- **`get_media_buy_delivery` parameter mismatch** (2025-10-04): Expects `media_buy_id` (singular) instead of spec-compliant `media_buy_ids` (plural)
+
 **When Test Agent is Down:**
 - Check Fly.io logs first: `fly logs --app <test-agent-app-name>`
 - Check Fly.io status: `fly status --app <test-agent-app-name>`

Dockerfile

@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1.4
 # Multi-stage build for smaller image
+# Cache bust: 2025-10-22-2135
 FROM python:3.12-slim AS builder
 
 # Disable man pages and docs to speed up apt operations
@@ -64,6 +65,10 @@ RUN useradd -m -u 1000 adcp
 
 WORKDIR /app
 
+# Cache bust for COPY layer - change this value to force rebuild
+ARG CACHE_BUST=2025-10-23-FIX-PROMOTED-OFFERING-V4
+RUN echo "Cache bust: $CACHE_BUST"
+
 # Copy application code
 COPY . .
 

MIGRATION_REQUIRED_delivery_type_fix.md

@@ -0,0 +1,137 @@
+# URGENT: Production Migration Required - delivery_type Validation Failure
+
+## Issue Summary
+
+**Status:** 🔴 BLOCKING PRODUCTION
+**Date Discovered:** 2025-10-16
+**Affected Systems:** All production sales agents (Wonderstruck, Test Agent, etc.)
+
+### Problem
+
+Production databases contain products with invalid `delivery_type` values:
+- **Current (invalid):** `'non-guaranteed'` (hyphen)
+- **Required (spec-compliant):** `'non_guaranteed'` (underscore)
+
+This causes **all `get_products` calls to fail** with validation errors:
+
+```
+Product 'prod_e8fd6012' in database failed AdCP schema validation.
+Error: 1 validation error for Product
+delivery_type
+  Input should be 'guaranteed' or 'non_guaranteed' [type=literal_error, input_value='non-guaranteed', input_type=str]
+```
+
+### Root Cause
+
+1. **AdCP Spec** defines delivery_type enum as: `["guaranteed", "non_guaranteed"]` (underscore)
+2. **Historic Data** used hyphenated format: `'non-guaranteed'`
+3. **Schema Enforcement** now strictly validates per AdCP spec (src/core/schemas.py:654)
+4. **Migration Exists** (`f9300bf2246d`) but **hasn't been run on production**
+
+## Impact
+
+- ❌ `get_products` fails for all agents
+- ❌ Product discovery broken
+- ❌ Cannot create new media buys (no products available)
+- ❌ Wonderstruck integration test failing
+- ❌ All AdCP workflows blocked
+
+## Solution
+
+### Migration Details
+
+**File:** `alembic/versions/f9300bf2246d_fix_delivery_type_values_hyphen_to_.py`
+**Revision:** `f9300bf2246d`
+**Depends On:** `2453043b72da`
+**Created:** 2025-10-16 10:00:09
+
+**What it does:**
+```sql
+UPDATE products
+SET delivery_type = 'non_guaranteed'
+WHERE delivery_type = 'non-guaranteed'
+```
+
+### Deployment Steps
+
+#### For Fly.io Production (Wonderstruck, Test Agent)
+
+```bash
+# 1. Check current migration state
+fly ssh console --app wonderstruck-sales-agent
+cd /app
+uv run alembic current
+
+# 2. Run pending migrations (includes f9300bf2246d)
+uv run python migrate.py
+
+# 3. Verify migration applied
+uv run alembic current  # Should show f9300bf2246d or later
+
+# 4. Verify data fixed
+uv run python -c "
+from src.core.database.database_session import get_db_session
+from src.core.database.models import Product
+from sqlalchemy import select
+
+with get_db_session() as session:
+    stmt = select(Product).where(Product.delivery_type == 'non-guaranteed')
+    bad_products = session.scalars(stmt).all()
+    print(f'Products with old format: {len(bad_products)}')
+
+    stmt = select(Product).where(Product.delivery_type == 'non_guaranteed')
+    good_products = session.scalars(stmt).all()
+    print(f'Products with new format: {len(good_products)}')
+"
+
+# 5. Test get_products endpoint
+curl -H "x-adcp-auth: <principal_token>" \
+  https://wonderstruck.sales-agent.scope3.com/mcp/get_products
+```
+
+#### Repeat for Test Agent
+
+```bash
+fly ssh console --app test-agent
+cd /app
+uv run python migrate.py
+# ... verify as above
+```
+
+### Verification
+
+After migration:
+- ✅ No products should have `delivery_type = 'non-guaranteed'`
+- ✅ All products should have `delivery_type = 'guaranteed'` OR `'non_guaranteed'`
+- ✅ `get_products` should return results without validation errors
+- ✅ Run: `tsx scripts/manual-testing/full-wonderstruck-test.ts` should pass
+
+## Prevention
+
+1. **Schema Validation Tests:** `tests/unit/test_adcp_contract.py` enforces spec compliance
+2. **Pre-commit Hooks:** Check for spec violations before commit
+3. **Migration Testing:** Always test migrations locally before production
+4. **CI/CD Integration:** Migrations run automatically on deploy
+
+## References
+
+- **AdCP Spec:** https://adcontextprotocol.org/schemas/v1/
+- **Schema Definition:** `src/core/schemas.py:654`
+- **Migration File:** `alembic/versions/f9300bf2246d_fix_delivery_type_values_hyphen_to_.py`
+- **Related Issue:** Product validation blocking all workflows
+- **Documentation:** `CLAUDE.md` sections on AdCP compliance and PostgreSQL-only architecture
+
+## Next Steps
+
+1. ✅ Document issue (this file)
+2. ⏳ Deploy migration to Wonderstruck production
+3. ⏳ Deploy migration to Test Agent production
+4. ⏳ Verify all agents return products successfully
+5. ⏳ Re-run Wonderstruck integration test
+6. ⏳ Delete this file after successful deployment
+
+---
+
+**Created:** 2025-10-16
+**Author:** Conductor Workspace (vatican-v3)
+**Branch:** fix-delivery-type-validation

alembic/versions/1a7693edad5d_ensure_default_property_tags.py

@@ -0,0 +1,73 @@
+"""ensure_default_property_tags
+
+Ensures all tenants have a default 'all_inventory' PropertyTag.
+This tag is commonly used in products to indicate coverage of all properties.
+
+Revision ID: 1a7693edad5d
+Revises: 0d4fe6eb03ab
+Create Date: 2025-10-16 16:43:51.255012
+
+"""
+
+from collections.abc import Sequence
+
+from sqlalchemy import text
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "1a7693edad5d"
+down_revision: str | Sequence[str] | None = "0d4fe6eb03ab"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Ensure all tenants have default property tags."""
+    conn = op.get_bind()
+
+    # Get all tenants
+    result = conn.execute(text("SELECT tenant_id FROM tenants"))
+    tenant_ids = [row[0] for row in result]
+
+    # For each tenant, ensure 'all_inventory' property tag exists
+    for tenant_id in tenant_ids:
+        # Check if tag already exists
+        existing = conn.execute(
+            text("SELECT COUNT(*) FROM property_tags WHERE tenant_id = :tenant_id AND tag_id = 'all_inventory'"),
+            {"tenant_id": tenant_id},
+        ).scalar()
+
+        if not existing:
+            # Insert the default tag
+            conn.execute(
+                text(
+                    """
+                    INSERT INTO property_tags (tenant_id, tag_id, name, description, created_at, updated_at)
+                    VALUES (:tenant_id, 'all_inventory', 'All Inventory',
+                            'All available inventory across all properties', NOW(), NOW())
+                """
+                ),
+                {"tenant_id": tenant_id},
+            )
+            print(f"✅ Created 'all_inventory' PropertyTag for tenant {tenant_id}")
+        else:
+            print(f"ℹ️  'all_inventory' PropertyTag already exists for tenant {tenant_id}")
+
+
+def downgrade() -> None:
+    """Remove default property tags created by this migration."""
+    conn = op.get_bind()
+
+    # Remove all 'all_inventory' tags that were created by this migration
+    # Note: We only remove tags with the exact description we created
+    conn.execute(
+        text(
+            """
+            DELETE FROM property_tags
+            WHERE tag_id = 'all_inventory'
+            AND description = 'All available inventory across all properties'
+        """
+        )
+    )
+    print("Removed default 'all_inventory' PropertyTags")

alembic/versions/661c474053fa_add_gcp_project_id_and_service_account_.py

@@ -0,0 +1,30 @@
+"""add_gam_service_account_email_to_adapter_config
+
+Revision ID: 661c474053fa
+Revises: 1a7693edad5d
+Create Date: 2025-10-19 04:41:52.439532
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "661c474053fa"
+down_revision: str | Sequence[str] | None = "1a7693edad5d"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # Only add service account email - GCP project ID is environment config, not per-tenant
+    op.add_column("adapter_config", sa.Column("gam_service_account_email", sa.String(length=255), nullable=True))
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    op.drop_column("adapter_config", "gam_service_account_email")

alembic/versions/ed7d05fea3be_add_progress_tracking_to_sync_jobs.py

@@ -0,0 +1,31 @@
+"""Add progress tracking to sync_jobs
+
+Revision ID: ed7d05fea3be
+Revises: 1a7693edad5d
+Create Date: 2025-10-19 06:43:06.718520
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "ed7d05fea3be"
+down_revision: str | Sequence[str] | None = "661c474053fa"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # Add progress column to sync_jobs table
+    op.add_column("sync_jobs", sa.Column("progress", sa.dialects.postgresql.JSONB, nullable=True))
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # Remove progress column from sync_jobs table
+    op.drop_column("sync_jobs", "progress")