Implement A2UI catalog negotiation (#576)

Author: jacobsimionato

examples/catalog_gallery/lib/samples_view.dart

@@ -40,7 +40,7 @@ class _SamplesViewState extends State<SamplesView> {
   @override
   void initState() {
     super.initState();
-    _genUiManager = GenUiManager(catalog: widget.catalog);
+    _genUiManager = GenUiManager(catalogs: [widget.catalog]);
     _loadSamples();
     _setupSurfaceListener();
   }
@@ -109,7 +109,7 @@ class _SamplesViewState extends State<SamplesView> {
     });
     // Re-create GenUiManager to ensure a clean state for the new sample.
     _genUiManager.dispose();
-    _genUiManager = GenUiManager(catalog: widget.catalog);
+    _genUiManager = GenUiManager(catalogs: [widget.catalog]);
     _setupSurfaceListener();
 
     try {

examples/custom_backend/lib/main.dart

@@ -77,7 +77,7 @@ class _IntegrationTesterState extends State<_IntegrationTester> {
   final _controller = TextEditingController(text: requestText);
 
   final _protocol = Backend(uiSchema);
-  late final GenUiManager _genUi = GenUiManager(catalog: _catalog);
+  late final GenUiManager _genUi = GenUiManager(catalogs: [_catalog]);
   String? _selectedResponse;
   bool _isLoading = false;
   String? _errorMessage;

examples/simple_chat/lib/main.dart

@@ -76,7 +76,7 @@ class _ChatScreenState extends State<ChatScreen> {
   void initState() {
     super.initState();
     final Catalog catalog = CoreCatalogItems.asCatalog();
-    _genUiManager = GenUiManager(catalog: catalog);
+    _genUiManager = GenUiManager(catalogs: [catalog]);
 
     final systemInstruction =
         '''You are a helpful assistant who chats with a user,

examples/travel_app/lib/src/catalog.dart

@@ -24,35 +24,20 @@ import 'catalog/travel_carousel.dart';
 /// for a travel planning experience, such as [travelCarousel], [itinerary],
 /// and [inputGroup]. The AI selects from these components to build a dynamic
 /// and interactive UI in response to user prompts.
-final Catalog travelAppCatalog = CoreCatalogItems.asCatalog()
-    .copyWithout([
-      CoreCatalogItems.audioPlayer,
-      CoreCatalogItems.card,
-      CoreCatalogItems.checkBox,
-      CoreCatalogItems.dateTimeInput,
-      CoreCatalogItems.divider,
-      CoreCatalogItems.textField,
-      CoreCatalogItems.list,
-      CoreCatalogItems.modal,
-      CoreCatalogItems.multipleChoice,
-      CoreCatalogItems.slider,
-      CoreCatalogItems.tabs,
-      CoreCatalogItems.video,
-      CoreCatalogItems.icon,
-      CoreCatalogItems.row,
-      CoreCatalogItems.image,
-    ])
-    .copyWith([
-      CoreCatalogItems.imageFixedSize,
-      checkboxFilterChipsInput,
-      dateInputChip,
-      informationCard,
-      inputGroup,
-      itinerary,
-      listingsBooker,
-      optionsFilterChipInput,
-      tabbedSections,
-      textInputChip,
-      trailhead,
-      travelCarousel,
-    ]);
+final Catalog travelAppCatalog = Catalog([
+  CoreCatalogItems.button,
+  CoreCatalogItems.column,
+  CoreCatalogItems.text,
+  CoreCatalogItems.imageFixedSize,
+  checkboxFilterChipsInput,
+  dateInputChip,
+  informationCard,
+  inputGroup,
+  itinerary,
+  listingsBooker,
+  optionsFilterChipInput,
+  tabbedSections,
+  textInputChip,
+  trailhead,
+  travelCarousel,
+], catalogId: 'example.com:travel_v0');

examples/travel_app/lib/src/travel_planner_page.dart

@@ -63,16 +63,7 @@ class _TravelPlannerPageState extends State<TravelPlannerPage>
   @override
   void initState() {
     super.initState();
-    final genUiManager = GenUiManager(
-      catalog: travelAppCatalog,
-      configuration: const GenUiConfiguration(
-        actions: ActionsConfig(
-          allowCreate: true,
-          allowUpdate: true,
-          allowDelete: true,
-        ),
-      ),
-    );
+    final genUiManager = GenUiManager(catalogs: [travelAppCatalog]);
     _userMessageSubscription = genUiManager.onSubmit.listen(
       _handleUserMessageFromUi,
     );

examples/travel_app/test/widgets/conversation_test.dart

@@ -12,7 +12,7 @@ void main() {
     late GenUiManager manager;
 
     setUp(() {
-      manager = GenUiManager(catalog: CoreCatalogItems.asCatalog());
+      manager = GenUiManager(catalogs: [CoreCatalogItems.asCatalog()]);
     });
 
     testWidgets('renders a list of messages', (WidgetTester tester) async {

examples/verdure/client/lib/features/ai/ai_provider.dart

@@ -67,7 +67,7 @@ class AiClientState {
 class Ai extends _$Ai {
   @override
   Future<AiClientState> build() async {
-    final genUiManager = GenUiManager(catalog: CoreCatalogItems.asCatalog());
+    final genUiManager = GenUiManager(catalogs: [CoreCatalogItems.asCatalog()]);
     final A2uiAgentConnector connector = await ref.watch(
       a2uiAgentConnectorProvider.future,
     );

packages/genui/CHANGELOG.md

@@ -3,6 +3,10 @@
 ## 0.5.2 (in progress)
 - Updated README sample code to reflect current `FirebaseAiContentGenerator` API (added `catalog` parameter and replaced `tools` with `additionalTools`).
 
+- **Feature**: `GenUiManager` now supports multiple catalogs by accepting an `Iterable<Catalog>` in its constructor.
+- **Feature**: `catalogId` property added to `UiDefinition` to specify which catalog a UI surface should use.
+- **Refactor**: Moved `standardCatalogId` constant from `core_catalog.dart` to `primitives/constants.dart` for better organization and accessibility.
+
 ## 0.5.1
 
 - Homepage URL was updated.

packages/genui/README.md

@@ -164,7 +164,7 @@ provider.
 
        // Create a GenUiManager with a widget catalog.
        // The CoreCatalogItems contain basic widgets for text, markdown, and images.
-       _genUiManager = GenUiManager(catalog: CoreCatalogItems.asCatalog());
+       _genUiManager = GenUiManager(catalogs: [CoreCatalogItems.asCatalog()]);
 
        // Create a ContentGenerator to communicate with the LLM.
        // Provide system instructions and the tools from the GenUiManager.
@@ -378,7 +378,7 @@ Include your catalog items when instantiating `GenUiManager`.
 
 ```dart
 _genUiManager = GenUiManager(
-  catalog: CoreCatalogItems.asCatalog().copyWith([riddleCard]),
+  catalogs: [CoreCatalogItems.asCatalog().copyWith([riddleCard])],
 );
 ```
 

packages/genui/lib/genui.dart

@@ -22,6 +22,7 @@ export 'src/core/widgets/chat_primitives.dart';
 export 'src/development_utilities/catalog_view.dart';
 export 'src/facade/direct_call_integration/model.dart';
 export 'src/facade/direct_call_integration/utils.dart';
+export 'src/model/a2ui_client_capabilities.dart';
 export 'src/model/a2ui_message.dart';
 export 'src/model/a2ui_schemas.dart';
 export 'src/model/catalog.dart';