Merge remote-tracking branch 'upstream/main' into delete-minimal-catalog

Author: josemontespg

samples/client/flutter/restaurant_finder/app/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -1,18 +1,17 @@
-// Copyright 2025 Google LLC
+// Copyright 2026 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//      https://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 //
 //  Generated file. Do not edit.
 //
@@ -27,5 +26,5 @@ import video_player_avfoundation
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
+  VideoPlayerPlugin.register(with: registry.registrar(forPlugin: "VideoPlayerPlugin"))
 }

specification/v0_10/docs/a2ui_protocol.md

@@ -181,6 +181,8 @@ This message signals the client to create a new surface and begin rendering it.
 - `catalogId` (string, required): A string that uniquely identifies the catalog (components and functions) used for this surface. It is recommended to prefix this with an internet domain that you own, to avoid conflicts (e.g., `https://mycompany.com/1.0/somecatalog`). If it is a URL, the URL does not need to have any deployed resources, it is simply a unique identifier.
 - `theme` (object, optional): A JSON object containing theme parameters (e.g., `primaryColor`) defined in the catalog's theme schema.
 - `sendDataModel` (boolean, optional): If true, the client will send the full data model of this surface in the metadata of every message sent to the server (via the Transport's metadata mechanism). This ensures the surface owner receives the full current state of the UI alongside the user's action or query. Defaults to false.
+- `components` (array, optional): A list containing UI components for the surface, allowing the client to build and populate the UI tree immediately on surface creation. Conforms to the `ComponentsList` schema.
+- `dataModel` (object, optional): A plain JSON object representing the initial root state of the data model.
 
 **Example:**
 
@@ -193,7 +195,22 @@ This message signals the client to create a new surface and begin rendering it.
     "theme": {
       "primaryColor": "#00BFFF"
     },
-    "sendDataModel": true
+    "sendDataModel": true,
+    "components": [
+      {
+        "id": "root",
+        "component": "Column",
+        "children": ["user_name"]
+      },
+      {
+        "id": "user_name",
+        "component": "Text",
+        "text": {"path": "/name"}
+      }
+    ],
+    "dataModel": {
+      "name": "John Doe"
+    }
   }
 }
 ```

specification/v0_10/eval/src/validator.ts

@@ -276,17 +276,36 @@ export class Validator {
         this.validateUpdateComponents(message.updateComponents, errors);
 
         // Check for root component in this message
-        if (message.updateComponents.components) {
+        if (Array.isArray(message.updateComponents.components)) {
           for (const comp of message.updateComponents.components) {
-            if (comp.id === 'root') {
+            if (comp && typeof comp === 'object' && comp.id === 'root') {
               hasRootComponent = true;
             }
           }
         }
       } else if (message.createSurface) {
         this.validateCreateSurface(message.createSurface, errors);
-        if (message.createSurface.surfaceId) {
-          createdSurfaces.add(message.createSurface.surfaceId);
+        const surfaceId = message.createSurface.surfaceId;
+        if (surfaceId) {
+          createdSurfaces.add(surfaceId);
+        }
+
+        const createSurface = message.createSurface;
+        if (createSurface.components) {
+          hasUpdateComponents = true;
+
+          if (Array.isArray(createSurface.components)) {
+            this.validateComponentsList(createSurface.components, errors);
+
+            // Check for root component in nested components
+            for (const comp of createSurface.components) {
+              if (comp && typeof comp === 'object' && comp.id === 'root') {
+                hasRootComponent = true;
+              }
+            }
+          } else {
+            errors.push('createSurface.components must be an array of components.');
+          }
         }
       } else if (message.updateDataModel) {
         this.validateUpdateDataModel(message.updateDataModel, errors);
@@ -347,7 +366,7 @@ export class Validator {
     if (data.catalogId === undefined) {
       errors.push("createSurface must have a 'catalogId' property.");
     }
-    const allowed = ['surfaceId', 'catalogId'];
+    const allowed = ['surfaceId', 'catalogId', 'theme', 'sendDataModel', 'components', 'dataModel'];
     for (const key in data) {
       if (!allowed.includes(key)) {
         errors.push(`createSurface has unexpected property: ${key}`);
@@ -376,8 +395,13 @@ export class Validator {
       return;
     }
 
+    this.validateComponentsList(data.components, errors);
+  }
+
+  private validateComponentsList(components: any[], errors: string[]) {
     const componentIds = new Set<string>();
-    for (const c of data.components) {
+    for (const c of components) {
+      if (!c || typeof c !== 'object') continue;
       const id = c.id;
       if (id) {
         if (componentIds.has(id)) {
@@ -405,12 +429,21 @@ export class Validator {
       }
     }
 
-    for (const component of data.components) {
-      this.validateComponent(component, componentIds, errors);
+    for (const component of components) {
+      if (component && typeof component === 'object') {
+        this.validateComponent(component, componentIds, errors);
+      }
     }
   }
 
   private validateUpdateDataModel(data: any, errors: string[]) {
+    if (data.surfaceId === undefined) {
+      errors.push("UpdateDataModel must have a 'surfaceId' property.");
+    }
+    this.validateDataModelUpdate(data, errors);
+  }
+
+  private validateDataModelUpdate(data: any, errors: string[]) {
     // Schema validation handles types and basic structure.
     // 'op' is removed in v0.10, so we don't need to validate it or its relationship with 'value'.
     // We strictly rely on the schema for this message type now.

specification/v0_10/json/server_to_client.json

@@ -38,6 +38,14 @@
             "sendDataModel": {
               "type": "boolean",
               "description": "If true, the client will send the full data model of this surface in the metadata of every A2A message sent to the server that created the surface. Defaults to false."
+            },
+            "components": {
+              "$ref": "#/$defs/ComponentsList"
+            },
+            "dataModel": {
+              "type": "object",
+              "description": "The initial root data model object for the surface.",
+              "additionalProperties": true
             }
           },
           "required": ["surfaceId", "catalogId"],
@@ -47,6 +55,14 @@
       "required": ["createSurface", "version"],
       "additionalProperties": false
     },
+    "ComponentsList": {
+      "type": "array",
+      "description": "A list containing UI components for the surface.",
+      "minItems": 1,
+      "items": {
+        "$ref": "catalog.json#/$defs/anyComponent"
+      }
+    },
     "UpdateComponentsMessage": {
       "type": "object",
       "properties": {
@@ -62,12 +78,7 @@
               "description": "The unique identifier for the UI surface to be updated."
             },
             "components": {
-              "type": "array",
-              "description": "A list containing all UI components for the surface.",
-              "minItems": 1,
-              "items": {
-                "$ref": "catalog.json#/$defs/anyComponent"
-              }
+              "$ref": "#/$defs/ComponentsList"
             }
           },
           "required": ["surfaceId", "components"],

specification/v0_10/test/cases/initial_state_validation.json

@@ -0,0 +1,132 @@
+{
+  "schema": "server_to_client.json",
+  "tests": [
+    {
+      "description": "Valid createSurface with both components list and dataModel update",
+      "valid": true,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "components": [
+            {
+              "id": "root",
+              "component": "Column",
+              "children": ["welcome_text"]
+            },
+            {
+              "id": "welcome_text",
+              "component": "Text",
+              "text": "Welcome to the application!"
+            }
+          ],
+          "dataModel": {
+            "user": {
+              "name": "John Doe"
+            }
+          }
+        }
+      }
+    },
+    {
+      "description": "Valid createSurface with only components list",
+      "valid": true,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "components": [
+            {
+              "id": "root",
+              "component": "Text",
+              "text": "Minimal components configuration"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Valid createSurface with only dataModel update",
+      "valid": true,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "dataModel": {
+            "themePreference": "dark"
+          }
+        }
+      }
+    },
+    {
+      "description": "Invalid: createSurface contains additional unexpected properties",
+      "valid": false,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "components": [
+            {
+              "id": "root",
+              "component": "Text",
+              "text": "Invalid extra prop"
+            }
+          ],
+          "extraProp": "should_not_be_here"
+        }
+      }
+    },
+    {
+      "description": "Invalid: components is a string instead of an array",
+      "valid": false,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "components": "not-an-array"
+        }
+      }
+    },
+    {
+      "description": "Invalid: components contains empty array",
+      "valid": false,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "components": []
+        }
+      }
+    },
+    {
+      "description": "Invalid: components array contains a null element",
+      "valid": false,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "components": [null]
+        }
+      }
+    },
+    {
+      "description": "Invalid: dataModel is a string instead of an object",
+      "valid": false,
+      "data": {
+        "version": "v0.10",
+        "createSurface": {
+          "surfaceId": "test_surface",
+          "catalogId": "https://a2ui.org/specification/v0_10/catalogs/basic/catalog.json",
+          "dataModel": "not-an-object"
+        }
+      }
+    }
+  ]
+}

specification/v0_10/test/run_tests.py

@@ -5,7 +5,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,