@dxos/plugin-space 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin, UndoMapping } from '@dxos/app-framework';
+import { Capabilities, Capability, Plugin, UndoMapping } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
 import { SpaceState, getSpace } from '@dxos/client/echo';
 import { Database, Obj, Query, Ref, Relation, Type } from '@dxos/echo';
 import { EchoDatabaseImpl, Serializer } from '@dxos/echo-db';
@@ -28,6 +29,7 @@ import {
   OBJECT_RENAME_POPOVER,
   SPACE_RENAME_POPOVER,
 } from '../../constants';
+import { meta } from '../../meta';
 import { SpaceEvents } from '../../types';
 import { SpaceCapabilities, SpaceOperation } from '../../types';
 import { COMPOSER_SPACE_LOCK, cloneObject, getNestedObjects } from '../../util';
@@ -43,11 +45,11 @@ export default Capability.makeModule(
     const capabilityManager = yield* Capability.Service;
 
     const resolve = (typename: string) =>
-      capabilityManager.getAll(Common.Capability.Metadata).find(({ id }: { id: string }) => id === typename)
-        ?.metadata ?? {};
+      capabilityManager.getAll(AppCapabilities.Metadata).find(({ id }: { id: string }) => id === typename)?.metadata ??
+      {};
 
     return [
-      Capability.contributes(Common.Capability.UndoMapping, [
+      Capability.contributes(Capabilities.UndoMapping, [
         UndoMapping.make({
           operation: SpaceOperation.DeleteField,
           inverse: SpaceOperation.RestoreField,
@@ -57,7 +59,7 @@ export default Capability.makeModule(
             props: output.props,
             index: output.index,
           }),
-          message: ['field deleted label', { ns: 'dxos.org/plugin/space' }],
+          message: ['field deleted label', { ns: meta.id }],
         }),
         UndoMapping.make({
           operation: SpaceOperation.RemoveObjects,
@@ -72,12 +74,12 @@ export default Capability.makeModule(
           message: (input, _output) => {
             const ns = Obj.getTypename(input.objects[0]);
             return ns && input.objects.length === 1
-              ? ['object deleted label', { ns }]
-              : ['objects deleted label', { ns: 'plugin-space' }];
+              ? ['object deleted label', { ns: meta.id }]
+              : ['objects deleted label', { ns: meta.id }];
           },
         }),
       ]),
-      Capability.contributes(Common.Capability.OperationResolver, [
+      Capability.contributes(Capabilities.OperationResolver, [
         //
         // Open
         //
@@ -106,7 +108,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.Join,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: JOIN_DIALOG,
               blockAlign: 'start',
               props: {
@@ -123,7 +125,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.WaitForObject,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Common.Capability.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
+            yield* Capabilities.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
               ...current,
               awaiting: input.id,
             }));
@@ -136,7 +138,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenSettings,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.Open, {
+            yield* Operation.invoke(LayoutOperation.Open, {
               subject: [`properties-settings${ATTENDABLE_PATH_SEPARATOR}${input.space.id}`],
               workspace: input.space.id,
             });
@@ -149,7 +151,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.RemoveObjects,
           handler: Effect.fnUntraced(function* (input) {
-            const layout = yield* Common.Capability.getAtomValue(Common.Capability.Layout);
+            const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
             const objects = input.objects as Obj.Unknown[];
 
             // All objects must be a member of the same space.
@@ -205,7 +207,7 @@ export default Capability.makeModule(
             }
 
             if (wasActive.length > 0) {
-              yield* Operation.invoke(Common.LayoutOperation.Close, { subject: wasActive });
+              yield* Operation.invoke(LayoutOperation.Close, { subject: wasActive });
             }
 
             // Return data needed for undo.
@@ -225,7 +227,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.DeleteField,
           handler: Effect.fnUntraced(function* (input) {
-            const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+            const registry = yield* Capability.get(Capabilities.AtomRegistry);
             const view = input.view as any;
             const db = Obj.getDatabase(view);
             invariant(db);
@@ -259,9 +261,9 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenCreateObject,
           handler: Effect.fnUntraced(function* (input) {
-            const ephemeralState = yield* Common.Capability.getAtomValue(SpaceCapabilities.EphemeralState);
+            const ephemeralState = yield* Capabilities.getAtomValue(SpaceCapabilities.EphemeralState);
             const navigable = input.navigable ?? true;
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: CREATE_OBJECT_DIALOG,
               blockAlign: 'start',
               props: {
@@ -297,7 +299,7 @@ export default Capability.makeModule(
               object,
               target: Database.isDatabase(target) ? undefined : target,
               hidden: input.hidden,
-            }).pipe(Effect.provide(Database.Service.layer(db)));
+            }).pipe(Effect.provide(Database.layer(db)));
 
             yield* Operation.schedule(ObservabilityOperation.SendEvent, {
               name: 'space.object.add',
@@ -381,7 +383,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenCreateSpace,
           handler: Effect.fnUntraced(function* () {
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: CREATE_SPACE_DIALOG,
               blockAlign: 'start',
             });
@@ -447,12 +449,12 @@ export default Capability.makeModule(
             const { space, version: targetVersion } = input;
 
             if (space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION) {
-              yield* Common.Capability.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
+              yield* Capabilities.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
                 ...current,
                 sdkMigrationRunning: { ...current.sdkMigrationRunning, [space.id]: true },
               }));
               yield* Effect.promise(() => space.internal.migrate());
-              yield* Common.Capability.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
+              yield* Capabilities.updateAtomValue(SpaceCapabilities.EphemeralState, (current) => ({
                 ...current,
                 sdkMigrationRunning: { ...current.sdkMigrationRunning, [space.id]: false },
               }));
@@ -494,7 +496,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.Rename,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.UpdatePopover, {
+            yield* Operation.invoke(LayoutOperation.UpdatePopover, {
               subject: SPACE_RENAME_POPOVER,
               anchorId: `dxos.org/ui/${input.caller}/${input.space.id}`,
               props: input.space,
@@ -509,7 +511,7 @@ export default Capability.makeModule(
           operation: SpaceOperation.RenameObject,
           handler: Effect.fnUntraced(function* (input) {
             const object = input.object as Obj.Unknown;
-            yield* Operation.invoke(Common.LayoutOperation.UpdatePopover, {
+            yield* Operation.invoke(LayoutOperation.UpdatePopover, {
               subject: OBJECT_RENAME_POPOVER,
               anchorId: `dxos.org/ui/${input.caller}/${Obj.getDXN(object).toString()}`,
               props: object,
@@ -523,7 +525,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.OpenMembers,
           handler: Effect.fnUntraced(function* (input) {
-            yield* Operation.invoke(Common.LayoutOperation.Open, {
+            yield* Operation.invoke(LayoutOperation.Open, {
               subject: [`members-settings${ATTENDABLE_PATH_SEPARATOR}${input.space.id}`],
               workspace: input.space.id,
             });
@@ -615,10 +617,10 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.AddSchema,
           handler: Effect.fnUntraced(function* (input) {
-            const db = input.db as any;
-            const schemas = (yield* Effect.promise(() => db.schemaRegistry.register([input.schema]))) as any[];
+            const db = input.db;
+            const schemas = yield* Effect.promise(() => db.schemaRegistry.register([input.schema]));
             const schema = schemas[0];
-            Obj.change(schema.storedSchema, (s) => {
+            Obj.change(schema.persistentSchema, (s) => {
               if (input.name) {
                 s.name = input.name;
               }
@@ -646,7 +648,7 @@ export default Capability.makeModule(
               },
             });
 
-            return { id: schema.id, object: schema.storedSchema, schema };
+            return { id: schema.id, object: schema.persistentSchema, schema };
           }),
         }),
 
@@ -690,7 +692,7 @@ export default Capability.makeModule(
         OperationResolver.make({
           operation: SpaceOperation.RestoreField,
           handler: Effect.fnUntraced(function* (input) {
-            const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+            const registry = yield* Capability.get(Capabilities.AtomRegistry);
             const view = input.view as any;
             const db = Obj.getDatabase(view);
             invariant(db);
@@ -750,7 +752,7 @@ export default Capability.makeModule(
 
             // Re-open objects that were active.
             if (wasActive.length > 0) {
-              yield* Operation.invoke(Common.LayoutOperation.Open, { subject: wasActive });
+              yield* Operation.invoke(LayoutOperation.Open, { subject: wasActive });
             }
           }),
         }),

package/src/capabilities/react-root/react-root.tsx

@@ -5,8 +5,8 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useAtomCapability } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { useAtomCapability } from '@dxos/app-framework/ui';
 
 import { AwaitingObject } from '../../components';
 import { meta } from '../../meta';
@@ -14,7 +14,7 @@ import { SpaceCapabilities } from '../../types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactRoot, {
+    Capability.contributes(Capabilities.ReactRoot, {
       id: meta.id,
       root: () => {
         const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);

package/src/capabilities/react-surface/react-surface.tsx

@@ -7,8 +7,10 @@ import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { Surface, useAtomCapability, useLayout, useSettingsState } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useAtomCapability, useSettingsState } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { useLayout } from '@dxos/app-toolkit/ui';
 import { Database, Obj, type Ref } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
 import { type Space, SpaceState, getSpace, isSpace, parseId, useSpace } from '@dxos/react-client/echo';
@@ -67,15 +69,15 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* (props?: ReactSurfaceOptions) {
     const { createInvitationUrl } = props!;
 
-    return Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
         id: `${meta.id}/article`,
         role: 'article',
         filter: (data): data is { subject: Space } =>
           // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
           isSpace(data.subject) && data.subject.state.get() === SpaceState.SPACE_READY,
         component: ({ data, role, ...rest }) => (
-          <Surface
+          <Surface.Surface
             data={{
               id: data.subject.id,
               subject: data.subject.properties[Collection.Collection.typename]?.target,
@@ -85,7 +87,7 @@ export default Capability.makeModule(
           />
         ),
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/collection-fallback`,
         role: 'article',
         position: 'fallback',
@@ -93,31 +95,31 @@ export default Capability.makeModule(
           Obj.instanceOf(Collection.Collection, data.subject) || Obj.instanceOf(Collection.Managed, data.subject),
         component: ({ data }) => <CollectionArticle subject={data.subject} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/record-article`,
         role: 'article',
         position: 'fallback',
         filter: (data): data is { subject: Obj.Unknown } => Obj.isObject(data.subject),
         component: ({ data }) => <RecordArticle subject={data.subject} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/plugin-settings`,
         role: 'article',
-        filter: (data): data is { subject: Common.Capability.Settings } =>
-          Common.Capability.isSettings(data.subject) && data.subject.prefix === meta.id,
+        filter: (data): data is { subject: AppCapabilities.Settings } =>
+          AppCapabilities.isSettings(data.subject) && data.subject.prefix === meta.id,
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<SpaceSettingsProps>(subject.atom);
           return <SpacePluginSettings settings={settings} onSettingsChange={updateSettings} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/companion/object-settings`,
         role: 'article',
         filter: (data): data is { companionTo: Obj.Unknown } =>
           Obj.isObject(data.companionTo) && data.subject === 'settings',
         component: ({ ref, data, role }) => <ObjectDetails subject={data.companionTo} role={role} ref={ref} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/space-settings-properties`,
         role: 'article',
         filter: (data): data is { subject: string } => data.subject === `${meta.id}/properties`,
@@ -129,10 +131,10 @@ export default Capability.makeModule(
             return null;
           }
 
-          return <SpaceSettingsContainer space={space} ref={ref} />;
+          return <SpaceSettingsContainer space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/space-settings-members`,
         role: 'article',
         position: 'hoist',
@@ -148,7 +150,7 @@ export default Capability.makeModule(
           return <MembersContainer space={space} createInvitationUrl={createInvitationUrl} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/space-settings-schema`,
         role: 'article',
         filter: (data): data is { subject: string } => data.subject === `${meta.id}/schema`,
@@ -163,7 +165,7 @@ export default Capability.makeModule(
           return <SchemaContainer space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/selected-objects`,
         role: 'article',
         filter: (data): data is { companionTo: Obj.Obj<{ view: Ref.Ref<View.View> }>; subject: 'selected-objects' } => {
@@ -187,25 +189,25 @@ export default Capability.makeModule(
           />
         ),
       }),
-      Common.createSurface({
+      Surface.create({
         id: JOIN_DIALOG,
         role: 'dialog',
         filter: (data): data is { props: JoinPanelProps } => data.component === JOIN_DIALOG,
         component: ({ data }) => <JoinDialog {...data.props} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: CREATE_SPACE_DIALOG,
         role: 'dialog',
         filter: (data): data is any => data.component === CREATE_SPACE_DIALOG,
         component: () => <CreateSpaceDialog />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: CREATE_OBJECT_DIALOG,
         role: 'dialog',
         filter: (data): data is { props: CreateObjectDialogProps } => data.component === CREATE_OBJECT_DIALOG,
         component: ({ data }) => <CreateObjectDialog {...data.props} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/create-initial-space-form-[hue]`,
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
@@ -224,7 +226,7 @@ export default Capability.makeModule(
           );
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/create-initial-space-form-[icon]`,
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
@@ -248,7 +250,7 @@ export default Capability.makeModule(
           );
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/typename-form-input`,
         role: 'form-input',
         filter: (
@@ -275,7 +277,7 @@ export default Capability.makeModule(
           return <SelectField {...props} options={options} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/object-settings`,
         role: 'object-settings',
         filter: (data): data is { subject: { view: Ref.Ref<View.View> } } => {
@@ -298,26 +300,26 @@ export default Capability.makeModule(
           return <ViewEditor view={view} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: SPACE_RENAME_POPOVER,
         role: 'popover',
         filter: (data): data is { props: Space } => data.component === SPACE_RENAME_POPOVER && isSpace(data.props),
         component: ({ data }) => <SpaceRenamePopover space={data.props} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: OBJECT_RENAME_POPOVER,
         role: 'popover',
         filter: (data): data is { props: Obj.Unknown } =>
           data.component === OBJECT_RENAME_POPOVER && Obj.isObject(data.props),
         component: ({ data }) => <ObjectRenamePopover object={data.props} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/menu-footer`,
         role: 'menu-footer',
         filter: (data): data is { subject: Obj.Unknown } => Obj.isObject(data.subject),
         component: ({ data }) => <MenuFooter object={data.subject} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/navtree-presence`,
         role: 'navtree-item-end',
         filter: (data): data is { id: string; subject: Obj.Unknown; open?: boolean } =>
@@ -328,7 +330,7 @@ export default Capability.makeModule(
         },
       }),
       // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/navtree-presence-fallback`,
         role: 'navtree-item-end',
         position: 'fallback',
@@ -336,13 +338,13 @@ export default Capability.makeModule(
         component: ({ data }) => <SmallPresenceLive id={data.id} open={data.open} />,
       }),
       // TODO(wittjosiah): Broken?
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/navtree-sync-status`,
         role: 'navtree-item-end',
         filter: (data): data is { subject: Space; open?: boolean } => isSpace(data.subject),
         component: ({ data }) => <InlineSyncStatus space={data.subject} open={data.open} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/navbar-presence`,
         role: 'navbar-end',
         position: 'hoist',
@@ -358,14 +360,14 @@ export default Capability.makeModule(
           return object ? <SpacePresence object={object} /> : null;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/collection-section`,
         role: 'section',
         filter: (data): data is { subject: Collection.Collection } =>
           Obj.instanceOf(Collection.Collection, data.subject),
         component: ({ data }) => <CollectionSection subject={data.subject} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/status`,
         role: 'status',
         component: () => <SyncStatus />,

package/src/capabilities/settings/settings.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
 import { meta } from '../../meta';
@@ -22,7 +23,7 @@ export default Capability.makeModule(() =>
 
     return [
       Capability.contributes(SpaceCapabilities.Settings, settingsAtom),
-      Capability.contributes(Common.Capability.Settings, {
+      Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
         schema: SpaceSettingsSchema,
         atom: settingsAtom,

package/src/capabilities/spaces-ready/spaces-ready.ts

@@ -5,7 +5,8 @@
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
 import { SubscriptionList } from '@dxos/async';
 import { Filter, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
@@ -32,10 +33,10 @@ export default Capability.makeModule(
     const subscriptions = new SubscriptionList();
     const spaceSubscriptions = new SubscriptionList();
 
-    const { invoke, invokePromise } = yield* Capability.get(Common.Capability.OperationInvoker);
-    const { graph } = yield* Capability.get(Common.Capability.AppGraph);
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
-    const layoutAtom = yield* Capability.get(Common.Capability.Layout);
+    const { invoke, invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
+    const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const layoutAtom = yield* Capability.get(AppCapabilities.Layout);
     const attention = yield* Capability.get(AttentionCapabilities.Attention);
     const stateAtom = yield* Capability.get(SpaceCapabilities.State);
     const ephemeralAtom = yield* Capability.get(SpaceCapabilities.EphemeralState);
@@ -47,7 +48,7 @@ export default Capability.makeModule(
     // Check if deck state indicates we should switch to default space.
     const layout = registry.get(layoutAtom);
     if (layout.workspace === 'default') {
-      yield* invoke(Common.LayoutOperation.SwitchWorkspace, { subject: defaultSpace.id });
+      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: defaultSpace.id });
     }
 
     // Initialize space sharing lock in default space.
@@ -279,7 +280,7 @@ export default Capability.makeModule(
       log.catch(err);
     }
 
-    return Capability.contributes(Common.Capability.Null, null, () =>
+    return Capability.contributes(Capabilities.Null, null, () =>
       Effect.sync(() => {
         spaceSubscriptions.clear();
         subscriptions.clear();

package/src/capabilities/state/state.ts

@@ -5,7 +5,7 @@
 import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { createKvsStore } from '@dxos/effect';
 import { PublicKey } from '@dxos/keys';
 import { ComplexMap } from '@dxos/util';
@@ -21,7 +21,7 @@ const defaultSpaceState: SpaceCapabilities.SpaceState = {
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
 
     // Persisted state using KVS store.
     const stateAtom = createKvsStore({
@@ -39,7 +39,7 @@ export default Capability.makeModule(
       viewersByIdentity: new ComplexMap<PublicKey, Set<string>>(PublicKey.hash),
     }).pipe(Atom.keepAlive);
 
-    const manager = yield* Capability.get(Common.Capability.PluginManager);
+    const manager = yield* Capability.get(Capabilities.PluginManager);
     // Update navigableCollections based on plugin state.
     const updateNavigableCollections = () => {
       const enabled = manager.getEnabled().includes('dxos.org/plugin/stack');

package/src/cli/commands/database/add.ts

@@ -11,7 +11,8 @@ import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 
 // eslint-disable-next-line unused-imports/no-unused-imports
-import { Common as AppFrameworkCommon, type Capability, Plugin } from '@dxos/app-framework';
+import { type Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppCapabilities } from '@dxos/app-toolkit';
 import { CommandConfig, Common, flushAndSync, print, spaceLayer } from '@dxos/cli-util';
 import { SpaceProperties } from '@dxos/client/echo';
 import { Database, Filter, Obj, Ref, Type } from '@dxos/echo';
@@ -42,19 +43,17 @@ export const add = Command.make(
       const manager = yield* Plugin.Service;
       const { db } = yield* Database.Service;
 
-      yield* manager.activate(AppFrameworkCommon.ActivationEvent.SetupMetadata);
+      yield* manager.activate(AppActivationEvents.SetupMetadata);
 
       const resolve = (typename: string) => {
         const metadata = manager.capabilities
-          .getAll(AppFrameworkCommon.Capability.Metadata)
+          .getAll(AppCapabilities.Metadata)
           .find(({ id }) => id === typename)?.metadata;
         return metadata?.createObject ? (metadata as Metadata) : undefined;
       };
 
-      const [properties] = yield* Database.Service.runQuery(Filter.type(SpaceProperties));
-      const collection = yield* Database.Service.load<Collection.Collection>(
-        properties[Collection.Collection.typename],
-      );
+      const [properties] = yield* Database.runQuery(Filter.type(SpaceProperties));
+      const collection = yield* Database.load<Collection.Collection>(properties[Collection.Collection.typename]);
 
       const selectedTypename = yield* Option.match(typename, {
         onNone: () => selectTypename(resolve),
@@ -92,7 +91,7 @@ export const add = Command.make(
  * Prompts for typename selection if not provided.
  */
 const selectTypename = Effect.fn(function* (resolve: (typename: string) => Metadata | undefined) {
-  const schemas = yield* Database.Service.runSchemaQuery({
+  const schemas = yield* Database.runSchemaQuery({
     location: ['database', 'runtime'],
     includeSystem: false,
   }).pipe(

package/src/cli/commands/database/query/query.ts

@@ -20,7 +20,7 @@ export const handler = ({ typename }: { typename: Option.Option<string> }) =>
       onNone: () => Filter.everything(),
       onSome: (typename) => Filter.typename(typename),
     });
-    const objects = yield* Database.Service.runQuery(filter);
+    const objects = yield* Database.runQuery(filter);
 
     if (json) {
       yield* Console.log(JSON.stringify(objects, null, 2));

package/src/cli/commands/database/remove.ts

@@ -34,9 +34,9 @@ export const remove = Command.make(
       } else {
         throw new Error('Must specify typename or id');
       }
-      const objects = yield* Database.Service.runQuery(query);
+      const objects = yield* Database.runQuery(query);
       for (const object of objects) {
-        yield* Database.Service.remove(object);
+        yield* Database.remove(object);
       }
 
       if (json) {

package/src/cli/commands/database/stats.ts

@@ -24,7 +24,7 @@ export const stats = Command.make(
   () =>
     Effect.gen(function* () {
       const { json } = yield* CommandConfig;
-      const objects = yield* Database.Service.runQuery(Query.select(Filter.everything()));
+      const objects = yield* Database.runQuery(Query.select(Filter.everything()));
       const stats = Function.pipe(
         objects,
         Array.groupBy((obj) => Obj.getTypename(obj) ?? '<empty>'),