@almadar/std 8.4.2 → 9.0.0

package/dist/behaviors/registry/service/organisms/std-service-research-assistant.orb

@@ -55,7 +55,7 @@
             {
               "event": "ResearchYoutubeCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "result",
                   "type": "object"
@@ -65,7 +65,7 @@
             {
               "event": "ResearchYoutubeFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -79,7 +79,7 @@
             {
               "event": "ResearchLlmCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "result",
                   "type": "object"
@@ -89,7 +89,7 @@
             {
               "event": "ResearchLlmFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -103,9 +103,9 @@
             {
               "event": "ResearchRedisCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
-                  "name": "result",
+                  "name": "data",
                   "type": "object"
                 }
               ]
@@ -113,7 +113,7 @@
             {
               "event": "ResearchRedisFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -127,9 +127,9 @@
             {
               "event": "ResearchStorageCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
-                  "name": "result",
+                  "name": "data",
                   "type": "object"
                 }
               ]
@@ -137,7 +137,7 @@
             {
               "event": "ResearchStorageFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -151,9 +151,9 @@
             {
               "event": "ResearchCustomBearerApiCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
-                  "name": "result",
+                  "name": "data",
                   "type": "object"
                 }
               ]
@@ -161,7 +161,7 @@
             {
               "event": "ResearchCustomBearerApiFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -207,7 +207,7 @@
               {
                 "key": "SEARCH_COMPLETE",
                 "name": "Search Complete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "results",
                     "type": "[Research]"
@@ -217,7 +217,7 @@
               {
                 "key": "FAILED",
                 "name": "Failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string",
@@ -228,7 +228,7 @@
               {
                 "key": "SELECT_AND_SUMMARIZE",
                 "name": "Select And Summarize",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "videoId",
                     "type": "string",
@@ -243,7 +243,7 @@
               {
                 "key": "VIDEO_FETCHED",
                 "name": "Video Fetched",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "title",
                     "type": "string",
@@ -259,7 +259,7 @@
               {
                 "key": "SUMMARY_COMPLETE",
                 "name": "Summary Complete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "content",
                     "type": "string",
@@ -270,7 +270,7 @@
               {
                 "key": "ResearchYoutubeCompleted",
                 "name": "Research youtube completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "result",
                     "type": "object"
@@ -280,7 +280,7 @@
               {
                 "key": "ResearchYoutubeFailed",
                 "name": "Research youtube failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -294,7 +294,7 @@
               {
                 "key": "ResearchLlmCompleted",
                 "name": "Research llm completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "result",
                     "type": "object"
@@ -304,7 +304,7 @@
               {
                 "key": "ResearchLlmFailed",
                 "name": "Research llm failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -318,9 +318,9 @@
               {
                 "key": "ResearchRedisCompleted",
                 "name": "Research redis completed",
-                "payload": [
+                "payloadSchema": [
                   {
-                    "name": "result",
+                    "name": "data",
                     "type": "object"
                   }
                 ]
@@ -328,7 +328,7 @@
               {
                 "key": "ResearchRedisFailed",
                 "name": "Research redis failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -342,9 +342,9 @@
               {
                 "key": "ResearchStorageCompleted",
                 "name": "Research storage completed",
-                "payload": [
+                "payloadSchema": [
                   {
-                    "name": "result",
+                    "name": "data",
                     "type": "object"
                   }
                 ]
@@ -352,7 +352,7 @@
               {
                 "key": "ResearchStorageFailed",
                 "name": "Research storage failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -366,9 +366,9 @@
               {
                 "key": "ResearchCustomBearerApiCompleted",
                 "name": "Research custom bearer api completed",
-                "payload": [
+                "payloadSchema": [
                   {
-                    "name": "result",
+                    "name": "data",
                     "type": "object"
                   }
                 ]
@@ -376,7 +376,7 @@
               {
                 "key": "ResearchCustomBearerApiFailed",
                 "name": "Research custom bearer api failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -398,28 +398,28 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "direction": "vertical",
+                          "gap": "lg",
                           "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "direction": "horizontal",
-                              "align": "center",
                               "children": [
                                 {
-                                  "name": "search",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "search"
                                 },
                                 {
+                                  "content": "Content Research",
                                   "variant": "h2",
-                                  "type": "typography",
-                                  "content": "Content Research"
+                                  "type": "typography"
                                 }
                               ],
+                              "direction": "horizontal",
+                              "gap": "sm",
                               "type": "stack",
-                              "gap": "sm"
+                              "align": "center"
                             },
                             {
                               "type": "divider"
@@ -429,36 +429,35 @@
                               "children": [
                                 {
                                   "type": "stack",
-                                  "gap": "md",
                                   "children": [
                                     {
-                                      "content": "Search YouTube for content to summarize",
                                       "variant": "body",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "content": "Search YouTube for content to summarize"
                                     },
                                     {
-                                      "type": "form-section",
+                                      "submitEvent": "SEARCH",
                                       "mode": "edit",
+                                      "entity": "@entity",
+                                      "type": "form-section",
                                       "fields": [
                                         "query"
-                                      ],
-                                      "submitEvent": "SEARCH",
-                                      "entity": "@entity"
+                                      ]
                                     }
                                   ],
-                                  "direction": "vertical"
+                                  "direction": "vertical",
+                                  "gap": "md"
                                 }
                               ]
                             }
-                          ],
-                          "gap": "lg"
+                          ]
                         }
                       ],
                       "navItems": [
                         {
                           "href": "/research",
-                          "icon": "search",
-                          "label": "Research"
+                          "label": "Research",
+                          "icon": "search"
                         },
                         {
                           "icon": "database",
@@ -466,17 +465,18 @@
                           "href": "/cache"
                         },
                         {
+                          "href": "/reports",
                           "label": "Reports",
-                          "icon": "file-text",
-                          "href": "/reports"
+                          "icon": "file-text"
                         },
                         {
-                          "label": "Knowledge",
                           "href": "/knowledge",
+                          "label": "Knowledge",
                           "icon": "book-open"
                         }
                       ],
-                      "appName": "ResearchAssistant"
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -496,9 +496,9 @@
                     "youtube",
                     "search",
                     {
-                      "type": "video",
+                      "maxResults": 5.0,
                       "query": "@entity.query",
-                      "maxResults": 5.0
+                      "type": "video"
                     },
                     {
                       "emit": {
@@ -511,57 +511,57 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "ResearchAssistant",
+                      "navItems": [
+                        {
+                          "icon": "search",
+                          "label": "Research",
+                          "href": "/research"
+                        },
+                        {
+                          "icon": "database",
+                          "href": "/cache",
+                          "label": "Cache"
+                        },
+                        {
+                          "label": "Reports",
+                          "href": "/reports",
+                          "icon": "file-text"
+                        },
+                        {
+                          "icon": "book-open",
+                          "label": "Knowledge",
+                          "href": "/knowledge"
+                        }
+                      ],
                       "children": [
                         {
-                          "align": "center",
-                          "gap": "lg",
-                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "search"
+                              "name": "search",
+                              "type": "icon"
                             },
                             {
                               "content": "Searching YouTube...",
-                              "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             },
                             {
                               "type": "spinner"
                             },
                             {
-                              "variant": "caption",
                               "type": "typography",
-                              "content": "@entity.query"
+                              "content": "@entity.query",
+                              "variant": "caption"
                             }
                           ],
-                          "direction": "vertical"
+                          "type": "stack",
+                          "align": "center",
+                          "direction": "vertical",
+                          "gap": "lg"
                         }
                       ],
-                      "navItems": [
-                        {
-                          "href": "/research",
-                          "icon": "search",
-                          "label": "Research"
-                        },
-                        {
-                          "label": "Cache",
-                          "href": "/cache",
-                          "icon": "database"
-                        },
-                        {
-                          "icon": "file-text",
-                          "href": "/reports",
-                          "label": "Reports"
-                        },
-                        {
-                          "icon": "book-open",
-                          "href": "/knowledge",
-                          "label": "Knowledge"
-                        }
-                      ]
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -580,65 +580,85 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "search",
+                          "label": "Research",
+                          "href": "/research"
+                        },
+                        {
+                          "label": "Cache",
+                          "icon": "database",
+                          "href": "/cache"
+                        },
+                        {
+                          "icon": "file-text",
+                          "label": "Reports",
+                          "href": "/reports"
+                        },
+                        {
+                          "href": "/knowledge",
+                          "label": "Knowledge",
+                          "icon": "book-open"
+                        }
+                      ],
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "lg",
                           "direction": "vertical",
+                          "gap": "lg",
+                          "type": "stack",
                           "children": [
                             {
-                              "direction": "horizontal",
-                              "align": "center",
-                              "gap": "sm",
-                              "type": "stack",
-                              "justify": "between",
                               "children": [
                                 {
                                   "direction": "horizontal",
-                                  "gap": "sm",
                                   "type": "stack",
                                   "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "video"
+                                      "name": "video",
+                                      "type": "icon"
                                     },
                                     {
                                       "content": "Search Results",
                                       "type": "typography",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm"
                                 },
                                 {
                                   "type": "button",
+                                  "action": "RESET",
                                   "icon": "rotate-ccw",
                                   "label": "New Search",
-                                  "action": "RESET",
                                   "variant": "ghost"
                                 }
-                              ]
+                              ],
+                              "direction": "horizontal",
+                              "type": "stack",
+                              "align": "center",
+                              "justify": "between",
+                              "gap": "sm"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "fields": [],
+                              "type": "data-grid",
                               "itemActions": [
                                 {
                                   "label": "Summarize",
-                                  "event": "SELECT_AND_SUMMARIZE",
-                                  "variant": "primary"
+                                  "variant": "primary",
+                                  "event": "SELECT_AND_SUMMARIZE"
                                 }
                               ],
-                              "type": "data-grid",
                               "columns": [
                                 {
+                                  "label": "Title",
                                   "variant": "h4",
-                                  "name": "videoTitle",
                                   "icon": "video",
-                                  "label": "Title"
+                                  "name": "videoTitle"
                                 },
                                 {
                                   "label": "Description",
@@ -646,34 +666,14 @@
                                   "name": "videoDescription"
                                 }
                               ],
-                              "entity": "@payload.results"
+                              "entity": "@payload.results",
+                              "fields": []
                             }
                           ]
                         }
                       ],
                       "appName": "ResearchAssistant",
-                      "navItems": [
-                        {
-                          "href": "/research",
-                          "icon": "search",
-                          "label": "Research"
-                        },
-                        {
-                          "icon": "database",
-                          "href": "/cache",
-                          "label": "Cache"
-                        },
-                        {
-                          "href": "/reports",
-                          "icon": "file-text",
-                          "label": "Reports"
-                        },
-                        {
-                          "href": "/knowledge",
-                          "icon": "book-open",
-                          "label": "Knowledge"
-                        }
-                      ]
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -697,44 +697,22 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "icon": "search",
-                          "label": "Research",
-                          "href": "/research"
-                        },
-                        {
-                          "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
-                        },
-                        {
-                          "label": "Reports",
-                          "icon": "file-text",
-                          "href": "/reports"
-                        },
-                        {
-                          "label": "Knowledge",
-                          "href": "/knowledge",
-                          "icon": "book-open"
-                        }
-                      ],
                       "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "align": "center",
-                          "gap": "lg",
-                          "type": "stack",
                           "direction": "vertical",
+                          "type": "stack",
+                          "gap": "lg",
+                          "align": "center",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
-                              "content": "Pipeline Error",
                               "variant": "h2",
+                              "content": "Pipeline Error",
                               "type": "typography"
                             },
                             {
@@ -744,13 +722,35 @@
                             },
                             {
                               "type": "button",
-                              "action": "RESET",
                               "label": "Try Again",
-                              "icon": "rotate-ccw",
-                              "variant": "primary"
+                              "action": "RESET",
+                              "variant": "primary",
+                              "icon": "rotate-ccw"
                             }
                           ]
                         }
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Research",
+                          "href": "/research",
+                          "icon": "search"
+                        },
+                        {
+                          "label": "Cache",
+                          "href": "/cache",
+                          "icon": "database"
+                        },
+                        {
+                          "icon": "file-text",
+                          "label": "Reports",
+                          "href": "/reports"
+                        },
+                        {
+                          "icon": "book-open",
+                          "label": "Knowledge",
+                          "href": "/knowledge"
+                        }
                       ]
                     }
                   ]
@@ -784,30 +784,29 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
                           "children": [
                             {
                               "type": "icon",
                               "name": "cpu"
                             },
                             {
-                              "type": "typography",
+                              "content": "Fetching & summarizing...",
                               "variant": "h3",
-                              "content": "Fetching & summarizing..."
+                              "type": "typography"
                             },
                             {
                               "type": "spinner"
                             },
                             {
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "@entity.videoTitle"
+                              "content": "@entity.videoTitle",
+                              "variant": "caption"
                             }
                           ],
+                          "type": "stack",
+                          "align": "center",
                           "direction": "vertical",
                           "gap": "lg"
                         }
@@ -819,22 +818,23 @@
                           "href": "/research"
                         },
                         {
-                          "label": "Cache",
                           "icon": "database",
-                          "href": "/cache"
+                          "href": "/cache",
+                          "label": "Cache"
                         },
                         {
+                          "label": "Reports",
                           "icon": "file-text",
-                          "href": "/reports",
-                          "label": "Reports"
+                          "href": "/reports"
                         },
                         {
                           "href": "/knowledge",
-                          "icon": "book-open",
-                          "label": "Knowledge"
+                          "label": "Knowledge",
+                          "icon": "book-open"
                         }
                       ],
-                      "appName": "ResearchAssistant"
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -853,85 +853,85 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "search",
-                          "label": "Research",
-                          "href": "/research"
-                        },
-                        {
-                          "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
-                        },
-                        {
-                          "icon": "file-text",
-                          "label": "Reports",
-                          "href": "/reports"
-                        },
-                        {
-                          "icon": "book-open",
-                          "href": "/knowledge",
-                          "label": "Knowledge"
-                        }
-                      ],
-                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "stack",
                           "children": [
                             {
-                              "align": "center",
                               "gap": "sm",
                               "children": [
                                 {
-                                  "name": "search",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "search"
                                 },
                                 {
-                                  "content": "Content Research",
                                   "variant": "h2",
+                                  "content": "Content Research",
                                   "type": "typography"
                                 }
                               ],
                               "direction": "horizontal",
-                              "type": "stack"
+                              "type": "stack",
+                              "align": "center"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "card",
                               "children": [
                                 {
-                                  "type": "stack",
+                                  "direction": "vertical",
                                   "children": [
                                     {
                                       "variant": "body",
-                                      "content": "Search YouTube for content to summarize",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "content": "Search YouTube for content to summarize"
                                     },
                                     {
                                       "entity": "@entity",
+                                      "type": "form-section",
                                       "fields": [
                                         "query"
                                       ],
                                       "mode": "edit",
-                                      "type": "form-section",
                                       "submitEvent": "SEARCH"
                                     }
                                   ],
-                                  "direction": "vertical",
-                                  "gap": "md"
+                                  "gap": "md",
+                                  "type": "stack"
                                 }
-                              ],
-                              "type": "card"
+                              ]
                             }
                           ],
+                          "type": "stack",
                           "gap": "lg",
                           "direction": "vertical"
                         }
                       ],
-                      "type": "dashboard-layout"
+                      "appName": "ResearchAssistant",
+                      "navItems": [
+                        {
+                          "href": "/research",
+                          "icon": "search",
+                          "label": "Research"
+                        },
+                        {
+                          "href": "/cache",
+                          "label": "Cache",
+                          "icon": "database"
+                        },
+                        {
+                          "label": "Reports",
+                          "icon": "file-text",
+                          "href": "/reports"
+                        },
+                        {
+                          "href": "/knowledge",
+                          "label": "Knowledge",
+                          "icon": "book-open"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -988,19 +988,19 @@
                     {
                       "navItems": [
                         {
+                          "icon": "search",
                           "label": "Research",
-                          "href": "/research",
-                          "icon": "search"
+                          "href": "/research"
                         },
                         {
-                          "label": "Cache",
                           "href": "/cache",
-                          "icon": "database"
+                          "icon": "database",
+                          "label": "Cache"
                         },
                         {
-                          "href": "/reports",
+                          "icon": "file-text",
                           "label": "Reports",
-                          "icon": "file-text"
+                          "href": "/reports"
                         },
                         {
                           "label": "Knowledge",
@@ -1008,7 +1008,6 @@
                           "icon": "book-open"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "appName": "ResearchAssistant",
                       "children": [
                         {
@@ -1017,36 +1016,36 @@
                           "children": [
                             {
                               "direction": "horizontal",
-                              "type": "stack",
-                              "align": "center",
                               "gap": "sm",
-                              "justify": "between",
+                              "align": "center",
                               "children": [
                                 {
+                                  "type": "stack",
                                   "align": "center",
-                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "name": "check-circle",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "check-circle"
                                     },
                                     {
-                                      "variant": "h2",
                                       "content": "Research Complete",
+                                      "variant": "h2",
                                       "type": "typography"
                                     }
                                   ],
-                                  "type": "stack",
+                                  "gap": "sm",
                                   "direction": "horizontal"
                                 },
                                 {
                                   "icon": "rotate-ccw",
-                                  "variant": "ghost",
-                                  "action": "RESET",
                                   "type": "button",
-                                  "label": "New Search"
+                                  "label": "New Search",
+                                  "action": "RESET",
+                                  "variant": "ghost"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "justify": "between"
                             },
                             {
                               "type": "divider"
@@ -1054,26 +1053,26 @@
                             {
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "gap": "md",
                                   "direction": "vertical",
+                                  "gap": "md",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "gap": "sm",
                                       "align": "center",
-                                      "direction": "horizontal",
                                       "children": [
                                         {
-                                          "name": "video",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "video"
                                         },
                                         {
                                           "variant": "h3",
                                           "type": "typography",
                                           "content": "@entity.videoTitle"
                                         }
-                                      ]
+                                      ],
+                                      "type": "stack",
+                                      "direction": "horizontal",
+                                      "gap": "sm"
                                     },
                                     {
                                       "type": "divider"
@@ -1084,9 +1083,9 @@
                                       "variant": "caption"
                                     },
                                     {
-                                      "content": "@entity.summary",
                                       "type": "typography",
-                                      "variant": "body"
+                                      "variant": "body",
+                                      "content": "@entity.summary"
                                     }
                                   ]
                                 }
@@ -1096,7 +1095,8 @@
                           ],
                           "direction": "vertical"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -1120,61 +1120,61 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "gap": "lg",
                           "align": "center",
-                          "type": "stack",
+                          "gap": "lg",
                           "direction": "vertical",
                           "children": [
                             {
-                              "name": "alert-triangle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "alert-triangle"
                             },
                             {
-                              "variant": "h2",
+                              "type": "typography",
                               "content": "Pipeline Error",
-                              "type": "typography"
+                              "variant": "h2"
                             },
                             {
-                              "message": "@entity.error",
                               "type": "alert",
-                              "variant": "error"
+                              "variant": "error",
+                              "message": "@entity.error"
                             },
                             {
-                              "icon": "rotate-ccw",
-                              "action": "RESET",
+                              "type": "button",
                               "label": "Try Again",
+                              "action": "RESET",
                               "variant": "primary",
-                              "type": "button"
+                              "icon": "rotate-ccw"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         }
                       ],
-                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "href": "/research",
                           "label": "Research",
+                          "href": "/research",
                           "icon": "search"
                         },
                         {
+                          "icon": "database",
                           "label": "Cache",
-                          "href": "/cache",
-                          "icon": "database"
+                          "href": "/cache"
                         },
                         {
-                          "href": "/reports",
                           "icon": "file-text",
-                          "label": "Reports"
+                          "label": "Reports",
+                          "href": "/reports"
                         },
                         {
                           "label": "Knowledge",
                           "href": "/knowledge",
                           "icon": "book-open"
                         }
-                      ]
+                      ],
+                      "appName": "ResearchAssistant"
                     }
                   ]
                 ]
@@ -1213,85 +1213,85 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Research",
+                          "href": "/research",
+                          "icon": "search"
+                        },
+                        {
+                          "label": "Cache",
+                          "icon": "database",
+                          "href": "/cache"
+                        },
+                        {
+                          "href": "/reports",
+                          "icon": "file-text",
+                          "label": "Reports"
+                        },
+                        {
+                          "href": "/knowledge",
+                          "icon": "book-open",
+                          "label": "Knowledge"
+                        }
+                      ],
                       "children": [
                         {
                           "gap": "lg",
                           "type": "stack",
                           "children": [
                             {
-                              "direction": "horizontal",
                               "gap": "sm",
+                              "direction": "horizontal",
+                              "align": "center",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "search"
+                                  "name": "search",
+                                  "type": "icon"
                                 },
                                 {
-                                  "variant": "h2",
                                   "type": "typography",
-                                  "content": "Content Research"
+                                  "content": "Content Research",
+                                  "variant": "h2"
                                 }
                               ],
-                              "align": "center",
                               "type": "stack"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "card",
                               "children": [
                                 {
                                   "direction": "vertical",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "content": "Search YouTube for content to summarize",
+                                      "type": "typography",
                                       "variant": "body",
-                                      "type": "typography"
+                                      "content": "Search YouTube for content to summarize"
                                     },
                                     {
                                       "submitEvent": "SEARCH",
                                       "type": "form-section",
-                                      "mode": "edit",
                                       "entity": "@entity",
+                                      "mode": "edit",
                                       "fields": [
                                         "query"
                                       ]
                                     }
                                   ],
-                                  "gap": "md",
                                   "type": "stack"
                                 }
-                              ]
+                              ],
+                              "type": "card"
                             }
                           ],
                           "direction": "vertical"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "ResearchAssistant",
-                      "navItems": [
-                        {
-                          "label": "Research",
-                          "href": "/research",
-                          "icon": "search"
-                        },
-                        {
-                          "href": "/cache",
-                          "icon": "database",
-                          "label": "Cache"
-                        },
-                        {
-                          "icon": "file-text",
-                          "label": "Reports",
-                          "href": "/reports"
-                        },
-                        {
-                          "href": "/knowledge",
-                          "label": "Knowledge",
-                          "icon": "book-open"
-                        }
-                      ]
+                      "appName": "ResearchAssistant"
                     }
                   ]
                 ]
@@ -1315,36 +1315,16 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "search",
-                          "href": "/research",
-                          "label": "Research"
-                        },
-                        {
-                          "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
-                        },
-                        {
-                          "href": "/reports",
-                          "label": "Reports",
-                          "icon": "file-text"
-                        },
-                        {
-                          "label": "Knowledge",
-                          "href": "/knowledge",
-                          "icon": "book-open"
-                        }
-                      ],
-                      "children": [
+                      "type": "dashboard-layout",
+                      "children": [
                         {
                           "type": "stack",
-                          "direction": "vertical",
                           "gap": "lg",
+                          "direction": "vertical",
                           "children": [
                             {
                               "gap": "sm",
+                              "type": "stack",
                               "children": [
                                 {
                                   "name": "search",
@@ -1357,18 +1337,18 @@
                                 }
                               ],
                               "direction": "horizontal",
-                              "align": "center",
-                              "type": "stack"
+                              "align": "center"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "card",
                               "children": [
                                 {
-                                  "direction": "vertical",
-                                  "type": "stack",
                                   "gap": "md",
+                                  "type": "stack",
+                                  "direction": "vertical",
                                   "children": [
                                     {
                                       "type": "typography",
@@ -1381,19 +1361,39 @@
                                         "query"
                                       ],
                                       "submitEvent": "SEARCH",
-                                      "mode": "edit",
-                                      "type": "form-section"
+                                      "type": "form-section",
+                                      "mode": "edit"
                                     }
                                   ]
                                 }
-                              ],
-                              "type": "card"
+                              ]
                             }
                           ]
                         }
                       ],
                       "appName": "ResearchAssistant",
-                      "type": "dashboard-layout"
+                      "navItems": [
+                        {
+                          "label": "Research",
+                          "icon": "search",
+                          "href": "/research"
+                        },
+                        {
+                          "label": "Cache",
+                          "href": "/cache",
+                          "icon": "database"
+                        },
+                        {
+                          "label": "Reports",
+                          "href": "/reports",
+                          "icon": "file-text"
+                        },
+                        {
+                          "icon": "book-open",
+                          "label": "Knowledge",
+                          "href": "/knowledge"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -1463,7 +1463,7 @@
               "event": "CacheEntryLoadFailed",
               "description": "Fired when CacheEntry fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1478,7 +1478,7 @@
               "event": "CacheEntryLoaded",
               "description": "Fired when CacheEntry finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[CacheEntry]"
@@ -1488,7 +1488,7 @@
             {
               "event": "ResearchRedisCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "object"
@@ -1498,7 +1498,7 @@
             {
               "event": "ResearchRedisFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1546,7 +1546,7 @@
               {
                 "key": "EXECUTED",
                 "name": "Executed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -1556,7 +1556,7 @@
               {
                 "key": "FAILED",
                 "name": "Failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1570,7 +1570,7 @@
               {
                 "key": "CacheEntryLoadFailed",
                 "name": "CacheEntry load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1584,7 +1584,7 @@
               {
                 "key": "CacheEntryLoaded",
                 "name": "CacheEntry loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[CacheEntry]"
@@ -1594,7 +1594,7 @@
               {
                 "key": "ResearchRedisCompleted",
                 "name": "Research redis completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object"
@@ -1604,7 +1604,7 @@
               {
                 "key": "ResearchRedisFailed",
                 "name": "Research redis failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1639,104 +1639,104 @@
                       "appName": "ResearchAssistant",
                       "children": [
                         {
+                          "type": "stack",
+                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
-                              "gap": "md",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "database"
+                                  "name": "database",
+                                  "type": "icon"
                                 },
                                 {
-                                  "content": "Redis Cache",
                                   "variant": "h2",
+                                  "content": "Redis Cache",
                                   "type": "typography"
                                 }
                               ],
+                              "gap": "md",
                               "direction": "horizontal",
-                              "type": "stack",
                               "align": "center"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "direction": "vertical",
                               "type": "stack",
-                              "gap": "md",
                               "children": [
                                 {
                                   "type": "input",
                                   "placeholder": "cache-key"
                                 },
                                 {
-                                  "placeholder": "cache-value",
-                                  "type": "input"
+                                  "type": "input",
+                                  "placeholder": "cache-value"
                                 },
                                 {
-                                  "inputType": "number",
                                   "type": "input",
+                                  "inputType": "number",
                                   "placeholder": "3600"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "gap": "md"
                             },
                             {
+                              "justify": "center",
+                              "type": "stack",
+                              "direction": "horizontal",
+                              "gap": "sm",
                               "children": [
                                 {
+                                  "variant": "primary",
                                   "type": "button",
                                   "label": "Get",
                                   "action": "GET_KEY",
-                                  "variant": "primary",
                                   "icon": "download"
                                 },
                                 {
                                   "variant": "primary",
+                                  "label": "Set",
                                   "icon": "upload",
-                                  "type": "button",
                                   "action": "SET_KEY",
-                                  "label": "Set"
+                                  "type": "button"
                                 },
                                 {
-                                  "label": "Delete",
-                                  "type": "button",
                                   "variant": "danger",
-                                  "action": "DELETE_KEY",
-                                  "icon": "trash-2"
+                                  "icon": "trash-2",
+                                  "type": "button",
+                                  "label": "Delete",
+                                  "action": "DELETE_KEY"
                                 }
-                              ],
-                              "gap": "sm",
-                              "justify": "center",
-                              "type": "stack",
-                              "direction": "horizontal"
+                              ]
                             }
                           ],
-                          "gap": "lg",
-                          "direction": "vertical",
-                          "type": "stack"
+                          "direction": "vertical"
                         }
                       ],
                       "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "href": "/research",
                           "icon": "search",
+                          "href": "/research",
                           "label": "Research"
                         },
                         {
-                          "href": "/cache",
                           "label": "Cache",
+                          "href": "/cache",
                           "icon": "database"
                         },
                         {
                           "icon": "file-text",
-                          "href": "/reports",
-                          "label": "Reports"
+                          "label": "Reports",
+                          "href": "/reports"
                         },
                         {
-                          "icon": "book-open",
+                          "label": "Knowledge",
                           "href": "/knowledge",
-                          "label": "Knowledge"
+                          "icon": "book-open"
                         }
                       ]
                     }
@@ -1752,6 +1752,15 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ResearchAssistant",
+                      "children": [
+                        {
+                          "type": "loading-state",
+                          "title": "Executing...",
+                          "message": "Running redis operation..."
+                        }
+                      ],
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "href": "/research",
@@ -1759,30 +1768,21 @@
                           "label": "Research"
                         },
                         {
-                          "href": "/cache",
                           "label": "Cache",
-                          "icon": "database"
+                          "icon": "database",
+                          "href": "/cache"
                         },
                         {
                           "label": "Reports",
-                          "icon": "file-text",
-                          "href": "/reports"
+                          "href": "/reports",
+                          "icon": "file-text"
                         },
                         {
                           "icon": "book-open",
-                          "label": "Knowledge",
-                          "href": "/knowledge"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "children": [
-                        {
-                          "type": "loading-state",
-                          "title": "Executing...",
-                          "message": "Running redis operation..."
+                          "href": "/knowledge",
+                          "label": "Knowledge"
                         }
-                      ],
-                      "appName": "ResearchAssistant"
+                      ]
                     }
                   ],
                   [
@@ -1794,8 +1794,8 @@
                     },
                     {
                       "emit": {
-                        "failure": "ResearchRedisFailed",
-                        "success": "ResearchRedisCompleted"
+                        "success": "ResearchRedisCompleted",
+                        "failure": "ResearchRedisFailed"
                       }
                     }
                   ]
@@ -1810,37 +1810,37 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "children": [
+                        {
+                          "message": "Running redis operation...",
+                          "title": "Executing...",
+                          "type": "loading-state"
+                        }
+                      ],
                       "navItems": [
                         {
-                          "icon": "search",
+                          "href": "/research",
                           "label": "Research",
-                          "href": "/research"
+                          "icon": "search"
                         },
                         {
-                          "href": "/cache",
                           "label": "Cache",
+                          "href": "/cache",
                           "icon": "database"
                         },
                         {
+                          "label": "Reports",
                           "icon": "file-text",
-                          "href": "/reports",
-                          "label": "Reports"
+                          "href": "/reports"
                         },
                         {
                           "label": "Knowledge",
-                          "href": "/knowledge",
-                          "icon": "book-open"
-                        }
-                      ],
-                      "children": [
-                        {
-                          "title": "Executing...",
-                          "message": "Running redis operation...",
-                          "type": "loading-state"
+                          "icon": "book-open",
+                          "href": "/knowledge"
                         }
                       ],
-                      "appName": "ResearchAssistant",
-                      "type": "dashboard-layout"
+                      "appName": "ResearchAssistant"
                     }
                   ],
                   [
@@ -1848,9 +1848,9 @@
                     "redis",
                     "set",
                     {
-                      "value": "@entity.value",
                       "ttl": "@entity.ttl",
-                      "key": "@entity.key"
+                      "key": "@entity.key",
+                      "value": "@entity.value"
                     },
                     {
                       "emit": {
@@ -1870,37 +1870,37 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ResearchAssistant",
-                      "children": [
-                        {
-                          "type": "loading-state",
-                          "title": "Executing...",
-                          "message": "Running redis operation..."
-                        }
-                      ],
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "label": "Research",
-                          "href": "/research",
-                          "icon": "search"
+                          "icon": "search",
+                          "href": "/research"
                         },
                         {
-                          "label": "Cache",
                           "href": "/cache",
+                          "label": "Cache",
                           "icon": "database"
                         },
                         {
-                          "href": "/reports",
                           "icon": "file-text",
-                          "label": "Reports"
+                          "label": "Reports",
+                          "href": "/reports"
                         },
                         {
                           "label": "Knowledge",
-                          "icon": "book-open",
-                          "href": "/knowledge"
+                          "href": "/knowledge",
+                          "icon": "book-open"
                         }
-                      ]
+                      ],
+                      "children": [
+                        {
+                          "type": "loading-state",
+                          "title": "Executing...",
+                          "message": "Running redis operation..."
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "ResearchAssistant"
                     }
                   ],
                   [
@@ -1933,33 +1933,35 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "search",
+                          "label": "Research",
                           "href": "/research",
-                          "label": "Research"
+                          "icon": "search"
                         },
                         {
+                          "icon": "database",
                           "label": "Cache",
-                          "href": "/cache",
-                          "icon": "database"
+                          "href": "/cache"
                         },
                         {
-                          "icon": "file-text",
+                          "href": "/reports",
                           "label": "Reports",
-                          "href": "/reports"
+                          "icon": "file-text"
                         },
                         {
                           "label": "Knowledge",
-                          "icon": "book-open",
-                          "href": "/knowledge"
+                          "href": "/knowledge",
+                          "icon": "book-open"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "align": "center",
                           "type": "stack",
+                          "gap": "lg",
+                          "align": "center",
                           "direction": "vertical",
                           "children": [
                             {
@@ -1967,28 +1969,26 @@
                               "type": "icon"
                             },
                             {
-                              "variant": "success",
+                              "message": "Operation complete",
                               "type": "alert",
-                              "message": "Operation complete"
+                              "variant": "success"
                             },
                             {
-                              "content": "@entity.result",
                               "type": "typography",
-                              "variant": "body",
-                              "color": "muted"
+                              "color": "muted",
+                              "content": "@entity.result",
+                              "variant": "body"
                             },
                             {
-                              "action": "RESET",
                               "icon": "rotate-ccw",
-                              "variant": "ghost",
+                              "action": "RESET",
                               "type": "button",
+                              "variant": "ghost",
                               "label": "Reset"
                             }
-                          ],
-                          "gap": "lg"
+                          ]
                         }
-                      ],
-                      "appName": "ResearchAssistant"
+                      ]
                     }
                   ]
                 ]
@@ -2007,36 +2007,36 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "onRetry": "RESET",
                           "type": "error-state",
                           "message": "@entity.error",
-                          "title": "Redis Error"
+                          "title": "Redis Error",
+                          "onRetry": "RESET"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "ResearchAssistant",
                       "navItems": [
                         {
+                          "icon": "search",
                           "label": "Research",
-                          "href": "/research",
-                          "icon": "search"
+                          "href": "/research"
                         },
                         {
                           "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
+                          "href": "/cache",
+                          "label": "Cache"
                         },
                         {
-                          "href": "/reports",
                           "label": "Reports",
-                          "icon": "file-text"
+                          "icon": "file-text",
+                          "href": "/reports"
                         },
                         {
+                          "label": "Knowledge",
                           "icon": "book-open",
-                          "href": "/knowledge",
-                          "label": "Knowledge"
+                          "href": "/knowledge"
                         }
                       ]
                     }
@@ -2052,55 +2052,31 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ResearchAssistant",
                       "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "icon": "search",
-                          "label": "Research",
-                          "href": "/research"
-                        },
-                        {
-                          "label": "Cache",
-                          "href": "/cache",
-                          "icon": "database"
-                        },
-                        {
-                          "label": "Reports",
-                          "icon": "file-text",
-                          "href": "/reports"
-                        },
-                        {
-                          "href": "/knowledge",
-                          "label": "Knowledge",
-                          "icon": "book-open"
-                        }
-                      ],
                       "children": [
                         {
                           "children": [
                             {
                               "type": "stack",
+                              "gap": "md",
+                              "direction": "horizontal",
+                              "align": "center",
                               "children": [
                                 {
-                                  "name": "database",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "database"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "h2",
+                                  "type": "typography",
                                   "content": "Redis Cache"
                                 }
-                              ],
-                              "align": "center",
-                              "gap": "md",
-                              "direction": "horizontal"
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "gap": "md",
                               "direction": "vertical",
                               "children": [
                                 {
@@ -2117,42 +2093,66 @@
                                   "inputType": "number"
                                 }
                               ],
-                              "type": "stack"
+                              "type": "stack",
+                              "gap": "md"
                             },
                             {
-                              "gap": "sm",
-                              "type": "stack",
-                              "direction": "horizontal",
-                              "justify": "center",
                               "children": [
                                 {
-                                  "variant": "primary",
-                                  "icon": "download",
+                                  "action": "GET_KEY",
                                   "type": "button",
                                   "label": "Get",
-                                  "action": "GET_KEY"
+                                  "variant": "primary",
+                                  "icon": "download"
                                 },
                                 {
                                   "type": "button",
-                                  "variant": "primary",
-                                  "label": "Set",
                                   "icon": "upload",
-                                  "action": "SET_KEY"
+                                  "action": "SET_KEY",
+                                  "label": "Set",
+                                  "variant": "primary"
                                 },
                                 {
-                                  "label": "Delete",
+                                  "variant": "danger",
                                   "icon": "trash-2",
                                   "type": "button",
-                                  "variant": "danger",
-                                  "action": "DELETE_KEY"
+                                  "action": "DELETE_KEY",
+                                  "label": "Delete"
                                 }
-                              ]
+                              ],
+                              "direction": "horizontal",
+                              "gap": "sm",
+                              "type": "stack",
+                              "justify": "center"
                             }
                           ],
-                          "gap": "lg",
                           "align": "center",
                           "type": "stack",
-                          "direction": "vertical"
+                          "direction": "vertical",
+                          "gap": "lg"
+                        }
+                      ],
+                      "appName": "ResearchAssistant",
+                      "navItems": [
+                        {
+                          "icon": "search",
+                          "label": "Research",
+                          "href": "/research"
+                        },
+                        {
+                          "label": "Cache",
+                          "href": "/cache",
+                          "icon": "database"
+                        },
+                        {
+                          "label": "Reports",
+                          "href": "/reports",
+                          "icon": "file-text"
+                        },
+                        {
+                          "icon": "book-open",
+                          "href": "/knowledge",
+                          "label": "Knowledge"
                         }
                       ]
                     }
@@ -2171,49 +2171,49 @@
                       "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Research",
                           "href": "/research",
-                          "icon": "search"
+                          "icon": "search",
+                          "label": "Research"
                         },
                         {
                           "href": "/cache",
-                          "icon": "database",
-                          "label": "Cache"
+                          "label": "Cache",
+                          "icon": "database"
                         },
                         {
+                          "icon": "file-text",
                           "href": "/reports",
-                          "label": "Reports",
-                          "icon": "file-text"
+                          "label": "Reports"
                         },
                         {
-                          "icon": "book-open",
+                          "label": "Knowledge",
                           "href": "/knowledge",
-                          "label": "Knowledge"
+                          "icon": "book-open"
                         }
                       ],
                       "appName": "ResearchAssistant",
                       "children": [
                         {
                           "direction": "vertical",
+                          "align": "center",
                           "gap": "lg",
-                          "type": "stack",
                           "children": [
                             {
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "database"
+                                  "name": "database",
+                                  "type": "icon"
                                 },
                                 {
                                   "variant": "h2",
-                                  "content": "Redis Cache",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "content": "Redis Cache"
                                 }
                               ],
-                              "direction": "horizontal",
                               "gap": "md",
+                              "align": "center",
                               "type": "stack",
-                              "align": "center"
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
@@ -2225,50 +2225,50 @@
                                   "placeholder": "cache-key"
                                 },
                                 {
-                                  "type": "input",
-                                  "placeholder": "cache-value"
+                                  "placeholder": "cache-value",
+                                  "type": "input"
                                 },
                                 {
-                                  "type": "input",
                                   "placeholder": "3600",
-                                  "inputType": "number"
+                                  "inputType": "number",
+                                  "type": "input"
                                 }
                               ],
                               "type": "stack",
-                              "direction": "vertical",
-                              "gap": "md"
+                              "gap": "md",
+                              "direction": "vertical"
                             },
                             {
-                              "justify": "center",
-                              "type": "stack",
                               "direction": "horizontal",
+                              "type": "stack",
                               "gap": "sm",
+                              "justify": "center",
                               "children": [
                                 {
-                                  "icon": "download",
                                   "label": "Get",
                                   "type": "button",
-                                  "variant": "primary",
-                                  "action": "GET_KEY"
+                                  "action": "GET_KEY",
+                                  "icon": "download",
+                                  "variant": "primary"
                                 },
                                 {
-                                  "label": "Set",
+                                  "type": "button",
                                   "action": "SET_KEY",
+                                  "label": "Set",
                                   "icon": "upload",
-                                  "type": "button",
                                   "variant": "primary"
                                 },
                                 {
-                                  "icon": "trash-2",
-                                  "action": "DELETE_KEY",
+                                  "variant": "danger",
                                   "type": "button",
                                   "label": "Delete",
-                                  "variant": "danger"
+                                  "action": "DELETE_KEY",
+                                  "icon": "trash-2"
                                 }
                               ]
                             }
                           ],
-                          "align": "center"
+                          "type": "stack"
                         }
                       ]
                     }
@@ -2344,7 +2344,7 @@
               "event": "ReportLoadFailed",
               "description": "Fired when Report fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2359,7 +2359,7 @@
               "event": "ReportLoaded",
               "description": "Fired when Report finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Report]"
@@ -2369,7 +2369,7 @@
             {
               "event": "ResearchStorageCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "object"
@@ -2379,7 +2379,7 @@
             {
               "event": "ResearchStorageFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2431,7 +2431,7 @@
               {
                 "key": "EXECUTED",
                 "name": "Executed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -2441,7 +2441,7 @@
               {
                 "key": "FAILED",
                 "name": "Failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2455,7 +2455,7 @@
               {
                 "key": "ReportLoadFailed",
                 "name": "Report load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2469,7 +2469,7 @@
               {
                 "key": "ReportLoaded",
                 "name": "Report loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Report]"
@@ -2479,7 +2479,7 @@
               {
                 "key": "ResearchStorageCompleted",
                 "name": "Research storage completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object"
@@ -2489,7 +2489,7 @@
               {
                 "key": "ResearchStorageFailed",
                 "name": "Research storage failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2521,55 +2521,60 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "ResearchAssistant",
                       "navItems": [
                         {
-                          "label": "Research",
                           "icon": "search",
+                          "label": "Research",
                           "href": "/research"
                         },
                         {
-                          "icon": "database",
                           "href": "/cache",
-                          "label": "Cache"
+                          "label": "Cache",
+                          "icon": "database"
                         },
                         {
-                          "icon": "file-text",
                           "label": "Reports",
-                          "href": "/reports"
+                          "href": "/reports",
+                          "icon": "file-text"
                         },
                         {
-                          "icon": "book-open",
                           "href": "/knowledge",
-                          "label": "Knowledge"
+                          "label": "Knowledge",
+                          "icon": "book-open"
                         }
                       ],
                       "children": [
                         {
+                          "direction": "vertical",
+                          "align": "stretch",
+                          "gap": "lg",
                           "type": "stack",
                           "children": [
                             {
+                              "align": "center",
+                              "type": "stack",
+                              "gap": "md",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "hard-drive"
+                                  "name": "hard-drive",
+                                  "type": "icon"
                                 },
                                 {
-                                  "type": "typography",
+                                  "variant": "h2",
                                   "content": "Report Storage",
-                                  "variant": "h2"
+                                  "type": "typography"
                                 }
                               ],
-                              "align": "center",
-                              "type": "stack",
-                              "gap": "md",
                               "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "input",
-                              "placeholder": "bucket-name"
+                              "placeholder": "bucket-name",
+                              "type": "input"
                             },
                             {
                               "placeholder": "path/to/file.txt",
@@ -2580,53 +2585,48 @@
                               "placeholder": "path/prefix/"
                             },
                             {
-                              "type": "textarea",
-                              "placeholder": "File content..."
+                              "placeholder": "File content...",
+                              "type": "textarea"
                             },
                             {
-                              "type": "stack",
                               "direction": "horizontal",
-                              "gap": "sm",
-                              "justify": "center",
                               "children": [
                                 {
                                   "icon": "upload",
-                                  "action": "UPLOAD_FILE",
                                   "type": "button",
+                                  "action": "UPLOAD_FILE",
                                   "label": "Upload",
                                   "variant": "primary"
                                 },
                                 {
+                                  "type": "button",
                                   "variant": "secondary",
-                                  "label": "Download",
-                                  "action": "DOWNLOAD_FILE",
                                   "icon": "download",
-                                  "type": "button"
+                                  "action": "DOWNLOAD_FILE",
+                                  "label": "Download"
                                 },
                                 {
-                                  "type": "button",
-                                  "action": "LIST_FILES",
+                                  "icon": "list",
                                   "label": "List",
-                                  "variant": "secondary",
-                                  "icon": "list"
+                                  "action": "LIST_FILES",
+                                  "type": "button",
+                                  "variant": "secondary"
                                 },
                                 {
-                                  "icon": "trash-2",
                                   "type": "button",
+                                  "icon": "trash-2",
+                                  "action": "DELETE_FILE",
                                   "variant": "danger",
-                                  "label": "Delete",
-                                  "action": "DELETE_FILE"
+                                  "label": "Delete"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "sm",
+                              "justify": "center"
                             }
-                          ],
-                          "align": "stretch",
-                          "gap": "lg",
-                          "direction": "vertical"
+                          ]
                         }
-                      ],
-                      "appName": "ResearchAssistant",
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -2640,37 +2640,37 @@
                     "render-ui",
                     "main",
                     {
-                      "children": [
-                        {
-                          "title": "Processing...",
-                          "message": "Executing storage operation on report...",
-                          "type": "loading-state"
-                        }
-                      ],
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "icon": "search",
-                          "label": "Research",
-                          "href": "/research"
+                          "href": "/research",
+                          "label": "Research"
                         },
                         {
                           "label": "Cache",
-                          "href": "/cache",
-                          "icon": "database"
+                          "icon": "database",
+                          "href": "/cache"
                         },
                         {
+                          "icon": "file-text",
                           "label": "Reports",
-                          "href": "/reports",
-                          "icon": "file-text"
+                          "href": "/reports"
                         },
                         {
-                          "href": "/knowledge",
+                          "label": "Knowledge",
                           "icon": "book-open",
-                          "label": "Knowledge"
+                          "href": "/knowledge"
                         }
                       ],
-                      "appName": "ResearchAssistant",
-                      "type": "dashboard-layout"
+                      "children": [
+                        {
+                          "type": "loading-state",
+                          "title": "Processing...",
+                          "message": "Executing storage operation on report..."
+                        }
+                      ],
+                      "appName": "ResearchAssistant"
                     }
                   ],
                   [
@@ -2678,8 +2678,8 @@
                     "storage",
                     "upload",
                     {
-                      "key": "@entity.fileKey",
                       "bucket": "@entity.bucket",
+                      "key": "@entity.fileKey",
                       "content": "@entity.content"
                     },
                     {
@@ -2702,19 +2702,19 @@
                     {
                       "navItems": [
                         {
+                          "icon": "search",
                           "label": "Research",
-                          "href": "/research",
-                          "icon": "search"
+                          "href": "/research"
                         },
                         {
-                          "icon": "database",
                           "label": "Cache",
-                          "href": "/cache"
+                          "href": "/cache",
+                          "icon": "database"
                         },
                         {
                           "label": "Reports",
-                          "icon": "file-text",
-                          "href": "/reports"
+                          "href": "/reports",
+                          "icon": "file-text"
                         },
                         {
                           "label": "Knowledge",
@@ -2743,8 +2743,8 @@
                     },
                     {
                       "emit": {
-                        "failure": "ResearchStorageFailed",
-                        "success": "ResearchStorageCompleted"
+                        "success": "ResearchStorageCompleted",
+                        "failure": "ResearchStorageFailed"
                       }
                     }
                   ]
@@ -2762,34 +2762,34 @@
                       "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "search",
+                          "href": "/research",
                           "label": "Research",
-                          "href": "/research"
+                          "icon": "search"
                         },
                         {
-                          "href": "/cache",
                           "label": "Cache",
+                          "href": "/cache",
                           "icon": "database"
                         },
                         {
+                          "label": "Reports",
                           "href": "/reports",
-                          "icon": "file-text",
-                          "label": "Reports"
+                          "icon": "file-text"
                         },
                         {
-                          "href": "/knowledge",
                           "label": "Knowledge",
-                          "icon": "book-open"
+                          "icon": "book-open",
+                          "href": "/knowledge"
                         }
                       ],
+                      "appName": "ResearchAssistant",
                       "children": [
                         {
+                          "type": "loading-state",
                           "message": "Executing storage operation on report...",
-                          "title": "Processing...",
-                          "type": "loading-state"
+                          "title": "Processing..."
                         }
-                      ],
-                      "appName": "ResearchAssistant"
+                      ]
                     }
                   ],
                   [
@@ -2797,8 +2797,8 @@
                     "storage",
                     "list",
                     {
-                      "prefix": "@entity.prefix",
-                      "bucket": "@entity.bucket"
+                      "bucket": "@entity.bucket",
+                      "prefix": "@entity.prefix"
                     },
                     {
                       "emit": {
@@ -2818,24 +2818,17 @@
                     "render-ui",
                     "main",
                     {
-                      "children": [
-                        {
-                          "title": "Processing...",
-                          "type": "loading-state",
-                          "message": "Executing storage operation on report..."
-                        }
-                      ],
-                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "label": "Research",
                           "icon": "search",
-                          "href": "/research",
-                          "label": "Research"
+                          "href": "/research"
                         },
                         {
-                          "label": "Cache",
                           "href": "/cache",
-                          "icon": "database"
+                          "icon": "database",
+                          "label": "Cache"
                         },
                         {
                           "label": "Reports",
@@ -2843,12 +2836,19 @@
                           "icon": "file-text"
                         },
                         {
-                          "label": "Knowledge",
                           "href": "/knowledge",
-                          "icon": "book-open"
+                          "icon": "book-open",
+                          "label": "Knowledge"
                         }
                       ],
-                      "type": "dashboard-layout"
+                      "appName": "ResearchAssistant",
+                      "children": [
+                        {
+                          "title": "Processing...",
+                          "message": "Executing storage operation on report...",
+                          "type": "loading-state"
+                        }
+                      ]
                     }
                   ],
                   [
@@ -2861,8 +2861,8 @@
                     },
                     {
                       "emit": {
-                        "success": "ResearchStorageCompleted",
-                        "failure": "ResearchStorageFailed"
+                        "failure": "ResearchStorageFailed",
+                        "success": "ResearchStorageCompleted"
                       }
                     }
                   ]
@@ -2887,60 +2887,60 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/research",
-                          "label": "Research",
-                          "icon": "search"
-                        },
-                        {
-                          "label": "Cache",
-                          "href": "/cache",
-                          "icon": "database"
-                        },
-                        {
-                          "href": "/reports",
-                          "label": "Reports",
-                          "icon": "file-text"
-                        },
-                        {
-                          "icon": "book-open",
-                          "href": "/knowledge",
-                          "label": "Knowledge"
-                        }
-                      ],
                       "appName": "ResearchAssistant",
                       "children": [
                         {
+                          "direction": "vertical",
+                          "align": "center",
                           "children": [
                             {
                               "name": "check-circle",
                               "type": "icon"
                             },
                             {
+                              "message": "Operation completed successfully",
                               "type": "alert",
-                              "variant": "success",
-                              "message": "Operation completed successfully"
+                              "variant": "success"
                             },
                             {
-                              "color": "muted",
+                              "content": "@entity.result",
                               "type": "typography",
                               "variant": "body",
-                              "content": "@entity.result"
+                              "color": "muted"
                             },
                             {
-                              "variant": "ghost",
                               "icon": "rotate-ccw",
-                              "type": "button",
+                              "action": "RESET",
                               "label": "Back",
-                              "action": "RESET"
+                              "type": "button",
+                              "variant": "ghost"
                             }
                           ],
-                          "gap": "lg",
                           "type": "stack",
-                          "direction": "vertical",
-                          "align": "center"
+                          "gap": "lg"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "search",
+                          "href": "/research",
+                          "label": "Research"
+                        },
+                        {
+                          "label": "Cache",
+                          "href": "/cache",
+                          "icon": "database"
+                        },
+                        {
+                          "label": "Reports",
+                          "href": "/reports",
+                          "icon": "file-text"
+                        },
+                        {
+                          "href": "/knowledge",
+                          "label": "Knowledge",
+                          "icon": "book-open"
                         }
                       ]
                     }
@@ -2966,7 +2966,6 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ResearchAssistant",
                       "navItems": [
                         {
                           "label": "Research",
@@ -2974,27 +2973,23 @@
                           "icon": "search"
                         },
                         {
-                          "href": "/cache",
+                          "label": "Cache",
                           "icon": "database",
-                          "label": "Cache"
+                          "href": "/cache"
                         },
                         {
-                          "label": "Reports",
                           "icon": "file-text",
+                          "label": "Reports",
                           "href": "/reports"
                         },
                         {
                           "href": "/knowledge",
-                          "icon": "book-open",
-                          "label": "Knowledge"
+                          "label": "Knowledge",
+                          "icon": "book-open"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "gap": "lg",
-                          "type": "stack",
-                          "direction": "vertical",
                           "align": "center",
                           "children": [
                             {
@@ -3003,15 +2998,20 @@
                               "message": "@entity.error"
                             },
                             {
-                              "label": "Back",
-                              "action": "RESET",
                               "type": "button",
+                              "label": "Back",
                               "variant": "ghost",
-                              "icon": "rotate-ccw"
+                              "icon": "rotate-ccw",
+                              "action": "RESET"
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "type": "stack",
+                          "gap": "lg"
                         }
-                      ]
+                      ],
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3030,39 +3030,14 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ResearchAssistant",
-                      "navItems": [
-                        {
-                          "href": "/research",
-                          "icon": "search",
-                          "label": "Research"
-                        },
-                        {
-                          "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
-                        },
-                        {
-                          "icon": "file-text",
-                          "label": "Reports",
-                          "href": "/reports"
-                        },
-                        {
-                          "icon": "book-open",
-                          "href": "/knowledge",
-                          "label": "Knowledge"
-                        }
-                      ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "direction": "vertical",
                           "gap": "lg",
-                          "type": "stack",
                           "align": "stretch",
+                          "type": "stack",
                           "children": [
                             {
-                              "direction": "horizontal",
                               "children": [
                                 {
                                   "name": "hard-drive",
@@ -3074,9 +3049,10 @@
                                   "variant": "h2"
                                 }
                               ],
-                              "align": "center",
+                              "gap": "md",
+                              "direction": "horizontal",
                               "type": "stack",
-                              "gap": "md"
+                              "align": "center"
                             },
                             {
                               "type": "divider"
@@ -3090,52 +3066,76 @@
                               "type": "input"
                             },
                             {
-                              "type": "input",
-                              "placeholder": "path/prefix/"
+                              "placeholder": "path/prefix/",
+                              "type": "input"
                             },
                             {
                               "placeholder": "File content...",
                               "type": "textarea"
                             },
                             {
-                              "justify": "center",
-                              "direction": "horizontal",
                               "gap": "sm",
                               "type": "stack",
                               "children": [
                                 {
-                                  "icon": "upload",
-                                  "label": "Upload",
-                                  "variant": "primary",
                                   "action": "UPLOAD_FILE",
-                                  "type": "button"
+                                  "type": "button",
+                                  "label": "Upload",
+                                  "icon": "upload",
+                                  "variant": "primary"
                                 },
                                 {
-                                  "action": "DOWNLOAD_FILE",
                                   "variant": "secondary",
+                                  "icon": "download",
                                   "type": "button",
                                   "label": "Download",
-                                  "icon": "download"
+                                  "action": "DOWNLOAD_FILE"
                                 },
                                 {
-                                  "action": "LIST_FILES",
+                                  "label": "List",
                                   "icon": "list",
+                                  "variant": "secondary",
                                   "type": "button",
-                                  "label": "List",
-                                  "variant": "secondary"
+                                  "action": "LIST_FILES"
                                 },
                                 {
-                                  "label": "Delete",
                                   "type": "button",
                                   "variant": "danger",
+                                  "label": "Delete",
                                   "icon": "trash-2",
                                   "action": "DELETE_FILE"
                                 }
-                              ]
+                              ],
+                              "justify": "center",
+                              "direction": "horizontal"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "appName": "ResearchAssistant",
+                      "navItems": [
+                        {
+                          "label": "Research",
+                          "href": "/research",
+                          "icon": "search"
+                        },
+                        {
+                          "icon": "database",
+                          "label": "Cache",
+                          "href": "/cache"
+                        },
+                        {
+                          "label": "Reports",
+                          "href": "/reports",
+                          "icon": "file-text"
+                        },
+                        {
+                          "icon": "book-open",
+                          "label": "Knowledge",
+                          "href": "/knowledge"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3154,27 +3154,52 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/research",
+                          "icon": "search",
+                          "label": "Research"
+                        },
+                        {
+                          "icon": "database",
+                          "href": "/cache",
+                          "label": "Cache"
+                        },
+                        {
+                          "icon": "file-text",
+                          "label": "Reports",
+                          "href": "/reports"
+                        },
+                        {
+                          "href": "/knowledge",
+                          "label": "Knowledge",
+                          "icon": "book-open"
+                        }
+                      ],
                       "children": [
                         {
-                          "gap": "lg",
                           "align": "stretch",
+                          "type": "stack",
+                          "gap": "lg",
+                          "direction": "vertical",
                           "children": [
                             {
+                              "type": "stack",
+                              "align": "center",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "hard-drive"
+                                  "name": "hard-drive",
+                                  "type": "icon"
                                 },
                                 {
-                                  "variant": "h2",
                                   "type": "typography",
-                                  "content": "Report Storage"
+                                  "content": "Report Storage",
+                                  "variant": "h2"
                                 }
                               ],
-                              "gap": "md",
-                              "type": "stack",
-                              "direction": "horizontal",
-                              "align": "center"
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
@@ -3184,8 +3209,8 @@
                               "type": "input"
                             },
                             {
-                              "type": "input",
-                              "placeholder": "path/to/file.txt"
+                              "placeholder": "path/to/file.txt",
+                              "type": "input"
                             },
                             {
                               "placeholder": "path/prefix/",
@@ -3196,70 +3221,45 @@
                               "placeholder": "File content..."
                             },
                             {
-                              "direction": "horizontal",
                               "type": "stack",
                               "gap": "sm",
                               "children": [
                                 {
-                                  "variant": "primary",
                                   "action": "UPLOAD_FILE",
+                                  "label": "Upload",
                                   "type": "button",
-                                  "icon": "upload",
-                                  "label": "Upload"
+                                  "variant": "primary",
+                                  "icon": "upload"
                                 },
                                 {
-                                  "label": "Download",
                                   "icon": "download",
+                                  "action": "DOWNLOAD_FILE",
                                   "variant": "secondary",
-                                  "type": "button",
-                                  "action": "DOWNLOAD_FILE"
+                                  "label": "Download",
+                                  "type": "button"
                                 },
                                 {
-                                  "icon": "list",
-                                  "label": "List",
-                                  "type": "button",
                                   "action": "LIST_FILES",
-                                  "variant": "secondary"
+                                  "label": "List",
+                                  "variant": "secondary",
+                                  "icon": "list",
+                                  "type": "button"
                                 },
                                 {
+                                  "action": "DELETE_FILE",
                                   "type": "button",
                                   "variant": "danger",
-                                  "action": "DELETE_FILE",
                                   "icon": "trash-2",
                                   "label": "Delete"
                                 }
                               ],
+                              "direction": "horizontal",
                               "justify": "center"
                             }
-                          ],
-                          "direction": "vertical",
-                          "type": "stack"
+                          ]
                         }
                       ],
-                      "appName": "ResearchAssistant",
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/research",
-                          "label": "Research",
-                          "icon": "search"
-                        },
-                        {
-                          "href": "/cache",
-                          "label": "Cache",
-                          "icon": "database"
-                        },
-                        {
-                          "href": "/reports",
-                          "label": "Reports",
-                          "icon": "file-text"
-                        },
-                        {
-                          "label": "Knowledge",
-                          "icon": "book-open",
-                          "href": "/knowledge"
-                        }
-                      ]
+                      "appName": "ResearchAssistant"
                     }
                   ]
                 ]
@@ -3333,7 +3333,7 @@
               "event": "KnowledgeQueryLoadFailed",
               "description": "Fired when KnowledgeQuery fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3348,7 +3348,7 @@
               "event": "KnowledgeQueryLoaded",
               "description": "Fired when KnowledgeQuery finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[KnowledgeQuery]"
@@ -3358,7 +3358,7 @@
             {
               "event": "ResearchCustomBearerApiCompleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "object"
@@ -3368,7 +3368,7 @@
             {
               "event": "ResearchCustomBearerApiFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3408,7 +3408,7 @@
               {
                 "key": "API_RESPONSE",
                 "name": "Api Response",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -3422,7 +3422,7 @@
               {
                 "key": "FAILED",
                 "name": "Failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3440,7 +3440,7 @@
               {
                 "key": "KnowledgeQueryLoadFailed",
                 "name": "KnowledgeQuery load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3454,7 +3454,7 @@
               {
                 "key": "KnowledgeQueryLoaded",
                 "name": "KnowledgeQuery loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[KnowledgeQuery]"
@@ -3464,7 +3464,7 @@
               {
                 "key": "ResearchCustomBearerApiCompleted",
                 "name": "Research custom bearer api completed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object"
@@ -3474,7 +3474,7 @@
               {
                 "key": "ResearchCustomBearerApiFailed",
                 "name": "Research custom bearer api failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3506,8 +3506,34 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "search",
+                          "label": "Research",
+                          "href": "/research"
+                        },
+                        {
+                          "icon": "database",
+                          "label": "Cache",
+                          "href": "/cache"
+                        },
+                        {
+                          "icon": "file-text",
+                          "label": "Reports",
+                          "href": "/reports"
+                        },
+                        {
+                          "label": "Knowledge",
+                          "icon": "book-open",
+                          "href": "/knowledge"
+                        }
+                      ],
                       "children": [
                         {
+                          "type": "stack",
+                          "gap": "lg",
                           "align": "center",
                           "direction": "vertical",
                           "children": [
@@ -3516,8 +3542,8 @@
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "variant": "h2",
+                              "type": "typography",
                               "content": "Bearer API Tester"
                             },
                             {
@@ -3532,59 +3558,33 @@
                                   "value": "GET"
                                 },
                                 {
-                                  "label": "POST",
-                                  "value": "POST"
-                                },
-                                {
-                                  "label": "PUT",
-                                  "value": "PUT"
-                                },
-                                {
-                                  "value": "DELETE",
-                                  "label": "DELETE"
-                                }
-                              ]
-                            },
-                            {
-                              "type": "textarea",
-                              "placeholder": "JSON request body"
-                            },
-                            {
-                              "type": "button",
-                              "label": "Send Request",
-                              "variant": "primary",
-                              "action": "CALL_API",
-                              "icon": "send"
-                            }
-                          ],
-                          "gap": "lg",
-                          "type": "stack"
-                        }
-                      ],
-                      "appName": "ResearchAssistant",
-                      "navItems": [
-                        {
-                          "href": "/research",
-                          "label": "Research",
-                          "icon": "search"
-                        },
-                        {
-                          "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
-                        },
-                        {
-                          "href": "/reports",
-                          "icon": "file-text",
-                          "label": "Reports"
-                        },
-                        {
-                          "href": "/knowledge",
-                          "icon": "book-open",
-                          "label": "Knowledge"
+                                  "value": "POST",
+                                  "label": "POST"
+                                },
+                                {
+                                  "label": "PUT",
+                                  "value": "PUT"
+                                },
+                                {
+                                  "value": "DELETE",
+                                  "label": "DELETE"
+                                }
+                              ]
+                            },
+                            {
+                              "placeholder": "JSON request body",
+                              "type": "textarea"
+                            },
+                            {
+                              "type": "button",
+                              "label": "Send Request",
+                              "variant": "primary",
+                              "icon": "send",
+                              "action": "CALL_API"
+                            }
+                          ]
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -3600,13 +3600,13 @@
                     {
                       "children": [
                         {
-                          "title": "Calling API...",
+                          "type": "loading-state",
                           "message": "Sending request to knowledgequery endpoint...",
-                          "type": "loading-state"
+                          "title": "Calling API..."
                         }
                       ],
-                      "appName": "ResearchAssistant",
                       "type": "dashboard-layout",
+                      "appName": "ResearchAssistant",
                       "navItems": [
                         {
                           "label": "Research",
@@ -3614,19 +3614,19 @@
                           "href": "/research"
                         },
                         {
-                          "label": "Cache",
+                          "icon": "database",
                           "href": "/cache",
-                          "icon": "database"
+                          "label": "Cache"
                         },
                         {
                           "href": "/reports",
-                          "icon": "file-text",
-                          "label": "Reports"
+                          "label": "Reports",
+                          "icon": "file-text"
                         },
                         {
                           "label": "Knowledge",
-                          "icon": "book-open",
-                          "href": "/knowledge"
+                          "href": "/knowledge",
+                          "icon": "book-open"
                         }
                       ]
                     }
@@ -3636,8 +3636,8 @@
                     "custom-bearer-api",
                     "execute",
                     {
-                      "body": "@entity.requestBody",
                       "endpoint": "@entity.endpoint",
+                      "body": "@entity.requestBody",
                       "method": "@entity.method"
                     },
                     {
@@ -3668,66 +3668,66 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ResearchAssistant",
                       "children": [
                         {
+                          "direction": "vertical",
+                          "gap": "lg",
                           "children": [
                             {
                               "name": "check-circle",
                               "type": "icon"
                             },
                             {
-                              "variant": "h2",
+                              "content": "Response",
                               "type": "typography",
-                              "content": "Response"
+                              "variant": "h2"
                             },
                             {
-                              "variant": "info",
                               "label": "@entity.statusCode",
+                              "variant": "info",
                               "type": "badge"
                             },
                             {
+                              "language": "json",
                               "code": "@entity.responseData",
-                              "type": "code-block",
-                              "language": "json"
+                              "type": "code-block"
                             },
                             {
-                              "variant": "ghost",
                               "icon": "rotate-ccw",
+                              "variant": "ghost",
                               "type": "button",
                               "action": "RESET",
                               "label": "New Request"
                             }
                           ],
-                          "gap": "lg",
-                          "type": "stack",
-                          "direction": "vertical",
-                          "align": "center"
+                          "align": "center",
+                          "type": "stack"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "label": "Research",
                           "href": "/research",
-                          "icon": "search",
-                          "label": "Research"
+                          "icon": "search"
                         },
                         {
-                          "label": "Cache",
                           "href": "/cache",
+                          "label": "Cache",
                           "icon": "database"
                         },
                         {
-                          "icon": "file-text",
+                          "label": "Reports",
                           "href": "/reports",
-                          "label": "Reports"
+                          "icon": "file-text"
                         },
                         {
-                          "href": "/knowledge",
                           "label": "Knowledge",
-                          "icon": "book-open"
+                          "icon": "book-open",
+                          "href": "/knowledge"
                         }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "ResearchAssistant"
+                      ]
                     }
                   ]
                 ]
@@ -3746,22 +3746,22 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "appName": "ResearchAssistant",
                       "navItems": [
                         {
-                          "icon": "search",
                           "href": "/research",
+                          "icon": "search",
                           "label": "Research"
                         },
                         {
                           "label": "Cache",
-                          "icon": "database",
-                          "href": "/cache"
+                          "href": "/cache",
+                          "icon": "database"
                         },
                         {
                           "label": "Reports",
-                          "href": "/reports",
-                          "icon": "file-text"
+                          "icon": "file-text",
+                          "href": "/reports"
                         },
                         {
                           "href": "/knowledge",
@@ -3769,15 +3769,15 @@
                           "label": "Knowledge"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "onRetry": "RETRY",
-                          "type": "error-state",
                           "title": "Request Failed",
+                          "type": "error-state",
                           "message": "@entity.error"
                         }
-                      ],
-                      "appName": "ResearchAssistant"
+                      ]
                     }
                   ]
                 ]
@@ -3794,14 +3794,15 @@
                       "appName": "ResearchAssistant",
                       "children": [
                         {
+                          "direction": "vertical",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "shield"
+                              "name": "shield",
+                              "type": "icon"
                             },
                             {
-                              "variant": "h2",
                               "content": "Bearer API Tester",
+                              "variant": "h2",
                               "type": "typography"
                             },
                             {
@@ -3809,67 +3810,66 @@
                               "placeholder": "/users"
                             },
                             {
+                              "type": "select",
                               "options": [
                                 {
                                   "label": "GET",
                                   "value": "GET"
                                 },
                                 {
-                                  "label": "POST",
-                                  "value": "POST"
+                                  "value": "POST",
+                                  "label": "POST"
                                 },
                                 {
                                   "label": "PUT",
                                   "value": "PUT"
                                 },
                                 {
-                                  "label": "DELETE",
-                                  "value": "DELETE"
+                                  "value": "DELETE",
+                                  "label": "DELETE"
                                 }
-                              ],
-                              "type": "select"
+                              ]
                             },
                             {
                               "type": "textarea",
                               "placeholder": "JSON request body"
                             },
                             {
-                              "variant": "primary",
-                              "action": "CALL_API",
                               "icon": "send",
                               "type": "button",
-                              "label": "Send Request"
+                              "label": "Send Request",
+                              "variant": "primary",
+                              "action": "CALL_API"
                             }
                           ],
                           "type": "stack",
-                          "direction": "vertical",
-                          "align": "center",
-                          "gap": "lg"
+                          "gap": "lg",
+                          "align": "center"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "label": "Research",
                           "href": "/research",
-                          "icon": "search",
-                          "label": "Research"
+                          "icon": "search"
                         },
                         {
-                          "href": "/cache",
+                          "icon": "database",
                           "label": "Cache",
-                          "icon": "database"
+                          "href": "/cache"
                         },
                         {
-                          "icon": "file-text",
                           "href": "/reports",
-                          "label": "Reports"
+                          "label": "Reports",
+                          "icon": "file-text"
                         },
                         {
-                          "href": "/knowledge",
                           "icon": "book-open",
+                          "href": "/knowledge",
                           "label": "Knowledge"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -3883,31 +3883,35 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ResearchAssistant",
                       "type": "dashboard-layout",
                       "navItems": [
                         {
                           "icon": "search",
-                          "label": "Research",
-                          "href": "/research"
+                          "href": "/research",
+                          "label": "Research"
                         },
                         {
-                          "href": "/cache",
                           "label": "Cache",
-                          "icon": "database"
+                          "icon": "database",
+                          "href": "/cache"
                         },
                         {
+                          "href": "/reports",
                           "label": "Reports",
-                          "icon": "file-text",
-                          "href": "/reports"
+                          "icon": "file-text"
                         },
                         {
                           "icon": "book-open",
-                          "label": "Knowledge",
-                          "href": "/knowledge"
+                          "href": "/knowledge",
+                          "label": "Knowledge"
                         }
                       ],
                       "children": [
                         {
+                          "gap": "lg",
+                          "direction": "vertical",
+                          "align": "center",
                           "children": [
                             {
                               "type": "icon",
@@ -3923,14 +3927,15 @@
                               "placeholder": "/users"
                             },
                             {
+                              "type": "select",
                               "options": [
                                 {
-                                  "value": "GET",
-                                  "label": "GET"
+                                  "label": "GET",
+                                  "value": "GET"
                                 },
                                 {
-                                  "value": "POST",
-                                  "label": "POST"
+                                  "label": "POST",
+                                  "value": "POST"
                                 },
                                 {
                                   "value": "PUT",
@@ -3940,28 +3945,23 @@
                                   "label": "DELETE",
                                   "value": "DELETE"
                                 }
-                              ],
-                              "type": "select"
+                              ]
                             },
                             {
                               "type": "textarea",
                               "placeholder": "JSON request body"
                             },
                             {
-                              "type": "button",
                               "label": "Send Request",
-                              "icon": "send",
+                              "action": "CALL_API",
+                              "type": "button",
                               "variant": "primary",
-                              "action": "CALL_API"
+                              "icon": "send"
                             }
                           ],
-                          "gap": "lg",
-                          "type": "stack",
-                          "direction": "vertical",
-                          "align": "center"
+                          "type": "stack"
                         }
-                      ],
-                      "appName": "ResearchAssistant"
+                      ]
                     }
                   ]
                 ]
@@ -3975,31 +3975,12 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "search",
-                          "label": "Research",
-                          "href": "/research"
-                        },
-                        {
-                          "icon": "database",
-                          "label": "Cache",
-                          "href": "/cache"
-                        },
-                        {
-                          "icon": "file-text",
-                          "label": "Reports",
-                          "href": "/reports"
-                        },
-                        {
-                          "href": "/knowledge",
-                          "icon": "book-open",
-                          "label": "Knowledge"
-                        }
-                      ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "direction": "vertical",
+                          "align": "center",
+                          "type": "stack",
+                          "gap": "lg",
                           "children": [
                             {
                               "type": "icon",
@@ -4011,8 +3992,8 @@
                               "type": "typography"
                             },
                             {
-                              "placeholder": "/users",
-                              "type": "input"
+                              "type": "input",
+                              "placeholder": "/users"
                             },
                             {
                               "type": "select",
@@ -4030,8 +4011,8 @@
                                   "value": "PUT"
                                 },
                                 {
-                                  "value": "DELETE",
-                                  "label": "DELETE"
+                                  "label": "DELETE",
+                                  "value": "DELETE"
                                 }
                               ]
                             },
@@ -4040,20 +4021,39 @@
                               "placeholder": "JSON request body"
                             },
                             {
-                              "type": "button",
+                              "action": "CALL_API",
                               "variant": "primary",
                               "icon": "send",
-                              "action": "CALL_API",
+                              "type": "button",
                               "label": "Send Request"
                             }
-                          ],
-                          "direction": "vertical",
-                          "type": "stack",
-                          "gap": "lg",
-                          "align": "center"
+                          ]
                         }
                       ],
-                      "appName": "ResearchAssistant"
+                      "appName": "ResearchAssistant",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Research",
+                          "href": "/research",
+                          "icon": "search"
+                        },
+                        {
+                          "label": "Cache",
+                          "icon": "database",
+                          "href": "/cache"
+                        },
+                        {
+                          "label": "Reports",
+                          "href": "/reports",
+                          "icon": "file-text"
+                        },
+                        {
+                          "label": "Knowledge",
+                          "icon": "book-open",
+                          "href": "/knowledge"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -4076,4 +4076,4 @@
       ]
     }
   ]
-}
+}