Merge branch 'main' into copilot/evaluate-metadata-loading-package

Author: hotlong

examples/msw-react-crud/src/components/TaskForm.tsx

@@ -123,12 +123,20 @@ export class ObjectQL implements IDataEngine {
 
       // Register objects
       if (manifest.objects) {
-          this.logger.debug('Registering objects from manifest', { id, objectCount: Object.keys(manifest.objects).length });
-          for (const [name, objDef] of Object.entries(manifest.objects)) {
-              // Ensure name in definition matches key
-              (objDef as any).name = name;
-              SchemaRegistry.registerObject(objDef as any);
-              this.logger.debug('Registered Object', { object: name, from: id });
+          if (Array.isArray(manifest.objects)) {
+             this.logger.debug('Registering objects from manifest (Array)', { id, objectCount: manifest.objects.length });
+             for (const objDef of manifest.objects) {
+                SchemaRegistry.registerObject(objDef);
+                this.logger.debug('Registered Object', { object: objDef.name, from: id });
+             }
+          } else {
+             this.logger.debug('Registering objects from manifest (Map)', { id, objectCount: Object.keys(manifest.objects).length });
+             for (const [name, objDef] of Object.entries(manifest.objects)) {
+                // Ensure name in definition matches key
+                (objDef as any).name = name;
+                SchemaRegistry.registerObject(objDef as any);
+                this.logger.debug('Registered Object', { object: name, from: id });
+             }
           }
       }
 

packages/objectql/src/engine.ts

@@ -38,7 +38,14 @@ export class AppPlugin implements Plugin {
         // Register the app manifest as a service
         // ObjectQLPlugin will discover this and call ql.registerApp()
         const serviceName = `app.${appId}`;
-        ctx.registerService(serviceName, this.bundle.manifest || this.bundle);
+
+        // Merge manifest with the bundle to ensure objects/apps are accessible at root
+        // This supports both Legacy Manifests and new Stack Definitions
+        const servicePayload = this.bundle.manifest 
+            ? { ...this.bundle.manifest, ...this.bundle }
+            : this.bundle;
+
+        ctx.registerService(serviceName, servicePayload);
     }
 
     async start(ctx: PluginContext) {