@dxos/app-framework 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

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

@@ -15,7 +15,7 @@ import * as TestClock from 'effect/TestClock';
 import { invariant } from '@dxos/invariant';
 import { type LogConfig, type LogEntry, LogLevel, log } from '@dxos/log';
 
-import * as Common from '../common';
+import { ActivationEvents } from '../common';
 
 import * as ActivationEvent from './activation-event';
 import * as Capability from './capability';
@@ -23,14 +23,14 @@ import type * as CapabilityManager from './capability-manager';
 import * as Plugin from './plugin';
 import * as PluginManager from './plugin-manager';
 
-const String = Capability.make<{ string: string }>('dxos.org/test/string');
-const Number = Capability.make<{ number: number }>('dxos.org/test/number');
-const Total = Capability.make<{ total: number }>('dxos.org/test/total');
+const String = Capability.make<{ string: string }>('org.dxos.test.string');
+const Number = Capability.make<{ number: number }>('org.dxos.test.number');
+const Total = Capability.make<{ total: number }>('org.dxos.test.total');
 
-const CountEvent = ActivationEvent.make('dxos.org/test/count');
-const FailEvent = ActivationEvent.make('dxos.org/test/fail');
+const CountEvent = ActivationEvent.make('org.dxos.test.count');
+const FailEvent = ActivationEvent.make('org.dxos.test.fail');
 
-const testMeta = { id: 'dxos.org/plugin/test', name: 'Test' };
+const testMeta = { id: 'org.dxos.plugin.test', name: 'Test' };
 
 // TODO(wittjosiah): Factor out?
 const atomCounter = (registry: Registry.Registry, atom: Atom.Atom<any>) => {
@@ -89,12 +89,12 @@ describe('PluginManager', () => {
       const TestPluginFactory = Plugin.define<TestPluginOptions>(testMeta).pipe(
         Plugin.addModule((options: TestPluginOptions) => ({
           id: 'Hello',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activate: () => Effect.succeed(Capability.contributes(String, { string: `hello-${options.count}` })),
         })),
         Plugin.addModule({
           id: 'World',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activate: () => Effect.succeed(Capability.contributes(String, { string: 'world' })),
         }),
         Plugin.make,
@@ -105,7 +105,7 @@ describe('PluginManager', () => {
 
       const manager = PluginManager.make({ plugins: [plugin], core: [], pluginLoader });
       yield* manager.enable(testMeta.id);
-      yield* manager.activate(Common.ActivationEvent.Startup);
+      yield* manager.activate(ActivationEvents.Startup);
       const strings = manager.capabilities.getAll(String);
       assert.strictEqual(strings.length, 2);
       assert.strictEqual(strings[0].string, 'hello-5');
@@ -118,7 +118,7 @@ describe('PluginManager', () => {
       const Test = Plugin.define(testMeta).pipe(
         Plugin.addModule({
           id: 'Hello',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activate: () => Effect.succeed(Capability.contributes(String, { string: 'hello' })),
         }),
         Plugin.make,
@@ -140,7 +140,7 @@ describe('PluginManager', () => {
       const Test = Plugin.define(testMeta).pipe(
         Plugin.addModule({
           id: 'Hello',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activate: () => Effect.succeed(Capability.contributes(String, { string: 'hello' })),
         }),
         Plugin.make,
@@ -154,9 +154,9 @@ describe('PluginManager', () => {
       assert.deepStrictEqual(manager.getModules(), [testPlugin.modules[0]]);
       assert.deepStrictEqual(manager.getActive(), []);
       assert.deepStrictEqual(manager.getEventsFired(), []);
-      yield* manager.activate(Common.ActivationEvent.Startup);
+      yield* manager.activate(ActivationEvents.Startup);
       assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
-      assert.deepStrictEqual(manager.getEventsFired(), [Common.ActivationEvent.Startup.id]);
+      assert.deepStrictEqual(manager.getEventsFired(), [ActivationEvents.Startup.id]);
     }),
   );
 
@@ -165,7 +165,7 @@ describe('PluginManager', () => {
       const Test = Plugin.define(testMeta).pipe(
         Plugin.addModule({
           id: 'NoCapabilities',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activate: Effect.fnUntraced(function* () {}),
         }),
         Plugin.make,
@@ -175,7 +175,7 @@ describe('PluginManager', () => {
       const manager = PluginManager.make({ plugins: [testPlugin], pluginLoader });
       yield* manager.enable(Test.meta.id);
 
-      const result = yield* manager.activate(Common.ActivationEvent.Startup);
+      const result = yield* manager.activate(ActivationEvents.Startup);
       assert.isTrue(result);
       assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
       assert.strictEqual(manager.capabilities.getAll(String).length, 0);
@@ -204,7 +204,7 @@ describe('PluginManager', () => {
 
   it.effect('should catch and log defects (synchronous throws) in module activation', () =>
     Effect.gen(function* () {
-      const DefectEvent = ActivationEvent.make('dxos.org/test/defect');
+      const DefectEvent = ActivationEvent.make('org.dxos.test.defect');
       const capturedErrors: LogEntry[] = [];
       const removeProcessor = log.addProcessor((_config: LogConfig, entry: LogEntry) => {
         if (entry.level === LogLevel.ERROR) {
@@ -238,7 +238,7 @@ describe('PluginManager', () => {
       const defectLog = capturedErrors.find(
         (entry) =>
           entry.message?.includes('module failed to activate') &&
-          entry.context?.module === 'dxos.org/plugin/test/module/DefectInEffectSync',
+          entry.context?.module === 'org.dxos.plugin.test.module.DefectInEffectSync',
       );
       assert.isNotNull(defectLog, 'Expected error log for defect');
       assert.strictEqual(defectLog?.context?.isDefect, true, 'Expected isDefect to be true for synchronous throw');
@@ -249,7 +249,7 @@ describe('PluginManager', () => {
 
   it.effect('should catch and log defects when activate throws before returning Effect', () =>
     Effect.gen(function* () {
-      const DefectEvent = ActivationEvent.make('dxos.org/test/defect-immediate');
+      const DefectEvent = ActivationEvent.make('org.dxos.test.defect-immediate');
       const capturedErrors: LogEntry[] = [];
       const removeProcessor = log.addProcessor((_config: LogConfig, entry: LogEntry) => {
         if (entry.level === LogLevel.ERROR) {
@@ -284,7 +284,7 @@ describe('PluginManager', () => {
       const defectLog = capturedErrors.find(
         (entry) =>
           entry.message?.includes('module failed to activate') &&
-          entry.context?.module === 'dxos.org/plugin/test/module/DefectImmediate',
+          entry.context?.module === 'org.dxos.plugin.test.module.DefectImmediate',
       );
       assert.isNotNull(defectLog, 'Expected error log for immediate defect');
       assert.strictEqual(
@@ -303,7 +303,7 @@ describe('PluginManager', () => {
         Plugin.define(testMeta).pipe(
           Plugin.addModule({
             id: 'Hello',
-            activatesOn: Common.ActivationEvent.Startup,
+            activatesOn: ActivationEvents.Startup,
             activate: () => Effect.succeed(Capability.contributes(String, { string: 'hello' })),
           }),
           Plugin.addModule({
@@ -339,7 +339,7 @@ describe('PluginManager', () => {
       );
 
       yield* manager.add(testMeta.id);
-      yield* manager.activate(Common.ActivationEvent.Startup);
+      yield* manager.activate(ActivationEvents.Startup);
       yield* activating.await;
       yield* activated.await;
 
@@ -374,7 +374,7 @@ describe('PluginManager', () => {
       const Test = Plugin.define(testMeta).pipe(
         Plugin.addModule({
           id: 'Hello',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activate: () => {
             count++;
             return Effect.succeed(Capability.contributes(String, { string: 'hello' }));
@@ -389,19 +389,19 @@ describe('PluginManager', () => {
 
       {
         yield* manager.add(testMeta.id);
-        const result = yield* manager.activate(Common.ActivationEvent.Startup);
+        const result = yield* manager.activate(ActivationEvents.Startup);
         assert.isTrue(result);
         assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
         assert.strictEqual(count, 1);
       }
 
       {
-        const result = yield* manager.activate(Common.ActivationEvent.Startup);
+        const result = yield* manager.activate(ActivationEvents.Startup);
         assert.isFalse(result);
       }
 
       {
-        const result = yield* manager.reset(Common.ActivationEvent.Startup);
+        const result = yield* manager.reset(ActivationEvents.Startup);
         assert.isTrue(result);
         assert.strictEqual(count, 2);
       }
@@ -419,7 +419,7 @@ describe('PluginManager', () => {
 
   it.effect('should be able to fire custom activation events', () =>
     Effect.gen(function* () {
-      const Plugin1 = Plugin.define({ id: 'dxos.org/test/plugin-1', name: 'Plugin 1' }).pipe(
+      const Plugin1 = Plugin.define({ id: 'org.dxos.test.plugin-1', name: 'Plugin 1' }).pipe(
         Plugin.addModule({
           activatesOn: CountEvent,
           id: 'Plugin1',
@@ -427,7 +427,7 @@ describe('PluginManager', () => {
         }),
         Plugin.make,
       );
-      const Plugin2 = Plugin.define({ id: 'dxos.org/test/plugin-2', name: 'Plugin 2' }).pipe(
+      const Plugin2 = Plugin.define({ id: 'org.dxos.test.plugin-2', name: 'Plugin 2' }).pipe(
         Plugin.addModule({
           activatesOn: CountEvent,
           id: 'Plugin2',
@@ -435,7 +435,7 @@ describe('PluginManager', () => {
         }),
         Plugin.make,
       );
-      const Plugin3 = Plugin.define({ id: 'dxos.org/test/plugin-3', name: 'Plugin 3' }).pipe(
+      const Plugin3 = Plugin.define({ id: 'org.dxos.test.plugin-3', name: 'Plugin 3' }).pipe(
         Plugin.addModule({
           activatesOn: CountEvent,
           id: 'Plugin3',
@@ -477,7 +477,7 @@ describe('PluginManager', () => {
     Effect.gen(function* () {
       const Test = Plugin.define(testMeta).pipe(
         Plugin.addModule({
-          activatesOn: ActivationEvent.allOf(Common.ActivationEvent.Startup, CountEvent),
+          activatesOn: ActivationEvent.allOf(ActivationEvents.Startup, CountEvent),
           id: 'Hello',
           activate: () => {
             return Effect.succeed(Capability.contributes(String, { string: 'hello' }));
@@ -493,7 +493,7 @@ describe('PluginManager', () => {
       assert.strictEqual(manager.capabilities.getAll(String).length, 0);
 
       yield* manager.add(testMeta.id);
-      yield* manager.activate(Common.ActivationEvent.Startup);
+      yield* manager.activate(ActivationEvents.Startup);
       assert.deepStrictEqual(manager.getActive(), []);
       assert.strictEqual(manager.capabilities.getAll(String).length, 0);
 
@@ -509,7 +509,7 @@ describe('PluginManager', () => {
       const Test = Plugin.define(testMeta).pipe(
         Plugin.addModule({
           id: 'Hello',
-          activatesOn: ActivationEvent.oneOf(Common.ActivationEvent.Startup, CountEvent),
+          activatesOn: ActivationEvent.oneOf(ActivationEvents.Startup, CountEvent),
           activate: () => {
             count++;
             return Effect.succeed(Capability.contributes(String, { string: 'hello' }));
@@ -531,7 +531,7 @@ describe('PluginManager', () => {
       assert.strictEqual(manager.capabilities.getAll(String).length, 1);
       assert.strictEqual(count, 1);
 
-      yield* manager.activate(Common.ActivationEvent.Startup);
+      yield* manager.activate(ActivationEvents.Startup);
       assert.deepStrictEqual(manager.getActive(), [testPlugin.modules[0].id]);
       assert.strictEqual(manager.capabilities.getAll(String).length, 1);
       assert.strictEqual(count, 1);
@@ -546,10 +546,10 @@ describe('PluginManager', () => {
         state.total = numbers.reduce((acc: number, n: { number: number }) => acc + n.number, 0);
       };
 
-      const Count = Plugin.define({ id: 'dxos.org/test/count', name: 'Count' }).pipe(
+      const Count = Plugin.define({ id: 'org.dxos.test.count', name: 'Count' }).pipe(
         Plugin.addModule({
           id: 'Count',
-          activatesOn: Common.ActivationEvent.Startup,
+          activatesOn: ActivationEvents.Startup,
           activatesBefore: [CountEvent],
           activate: Effect.fnUntraced(function* () {
             const capabilityManager = yield* Capability.Service;
@@ -586,7 +586,7 @@ describe('PluginManager', () => {
       {
         yield* manager.add(Test.meta.id);
         yield* manager.add(Count.meta.id);
-        yield* manager.activate(Common.ActivationEvent.Startup);
+        yield* manager.activate(ActivationEvents.Startup);
         assert.deepStrictEqual(manager.getActive(), [
           ...testPlugin.modules.map((m) => m.id),
           countPlugin.modules[0].id,
@@ -626,7 +626,7 @@ describe('PluginManager', () => {
 
   it.effect('should be reactive', () =>
     Effect.gen(function* () {
-      const Plugin1 = Plugin.define({ id: 'dxos.org/test/plugin-1', name: 'Plugin 1' }).pipe(
+      const Plugin1 = Plugin.define({ id: 'org.dxos.test.plugin-1', name: 'Plugin 1' }).pipe(
         Plugin.addModule({
           activatesOn: CountEvent,
           id: 'Plugin1',
@@ -634,7 +634,7 @@ describe('PluginManager', () => {
         }),
         Plugin.make,
       );
-      const Plugin2 = Plugin.define({ id: 'dxos.org/test/plugin-2', name: 'Plugin 2' }).pipe(
+      const Plugin2 = Plugin.define({ id: 'org.dxos.test.plugin-2', name: 'Plugin 2' }).pipe(
         Plugin.addModule({
           activatesOn: CountEvent,
           id: 'Plugin2',
@@ -642,7 +642,7 @@ describe('PluginManager', () => {
         }),
         Plugin.make,
       );
-      const Plugin3 = Plugin.define({ id: 'dxos.org/test/plugin-3', name: 'Plugin 3' }).pipe(
+      const Plugin3 = Plugin.define({ id: 'org.dxos.test.plugin-3', name: 'Plugin 3' }).pipe(
         Plugin.addModule({
           activatesOn: CountEvent,
           id: 'Plugin3',
@@ -752,8 +752,8 @@ describe('PluginManager', () => {
         }
       });
 
-      const SlowEvent = ActivationEvent.make('dxos.org/test/slow');
-      const SlowPlugin = Plugin.define({ id: 'dxos.org/test/slow-plugin', name: 'Slow Plugin' }).pipe(
+      const SlowEvent = ActivationEvent.make('org.dxos.test.slow');
+      const SlowPlugin = Plugin.define({ id: 'org.dxos.test.slow-plugin', name: 'Slow Plugin' }).pipe(
         Plugin.addModule({
           id: 'SlowModule',
           activatesOn: SlowEvent,
@@ -795,11 +795,11 @@ 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('dxos.org/test/event-a');
-      const EventB = ActivationEvent.make('dxos.org/test/event-b');
+      const EventA = ActivationEvent.make('org.dxos.test.event-a');
+      const EventB = ActivationEvent.make('org.dxos.test.event-b');
 
       let activateCallCount = 0;
-      const ConcurrentPlugin = Plugin.define({ id: 'dxos.org/test/concurrent-plugin', name: 'Concurrent Plugin' }).pipe(
+      const ConcurrentPlugin = Plugin.define({ id: 'org.dxos.test.concurrent-plugin', name: 'Concurrent Plugin' }).pipe(
         Plugin.addModule({
           id: 'ConcurrentModule',
           // Module activates on either event - this allows two different events to race.

package/src/core/plugin-manager.ts

@@ -15,6 +15,7 @@ import * as PubSub from 'effect/PubSub';
 import * as Ref from 'effect/Ref';
 
 import { runAndForwardErrors } from '@dxos/effect';
+import { Performance } from '@dxos/effect';
 import { log } from '@dxos/log';
 
 import * as ActivationEvent from './activation-event';
@@ -438,6 +439,15 @@ class ManagerImpl implements PluginManager {
           Effect.andThen(Effect.sync(() => log.warn('event activation is taking a long time', { event: key }))),
         ),
       ),
+      Performance.addTrackEntry({
+        name: typeof event === 'string' ? event : ActivationEvent.eventKey(event),
+        devtools: {
+          dataType: 'track-entry',
+          track: 'Event Activation',
+          trackGroup: 'Composer',
+          color: 'primary',
+        },
+      }),
     );
   }
 
@@ -609,6 +619,15 @@ class ManagerImpl implements PluginManager {
               ),
             ),
           ),
+          Performance.addTrackEntry({
+            name: module.id,
+            devtools: {
+              dataType: 'track-entry',
+              track: 'Module Activation',
+              trackGroup: 'Composer',
+              color: 'primary',
+            },
+          }),
         );
 
         // Fork the load to run in background, completing the deferred when done.

package/src/core/plugin.ts

@@ -49,7 +49,7 @@ export const reset = (event: ActivationEvent.ActivationEvent): Effect.Effect<boo
  * Computes a module ID from plugin ID and export name.
  */
 const computeModuleId = (pluginId: string, moduleName: string): string => {
-  return `${pluginId}/module/${moduleName}`;
+  return `${pluginId}.module.${moduleName}`;
 };
 
 /**
@@ -128,7 +128,7 @@ export type Meta = {
    *
    * Expected to be in the form of a valid URL.
    *
-   * @example dxos.org/plugin/example
+   * @example org.dxos.plugin.example
    */
   id: string;
 
@@ -190,6 +190,7 @@ export const isPlugin = (value: unknown): value is Plugin => {
  * A collection of modules that are be enabled/disabled as a unit.
  * Plugins provide things such as components, state, actions, etc. to the application.
  */
+// TODO(burdon): Convert to ECHO schema.
 export interface Plugin {
   readonly [PluginTypeId]: PluginTypeId;
   readonly meta: Readonly<Meta>;

package/src/index.ts

@@ -2,10 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './cli';
-export * as Common from './common';
+export * from './common';
 export * from './context';
 export * from './core';
 export * from './plugin-operation';
 export * from './plugin-runtime';
-export * from './plugin-settings';

package/src/plugin-operation/OperationPlugin.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Common from '../common';
+import { ActivationEvents } from '../common';
 import { Capability, Plugin } from '../core';
 
 import { meta } from './meta';
@@ -12,13 +12,13 @@ const HistoryCapabilities = Capability.lazy('HistoryCapabilities', () => import(
 
 export const OperationPlugin = Plugin.define(meta).pipe(
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.ManagedRuntimeReady,
-    activatesBefore: [Common.ActivationEvent.SetupOperationResolver],
-    activatesAfter: [Common.ActivationEvent.OperationInvokerReady],
+    activatesOn: ActivationEvents.ManagedRuntimeReady,
+    activatesBefore: [ActivationEvents.SetupOperationResolver],
+    activatesAfter: [ActivationEvents.OperationInvokerReady],
     activate: OperationInvoker,
   }),
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.OperationInvokerReady,
+    activatesOn: ActivationEvents.OperationInvokerReady,
     activate: HistoryCapabilities,
   }),
   Plugin.make,

package/src/plugin-operation/history/capability.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { type OperationInvoker } from '@dxos/operation';
 
-import * as Common from '../../common';
+import { Capabilities } from '../../common';
 import { Capability } from '../../core';
 
 import * as HistoryTracker from './history-tracker';
@@ -22,16 +22,16 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     // Create UndoRegistry.
-    const undoRegistry = UndoRegistry.make(() => capabilities.getAll(Common.Capability.UndoMapping).flat());
+    const undoRegistry = UndoRegistry.make(() => capabilities.getAll(Capabilities.UndoMapping).flat());
 
     // Create HistoryTracker (depends on UndoRegistry and OperationInvoker).
-    const invoker = yield* Capability.get(Common.Capability.OperationInvoker);
+    const invoker = yield* Capability.get(Capabilities.OperationInvoker);
     // Cast to internal type - the factory always returns OperationInvokerInternal.
     const historyTracker = HistoryTracker.make(invoker as OperationInvoker.OperationInvokerInternal, undoRegistry);
 
     return [
-      Capability.contributes(Common.Capability.UndoRegistry, undoRegistry),
-      Capability.contributes(Common.Capability.HistoryTracker, historyTracker),
+      Capability.contributes(Capabilities.UndoRegistry, undoRegistry),
+      Capability.contributes(Capabilities.HistoryTracker, historyTracker),
     ];
   }),
 );

package/src/plugin-operation/history/undo-mapping.ts

@@ -4,7 +4,10 @@
 
 import type { Operation } from '@dxos/operation';
 
-import type { Label } from '../../common/translations';
+/**
+ * Label type for translatable text (canonical definition in @dxos/app-toolkit).
+ */
+type Label = string | [string, { ns: string; count?: number; defaultValue?: string }];
 
 /**
  * Extract the input type from an OperationDefinition.
@@ -95,7 +98,7 @@ export interface UndoMappingProps<
  *     thread: output.thread,
  *     anchor: output.anchor,
  *   }),
- *   message: ['thread deleted label', { ns: 'plugin-thread' }],
+ *   message: ['thread deleted label', { ns: '@dxos/plugin-thread' }],
  * });
  *
  * // Dynamic message based on input/output
@@ -106,7 +109,7 @@ export interface UndoMappingProps<
  *   message: (input, _output) =>
  *     input.objects.length === 1
  *       ? ['object deleted label', { ns: getTypename(input.objects[0]) }]
- *       : ['objects deleted label', { ns: 'plugin-space' }],
+ *       : ['objects deleted label', { ns: '@dxos/plugin-space' }],
  * });
  * ```
  */

package/src/plugin-operation/invoker-capability.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { OperationInvoker } from '@dxos/operation';
 
-import * as Common from '../common';
+import { ActivationEvents, Capabilities } from '../common';
 import { Capability, Plugin } from '../core';
 
 //
@@ -20,14 +20,14 @@ export default Capability.makeModule(
     const pluginManager = yield* Plugin.Service;
 
     // Get the ManagedRuntime capability (should be available since we activate after ManagedRuntimeReady).
-    const managedRuntimes = yield* Capability.getAll(Common.Capability.ManagedRuntime);
+    const managedRuntimes = yield* Capability.getAll(Capabilities.ManagedRuntime);
     const managedRuntime = managedRuntimes.length > 0 ? managedRuntimes[0] : undefined;
 
     const invoker = OperationInvoker.make(
       () =>
         Effect.gen(function* () {
-          yield* Plugin.activate(Common.ActivationEvent.SetupOperationResolver);
-          return (yield* Capability.getAll(Common.Capability.OperationResolver)).flat();
+          yield* Plugin.activate(ActivationEvents.SetupOperationResolver);
+          return (yield* Capability.getAll(Capabilities.OperationResolver)).flat();
         }).pipe(
           Effect.provideService(Capability.Service, capabilityManager),
           Effect.provideService(Plugin.Service, pluginManager),
@@ -35,6 +35,6 @@ export default Capability.makeModule(
       managedRuntime,
     );
 
-    return Capability.contributes(Common.Capability.OperationInvoker, invoker);
+    return Capability.contributes(Capabilities.OperationInvoker, invoker);
   }),
 );

package/src/plugin-operation/meta.ts

@@ -5,7 +5,7 @@
 import { type Plugin } from '../core';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/operation',
+  id: 'org.dxos.plugin.operation',
   name: 'Operation Plugin',
   description: 'Provides operation invocation, undo registry, and history tracking.',
 };

package/src/plugin-runtime/RuntimePlugin.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Common from '../common';
+import { ActivationEvents } from '../common';
 import { Capability, Plugin } from '../core';
 
 import { meta } from './meta';
@@ -11,9 +11,9 @@ const ManagedRuntimeCapability = Capability.lazy('ManagedRuntime', () => import(
 
 export const RuntimePlugin = Plugin.define(meta).pipe(
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.Startup,
-    activatesBefore: [Common.ActivationEvent.SetupLayer],
-    activatesAfter: [Common.ActivationEvent.ManagedRuntimeReady],
+    activatesOn: ActivationEvents.Startup,
+    activatesBefore: [ActivationEvents.SetupLayer],
+    activatesAfter: [ActivationEvents.ManagedRuntimeReady],
     activate: ManagedRuntimeCapability,
   }),
   Plugin.make,

package/src/plugin-runtime/capability.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import * as Common from '../common';
+import { ActivationEvents, Capabilities } from '../common';
 import { Capability, Plugin } from '../core';
 
 //
@@ -22,10 +22,10 @@ export default Capability.makeModule(
     const pluginManager = yield* Plugin.Service;
 
     // Trigger setup event so plugins can contribute their layers.
-    yield* Plugin.activate(Common.ActivationEvent.SetupLayer);
+    yield* Plugin.activate(ActivationEvents.SetupLayer);
 
     // Gather all contributed layers.
-    const layers = yield* Capability.getAll(Common.Capability.Layer);
+    const layers = yield* Capability.getAll(Capabilities.Layer);
 
     // Create layers that provide Capability.Service and Plugin.Service.
     const capabilityServiceLayer = Layer.succeed(Capability.Service, capabilityManager);
@@ -46,8 +46,8 @@ export default Capability.makeModule(
           );
 
     // Create the managed runtime from the composed layer.
-    const runtime = ManagedRuntime.make(composedLayer) as Common.Capability.ManagedRuntime;
+    const runtime = ManagedRuntime.make(composedLayer) as Capabilities.ManagedRuntime;
 
-    return Capability.contributes(Common.Capability.ManagedRuntime, runtime);
+    return Capability.contributes(Capabilities.ManagedRuntime, runtime);
   }),
 );

package/src/plugin-runtime/meta.ts

@@ -5,7 +5,7 @@
 import { type Plugin } from '../core';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/runtime',
+  id: 'org.dxos.plugin.runtime',
   name: 'Runtime Plugin',
   description: 'Provides a managed Effect runtime by composing contributed layers.',
 };

package/src/testing/service.ts

@@ -7,7 +7,7 @@ import * as Layer from 'effect/Layer';
 
 import { invariant } from '@dxos/invariant';
 
-import * as Common from '../common';
+import { ActivationEvents, Capabilities } from '../common';
 import { Plugin, PluginManager } from '../core';
 
 /**
@@ -34,18 +34,18 @@ export const fromPlugins = (plugins: Plugin.Plugin[]) =>
       });
 
       manager.capabilities.contribute({
-        interface: Common.Capability.PluginManager,
+        interface: Capabilities.PluginManager,
         implementation: manager,
-        module: 'dxos.org/app-framework/plugin-manager',
+        module: 'org.dxos.app-framework.plugin-manager',
       });
 
       manager.capabilities.contribute({
-        interface: Common.Capability.AtomRegistry,
+        interface: Capabilities.AtomRegistry,
         implementation: manager.registry,
-        module: 'dxos.org/app-framework/atom-registry',
+        module: 'org.dxos.app-framework.atom-registry',
       });
 
-      yield* manager.activate(Common.ActivationEvent.Startup);
+      yield* manager.activate(ActivationEvents.Startup);
 
       return manager;
     }),