@dxos/plugin-space 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

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

@@ -7,17 +7,26 @@ 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 { Database, Obj, type Ref } from '@dxos/echo';
+import { Collection, type View } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
-import { type Space, SpaceState, getSpace, isSpace, parseId, useSpace } from '@dxos/react-client/echo';
+import { type Space, SpaceState, getSpace, isSpace, useSpace } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
 import { type FormFieldComponentProps, SelectField } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
-import { Collection, type View, ViewAnnotation } from '@dxos/schema';
+import { ViewAnnotation } from '@dxos/schema';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
+import {
+  CREATE_OBJECT_DIALOG,
+  CREATE_SPACE_DIALOG,
+  JOIN_DIALOG,
+  OBJECT_RENAME_POPOVER,
+  SPACE_RENAME_POPOVER,
+} from '../../constants';
 import {
   CollectionArticle,
   CollectionSection,
@@ -40,15 +49,8 @@ import {
   SpaceSettingsContainer,
   SyncStatus,
   ViewEditor,
-} from '../../components';
-import {
-  CREATE_OBJECT_DIALOG,
-  CREATE_SPACE_DIALOG,
-  JOIN_DIALOG,
-  OBJECT_RENAME_POPOVER,
-  SPACE_RENAME_POPOVER,
-} from '../../constants';
-import { useTypeOptions } from '../../hooks';
+} from '../../containers';
+import { useActiveSpace, useTypeOptions } from '../../hooks';
 import { meta } from '../../meta';
 import {
   HueAnnotationId,
@@ -64,109 +66,86 @@ type ReactSurfaceOptions = {
 };
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: ReactSurfaceOptions) {
-    const { createInvitationUrl } = props!;
-
-    return Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
-        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
-            data={{
-              id: data.subject.id,
-              subject: data.subject.properties[Collection.Collection.typename]?.target,
-            }}
-            role={role}
-            {...rest}
-          />
-        ),
-      }),
-      Common.createSurface({
-        id: `${meta.id}/collection-fallback`,
+  Effect.fnUntraced(function* ({ createInvitationUrl }: ReactSurfaceOptions) {
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: `${meta.id}.collection-fallback`,
         role: 'article',
         position: 'fallback',
-        filter: (data): data is { subject: Collection.Collection | Collection.Managed } =>
-          Obj.instanceOf(Collection.Collection, data.subject) || Obj.instanceOf(Collection.Managed, data.subject),
-        component: ({ data }) => <CollectionArticle subject={data.subject} />,
+        filter: (data): data is { attendableId?: string; subject: Collection.Collection } =>
+          Obj.instanceOf(Collection.Collection, data.subject),
+        component: ({ data }) => <CollectionArticle attendableId={data.attendableId} subject={data.subject} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/record-article`,
+      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({
-        id: `${meta.id}/plugin-settings`,
+      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({
-        id: `${meta.id}/companion/object-settings`,
+      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({
-        id: `${meta.id}/space-settings-properties`,
+      Surface.create({
+        id: `${meta.id}.space-settings-properties`,
         role: 'article',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/properties`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.general`,
         component: ({ ref }) => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
-          if (!space || !spaceId) {
+          const space = useActiveSpace();
+          if (!space) {
             return null;
           }
 
-          return <SpaceSettingsContainer space={space} ref={ref} />;
+          return <SpaceSettingsContainer space={space} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/space-settings-members`,
+      Surface.create({
+        id: `${meta.id}.space-settings-members`,
         role: 'article',
         position: 'hoist',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/members`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.members`,
         component: () => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
-          if (!space || !spaceId) {
+          const space = useActiveSpace();
+          if (!space) {
             return null;
           }
 
           return <MembersContainer space={space} createInvitationUrl={createInvitationUrl} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/space-settings-schema`,
+      Surface.create({
+        id: `${meta.id}.space-settings-schema`,
         role: 'article',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/schema`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.schema`,
         component: () => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
-          if (!space || !spaceId) {
+          const space = useActiveSpace();
+          if (!space) {
             return null;
           }
 
           return <SchemaContainer space={space} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/selected-objects`,
+      Surface.create({
+        id: `${meta.id}.selected-objects`,
         role: 'article',
-        filter: (data): data is { companionTo: Obj.Obj<{ view: Ref.Ref<View.View> }>; subject: 'selected-objects' } => {
+        filter: (
+          data,
+        ): data is { companionTo: Obj.OfShape<{ view: Ref.Ref<View.View> }>; subject: 'selected-objects' } => {
           if (data.subject !== 'selected-objects' || !Obj.isObject(data.companionTo)) {
             return false;
           }
@@ -178,6 +157,7 @@ export default Capability.makeModule(
             Option.getOrElse(() => false),
           );
         },
+        // TODO(burdon): Replace with mosaic.
         component: ({ data, ref }) => (
           <ObjectCardStack
             key={Obj.getDXN(data.companionTo).toString()}
@@ -187,26 +167,26 @@ 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({
-        id: `${meta.id}/create-initial-space-form-[hue]`,
+      Surface.create({
+        id: `${meta.id}.create-initial-space-form-[hue]`,
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
           const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
@@ -224,8 +204,8 @@ export default Capability.makeModule(
           );
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/create-initial-space-form-[icon]`,
+      Surface.create({
+        id: `${meta.id}.create-initial-space-form-[icon]`,
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
           const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
@@ -248,8 +228,8 @@ export default Capability.makeModule(
           );
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/typename-form-input`,
+      Surface.create({
+        id: `${meta.id}.typename-form-input`,
         role: 'form-input',
         filter: (
           data,
@@ -275,8 +255,8 @@ export default Capability.makeModule(
           return <SelectField {...props} options={options} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/object-settings`,
+      Surface.create({
+        id: `${meta.id}.object-settings`,
         role: 'object-settings',
         filter: (data): data is { subject: { view: Ref.Ref<View.View> } } => {
           if (!Obj.isObject(data.subject)) {
@@ -298,27 +278,27 @@ 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({
-        id: `${meta.id}/menu-footer`,
+      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({
-        id: `${meta.id}/navtree-presence`,
+      Surface.create({
+        id: `${meta.id}.navtree-presence`,
         role: 'navtree-item-end',
         filter: (data): data is { id: string; subject: Obj.Unknown; open?: boolean } =>
           typeof data.id === 'string' && Obj.isObject(data.subject),
@@ -328,22 +308,22 @@ export default Capability.makeModule(
         },
       }),
       // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
-      Common.createSurface({
-        id: `${meta.id}/navtree-presence-fallback`,
+      Surface.create({
+        id: `${meta.id}.navtree-presence-fallback`,
         role: 'navtree-item-end',
         position: 'fallback',
         filter: (data): data is { id: string; open?: boolean } => typeof data.id === 'string',
         component: ({ data }) => <SmallPresenceLive id={data.id} open={data.open} />,
       }),
       // TODO(wittjosiah): Broken?
-      Common.createSurface({
-        id: `${meta.id}/navtree-sync-status`,
+      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({
-        id: `${meta.id}/navbar-presence`,
+      Surface.create({
+        id: `${meta.id}.navbar-presence`,
         role: 'navbar-end',
         position: 'hoist',
         filter: (data): data is { subject: Space | Obj.Unknown } => isSpace(data.subject) || Obj.isObject(data.subject),
@@ -358,15 +338,15 @@ export default Capability.makeModule(
           return object ? <SpacePresence object={object} /> : null;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/collection-section`,
+      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({
-        id: `${meta.id}/status`,
+      Surface.create({
+        id: `${meta.id}.status`,
         role: 'status',
         component: () => <SyncStatus />,
       }),

package/src/capabilities/repair/repair.ts

@@ -5,9 +5,8 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { Obj, Ref, Type } from '@dxos/echo';
+import { Collection, Obj, Ref } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
-import { Collection } from '@dxos/schema';
 
 import { SpaceCapabilities } from '../../types';
 
@@ -15,7 +14,6 @@ export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(SpaceCapabilities.Repair, async ({ space }: { space: Space }) => {
       await removeQueryCollections(space);
-      await ensureSystemCollection(space);
     }),
   ),
 );
@@ -30,38 +28,15 @@ const removeQueryCollections = async (space: Space) => {
   }
 
   const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
-  const queryCollections = objects.filter((object) => Obj.getTypename(object) === 'dxos.org/type/QueryCollection');
+  const queryCollections = objects.filter((object) => Obj.getTypename(object) === 'org.dxos.type.query-collection');
   if (queryCollections.length === 0) {
     return;
   }
 
   Obj.change(rootCollection, (c) => {
     c.objects = objects
-      .filter((object) => Obj.getTypename(object) !== 'dxos.org/type/QueryCollection')
+      .filter((object) => Obj.getTypename(object) !== 'org.dxos.type.query-collection')
       .map((object) => Ref.make(object));
   });
   queryCollections.forEach((object) => space.db.remove(object));
 };
-
-/**
- * Ensure the root collection has a system collection for StoredSchema.
- */
-const ensureSystemCollection = async (space: Space) => {
-  const rootCollection: Collection.Collection = await space.properties[Collection.Collection.typename]?.load();
-  if (!rootCollection) {
-    return;
-  }
-
-  const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
-  const records = objects.find(
-    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Type.getTypename(Type.PersistentType),
-  );
-  if (records) {
-    return;
-  }
-
-  const recordsCollectionRef = Ref.make(Collection.makeManaged({ key: Type.getTypename(Type.PersistentType) }));
-  Obj.change(rootCollection, (c) => {
-    c.objects.push(recordsCollectionRef);
-  });
-};

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, getSpacePath } 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: getSpacePath(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,11 +21,11 @@ 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({
-      key: `${meta.id}/state`,
+      key: `${meta.id}.state`,
       schema: SpaceCapabilities.StateSchema,
       defaultValue: () => ({ ...defaultSpaceState }),
     });
@@ -39,10 +39,12 @@ 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');
+      const enabled =
+        manager.getEnabled().includes('org.dxos.plugin.stack') ||
+        manager.getEnabled().includes('org.dxos.plugin.simple-layout');
       const current = registry.get(ephemeralAtom);
       if (enabled !== current.navigableCollections) {
         registry.update(ephemeralAtom, (c) => ({ ...c, navigableCollections: enabled }));

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

@@ -11,14 +11,15 @@ 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';
+import { Collection } from '@dxos/echo';
 import { EntityKind, getTypeAnnotation } from '@dxos/echo/internal';
 // eslint-disable-next-line unused-imports/no-unused-imports
 import type { Operation } from '@dxos/operation';
-import { Collection } from '@dxos/schema';
 
 import { type CreateObject } from '../../../types';
 
@@ -27,7 +28,6 @@ import { printObject } from './util';
 export type Metadata = {
   createObject: CreateObject;
   inputSchema?: Schema.Schema.AnyNoContext;
-  addToCollectionOnCreate?: boolean;
 };
 
 export const add = Command.make(
@@ -42,19 +42,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 +90,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>'),

package/src/cli/commands/space/close/close.ts

@@ -19,7 +19,7 @@ export const handler = ({ spaceId }: { spaceId: Key.SpaceId }) =>
     const space = yield* getSpace(spaceId);
 
     // Flush and sync before closing
-    yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+    yield* Effect.tryPromise(() => space.db.flush());
     yield* waitForSync(space);
 
     yield* Effect.tryPromise(() => space.close());

package/src/cli/commands/space/create/create.ts

@@ -48,7 +48,7 @@ export const handler = Effect.fn(function* ({ name }: { name: Option.Option<stri
   }
 
   // Flush and sync before completion
-  yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+  yield* Effect.tryPromise(() => space.db.flush());
   yield* waitForSync(space);
 });
 

package/src/cli/commands/space/join/join.ts

@@ -88,7 +88,7 @@ export const handler = Effect.fn(function* ({
   }
 
   // Flush and sync after joining
-  yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+  yield* Effect.tryPromise(() => space.db.flush());
   yield* waitForSync(space);
 
   if (json) {

package/src/cli/commands/space/open/open.ts

@@ -20,7 +20,7 @@ export const handler = ({ spaceId }: { spaceId: Key.SpaceId }) =>
     yield* Effect.tryPromise(() => space.open());
 
     // Flush and sync after opening
-    yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+    yield* Effect.tryPromise(() => space.db.flush());
     yield* waitForSync(space);
 
     if (json) {