@dxos/app-framework 0.8.4-staging.60fe92afc8 → 0.9.1-main.c7dcc2e112

package/src/core/plugin-manager.test.ts

@@ -60,7 +60,7 @@ const atomCounter = (registry: Registry.Registry, atom: Atom.Atom<any>) => {
 describe('PluginManager', () => {
   let plugins: Plugin.Plugin[] = [];
   const pluginLoader = Effect.fn(function* (id: string) {
-    const plugin = plugins.find((plugin) => plugin.meta.id === id);
+    const plugin = plugins.find((plugin) => plugin.meta.profile.key === id);
     invariant(plugin, `Plugin not found: ${id}`);
     return { plugin };
   });
@@ -76,17 +76,17 @@ describe('PluginManager', () => {
       plugins = [testPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      const added = yield* manager.add(testMeta.id);
+      const added = yield* manager.add(testMeta.profile.key);
       assert.strictEqual(added, testPlugin);
       assert.deepStrictEqual(manager.getPlugins(), [testPlugin]);
       assert.deepStrictEqual(manager.getEnabled(), []);
-      const removed = yield* manager.remove(testMeta.id);
+      const removed = yield* manager.remove(testMeta.profile.key);
       assert.isTrue(removed);
       assert.deepStrictEqual(manager.getPlugins(), []);
     }),
   );
 
-  it.effect('should add plugin when locator differs from meta.id', () =>
+  it.effect('should add plugin when locator differs from meta.profile.key', () =>
     Effect.gen(function* () {
       const Test = Plugin.make(Plugin.define(testMeta));
       const testPlugin = Test();
@@ -104,8 +104,8 @@ describe('PluginManager', () => {
       assert.strictEqual(added, testPlugin);
       assert.deepStrictEqual(manager.getPlugins(), [testPlugin]);
       assert.deepStrictEqual(manager.getEnabled(), []);
-      yield* manager.enable(added.meta.id);
-      assert.deepStrictEqual(manager.getEnabled(), [testMeta.id]);
+      yield* manager.enable(added.meta.profile.key);
+      assert.deepStrictEqual(manager.getEnabled(), [testMeta.profile.key]);
     }),
   );
 
@@ -142,7 +142,7 @@ describe('PluginManager', () => {
 
       const manager = PluginManager.make({ pluginLoader: loader });
       yield* manager.add('prod');
-      yield* manager.enable(testMeta.id);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       assert.deepStrictEqual(
         manager.capabilities.getAll(String).map((value) => value.string),
@@ -151,9 +151,9 @@ describe('PluginManager', () => {
 
       // Loading the dev plugin with the same id swaps it into the id slot.
       yield* manager.add('dev');
-      yield* manager.enable(testMeta.id);
+      yield* manager.enable(testMeta.profile.key);
       assert.strictEqual(
-        manager.getPlugins().find((plugin) => plugin.meta.id === testMeta.id),
+        manager.getPlugins().find((plugin) => plugin.meta.profile.key === testMeta.profile.key),
         devPlugin,
       );
       yield* manager.reset(ActivationEvents.Startup);
@@ -164,12 +164,12 @@ describe('PluginManager', () => {
 
       // Removing the dev plugin restores the original and re-enables it
       // because it was enabled at shadow time.
-      yield* manager.remove(testMeta.id);
+      yield* manager.remove(testMeta.profile.key);
       assert.strictEqual(
-        manager.getPlugins().find((plugin) => plugin.meta.id === testMeta.id),
+        manager.getPlugins().find((plugin) => plugin.meta.profile.key === testMeta.profile.key),
         productionPlugin,
       );
-      assert.isTrue(manager.getEnabled().includes(testMeta.id));
+      assert.isTrue(manager.getEnabled().includes(testMeta.profile.key));
       yield* manager.reset(ActivationEvents.Startup);
       assert.deepStrictEqual(
         manager.capabilities.getAll(String).map((value) => value.string),
@@ -198,11 +198,11 @@ describe('PluginManager', () => {
       assert.deepStrictEqual(manager.getEnabled(), []);
 
       yield* manager.add('dev');
-      yield* manager.remove(testMeta.id);
+      yield* manager.remove(testMeta.profile.key);
 
       // Original is restored but stays disabled, matching its pre-shadow state.
       assert.strictEqual(
-        manager.getPlugins().find((plugin) => plugin.meta.id === testMeta.id),
+        manager.getPlugins().find((plugin) => plugin.meta.profile.key === testMeta.profile.key),
         productionPlugin,
       );
       assert.deepStrictEqual(manager.getEnabled(), []);
@@ -230,7 +230,7 @@ describe('PluginManager', () => {
       plugins = [plugin];
 
       const manager = PluginManager.make({ plugins: [plugin], pluginLoader });
-      yield* manager.enable(testMeta.id);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       const strings = manager.capabilities.getAll(String);
       assert.strictEqual(strings.length, 2);
@@ -252,10 +252,10 @@ describe('PluginManager', () => {
 
       const testPlugin = Test();
       const manager = PluginManager.make({ plugins: [testPlugin], pluginLoader });
-      yield* manager.enable(testMeta.id);
-      assert.deepStrictEqual(manager.getEnabled(), [Test.meta.id]);
+      yield* manager.enable(testMeta.profile.key);
+      assert.deepStrictEqual(manager.getEnabled(), [Test.meta.profile.key]);
       assert.deepStrictEqual(manager.getModules(), [testPlugin.modules[0]]);
-      yield* manager.disable(testMeta.id);
+      yield* manager.disable(testMeta.profile.key);
       assert.deepStrictEqual(manager.getEnabled(), []);
       assert.deepStrictEqual(manager.getModules(), []);
     }),
@@ -274,9 +274,9 @@ describe('PluginManager', () => {
 
       const testPlugin = Test();
       const manager = PluginManager.make({ plugins: [testPlugin], pluginLoader });
-      yield* manager.enable(Test.meta.id);
+      yield* manager.enable(Test.meta.profile.key);
       assert.deepStrictEqual(manager.getPlugins(), [testPlugin]);
-      assert.deepStrictEqual(manager.getEnabled(), [Test.meta.id]);
+      assert.deepStrictEqual(manager.getEnabled(), [Test.meta.profile.key]);
       assert.deepStrictEqual(manager.getModules(), [testPlugin.modules[0]]);
       assert.deepStrictEqual(manager.getActive(), []);
       assert.deepStrictEqual(manager.getEventsFired(), []);
@@ -299,7 +299,7 @@ describe('PluginManager', () => {
 
       const testPlugin = Test();
       const manager = PluginManager.make({ plugins: [testPlugin], pluginLoader });
-      yield* manager.enable(Test.meta.id);
+      yield* manager.enable(Test.meta.profile.key);
 
       const result = yield* manager.activate(ActivationEvents.Startup);
       assert.isTrue(result);
@@ -322,8 +322,8 @@ describe('PluginManager', () => {
       ];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       const error = yield* Effect.flip(manager.activate(FailEvent));
       assert.strictEqual(error.message, 'test');
     }),
@@ -355,8 +355,8 @@ describe('PluginManager', () => {
       ];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       const error = yield* Effect.flip(manager.activate(DefectEvent));
 
       // Verify the error was caught and propagated.
@@ -377,7 +377,7 @@ describe('PluginManager', () => {
 
   it.effect('should catch and log defects when activate throws before returning Effect', () =>
     Effect.gen(function* () {
-      const DefectEvent = ActivationEvent.make('org.dxos.test.defect-immediate');
+      const DefectEvent = ActivationEvent.make('org.dxos.test.defectImmediate');
       const capturedErrors: LogEntry[] = [];
       const removeProcessor = log.addProcessor((_config: LogConfig, entry: LogEntry) => {
         if (entry.level === LogLevel.ERROR) {
@@ -402,8 +402,8 @@ describe('PluginManager', () => {
       ];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       const error = yield* Effect.flip(manager.activate(DefectEvent));
 
       // Verify the error was caught and propagated.
@@ -467,8 +467,8 @@ describe('PluginManager', () => {
         Effect.runFork,
       );
 
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       yield* activating.await;
       yield* activated.await;
@@ -518,8 +518,8 @@ describe('PluginManager', () => {
       const manager = PluginManager.make({ pluginLoader });
 
       {
-        yield* manager.add(testMeta.id);
-        yield* manager.enable(testMeta.id);
+        yield* manager.add(testMeta.profile.key);
+        yield* manager.enable(testMeta.profile.key);
         const result = yield* manager.activate(ActivationEvents.Startup);
         assert.isTrue(result);
         assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
@@ -542,7 +542,7 @@ describe('PluginManager', () => {
   it.effect('should not fire an unknown event', () =>
     Effect.gen(function* () {
       const manager = PluginManager.make({ pluginLoader });
-      const UnknownEvent = ActivationEvent.make('unknown');
+      const UnknownEvent = ActivationEvent.make('org.dxos.test.unknown');
       const result = yield* manager.activate(UnknownEvent);
       assert.isFalse(result);
     }),
@@ -583,20 +583,20 @@ describe('PluginManager', () => {
       assert.deepStrictEqual(manager.getActive(), []);
       assert.strictEqual(manager.capabilities.getAll(Number).length, 0);
 
-      yield* manager.add(Plugin1.meta.id);
-      yield* manager.enable(Plugin1.meta.id);
+      yield* manager.add(Plugin1.meta.profile.key);
+      yield* manager.enable(Plugin1.meta.profile.key);
       yield* manager.activate(CountEvent);
       assert.deepStrictEqual(manager.getActive(), [plugin1.modules[0].id]);
       assert.strictEqual(manager.capabilities.getAll(Number).length, 1);
 
-      yield* manager.add(Plugin2.meta.id);
-      yield* manager.enable(Plugin2.meta.id);
+      yield* manager.add(Plugin2.meta.profile.key);
+      yield* manager.enable(Plugin2.meta.profile.key);
       yield* manager.activate(CountEvent);
       assert.deepStrictEqual(manager.getActive(), [plugin1.modules[0].id, plugin2.modules[0].id]);
       assert.strictEqual(manager.capabilities.getAll(Number).length, 2);
 
-      yield* manager.add(Plugin3.meta.id);
-      yield* manager.enable(Plugin3.meta.id);
+      yield* manager.add(Plugin3.meta.profile.key);
+      yield* manager.enable(Plugin3.meta.profile.key);
       yield* manager.activate(CountEvent);
       assert.deepStrictEqual(manager.getActive(), [
         plugin1.modules[0].id,
@@ -626,8 +626,8 @@ describe('PluginManager', () => {
       assert.deepStrictEqual(manager.getActive(), []);
       assert.strictEqual(manager.capabilities.getAll(String).length, 0);
 
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       assert.deepStrictEqual(manager.getActive(), []);
       assert.strictEqual(manager.capabilities.getAll(String).length, 0);
@@ -660,8 +660,8 @@ describe('PluginManager', () => {
       assert.strictEqual(manager.capabilities.getAll(String).length, 0);
       assert.strictEqual(count, 0);
 
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(CountEvent);
       assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
       assert.strictEqual(manager.capabilities.getAll(String).length, 1);
@@ -720,10 +720,10 @@ describe('PluginManager', () => {
 
       const manager = PluginManager.make({ pluginLoader });
       {
-        yield* manager.add(Test.meta.id);
-        yield* manager.enable(Test.meta.id);
-        yield* manager.add(Count.meta.id);
-        yield* manager.enable(Count.meta.id);
+        yield* manager.add(Test.meta.profile.key);
+        yield* manager.enable(Test.meta.profile.key);
+        yield* manager.add(Count.meta.profile.key);
+        yield* manager.enable(Count.meta.profile.key);
         yield* manager.activate(ActivationEvents.Startup);
         assert.deepStrictEqual(manager.getActive(), [
           ...testPlugin.modules.map((m) => m.id),
@@ -737,7 +737,7 @@ describe('PluginManager', () => {
       }
 
       {
-        yield* manager.disable(Test.meta.id);
+        yield* manager.disable(Test.meta.profile.key);
         assert.deepStrictEqual(manager.getActive(), [countPlugin.modules[0].id]);
         assert.deepStrictEqual(manager.getPendingReset(), []);
 
@@ -748,7 +748,7 @@ describe('PluginManager', () => {
       }
 
       {
-        yield* manager.enable(Test.meta.id);
+        yield* manager.enable(Test.meta.profile.key);
         assert.deepStrictEqual(manager.getActive(), [
           countPlugin.modules[0].id,
           ...testPlugin.modules.map((m) => m.id),
@@ -805,8 +805,8 @@ describe('PluginManager', () => {
       assert.strictEqual(eventsFiredUpdates.count, 0);
       assert.strictEqual(pendingResetUpdates.count, 0);
 
-      yield* manager.add(Plugin1.meta.id);
-      yield* manager.enable(Plugin1.meta.id);
+      yield* manager.add(Plugin1.meta.profile.key);
+      yield* manager.enable(Plugin1.meta.profile.key);
       assert.strictEqual(pluginUpdates.count, 1);
       assert.strictEqual(enabledUpdates.count, 1);
       assert.strictEqual(modulesUpdates.count, 1);
@@ -822,8 +822,8 @@ describe('PluginManager', () => {
       assert.strictEqual(eventsFiredUpdates.count, 1);
       assert.strictEqual(pendingResetUpdates.count, 0);
 
-      yield* manager.add(Plugin2.meta.id);
-      yield* manager.enable(Plugin2.meta.id);
+      yield* manager.add(Plugin2.meta.profile.key);
+      yield* manager.enable(Plugin2.meta.profile.key);
       assert.strictEqual(pluginUpdates.count, 2);
       assert.strictEqual(enabledUpdates.count, 2);
       assert.strictEqual(modulesUpdates.count, 2);
@@ -839,8 +839,8 @@ describe('PluginManager', () => {
       assert.strictEqual(eventsFiredUpdates.count, 1);
       assert.strictEqual(pendingResetUpdates.count, 2);
 
-      yield* manager.add(Plugin3.meta.id);
-      yield* manager.enable(Plugin3.meta.id);
+      yield* manager.add(Plugin3.meta.profile.key);
+      yield* manager.enable(Plugin3.meta.profile.key);
       assert.strictEqual(pluginUpdates.count, 3);
       assert.strictEqual(enabledUpdates.count, 3);
       assert.strictEqual(modulesUpdates.count, 3);
@@ -857,7 +857,7 @@ describe('PluginManager', () => {
       assert.strictEqual(eventsFiredUpdates.count, 1);
       assert.strictEqual(pendingResetUpdates.count, 4);
 
-      yield* manager.disable(Plugin1.meta.id);
+      yield* manager.disable(Plugin1.meta.profile.key);
       assert.strictEqual(pluginUpdates.count, 3);
       assert.strictEqual(enabledUpdates.count, 4);
       assert.strictEqual(modulesUpdates.count, 4);
@@ -865,7 +865,7 @@ describe('PluginManager', () => {
       assert.strictEqual(eventsFiredUpdates.count, 1);
       assert.strictEqual(pendingResetUpdates.count, 4);
 
-      yield* manager.remove(Plugin1.meta.id);
+      yield* manager.remove(Plugin1.meta.profile.key);
       assert.strictEqual(pluginUpdates.count, 4);
       assert.strictEqual(enabledUpdates.count, 4);
       assert.strictEqual(modulesUpdates.count, 4);
@@ -913,8 +913,8 @@ describe('PluginManager', () => {
       plugins = [slowPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(SlowPlugin.meta.id);
-      yield* manager.enable(SlowPlugin.meta.id);
+      yield* manager.add(SlowPlugin.meta.profile.key);
+      yield* manager.enable(SlowPlugin.meta.profile.key);
 
       // Fork the activation so we can control time with TestClock.
       const activationFiber = yield* Effect.fork(manager.activate(SlowEvent));
@@ -939,8 +939,8 @@ describe('PluginManager', () => {
   it.effect('should prevent concurrent loads of the same module via semaphore', () =>
     Effect.gen(function* () {
       // Two different events that both can trigger the same module.
-      const EventA = ActivationEvent.make('org.dxos.test.event-a');
-      const EventB = ActivationEvent.make('org.dxos.test.event-b');
+      const EventA = ActivationEvent.make('org.dxos.test.eventA');
+      const EventB = ActivationEvent.make('org.dxos.test.eventB');
 
       let activateCallCount = 0;
       const ConcurrentPlugin = Plugin.define(
@@ -967,8 +967,8 @@ describe('PluginManager', () => {
       plugins = [concurrentPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(ConcurrentPlugin.meta.id);
-      yield* manager.enable(ConcurrentPlugin.meta.id);
+      yield* manager.add(ConcurrentPlugin.meta.profile.key);
+      yield* manager.enable(ConcurrentPlugin.meta.profile.key);
 
       // Fork two concurrent activations with DIFFERENT events.
       // Both events trigger the same module, so both will try to call _loadModule.
@@ -1016,10 +1016,10 @@ describe('PluginManager', () => {
       plugins = [plugin1, plugin2];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(Plugin1.meta.id);
-      yield* manager.enable(Plugin1.meta.id);
-      yield* manager.add(Plugin2.meta.id);
-      yield* manager.enable(Plugin2.meta.id);
+      yield* manager.add(Plugin1.meta.profile.key);
+      yield* manager.enable(Plugin1.meta.profile.key);
+      yield* manager.add(Plugin2.meta.profile.key);
+      yield* manager.enable(Plugin2.meta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       assert.strictEqual(manager.getActive().length, 2);
       assert.strictEqual(manager.capabilities.getAll(String).length, 1);
@@ -1055,8 +1055,8 @@ describe('PluginManager', () => {
       plugins = [testPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       assert.isFalse(deactivated);
 
@@ -1101,10 +1101,10 @@ describe('PluginManager', () => {
       plugins = [Plugin1(), Plugin2()];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(Plugin1.meta.id);
-      yield* manager.enable(Plugin1.meta.id);
-      yield* manager.add(Plugin2.meta.id);
-      yield* manager.enable(Plugin2.meta.id);
+      yield* manager.add(Plugin1.meta.profile.key);
+      yield* manager.enable(Plugin1.meta.profile.key);
+      yield* manager.add(Plugin2.meta.profile.key);
+      yield* manager.enable(Plugin2.meta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
 
       yield* manager.shutdown();
@@ -1126,8 +1126,8 @@ describe('PluginManager', () => {
       plugins = [testPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       assert.isTrue(manager.getEventsFired().length > 0);
 
@@ -1159,8 +1159,8 @@ describe('PluginManager', () => {
       plugins = [testPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
 
       const activationFiber = yield* Effect.fork(manager.activate(ActivationEvents.Startup));
       yield* activationStarted.await;
@@ -1196,8 +1196,8 @@ describe('PluginManager', () => {
       plugins = [testPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
 
       const pluginsBefore = manager.getPlugins();
@@ -1232,8 +1232,8 @@ describe('PluginManager', () => {
       plugins = [testPlugin];
 
       const manager = PluginManager.make({ pluginLoader });
-      yield* manager.add(testMeta.id);
-      yield* manager.enable(testMeta.id);
+      yield* manager.add(testMeta.profile.key);
+      yield* manager.enable(testMeta.profile.key);
       yield* manager.activate(ActivationEvents.Startup);
       assert.strictEqual(activateCount, 1);
       assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
@@ -1259,12 +1259,12 @@ describe('PluginManager', () => {
         return Promise.resolve({ default: Real });
       });
 
-      assert.strictEqual(LazyTest.meta.id, lazyMeta.id);
-      assert.strictEqual(LazyTest.meta.name, 'Lazy');
+      assert.strictEqual(LazyTest.meta.profile.key, lazyMeta.profile.key);
+      assert.strictEqual(LazyTest.meta.profile.name, 'Lazy');
       assert.strictEqual(loaderCalls, 0);
 
       const stub = LazyTest();
-      assert.strictEqual(stub.meta.id, lazyMeta.id);
+      assert.strictEqual(stub.meta.profile.key, lazyMeta.profile.key);
       assert.deepStrictEqual([...stub.modules], []);
       assert.isTrue(Plugin.isLazy(stub));
       assert.strictEqual(loaderCalls, 0);
@@ -1290,16 +1290,16 @@ describe('PluginManager', () => {
         plugins = [lazyStub];
 
         const manager = PluginManager.make({ pluginLoader });
-        yield* manager.add(lazyMeta.id);
+        yield* manager.add(lazyMeta.profile.key);
         // Loader has not been invoked yet — only meta is exposed.
         assert.strictEqual(loaderCalls, 0);
         assert.deepStrictEqual(manager.getModules(), []);
 
-        yield* manager.enable(lazyMeta.id);
+        yield* manager.enable(lazyMeta.profile.key);
         assert.strictEqual(loaderCalls, 1);
         // After enable the registered plugin should be the real one (not the stub),
         // and its modules should be registered with the manager.
-        const registered = manager.getPlugins().find((p) => p.meta.id === lazyMeta.id);
+        const registered = manager.getPlugins().find((p) => p.meta.profile.key === lazyMeta.profile.key);
         assert.isDefined(registered);
         assert.isFalse(Plugin.isLazy(registered!));
         assert.strictEqual(registered!.modules.length, 1);
@@ -1321,7 +1321,7 @@ describe('PluginManager', () => {
         plugins = [lazyStub];
 
         const manager = PluginManager.make({ pluginLoader });
-        yield* manager.add(lazyMeta.id);
+        yield* manager.add(lazyMeta.profile.key);
 
         // Activate an event that has no listeners — the lazy plugin must not load.
         yield* manager.activate(ActivationEvents.Startup);
@@ -1349,8 +1349,8 @@ describe('PluginManager', () => {
         plugins = [lazyStub];
 
         const manager = PluginManager.make({ pluginLoader });
-        yield* manager.add(lazyMeta.id);
-        yield* manager.enable(lazyMeta.id);
+        yield* manager.add(lazyMeta.profile.key);
+        yield* manager.enable(lazyMeta.profile.key);
         yield* manager.activate(ActivationEvents.Startup);
 
         const all = manager.capabilities.getAll(String);
@@ -1368,16 +1368,16 @@ describe('PluginManager', () => {
         plugins = [lazyStub];
 
         const manager = PluginManager.make({ pluginLoader });
-        yield* manager.add(lazyMeta.id);
+        yield* manager.add(lazyMeta.profile.key);
 
-        const exit = yield* Effect.exit(manager.enable(lazyMeta.id));
+        const exit = yield* Effect.exit(manager.enable(lazyMeta.profile.key));
         assert.isTrue(Exit.isFailure(exit));
         if (Exit.isFailure(exit)) {
           const failure = Cause.failureOption(exit.cause);
           assert.isTrue(failure._tag === 'Some');
           if (failure._tag === 'Some') {
             assert.isTrue(Plugin.LazyPluginError.is(failure.value));
-            assert.strictEqual((failure.value as Plugin.LazyPluginError).context.id, lazyMeta.id);
+            assert.strictEqual((failure.value as Plugin.LazyPluginError).context.id, lazyMeta.profile.key);
             assert.strictEqual((failure.value as Plugin.LazyPluginError).context.reason, 'load-failed');
           }
         }
@@ -1395,11 +1395,13 @@ describe('PluginManager', () => {
         const manager = PluginManager.make({ pluginLoader });
         // Subscribe first so we don't miss the activating/error pair.
         const queue = yield* PubSub.subscribe(manager.activation);
-        yield* manager.add(lazyMeta.id);
-        yield* Effect.exit(manager.enable(lazyMeta.id));
+        yield* manager.add(lazyMeta.profile.key);
+        yield* Effect.exit(manager.enable(lazyMeta.profile.key));
         const messages = yield* Queue.takeAll(queue);
 
-        const errorMessage = [...messages].find((m) => m.module === `lazy:${lazyMeta.id}` && m.state === 'error');
+        const errorMessage = [...messages].find(
+          (m) => m.module === `lazy:${lazyMeta.profile.key}` && m.state === 'error',
+        );
         assert.isDefined(errorMessage);
         assert.isDefined(errorMessage!.error);
       }).pipe(Effect.scoped),
@@ -1434,7 +1436,7 @@ describe('PluginManager', () => {
         // coalescing, the underlying factory should still run exactly once.
         plugins = [lazyStub];
         const manager = PluginManager.make({ pluginLoader, plugins });
-        yield* manager.enable(coreLazyMeta.id);
+        yield* manager.enable(coreLazyMeta.profile.key);
         assert.strictEqual(factoryCalls, 1);
       }),
     );
@@ -1447,9 +1449,9 @@ describe('PluginManager', () => {
         plugins = [lazyStub];
 
         const manager = PluginManager.make({ pluginLoader });
-        yield* manager.add(lazyMeta.id);
+        yield* manager.add(lazyMeta.profile.key);
 
-        const exit = yield* Effect.exit(manager.enable(lazyMeta.id));
+        const exit = yield* Effect.exit(manager.enable(lazyMeta.profile.key));
         assert.isTrue(Exit.isFailure(exit));
         if (Exit.isFailure(exit)) {
           const failure = Cause.failureOption(exit.cause);
@@ -1492,7 +1494,7 @@ describe('PluginManager', () => {
 
     it.effect('records and auto-disables a plugin whose module exceeds the activation timeout', () =>
       Effect.gen(function* () {
-        const SlowEvent = ActivationEvent.make('org.dxos.test.activation-timeout');
+        const SlowEvent = ActivationEvent.make('org.dxos.test.activationTimeout');
         const SlowPlugin = Plugin.define(
           Plugin.makeMeta({
             key: DXN.make('org.dxos.test.slowActivation'),
@@ -1517,8 +1519,8 @@ describe('PluginManager', () => {
           registry,
           activationTimeout: Duration.seconds(2),
         });
-        yield* manager.add(SlowPlugin.meta.id);
-        yield* manager.enable(SlowPlugin.meta.id);
+        yield* manager.add(SlowPlugin.meta.profile.key);
+        yield* manager.enable(SlowPlugin.meta.profile.key);
 
         const fiber = yield* Effect.fork(manager.activate(SlowEvent));
         // Push past the 2s activation timeout. The forked module fiber is on
@@ -1529,13 +1531,13 @@ describe('PluginManager', () => {
 
         const failed = manager.getFailed();
         assert.strictEqual(failed.length, 1);
-        assert.strictEqual(failed[0].id, SlowPlugin.meta.id);
+        assert.strictEqual(failed[0].id, SlowPlugin.meta.profile.key);
         assert.strictEqual(failed[0].phase, 'activation');
         assert.strictEqual(failed[0].reason, 'timeout');
 
         // Auto-disable runs in a forked fiber on the default runtime; wait for
         // the `enabled` atom to settle to the disabled state.
-        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(SlowPlugin.meta.id));
+        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(SlowPlugin.meta.profile.key));
         assert.deepStrictEqual(manager.getEnabled(), []);
       }),
     );
@@ -1554,9 +1556,9 @@ describe('PluginManager', () => {
           registry,
           loadTimeout: Duration.seconds(1),
         });
-        yield* manager.add(lazyMeta.id);
+        yield* manager.add(lazyMeta.profile.key);
 
-        const enableFiber = yield* Effect.fork(manager.enable(lazyMeta.id));
+        const enableFiber = yield* Effect.fork(manager.enable(lazyMeta.profile.key));
         yield* TestClock.adjust(Duration.seconds(2));
         const exit = yield* Fiber.await(enableFiber);
         assert.isTrue(Exit.isFailure(exit));
@@ -1573,19 +1575,19 @@ describe('PluginManager', () => {
 
         const failed = manager.getFailed();
         assert.strictEqual(failed.length, 1);
-        assert.strictEqual(failed[0].id, lazyMeta.id);
+        assert.strictEqual(failed[0].id, lazyMeta.profile.key);
         assert.strictEqual(failed[0].phase, 'load');
         assert.strictEqual(failed[0].reason, 'timeout');
 
         // The plugin was added to `enabled` before the lazy resolution failed,
         // so the auto-disable fork should clear it.
-        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(lazyMeta.id));
+        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(lazyMeta.profile.key));
       }),
     );
 
     it.effect('records non-timeout activation errors as reason: error', () =>
       Effect.gen(function* () {
-        const FailingEvent = ActivationEvent.make('org.dxos.test.activation-error');
+        const FailingEvent = ActivationEvent.make('org.dxos.test.activationError');
         const FailingPlugin = Plugin.define(
           Plugin.makeMeta({ key: DXN.make('org.dxos.test.failing'), name: 'Failing' }),
         ).pipe(
@@ -1600,8 +1602,8 @@ describe('PluginManager', () => {
 
         const registry = Registry.make();
         const manager = PluginManager.make({ pluginLoader, registry });
-        yield* manager.add(FailingPlugin.meta.id);
-        yield* manager.enable(FailingPlugin.meta.id);
+        yield* manager.add(FailingPlugin.meta.profile.key);
+        yield* manager.enable(FailingPlugin.meta.profile.key);
 
         const exit = yield* Effect.exit(manager.activate(FailingEvent));
         assert.isTrue(Exit.isFailure(exit));
@@ -1611,13 +1613,13 @@ describe('PluginManager', () => {
         assert.strictEqual(failed[0].reason, 'error');
         assert.strictEqual(failed[0].error.message, 'boom');
 
-        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(FailingPlugin.meta.id));
+        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(FailingPlugin.meta.profile.key));
       }),
     );
 
     it.effect('does not auto-disable a core plugin even though the failure is recorded', () =>
       Effect.gen(function* () {
-        const FailingEvent = ActivationEvent.make('org.dxos.test.core-fail');
+        const FailingEvent = ActivationEvent.make('org.dxos.test.coreFail');
         const CorePlugin = Plugin.define(
           Plugin.makeMeta({ key: DXN.make('org.dxos.test.core'), name: 'Core', tags: ['system'] }),
         ).pipe(
@@ -1641,7 +1643,7 @@ describe('PluginManager', () => {
 
         assert.strictEqual(manager.getFailed().length, 1);
         // Core stays enabled; host opted into it being non-removable.
-        assert.deepStrictEqual(manager.getEnabled(), [corePlugin.meta.id]);
+        assert.deepStrictEqual(manager.getEnabled(), [corePlugin.meta.profile.key]);
       }),
     );
 
@@ -1667,22 +1669,22 @@ describe('PluginManager', () => {
 
         const registry = Registry.make();
         const manager = PluginManager.make({ pluginLoader, registry });
-        yield* manager.add(flakyPlugin.meta.id);
-        yield* manager.enable(flakyPlugin.meta.id);
+        yield* manager.add(flakyPlugin.meta.profile.key);
+        yield* manager.enable(flakyPlugin.meta.profile.key);
 
         yield* Effect.exit(manager.activate(Event));
         assert.strictEqual(manager.getFailed().length, 1);
-        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(flakyPlugin.meta.id));
+        yield* waitFor(registry, manager.enabled, (ids) => !ids.includes(flakyPlugin.meta.profile.key));
 
         // Calling `enable` again clears the prior failure record before
         // attempting resolution; verify the explicit API does too.
-        assert.isTrue(manager.clearFailure(flakyPlugin.meta.id));
+        assert.isTrue(manager.clearFailure(flakyPlugin.meta.profile.key));
         assert.strictEqual(manager.getFailed().length, 0);
-        assert.isFalse(manager.clearFailure(flakyPlugin.meta.id));
+        assert.isFalse(manager.clearFailure(flakyPlugin.meta.profile.key));
 
         // Retry: enable + reset the activation event so the module re-runs.
         shouldFail = false;
-        yield* manager.enable(flakyPlugin.meta.id);
+        yield* manager.enable(flakyPlugin.meta.profile.key);
         yield* manager.reset(Event);
         assert.strictEqual(manager.getFailed().length, 0);
         assert.strictEqual(manager.capabilities.getAll(String).length, 1);
@@ -1695,15 +1697,15 @@ describe('PluginManager', () => {
     // focused on the dependency semantics rather than module wiring.
     // These dependency-graph tests use short opaque ids (`'a'`, `'coreClient'`,
     // `'org.dxos.missing'`) as graph keys rather than real DXNs. `id`/`dependsOn` are
-    // bare strings; only `key` (an unused DXN here) is cast at this test-only boundary.
     const makePlugin = (id: string, dependsOn?: string[], tags?: string[]) =>
       Plugin.make(
         Plugin.define({
-          id,
-          key: id as unknown as DXN.DXN,
-          name: id,
-          dependsOn,
-          tags,
+          profile: {
+            key: id,
+            name: id,
+            dependsOn,
+            tags,
+          },
         }),
       )();
 
@@ -1871,11 +1873,8 @@ describe('PluginManager', () => {
         registry.set(manager.pluginRegistry.plugins, {
           entries: [
             {
-              id: 'remote',
-              name: 'Remote',
-              moduleUrl: 'about:blank',
-              repo: 'example/remote',
-              version: 'v0.0.0',
+              profile: { key: 'remote', name: 'Remote' },
+              release: { version: 'v0.0.0', moduleUrl: 'about:blank' },
             },
           ],
           loading: false,
@@ -1885,7 +1884,7 @@ describe('PluginManager', () => {
         const ok = yield* manager.enable('dependent');
         assert.isTrue(ok);
         assert.deepStrictEqual(manager.getEnabled(), ['remote', 'dependent']);
-        assert.isTrue(manager.getPlugins().some((plugin) => plugin.meta.id === 'remote'));
+        assert.isTrue(manager.getPlugins().some((plugin) => plugin.meta.profile.key === 'remote'));
       }),
     );
 
@@ -1905,11 +1904,8 @@ describe('PluginManager', () => {
         registry.set(manager.pluginRegistry.plugins, {
           entries: [
             {
-              id: 'remote-broken',
-              name: 'Broken',
-              moduleUrl: 'about:blank',
-              repo: 'example/broken',
-              version: 'v0.0.0',
+              profile: { key: 'remote-broken', name: 'Broken' },
+              release: { version: 'v0.0.0', moduleUrl: 'about:blank' },
             },
           ],
           loading: false,