From 0d409577199e071312e18c8ff45ac188567b5fa0 Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Fri, 7 Nov 2025 10:40:57 -0500
Subject: [PATCH 1/2] Add output_format discriminator to preview responses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implements the schema changes from adcontextprotocol/adcp#185 which adds
a required output_format field to preview render responses. This discriminator
field indicates whether preview_url, preview_html, or both are provided,
improving validation performance by eliminating oneOf constraints.

Changes:
- Updated ADCP schemas from spec (preview-creative-response.json)
- Regenerated Pydantic models with output_format enum (url/html/both)
- Modified _generate_preview_variant() to set output_format based on
  which preview fields are provided
- All 187 tests passing

The output_format field is now required per spec:
- "url": preview_url only (iframe-embeddable)
- "html": preview_html only (direct embedding)
- "both": both preview_url and preview_html provided

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../_schemas_v1_adagents_json.py              | 251 +++++++++++++-
 .../_schemas_v1_core_assets_url_asset_json.py |  13 +
 .../_schemas_v1_core_creative_asset_json.py   |  12 +
 ...chemas_v1_core_creative_assignment_json.py |   7 +
 ..._schemas_v1_core_creative_manifest_json.py |  12 +
 .../_schemas_v1_core_format_json.py           |  45 ++-
 ...ive_list_creative_formats_response_json.py |  45 ++-
 ..._creative_preview_creative_request_json.py |  12 +
 ...creative_preview_creative_response_json.py | 159 ++-------
 ...1_media_buy_build_creative_request_json.py |  12 +
 ..._media_buy_build_creative_response_json.py |  12 +
 src/creative_agent/server.py                  |  14 +-
 .../schemas/v1/_schemas_v1_adagents_json.json | 309 +++++++++++++++++-
 ...schemas_v1_core_assets_url-asset_json.json |   9 +
 ...emas_v1_core_creative-assignment_json.json |  10 +-
 .../v1/_schemas_v1_core_format_json.json      |  44 ++-
 .../v1/_schemas_v1_core_property_json.json    |  74 +++++
 ...as_v1_creative_asset-types_index_json.json |   7 +-
 ...eative_preview-creative-response_json.json |  92 +++++-
 19 files changed, 973 insertions(+), 166 deletions(-)
 create mode 100644 tests/schemas/v1/_schemas_v1_core_property_json.json

diff --git a/src/creative_agent/schemas_generated/_schemas_v1_adagents_json.py b/src/creative_agent/schemas_generated/_schemas_v1_adagents_json.py
index 5276750..3c0e843 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_adagents_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_adagents_json.py
@@ -3,9 +3,203 @@
 
 from __future__ import annotations
 
-from typing import Annotated, Optional
+from enum import Enum
+from typing import Annotated, Any, Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel, ConfigDict, Field
+from pydantic import (
+    AnyUrl,
+    AwareDatetime,
+    BaseModel,
+    ConfigDict,
+    EmailStr,
+    Field,
+    RootModel,
+)
+
+
+class Contact(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    name: Annotated[
+        str,
+        Field(
+            description="Name of the entity managing this file (e.g., 'Meta Advertising Operations', 'Clear Channel Digital')",
+            max_length=255,
+            min_length=1,
+        ),
+    ]
+    email: Annotated[
+        Optional[EmailStr],
+        Field(
+            description="Contact email for questions or issues with this authorization file",
+            max_length=255,
+            min_length=1,
+        ),
+    ] = None
+    domain: Annotated[
+        Optional[str],
+        Field(
+            description="Primary domain of the entity managing this file",
+            pattern="^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$",
+        ),
+    ] = None
+    seller_id: Annotated[
+        Optional[str],
+        Field(
+            description="Seller ID from IAB Tech Lab sellers.json (if applicable)",
+            max_length=255,
+            min_length=1,
+        ),
+    ] = None
+    tag_id: Annotated[
+        Optional[str],
+        Field(
+            description="TAG Certified Against Fraud ID for verification (if applicable)",
+            max_length=100,
+            min_length=1,
+        ),
+    ] = None
+
+
+class PropertyType(Enum):
+    website = "website"
+    mobile_app = "mobile_app"
+    ctv_app = "ctv_app"
+    dooh = "dooh"
+    podcast = "podcast"
+    radio = "radio"
+    streaming_audio = "streaming_audio"
+
+
+class Type(Enum):
+    domain = "domain"
+    subdomain = "subdomain"
+    network_id = "network_id"
+    ios_bundle = "ios_bundle"
+    android_package = "android_package"
+    apple_app_store_id = "apple_app_store_id"
+    google_play_id = "google_play_id"
+    roku_store_id = "roku_store_id"
+    fire_tv_asin = "fire_tv_asin"
+    samsung_app_id = "samsung_app_id"
+    apple_tv_bundle = "apple_tv_bundle"
+    bundle_id = "bundle_id"
+    venue_id = "venue_id"
+    screen_id = "screen_id"
+    openooh_venue_type = "openooh_venue_type"
+    rss_url = "rss_url"
+    apple_podcast_id = "apple_podcast_id"
+    spotify_show_id = "spotify_show_id"
+    podcast_guid = "podcast_guid"
+
+
+class Identifier(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    type: Annotated[
+        Type,
+        Field(
+            description="Valid identifier types for property identification across different media types",
+            examples=["domain", "ios_bundle", "venue_id", "apple_podcast_id"],
+            title="Property Identifier Types",
+        ),
+    ]
+    value: Annotated[
+        str,
+        Field(
+            description="The identifier value. For domain type: 'example.com' matches base domain plus www and m subdomains; 'edition.example.com' matches that specific subdomain; '*.example.com' matches ALL subdomains but NOT base domain"
+        ),
+    ]
+
+
+class Tag(RootModel[str]):
+    root: Annotated[
+        str,
+        Field(
+            description="Lowercase tag with underscores (e.g., 'conde_nast_network', 'premium_content')",
+            pattern="^[a-z0-9_]+$",
+        ),
+    ]
+
+
+class Property(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    property_id: Annotated[
+        Optional[str],
+        Field(
+            description="Unique identifier for this property (optional). Enables referencing properties by ID instead of repeating full objects. Recommended format: lowercase with underscores (e.g., 'cnn_ctv_app', 'instagram_mobile')",
+            pattern="^[a-z0-9_]+$",
+        ),
+    ] = None
+    property_type: Annotated[
+        PropertyType, Field(description="Type of advertising property")
+    ]
+    name: Annotated[str, Field(description="Human-readable property name")]
+    identifiers: Annotated[
+        list[Identifier],
+        Field(description="Array of identifiers for this property", min_length=1),
+    ]
+    tags: Annotated[
+        Optional[list[Tag]],
+        Field(
+            description="Tags for categorization and grouping (e.g., network membership, content categories)"
+        ),
+    ] = None
+    publisher_domain: Annotated[
+        Optional[str],
+        Field(
+            description="Domain where adagents.json should be checked for authorization validation. Required for list_authorized_properties response. Optional in adagents.json (file location implies domain)."
+        ),
+    ] = None
+
+
+class Tags(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    name: Annotated[str, Field(description="Human-readable name for this tag")]
+    description: Annotated[
+        str, Field(description="Description of what this tag represents")
+    ]
+
+
+class PropertyId(RootModel[str]):
+    root: Annotated[str, Field(pattern="^[a-z0-9_]+$")]
+
+
+class PropertyTag(PropertyId):
+    pass
+
+
+class PublisherProperty(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    publisher_domain: Annotated[
+        str,
+        Field(
+            description="Domain where the publisher's adagents.json is hosted (e.g., 'cnn.com')",
+            pattern="^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$",
+        ),
+    ]
+    property_ids: Annotated[
+        Optional[list[PropertyId]],
+        Field(
+            description="Specific property IDs from the publisher's adagents.json properties array. Mutually exclusive with property_tags.",
+            min_length=1,
+        ),
+    ] = None
+    property_tags: Annotated[
+        Optional[list[PropertyTag]],
+        Field(
+            description="Property tags from the publisher's adagents.json tags. Agent is authorized for all properties with these tags. Mutually exclusive with property_ids.",
+            min_length=1,
+        ),
+    ] = None
 
 
 class AuthorizedAgent(BaseModel):
@@ -16,11 +210,39 @@ class AuthorizedAgent(BaseModel):
     authorized_for: Annotated[
         str,
         Field(
-            description="Human-readable description of what this agent is authorized to sell (e.g., 'Official sales agent for our US and CA display inventory')",
+            description="Human-readable description of what this agent is authorized to sell",
             max_length=500,
             min_length=1,
         ),
     ]
+    property_ids: Annotated[
+        Optional[list[PropertyId]],
+        Field(
+            description="Property IDs this agent is authorized for. Resolved against the top-level properties array in this file. Mutually exclusive with property_tags and properties fields.",
+            min_length=1,
+        ),
+    ] = None
+    property_tags: Annotated[
+        Optional[list[PropertyTag]],
+        Field(
+            description="Tags identifying which properties this agent is authorized for. Resolved against the top-level properties array in this file using tag matching. Mutually exclusive with property_ids and properties fields.",
+            min_length=1,
+        ),
+    ] = None
+    properties: Annotated[
+        Optional[list[Any]],
+        Field(
+            description="Specific properties this agent is authorized for (alternative to property_ids/property_tags). Mutually exclusive with property_ids and property_tags fields.",
+            min_length=1,
+        ),
+    ] = None
+    publisher_properties: Annotated[
+        Optional[list[PublisherProperty]],
+        Field(
+            description="Properties from other publisher domains this agent is authorized for. Each entry specifies a publisher domain and which of their properties this agent can sell (by property_id or property_tags). Mutually exclusive with property_ids, property_tags, and properties fields.",
+            min_length=1,
+        ),
+    ] = None
 
 
 class AuthorizedSalesAgents(BaseModel):
@@ -34,16 +256,35 @@ class AuthorizedSalesAgents(BaseModel):
             description="JSON Schema identifier for this adagents.json file",
         ),
     ] = "https://adcontextprotocol.org/schemas/v1/adagents.json"
+    contact: Annotated[
+        Optional[Contact],
+        Field(
+            description="Contact information for the entity managing this adagents.json file (may be publisher or third-party operator)"
+        ),
+    ] = None
+    properties: Annotated[
+        Optional[list[Property]],
+        Field(
+            description="Array of all properties covered by this adagents.json file. Same structure as list_authorized_properties response.",
+            min_length=1,
+        ),
+    ] = None
+    tags: Annotated[
+        Optional[dict[str, Tags]],
+        Field(
+            description="Metadata for each tag referenced by properties. Same structure as list_authorized_properties response."
+        ),
+    ] = None
     authorized_agents: Annotated[
         list[AuthorizedAgent],
         Field(
-            description="Array of sales agents authorized to sell this publisher's inventory",
+            description="Array of sales agents authorized to sell inventory for properties in this file",
             min_length=1,
         ),
     ]
     last_updated: Annotated[
         Optional[AwareDatetime],
         Field(
-            description="ISO 8601 timestamp indicating when this file was last updated (optional but recommended)"
+            description="ISO 8601 timestamp indicating when this file was last updated"
         ),
     ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_core_assets_url_asset_json.py b/src/creative_agent/schemas_generated/_schemas_v1_core_assets_url_asset_json.py
index f39935d..d6c42c7 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_core_assets_url_asset_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_core_assets_url_asset_json.py
@@ -3,16 +3,29 @@
 
 from __future__ import annotations
 
+from enum import Enum
 from typing import Annotated, Optional
 
 from pydantic import AnyUrl, BaseModel, ConfigDict, Field
 
 
+class UrlType(Enum):
+    clickthrough = "clickthrough"
+    tracker_pixel = "tracker_pixel"
+    tracker_script = "tracker_script"
+
+
 class UrlAsset(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
     url: Annotated[AnyUrl, Field(description="URL reference")]
+    url_type: Annotated[
+        Optional[UrlType],
+        Field(
+            description="Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+        ),
+    ] = None
     description: Annotated[
         Optional[str], Field(description="Description of what this URL points to")
     ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_core_creative_asset_json.py b/src/creative_agent/schemas_generated/_schemas_v1_core_creative_asset_json.py
index 755666c..891f729 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_core_creative_asset_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_core_creative_asset_json.py
@@ -729,11 +729,23 @@ class Assets11(BaseModel):
     ] = None
 
 
+class UrlType(Enum):
+    clickthrough = "clickthrough"
+    tracker_pixel = "tracker_pixel"
+    tracker_script = "tracker_script"
+
+
 class Assets12(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
     url: Annotated[AnyUrl, Field(description="URL reference")]
+    url_type: Annotated[
+        Optional[UrlType],
+        Field(
+            description="Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+        ),
+    ] = None
     description: Annotated[
         Optional[str], Field(description="Description of what this URL points to")
     ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_core_creative_assignment_json.py b/src/creative_agent/schemas_generated/_schemas_v1_core_creative_assignment_json.py
index 91e2464..292bf4e 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_core_creative_assignment_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_core_creative_assignment_json.py
@@ -17,3 +17,10 @@ class CreativeAssignment(BaseModel):
         Optional[float],
         Field(description="Delivery weight for this creative", ge=0.0, le=100.0),
     ] = None
+    placement_ids: Annotated[
+        Optional[list[str]],
+        Field(
+            description="Optional array of placement IDs where this creative should run. When omitted, the creative runs on all placements in the package. References placement_id values from the product's placements array.",
+            min_length=1,
+        ),
+    ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_core_creative_manifest_json.py b/src/creative_agent/schemas_generated/_schemas_v1_core_creative_manifest_json.py
index d3414f7..57adc84 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_core_creative_manifest_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_core_creative_manifest_json.py
@@ -177,11 +177,23 @@ class Assets18(BaseModel):
     ] = None
 
 
+class UrlType(Enum):
+    clickthrough = "clickthrough"
+    tracker_pixel = "tracker_pixel"
+    tracker_script = "tracker_script"
+
+
 class Assets19(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
     url: Annotated[AnyUrl, Field(description="URL reference")]
+    url_type: Annotated[
+        Optional[UrlType],
+        Field(
+            description="Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+        ),
+    ] = None
     description: Annotated[
         Optional[str], Field(description="Description of what this URL points to")
     ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_core_format_json.py b/src/creative_agent/schemas_generated/_schemas_v1_core_format_json.py
index db6864c..db8b658 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_core_format_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_core_format_json.py
@@ -106,6 +106,7 @@ class AssetType(Enum):
     vast = "vast"
     daast = "daast"
     text = "text"
+    markdown = "markdown"
     html = "html"
     css = "css"
     javascript = "javascript"
@@ -185,6 +186,36 @@ class AssetsRequired1(BaseModel):
     ]
 
 
+class FormatCard(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    format_id: Annotated[
+        Any, Field(description="Circular reference to /schemas/v1/core/format-id.json")
+    ]
+    manifest: Annotated[
+        dict[str, Any],
+        Field(
+            description="Asset manifest for rendering the card, structure defined by the format"
+        ),
+    ]
+
+
+class FormatCardDetailed(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    format_id: Annotated[
+        Any, Field(description="Circular reference to /schemas/v1/core/format-id.json")
+    ]
+    manifest: Annotated[
+        dict[str, Any],
+        Field(
+            description="Asset manifest for rendering the detailed card, structure defined by the format"
+        ),
+    ]
+
+
 class Format(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
@@ -206,7 +237,7 @@ class Format(BaseModel):
     preview_image: Annotated[
         Optional[AnyUrl],
         Field(
-            description="Optional preview image URL for format browsing/discovery UI. Should be 400x300px (4:3 aspect ratio) PNG or JPG. Used as thumbnail/card image in format browsers."
+            description="DEPRECATED: Use format_card instead. Optional preview image URL for format browsing/discovery UI. Should be 400x300px (4:3 aspect ratio) PNG or JPG. Used as thumbnail/card image in format browsers. This field is maintained for backward compatibility but format_card provides a more flexible, structured approach."
         ),
     ] = None
     example_url: Annotated[
@@ -252,3 +283,15 @@ class Format(BaseModel):
             description="For generative formats: array of format IDs that this format can generate. When a format accepts inputs like brand_manifest and message, this specifies what concrete output formats can be produced (e.g., a generative banner format might output standard image banner formats)."
         ),
     ] = None
+    format_card: Annotated[
+        Optional[FormatCard],
+        Field(
+            description="Optional standard visual card (300x400px) for displaying this format in user interfaces. Can be rendered via preview_creative or pre-generated."
+        ),
+    ] = None
+    format_card_detailed: Annotated[
+        Optional[FormatCardDetailed],
+        Field(
+            description="Optional detailed card with carousel and full specifications. Provides rich format documentation similar to ad spec pages."
+        ),
+    ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_creative_list_creative_formats_response_json.py b/src/creative_agent/schemas_generated/_schemas_v1_creative_list_creative_formats_response_json.py
index 2d343dd..31458d8 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_creative_list_creative_formats_response_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_creative_list_creative_formats_response_json.py
@@ -106,6 +106,7 @@ class AssetType(Enum):
     vast = "vast"
     daast = "daast"
     text = "text"
+    markdown = "markdown"
     html = "html"
     css = "css"
     javascript = "javascript"
@@ -185,6 +186,36 @@ class AssetsRequired3(BaseModel):
     ]
 
 
+class FormatCard(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    format_id: Annotated[
+        Any, Field(description="Circular reference to /schemas/v1/core/format-id.json")
+    ]
+    manifest: Annotated[
+        dict[str, Any],
+        Field(
+            description="Asset manifest for rendering the card, structure defined by the format"
+        ),
+    ]
+
+
+class FormatCardDetailed(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    format_id: Annotated[
+        Any, Field(description="Circular reference to /schemas/v1/core/format-id.json")
+    ]
+    manifest: Annotated[
+        dict[str, Any],
+        Field(
+            description="Asset manifest for rendering the detailed card, structure defined by the format"
+        ),
+    ]
+
+
 class Format(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
@@ -206,7 +237,7 @@ class Format(BaseModel):
     preview_image: Annotated[
         Optional[AnyUrl],
         Field(
-            description="Optional preview image URL for format browsing/discovery UI. Should be 400x300px (4:3 aspect ratio) PNG or JPG. Used as thumbnail/card image in format browsers."
+            description="DEPRECATED: Use format_card instead. Optional preview image URL for format browsing/discovery UI. Should be 400x300px (4:3 aspect ratio) PNG or JPG. Used as thumbnail/card image in format browsers. This field is maintained for backward compatibility but format_card provides a more flexible, structured approach."
         ),
     ] = None
     example_url: Annotated[
@@ -252,6 +283,18 @@ class Format(BaseModel):
             description="For generative formats: array of format IDs that this format can generate. When a format accepts inputs like brand_manifest and message, this specifies what concrete output formats can be produced (e.g., a generative banner format might output standard image banner formats)."
         ),
     ] = None
+    format_card: Annotated[
+        Optional[FormatCard],
+        Field(
+            description="Optional standard visual card (300x400px) for displaying this format in user interfaces. Can be rendered via preview_creative or pre-generated."
+        ),
+    ] = None
+    format_card_detailed: Annotated[
+        Optional[FormatCardDetailed],
+        Field(
+            description="Optional detailed card with carousel and full specifications. Provides rich format documentation similar to ad spec pages."
+        ),
+    ] = None
 
 
 class Capability(Enum):
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_request_json.py b/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_request_json.py
index 16ec3d0..9055b4f 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_request_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_request_json.py
@@ -185,11 +185,23 @@ class Assets32(BaseModel):
     ] = None
 
 
+class UrlType(Enum):
+    clickthrough = "clickthrough"
+    tracker_pixel = "tracker_pixel"
+    tracker_script = "tracker_script"
+
+
 class Assets33(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
     url: Annotated[AnyUrl, Field(description="URL reference")]
+    url_type: Annotated[
+        Optional[UrlType],
+        Field(
+            description="Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+        ),
+    ] = None
     description: Annotated[
         Optional[str], Field(description="Description of what this URL points to")
     ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_response_json.py b/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_response_json.py
index 7c95e7f..dceea83 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_response_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_creative_preview_creative_response_json.py
@@ -3,11 +3,18 @@
 
 from __future__ import annotations
 
+from enum import Enum
 from typing import Annotated, Any, Literal, Optional, Union
 
 from pydantic import AnyUrl, AwareDatetime, BaseModel, ConfigDict, Field, RootModel
 
 
+class OutputFormat(Enum):
+    url = "url"
+    html = "html"
+    both = "both"
+
+
 class Dimensions(BaseModel):
     width: Annotated[float, Field(ge=0.0)]
     height: Annotated[float, Field(ge=0.0)]
@@ -34,103 +41,31 @@ class Embedding(BaseModel):
     ] = None
 
 
-class Renders(BaseModel):
+class Render(BaseModel):
     render_id: Annotated[
         str,
         Field(
             description="Unique identifier for this rendered piece within the variant"
         ),
     ]
-    preview_url: Annotated[
-        AnyUrl,
-        Field(
-            description="URL to an HTML page that renders this piece. Can be embedded in an iframe. Typically returned when output_format='url' (default). Creative agents MAY provide both preview_url and preview_html for client flexibility."
-        ),
-    ]
-    preview_html: Annotated[
-        Optional[str],
-        Field(
-            description="Raw HTML for this rendered piece. Can be embedded directly in the page without iframe. Typically returned when output_format='html'. Security warning: Only use with trusted creative agents as this bypasses iframe sandboxing. Creative agents MAY provide both formats."
-        ),
-    ] = None
-    role: Annotated[
-        str,
-        Field(
-            description="Semantic role of this rendered piece. Use 'primary' for main content, 'companion' for associated banners, descriptive strings for device variants or custom roles."
-        ),
-    ]
-    dimensions: Annotated[
-        Optional[Dimensions],
-        Field(
-            description="Dimensions for this rendered piece. For companion ads with multiple sizes, this specifies which size this piece is."
-        ),
-    ] = None
-    embedding: Annotated[
-        Optional[Embedding],
-        Field(
-            description="Optional security and embedding metadata for safe iframe integration"
-        ),
-    ] = None
-
-
-class Renders1(BaseModel):
-    render_id: Annotated[
-        str,
+    output_format: Annotated[
+        OutputFormat,
         Field(
-            description="Unique identifier for this rendered piece within the variant"
+            description="Discriminator field indicating which preview format(s) are provided. 'url' = preview_url only, 'html' = preview_html only, 'both' = both preview_url and preview_html."
         ),
     ]
     preview_url: Annotated[
         Optional[AnyUrl],
         Field(
-            description="URL to an HTML page that renders this piece. Can be embedded in an iframe. Typically returned when output_format='url' (default). Creative agents MAY provide both preview_url and preview_html for client flexibility."
+            description="URL to an HTML page that renders this piece. Can be embedded in an iframe. Present when output_format is 'url' or 'both'."
         ),
     ] = None
     preview_html: Annotated[
-        str,
-        Field(
-            description="Raw HTML for this rendered piece. Can be embedded directly in the page without iframe. Typically returned when output_format='html'. Security warning: Only use with trusted creative agents as this bypasses iframe sandboxing. Creative agents MAY provide both formats."
-        ),
-    ]
-    role: Annotated[
-        str,
-        Field(
-            description="Semantic role of this rendered piece. Use 'primary' for main content, 'companion' for associated banners, descriptive strings for device variants or custom roles."
-        ),
-    ]
-    dimensions: Annotated[
-        Optional[Dimensions],
-        Field(
-            description="Dimensions for this rendered piece. For companion ads with multiple sizes, this specifies which size this piece is."
-        ),
-    ] = None
-    embedding: Annotated[
-        Optional[Embedding],
+        Optional[str],
         Field(
-            description="Optional security and embedding metadata for safe iframe integration"
+            description="Raw HTML for this rendered piece. Can be embedded directly in the page without iframe. Present when output_format is 'html' or 'both'. Security warning: Only use with trusted creative agents as this bypasses iframe sandboxing."
         ),
     ] = None
-
-
-class Renders2(BaseModel):
-    render_id: Annotated[
-        str,
-        Field(
-            description="Unique identifier for this rendered piece within the variant"
-        ),
-    ]
-    preview_url: Annotated[
-        AnyUrl,
-        Field(
-            description="URL to an HTML page that renders this piece. Can be embedded in an iframe. Typically returned when output_format='url' (default). Creative agents MAY provide both preview_url and preview_html for client flexibility."
-        ),
-    ]
-    preview_html: Annotated[
-        str,
-        Field(
-            description="Raw HTML for this rendered piece. Can be embedded directly in the page without iframe. Typically returned when output_format='html'. Security warning: Only use with trusted creative agents as this bypasses iframe sandboxing. Creative agents MAY provide both formats."
-        ),
-    ]
     role: Annotated[
         str,
         Field(
@@ -167,7 +102,7 @@ class Preview(BaseModel):
         str, Field(description="Unique identifier for this preview variant")
     ]
     renders: Annotated[
-        list[Union[Renders, Renders1, Renders2]],
+        list[Render],
         Field(
             description="Array of rendered pieces for this preview variant. Most formats render as a single piece. Companion ad formats (video + banner), multi-placement formats, and adaptive formats render as multiple pieces.",
             min_length=1,
@@ -203,68 +138,36 @@ class PreviewCreativeResponse1(BaseModel):
     ]
 
 
-class Embedding3(BaseModel):
+class Embedding1(BaseModel):
     recommended_sandbox: Optional[str] = None
     requires_https: Optional[bool] = None
     supports_fullscreen: Optional[bool] = None
     csp_policy: Optional[str] = None
 
 
-class Renders3(BaseModel):
+class Render3(BaseModel):
     render_id: str
-    preview_url: Annotated[
-        AnyUrl,
+    output_format: Annotated[
+        OutputFormat,
         Field(
-            description="URL to iframe-embeddable HTML page. Typically present when output_format='url'."
+            description="Discriminator field indicating which preview format(s) are provided. 'url' = preview_url only, 'html' = preview_html only, 'both' = both preview_url and preview_html."
         ),
     ]
-    preview_html: Annotated[
-        Optional[str],
-        Field(
-            description="Raw HTML for direct embedding. Typically present when output_format='html'. Security: Only use with trusted agents."
-        ),
-    ] = None
-    role: str
-    dimensions: Optional[Dimensions] = None
-    embedding: Optional[Embedding3] = None
-
-
-class Renders4(BaseModel):
-    render_id: str
     preview_url: Annotated[
         Optional[AnyUrl],
         Field(
-            description="URL to iframe-embeddable HTML page. Typically present when output_format='url'."
+            description="URL to iframe-embeddable HTML page. Present when output_format is 'url' or 'both'."
         ),
     ] = None
     preview_html: Annotated[
-        str,
-        Field(
-            description="Raw HTML for direct embedding. Typically present when output_format='html'. Security: Only use with trusted agents."
-        ),
-    ]
-    role: str
-    dimensions: Optional[Dimensions] = None
-    embedding: Optional[Embedding3] = None
-
-
-class Renders5(BaseModel):
-    render_id: str
-    preview_url: Annotated[
-        AnyUrl,
-        Field(
-            description="URL to iframe-embeddable HTML page. Typically present when output_format='url'."
-        ),
-    ]
-    preview_html: Annotated[
-        str,
+        Optional[str],
         Field(
-            description="Raw HTML for direct embedding. Typically present when output_format='html'. Security: Only use with trusted agents."
+            description="Raw HTML for direct embedding. Present when output_format is 'html' or 'both'. Security: Only use with trusted agents."
         ),
-    ]
+    ] = None
     role: str
     dimensions: Optional[Dimensions] = None
-    embedding: Optional[Embedding3] = None
+    embedding: Optional[Embedding1] = None
 
 
 class Input4(BaseModel):
@@ -275,7 +178,7 @@ class Input4(BaseModel):
 
 class Preview1(BaseModel):
     preview_id: str
-    renders: Annotated[list[Union[Renders3, Renders4, Renders5]], Field(min_length=1)]
+    renders: Annotated[list[Render3], Field(min_length=1)]
     input: Input4
 
 
@@ -313,18 +216,12 @@ class Results(BaseModel):
     ] = None
 
 
-Renders6 = Renders3
-
-
-Renders7 = Renders4
-
-
-Renders8 = Renders5
+Render4 = Render3
 
 
 class Preview2(BaseModel):
     preview_id: str
-    renders: Annotated[list[Union[Renders6, Renders7, Renders8]], Field(min_length=1)]
+    renders: Annotated[list[Render4], Field(min_length=1)]
     input: Input4
 
 
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_request_json.py b/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_request_json.py
index 57e2e08..8834e5a 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_request_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_request_json.py
@@ -177,11 +177,23 @@ class Assets46(BaseModel):
     ] = None
 
 
+class UrlType(Enum):
+    clickthrough = "clickthrough"
+    tracker_pixel = "tracker_pixel"
+    tracker_script = "tracker_script"
+
+
 class Assets47(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
     url: Annotated[AnyUrl, Field(description="URL reference")]
+    url_type: Annotated[
+        Optional[UrlType],
+        Field(
+            description="Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+        ),
+    ] = None
     description: Annotated[
         Optional[str], Field(description="Description of what this URL points to")
     ] = None
diff --git a/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_response_json.py b/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_response_json.py
index ff6bb12..dea5ef2 100644
--- a/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_response_json.py
+++ b/src/creative_agent/schemas_generated/_schemas_v1_media_buy_build_creative_response_json.py
@@ -177,11 +177,23 @@ class Assets60(BaseModel):
     ] = None
 
 
+class UrlType(Enum):
+    clickthrough = "clickthrough"
+    tracker_pixel = "tracker_pixel"
+    tracker_script = "tracker_script"
+
+
 class Assets61(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
     url: Annotated[AnyUrl, Field(description="URL reference")]
+    url_type: Annotated[
+        Optional[UrlType],
+        Field(
+            description="Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+        ),
+    ] = None
     description: Annotated[
         Optional[str], Field(description="Description of what this URL points to")
     ] = None
diff --git a/src/creative_agent/server.py b/src/creative_agent/server.py
index 4423c40..045e0f6 100644
--- a/src/creative_agent/server.py
+++ b/src/creative_agent/server.py
@@ -527,10 +527,20 @@ def _generate_preview_variant(
         "supports_fullscreen": embedding.supports_fullscreen,
     }
 
-    if preview_url:
+    # Determine output_format based on which fields are provided
+    if preview_url and preview_html:
+        render_dict["output_format"] = "both"
         render_dict["preview_url"] = preview_url
-    if preview_html:
         render_dict["preview_html"] = preview_html
+    elif preview_html:
+        render_dict["output_format"] = "html"
+        render_dict["preview_html"] = preview_html
+    elif preview_url:
+        render_dict["output_format"] = "url"
+        render_dict["preview_url"] = preview_url
+    else:
+        # This shouldn't happen, but default to url if neither is provided
+        render_dict["output_format"] = "url"
 
     # Create input echo
     input_dict = {
diff --git a/tests/schemas/v1/_schemas_v1_adagents_json.json b/tests/schemas/v1/_schemas_v1_adagents_json.json
index 1d44a91..5d8fb4b 100644
--- a/tests/schemas/v1/_schemas_v1_adagents_json.json
+++ b/tests/schemas/v1/_schemas_v1_adagents_json.json
@@ -10,9 +10,79 @@
       "description": "JSON Schema identifier for this adagents.json file",
       "default": "https://adcontextprotocol.org/schemas/v1/adagents.json"
     },
+    "contact": {
+      "type": "object",
+      "description": "Contact information for the entity managing this adagents.json file (may be publisher or third-party operator)",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the entity managing this file (e.g., 'Meta Advertising Operations', 'Clear Channel Digital')",
+          "minLength": 1,
+          "maxLength": 255
+        },
+        "email": {
+          "type": "string",
+          "format": "email",
+          "description": "Contact email for questions or issues with this authorization file",
+          "minLength": 1,
+          "maxLength": 255
+        },
+        "domain": {
+          "type": "string",
+          "description": "Primary domain of the entity managing this file",
+          "pattern": "^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$"
+        },
+        "seller_id": {
+          "type": "string",
+          "description": "Seller ID from IAB Tech Lab sellers.json (if applicable)",
+          "minLength": 1,
+          "maxLength": 255
+        },
+        "tag_id": {
+          "type": "string",
+          "description": "TAG Certified Against Fraud ID for verification (if applicable)",
+          "minLength": 1,
+          "maxLength": 100
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "properties": {
+      "type": "array",
+      "description": "Array of all properties covered by this adagents.json file. Same structure as list_authorized_properties response.",
+      "items": {
+        "$ref": "/schemas/v1/core/property.json"
+      },
+      "minItems": 1
+    },
+    "tags": {
+      "type": "object",
+      "description": "Metadata for each tag referenced by properties. Same structure as list_authorized_properties response.",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Human-readable name for this tag"
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of what this tag represents"
+          }
+        },
+        "required": [
+          "name",
+          "description"
+        ],
+        "additionalProperties": false
+      }
+    },
     "authorized_agents": {
       "type": "array",
-      "description": "Array of sales agents authorized to sell this publisher's inventory",
+      "description": "Array of sales agents authorized to sell inventory for properties in this file",
       "items": {
         "type": "object",
         "properties": {
@@ -23,9 +93,72 @@
           },
           "authorized_for": {
             "type": "string",
-            "description": "Human-readable description of what this agent is authorized to sell (e.g., 'Official sales agent for our US and CA display inventory')",
+            "description": "Human-readable description of what this agent is authorized to sell",
             "minLength": 1,
             "maxLength": 500
+          },
+          "property_ids": {
+            "type": "array",
+            "description": "Property IDs this agent is authorized for. Resolved against the top-level properties array in this file. Mutually exclusive with property_tags and properties fields.",
+            "items": {
+              "type": "string",
+              "pattern": "^[a-z0-9_]+$"
+            },
+            "minItems": 1
+          },
+          "property_tags": {
+            "type": "array",
+            "description": "Tags identifying which properties this agent is authorized for. Resolved against the top-level properties array in this file using tag matching. Mutually exclusive with property_ids and properties fields.",
+            "items": {
+              "type": "string",
+              "pattern": "^[a-z0-9_]+$"
+            },
+            "minItems": 1
+          },
+          "properties": {
+            "type": "array",
+            "description": "Specific properties this agent is authorized for (alternative to property_ids/property_tags). Mutually exclusive with property_ids and property_tags fields.",
+            "items": {
+              "$ref": "/schemas/v1/core/property.json"
+            },
+            "minItems": 1
+          },
+          "publisher_properties": {
+            "type": "array",
+            "description": "Properties from other publisher domains this agent is authorized for. Each entry specifies a publisher domain and which of their properties this agent can sell (by property_id or property_tags). Mutually exclusive with property_ids, property_tags, and properties fields.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "publisher_domain": {
+                  "type": "string",
+                  "description": "Domain where the publisher's adagents.json is hosted (e.g., 'cnn.com')",
+                  "pattern": "^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$"
+                },
+                "property_ids": {
+                  "type": "array",
+                  "description": "Specific property IDs from the publisher's adagents.json properties array. Mutually exclusive with property_tags.",
+                  "items": {
+                    "type": "string",
+                    "pattern": "^[a-z0-9_]+$"
+                  },
+                  "minItems": 1
+                },
+                "property_tags": {
+                  "type": "array",
+                  "description": "Property tags from the publisher's adagents.json tags. Agent is authorized for all properties with these tags. Mutually exclusive with property_ids.",
+                  "items": {
+                    "type": "string",
+                    "pattern": "^[a-z0-9_]+$"
+                  },
+                  "minItems": 1
+                }
+              },
+              "required": [
+                "publisher_domain"
+              ],
+              "additionalProperties": false
+            },
+            "minItems": 1
           }
         },
         "required": [
@@ -39,7 +172,7 @@
     "last_updated": {
       "type": "string",
       "format": "date-time",
-      "description": "ISO 8601 timestamp indicating when this file was last updated (optional but recommended)"
+      "description": "ISO 8601 timestamp indicating when this file was last updated"
     }
   },
   "required": [
@@ -52,24 +185,182 @@
       "authorized_agents": [
         {
           "url": "https://agent.example.com",
-          "authorized_for": "Official sales agent for our US and CA display inventory"
+          "authorized_for": "Official sales agent"
         }
       ],
       "last_updated": "2025-01-10T12:00:00Z"
     },
     {
       "$schema": "https://adcontextprotocol.org/schemas/v1/adagents.json",
-      "authorized_agents": [
+      "contact": {
+        "name": "Meta Advertising Operations",
+        "email": "adops@meta.com",
+        "domain": "meta.com",
+        "seller_id": "pub-meta-12345",
+        "tag_id": "12345"
+      },
+      "properties": [
+        {
+          "property_type": "mobile_app",
+          "name": "Instagram",
+          "identifiers": [
+            {
+              "type": "ios_bundle",
+              "value": "com.burbn.instagram"
+            },
+            {
+              "type": "android_package",
+              "value": "com.instagram.android"
+            }
+          ],
+          "tags": [
+            "meta_network",
+            "social_media"
+          ],
+          "publisher_domain": "instagram.com"
+        },
         {
-          "url": "https://direct-agent.com",
-          "authorized_for": "Primary sales agent for premium video inventory worldwide"
+          "property_type": "mobile_app",
+          "name": "Facebook",
+          "identifiers": [
+            {
+              "type": "ios_bundle",
+              "value": "com.facebook.Facebook"
+            },
+            {
+              "type": "android_package",
+              "value": "com.facebook.katana"
+            }
+          ],
+          "tags": [
+            "meta_network",
+            "social_media"
+          ],
+          "publisher_domain": "facebook.com"
         },
         {
-          "url": "https://reseller-network.com",
-          "authorized_for": "Authorized reseller for display inventory in EMEA region"
+          "property_type": "mobile_app",
+          "name": "WhatsApp",
+          "identifiers": [
+            {
+              "type": "ios_bundle",
+              "value": "net.whatsapp.WhatsApp"
+            },
+            {
+              "type": "android_package",
+              "value": "com.whatsapp"
+            }
+          ],
+          "tags": [
+            "meta_network",
+            "messaging"
+          ],
+          "publisher_domain": "whatsapp.com"
+        }
+      ],
+      "tags": {
+        "meta_network": {
+          "name": "Meta Network",
+          "description": "All Meta-owned properties"
+        },
+        "social_media": {
+          "name": "Social Media Apps",
+          "description": "Social networking applications"
+        },
+        "messaging": {
+          "name": "Messaging Apps",
+          "description": "Messaging and communication apps"
+        }
+      },
+      "authorized_agents": [
+        {
+          "url": "https://meta-ads.com",
+          "authorized_for": "All Meta properties",
+          "property_tags": [
+            "meta_network"
+          ]
         }
       ],
       "last_updated": "2025-01-10T15:30:00Z"
+    },
+    {
+      "$schema": "https://adcontextprotocol.org/schemas/v1/adagents.json",
+      "contact": {
+        "name": "Tumblr Advertising"
+      },
+      "properties": [
+        {
+          "property_type": "website",
+          "name": "Tumblr Corporate",
+          "identifiers": [
+            {
+              "type": "domain",
+              "value": "tumblr.com"
+            }
+          ],
+          "tags": [
+            "corporate"
+          ],
+          "publisher_domain": "tumblr.com"
+        }
+      ],
+      "tags": {
+        "corporate": {
+          "name": "Corporate Properties",
+          "description": "Tumblr-owned corporate properties (not user blogs)"
+        }
+      },
+      "authorized_agents": [
+        {
+          "url": "https://tumblr-sales.com",
+          "authorized_for": "Tumblr corporate properties only",
+          "property_tags": [
+            "corporate"
+          ]
+        }
+      ],
+      "last_updated": "2025-01-10T16:00:00Z"
+    },
+    {
+      "$schema": "https://adcontextprotocol.org/schemas/v1/adagents.json",
+      "contact": {
+        "name": "Example Third-Party Sales Agent",
+        "email": "sales@agent.example",
+        "domain": "agent.example"
+      },
+      "authorized_agents": [
+        {
+          "url": "https://agent.example/api",
+          "authorized_for": "CNN CTV properties via publisher authorization",
+          "publisher_properties": [
+            {
+              "publisher_domain": "cnn.com",
+              "property_ids": [
+                "cnn_ctv_app"
+              ]
+            }
+          ]
+        },
+        {
+          "url": "https://agent.example/api",
+          "authorized_for": "All CTV properties from multiple publishers",
+          "publisher_properties": [
+            {
+              "publisher_domain": "cnn.com",
+              "property_tags": [
+                "ctv"
+              ]
+            },
+            {
+              "publisher_domain": "espn.com",
+              "property_tags": [
+                "ctv"
+              ]
+            }
+          ]
+        }
+      ],
+      "last_updated": "2025-01-10T17:00:00Z"
     }
   ]
 }
diff --git a/tests/schemas/v1/_schemas_v1_core_assets_url-asset_json.json b/tests/schemas/v1/_schemas_v1_core_assets_url-asset_json.json
index d1d8f11..c8eade6 100644
--- a/tests/schemas/v1/_schemas_v1_core_assets_url-asset_json.json
+++ b/tests/schemas/v1/_schemas_v1_core_assets_url-asset_json.json
@@ -10,6 +10,15 @@
       "format": "uri",
       "description": "URL reference"
     },
+    "url_type": {
+      "type": "string",
+      "enum": [
+        "clickthrough",
+        "tracker_pixel",
+        "tracker_script"
+      ],
+      "description": "Type of URL asset: 'clickthrough' for user click destination (landing page), 'tracker_pixel' for impression/event tracking via HTTP request (fires GET, expects pixel/204 response), 'tracker_script' for measurement SDKs that must load as <script> tag (OMID verification, native event trackers using method:2)"
+    },
     "description": {
       "type": "string",
       "description": "Description of what this URL points to"
diff --git a/tests/schemas/v1/_schemas_v1_core_creative-assignment_json.json b/tests/schemas/v1/_schemas_v1_core_creative-assignment_json.json
index aa9db99..1c10cb4 100644
--- a/tests/schemas/v1/_schemas_v1_core_creative-assignment_json.json
+++ b/tests/schemas/v1/_schemas_v1_core_creative-assignment_json.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/schemas/v1/core/creative-assignment.json",
   "title": "Creative Assignment",
-  "description": "Assignment of a creative asset to a package",
+  "description": "Assignment of a creative asset to a package with optional placement targeting. Used in create_media_buy and update_media_buy requests. Note: sync_creatives does not support placement_ids - use create/update_media_buy for placement-level targeting.",
   "type": "object",
   "properties": {
     "creative_id": {
@@ -14,6 +14,14 @@
       "description": "Delivery weight for this creative",
       "minimum": 0,
       "maximum": 100
+    },
+    "placement_ids": {
+      "type": "array",
+      "description": "Optional array of placement IDs where this creative should run. When omitted, the creative runs on all placements in the package. References placement_id values from the product's placements array.",
+      "items": {
+        "type": "string"
+      },
+      "minItems": 1
     }
   },
   "required": [
diff --git a/tests/schemas/v1/_schemas_v1_core_format_json.json b/tests/schemas/v1/_schemas_v1_core_format_json.json
index ea886a6..35e4924 100644
--- a/tests/schemas/v1/_schemas_v1_core_format_json.json
+++ b/tests/schemas/v1/_schemas_v1_core_format_json.json
@@ -20,7 +20,7 @@
     "preview_image": {
       "type": "string",
       "format": "uri",
-      "description": "Optional preview image URL for format browsing/discovery UI. Should be 400x300px (4:3 aspect ratio) PNG or JPG. Used as thumbnail/card image in format browsers."
+      "description": "DEPRECATED: Use format_card instead. Optional preview image URL for format browsing/discovery UI. Should be 400x300px (4:3 aspect ratio) PNG or JPG. Used as thumbnail/card image in format browsers. This field is maintained for backward compatibility but format_card provides a more flexible, structured approach."
     },
     "example_url": {
       "type": "string",
@@ -152,6 +152,7 @@
                   "vast",
                   "daast",
                   "text",
+                  "markdown",
                   "html",
                   "css",
                   "javascript",
@@ -224,6 +225,7 @@
                         "vast",
                         "daast",
                         "text",
+                        "markdown",
                         "html",
                         "css",
                         "javascript",
@@ -282,6 +284,46 @@
       "items": {
         "$ref": "/schemas/v1/core/format-id.json"
       }
+    },
+    "format_card": {
+      "type": "object",
+      "description": "Optional standard visual card (300x400px) for displaying this format in user interfaces. Can be rendered via preview_creative or pre-generated.",
+      "properties": {
+        "format_id": {
+          "$ref": "/schemas/v1/core/format-id.json",
+          "description": "Creative format defining the card layout (typically format_card_standard)"
+        },
+        "manifest": {
+          "type": "object",
+          "description": "Asset manifest for rendering the card, structure defined by the format",
+          "additionalProperties": true
+        }
+      },
+      "required": [
+        "format_id",
+        "manifest"
+      ],
+      "additionalProperties": false
+    },
+    "format_card_detailed": {
+      "type": "object",
+      "description": "Optional detailed card with carousel and full specifications. Provides rich format documentation similar to ad spec pages.",
+      "properties": {
+        "format_id": {
+          "$ref": "/schemas/v1/core/format-id.json",
+          "description": "Creative format defining the detailed card layout (typically format_card_detailed)"
+        },
+        "manifest": {
+          "type": "object",
+          "description": "Asset manifest for rendering the detailed card, structure defined by the format",
+          "additionalProperties": true
+        }
+      },
+      "required": [
+        "format_id",
+        "manifest"
+      ],
+      "additionalProperties": false
     }
   },
   "required": [
diff --git a/tests/schemas/v1/_schemas_v1_core_property_json.json b/tests/schemas/v1/_schemas_v1_core_property_json.json
new file mode 100644
index 0000000..d56208d
--- /dev/null
+++ b/tests/schemas/v1/_schemas_v1_core_property_json.json
@@ -0,0 +1,74 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "/schemas/v1/core/property.json",
+  "title": "Property",
+  "description": "An advertising property that can be validated via adagents.json",
+  "type": "object",
+  "properties": {
+    "property_id": {
+      "type": "string",
+      "description": "Unique identifier for this property (optional). Enables referencing properties by ID instead of repeating full objects. Recommended format: lowercase with underscores (e.g., 'cnn_ctv_app', 'instagram_mobile')",
+      "pattern": "^[a-z0-9_]+$"
+    },
+    "property_type": {
+      "type": "string",
+      "enum": [
+        "website",
+        "mobile_app",
+        "ctv_app",
+        "dooh",
+        "podcast",
+        "radio",
+        "streaming_audio"
+      ],
+      "description": "Type of advertising property"
+    },
+    "name": {
+      "type": "string",
+      "description": "Human-readable property name"
+    },
+    "identifiers": {
+      "type": "array",
+      "description": "Array of identifiers for this property",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "$ref": "/schemas/v1/enums/identifier-types.json",
+            "description": "Type of identifier for this property"
+          },
+          "value": {
+            "type": "string",
+            "description": "The identifier value. For domain type: 'example.com' matches base domain plus www and m subdomains; 'edition.example.com' matches that specific subdomain; '*.example.com' matches ALL subdomains but NOT base domain"
+          }
+        },
+        "required": [
+          "type",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "minItems": 1
+    },
+    "tags": {
+      "type": "array",
+      "description": "Tags for categorization and grouping (e.g., network membership, content categories)",
+      "items": {
+        "type": "string",
+        "pattern": "^[a-z0-9_]+$",
+        "description": "Lowercase tag with underscores (e.g., 'conde_nast_network', 'premium_content')"
+      },
+      "uniqueItems": true
+    },
+    "publisher_domain": {
+      "type": "string",
+      "description": "Domain where adagents.json should be checked for authorization validation. Required for list_authorized_properties response. Optional in adagents.json (file location implies domain)."
+    }
+  },
+  "required": [
+    "property_type",
+    "name",
+    "identifiers"
+  ],
+  "additionalProperties": false
+}
diff --git a/tests/schemas/v1/_schemas_v1_creative_asset-types_index_json.json b/tests/schemas/v1/_schemas_v1_creative_asset-types_index_json.json
index ee280fe..8379878 100644
--- a/tests/schemas/v1/_schemas_v1_creative_asset-types_index_json.json
+++ b/tests/schemas/v1/_schemas_v1_creative_asset-types_index_json.json
@@ -32,10 +32,15 @@
       "typical_use": "Third-party served audio ads with DAAST 1.0-1.1"
     },
     "text": {
-      "description": "Text content asset (plain, HTML, markdown)",
+      "description": "Plain text content asset",
       "schema": "/schemas/v1/core/assets/text-asset.json",
       "typical_use": "Headlines, descriptions, CTAs, body copy, disclaimers"
     },
+    "markdown": {
+      "description": "Markdown-formatted text content (CommonMark/GFM)",
+      "schema": "/schemas/v1/core/assets/markdown-asset.json",
+      "typical_use": "Product specifications, format documentation, rich descriptions, structured content"
+    },
     "url": {
       "description": "URL asset for clickthrough, tracking, landing pages",
       "schema": "/schemas/v1/core/assets/url-asset.json",
diff --git a/tests/schemas/v1/_schemas_v1_creative_preview-creative-response_json.json b/tests/schemas/v1/_schemas_v1_creative_preview-creative-response_json.json
index aa573be..059cc5d 100644
--- a/tests/schemas/v1/_schemas_v1_creative_preview-creative-response_json.json
+++ b/tests/schemas/v1/_schemas_v1_creative_preview-creative-response_json.json
@@ -28,14 +28,19 @@
                       "type": "string",
                       "description": "Unique identifier for this rendered piece within the variant"
                     },
+                    "output_format": {
+                      "type": "string",
+                      "enum": ["url", "html", "both"],
+                      "description": "Discriminator field indicating which preview format(s) are provided. 'url' = preview_url only, 'html' = preview_html only, 'both' = both preview_url and preview_html."
+                    },
                     "preview_url": {
                       "type": "string",
                       "format": "uri",
-                      "description": "URL to an HTML page that renders this piece. Can be embedded in an iframe. Typically returned when output_format='url' (default). Creative agents MAY provide both preview_url and preview_html for client flexibility."
+                      "description": "URL to an HTML page that renders this piece. Can be embedded in an iframe. Present when output_format is 'url' or 'both'."
                     },
                     "preview_html": {
                       "type": "string",
-                      "description": "Raw HTML for this rendered piece. Can be embedded directly in the page without iframe. Typically returned when output_format='html'. Security warning: Only use with trusted creative agents as this bypasses iframe sandboxing. Creative agents MAY provide both formats."
+                      "description": "Raw HTML for this rendered piece. Can be embedded directly in the page without iframe. Present when output_format is 'html' or 'both'. Security warning: Only use with trusted creative agents as this bypasses iframe sandboxing."
                     },
                     "role": {
                       "type": "string",
@@ -79,16 +84,43 @@
                       }
                     }
                   },
-                  "required": ["render_id", "role"],
-                  "oneOf": [
+                  "required": ["render_id", "role", "output_format"],
+                  "allOf": [
                     {
-                      "required": ["preview_url"]
+                      "if": {
+                        "properties": {
+                          "output_format": { "const": "url" }
+                        }
+                      },
+                      "then": {
+                        "required": ["preview_url"],
+                        "not": {
+                          "required": ["preview_html"]
+                        }
+                      }
                     },
                     {
-                      "required": ["preview_html"]
+                      "if": {
+                        "properties": {
+                          "output_format": { "const": "html" }
+                        }
+                      },
+                      "then": {
+                        "required": ["preview_html"],
+                        "not": {
+                          "required": ["preview_url"]
+                        }
+                      }
                     },
                     {
-                      "required": ["preview_url", "preview_html"]
+                      "if": {
+                        "properties": {
+                          "output_format": { "const": "both" }
+                        }
+                      },
+                      "then": {
+                        "required": ["preview_url", "preview_html"]
+                      }
                     }
                   ]
                 },
@@ -173,14 +205,19 @@
                               "render_id": {
                                 "type": "string"
                               },
+                              "output_format": {
+                                "type": "string",
+                                "enum": ["url", "html", "both"],
+                                "description": "Discriminator field indicating which preview format(s) are provided. 'url' = preview_url only, 'html' = preview_html only, 'both' = both preview_url and preview_html."
+                              },
                               "preview_url": {
                                 "type": "string",
                                 "format": "uri",
-                                "description": "URL to iframe-embeddable HTML page. Typically present when output_format='url'."
+                                "description": "URL to iframe-embeddable HTML page. Present when output_format is 'url' or 'both'."
                               },
                               "preview_html": {
                                 "type": "string",
-                                "description": "Raw HTML for direct embedding. Typically present when output_format='html'. Security: Only use with trusted agents."
+                                "description": "Raw HTML for direct embedding. Present when output_format is 'html' or 'both'. Security: Only use with trusted agents."
                               },
                               "role": {
                                 "type": "string"
@@ -217,16 +254,43 @@
                                 }
                               }
                             },
-                            "required": ["render_id", "role"],
-                            "oneOf": [
+                            "required": ["render_id", "role", "output_format"],
+                            "allOf": [
                               {
-                                "required": ["preview_url"]
+                                "if": {
+                                  "properties": {
+                                    "output_format": { "const": "url" }
+                                  }
+                                },
+                                "then": {
+                                  "required": ["preview_url"],
+                                  "not": {
+                                    "required": ["preview_html"]
+                                  }
+                                }
                               },
                               {
-                                "required": ["preview_html"]
+                                "if": {
+                                  "properties": {
+                                    "output_format": { "const": "html" }
+                                  }
+                                },
+                                "then": {
+                                  "required": ["preview_html"],
+                                  "not": {
+                                    "required": ["preview_url"]
+                                  }
+                                }
                               },
                               {
-                                "required": ["preview_url", "preview_html"]
+                                "if": {
+                                  "properties": {
+                                    "output_format": { "const": "both" }
+                                  }
+                                },
+                                "then": {
+                                  "required": ["preview_url", "preview_html"]
+                                }
                               }
                             ]
                           },

From 36cf5ac39f562bf3e4d02c8a2f228872918c3789 Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Fri, 7 Nov 2025 11:16:23 -0500
Subject: [PATCH 2/2] Improve output_format implementation and test coverage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Address code review feedback:
- Fix error handling: raise ValueError instead of defaulting when neither
  preview_url nor preview_html is provided (fail fast approach)
- Reorder conditional logic for better readability (url/html/both)
- Update docstring to document output_format field behavior
- Add test assertions to verify output_format discriminator values
- Verify that only appropriate preview fields are present per mode

Tests verify:
- output_format="html" sets field and excludes preview_url
- output_format="url" sets field and excludes preview_html
- Both single and batch modes correctly set discriminator

All 187 tests passing.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 src/creative_agent/server.py                  | 29 ++++++++++++++-----
 .../test_preview_html_and_batch.py            | 14 +++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/creative_agent/server.py b/src/creative_agent/server.py
index 045e0f6..8fcaba3 100644
--- a/src/creative_agent/server.py
+++ b/src/creative_agent/server.py
@@ -482,8 +482,23 @@ def _generate_preview_variant(
 
     Returns a Preview dict with:
     - preview_id (required)
-    - renders array (required)
-    - input (required)
+    - renders array (required), each containing:
+      - output_format: discriminator ("url", "html", or "both")
+      - preview_url: present when output_format is "url" or "both"
+      - preview_html: present when output_format is "html" or "both"
+      - render_id, role, dimensions, embedding metadata
+    - input (required): echoes back the input parameters
+
+    Args:
+        format_obj: Format object being previewed
+        manifest: Creative manifest data
+        input_set: Preview input with name and macros
+        preview_id: Unique preview identifier
+        preview_url: Optional URL for iframe embedding
+        preview_html: Optional raw HTML for direct embedding
+
+    Raises:
+        ValueError: If neither preview_url nor preview_html provided
     """
     from .schemas_generated._schemas_v1_core_format_json import Type
     from .schemas_generated._schemas_v1_creative_preview_creative_response_json import (
@@ -532,15 +547,15 @@ def _generate_preview_variant(
         render_dict["output_format"] = "both"
         render_dict["preview_url"] = preview_url
         render_dict["preview_html"] = preview_html
-    elif preview_html:
-        render_dict["output_format"] = "html"
-        render_dict["preview_html"] = preview_html
     elif preview_url:
         render_dict["output_format"] = "url"
         render_dict["preview_url"] = preview_url
+    elif preview_html:
+        render_dict["output_format"] = "html"
+        render_dict["preview_html"] = preview_html
     else:
-        # This shouldn't happen, but default to url if neither is provided
-        render_dict["output_format"] = "url"
+        # This is a programming error - one of preview_url or preview_html must be provided
+        raise ValueError("Internal error: Neither preview_url nor preview_html provided")
 
     # Create input echo
     input_dict = {
diff --git a/tests/integration/test_preview_html_and_batch.py b/tests/integration/test_preview_html_and_batch.py
index c10d986..1eccc4c 100644
--- a/tests/integration/test_preview_html_and_batch.py
+++ b/tests/integration/test_preview_html_and_batch.py
@@ -70,6 +70,10 @@ def test_html_output_returns_preview_html(self):
         assert isinstance(first_render.preview_html, str)
         assert len(first_render.preview_html) > 0
 
+        # Verify output_format discriminator
+        assert first_render.output_format.value == "html"
+        assert first_render.preview_url is None
+
         # HTML should contain expected elements
         assert "<div" in first_render.preview_html or "<html" in first_render.preview_html
 
@@ -127,6 +131,10 @@ def test_url_output_still_works(self, mock_s3_upload):
         assert first_render.preview_url is not None
         assert str(first_render.preview_url).startswith("https://")
 
+        # Verify output_format discriminator
+        assert first_render.output_format.value == "url"
+        assert first_render.preview_html is None
+
         # S3 upload should be called 3 times (desktop, mobile, tablet)
         assert mock_s3_upload.call_count == 3
 
@@ -234,6 +242,10 @@ def test_batch_mode_with_html_output(self):
         assert isinstance(first_render["preview_html"], str)
         assert len(first_render["preview_html"]) > 0
 
+        # Verify output_format discriminator
+        assert first_render["output_format"] == "html"
+        assert "preview_url" not in first_render or first_render.get("preview_url") is None
+
     def test_batch_mode_handles_errors_gracefully(self):
         """Test that batch mode handles individual request errors."""
         valid_manifest = CreativeManifest(
@@ -310,7 +322,9 @@ def test_batch_mode_per_request_output_format_override(self):
         # First request should have URL (overridden)
         first_render = structured["results"][0]["response"]["previews"][0]["renders"][0]
         assert "preview_url" in first_render
+        assert first_render["output_format"] == "url"
 
         # Second request should have HTML (default)
         second_render = structured["results"][1]["response"]["previews"][0]["renders"][0]
         assert "preview_html" in second_render
+        assert second_render["output_format"] == "html"