@dxos/plugin-space 0.8.4-main.422d1c7879 → 0.8.4-main.51f1e5ca51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.422d1c7879",
+  "version": "0.8.4-main.51f1e5ca51",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,6 +24,7 @@
     "#hooks": "./src/hooks/index.ts",
     "#meta": "./src/meta.ts",
     "#operations": "./src/operations/index.ts",
+    "#translations": "./src/translations.ts",
     "#types": "./src/types/index.ts"
   },
   "exports": {
@@ -50,6 +51,12 @@
       "browser": "./dist/lib/browser/operations/index.mjs",
       "node": "./dist/lib/node-esm/operations/index.mjs"
     },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -72,56 +79,54 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.422d1c7879",
-    "@dxos/app-framework": "0.8.4-main.422d1c7879",
-    "@dxos/async": "0.8.4-main.422d1c7879",
-    "@dxos/blueprints": "0.8.4-main.422d1c7879",
-    "@dxos/app-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/cli-util": "0.8.4-main.422d1c7879",
-    "@dxos/client-protocol": "0.8.4-main.422d1c7879",
-    "@dxos/client": "0.8.4-main.422d1c7879",
-    "@dxos/display-name": "0.8.4-main.422d1c7879",
-    "@dxos/context": "0.8.4-main.422d1c7879",
-    "@dxos/echo": "0.8.4-main.422d1c7879",
-    "@dxos/echo-db": "0.8.4-main.422d1c7879",
-    "@dxos/echo-protocol": "0.8.4-main.422d1c7879",
-    "@dxos/echo-atom": "0.8.4-main.422d1c7879",
-    "@dxos/effect": "0.8.4-main.422d1c7879",
-    "@dxos/functions": "0.8.4-main.422d1c7879",
-    "@dxos/invariant": "0.8.4-main.422d1c7879",
-    "@dxos/keys": "0.8.4-main.422d1c7879",
-    "@dxos/log": "0.8.4-main.422d1c7879",
-    "@dxos/operation": "0.8.4-main.422d1c7879",
-    "@dxos/migrations": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-attention": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-deck": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-observability": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-status-bar": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-settings": "0.8.4-main.422d1c7879",
-    "@dxos/react-client": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-attention": "0.8.4-main.422d1c7879",
-    "@dxos/protocols": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-components": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-editor": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-form": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-graph": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-list": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-mosaic": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-search": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-stack": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-masonry": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-tabs": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.422d1c7879",
-    "@dxos/shell": "0.8.4-main.422d1c7879",
-    "@dxos/schema": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-pickers": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879",
-    "@dxos/types": "0.8.4-main.422d1c7879",
-    "@dxos/ui-types": "0.8.4-main.422d1c7879",
-    "@dxos/util": "0.8.4-main.422d1c7879"
+    "@dxos/ai": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-framework": "0.8.4-main.51f1e5ca51",
+    "@dxos/async": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-toolkit": "0.8.4-main.51f1e5ca51",
+    "@dxos/client": "0.8.4-main.51f1e5ca51",
+    "@dxos/cli-util": "0.8.4-main.51f1e5ca51",
+    "@dxos/client-protocol": "0.8.4-main.51f1e5ca51",
+    "@dxos/compute": "0.8.4-main.51f1e5ca51",
+    "@dxos/display-name": "0.8.4-main.51f1e5ca51",
+    "@dxos/context": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-atom": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-protocol": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-db": "0.8.4-main.51f1e5ca51",
+    "@dxos/invariant": "0.8.4-main.51f1e5ca51",
+    "@dxos/effect": "0.8.4-main.51f1e5ca51",
+    "@dxos/migrations": "0.8.4-main.51f1e5ca51",
+    "@dxos/log": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo": "0.8.4-main.51f1e5ca51",
+    "@dxos/keys": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-deck": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-observability": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-settings": "0.8.4-main.51f1e5ca51",
+    "@dxos/protocols": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-status-bar": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-components": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-editor": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-form": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-list": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-masonry": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-mosaic": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-menu": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-pickers": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-search": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-stack": "0.8.4-main.51f1e5ca51",
+    "@dxos/shell": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-tabs": "0.8.4-main.51f1e5ca51",
+    "@dxos/schema": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/types": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-types": "0.8.4-main.51f1e5ca51",
+    "@dxos/util": "0.8.4-main.51f1e5ca51"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
@@ -133,14 +138,14 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-testing": "0.8.4-main.422d1c7879",
-    "@dxos/random": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-preview": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/storybook-utils": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879",
-    "@dxos/lit-ui": "0.8.4-main.422d1c7879"
+    "vite": "^8.0.10",
+    "@dxos/plugin-preview": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-testing": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/storybook-utils": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/random": "0.8.4-main.51f1e5ca51",
+    "@dxos/lit-ui": "0.8.4-main.51f1e5ca51"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -148,8 +153,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -8,13 +8,13 @@ import * as Schema from 'effect/Schema';
 
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Annotation, Ref, Tag, Type } from '@dxos/echo';
 import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 import { AttentionEvents } from '@dxos/plugin-attention/types';
 import { ClientEvents } from '@dxos/plugin-client/types';
-import { translations as componentsTranslations } from '@dxos/react-ui-components';
-import { translations as formTranslations } from '@dxos/react-ui-form';
+import { translations as componentsTranslations } from '@dxos/react-ui-components/translations';
+import { translations as formTranslations } from '@dxos/react-ui-form/translations';
 import { DataTypes, createDefaultSchema } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
 import {
@@ -48,11 +48,10 @@ import {
 } from '#capabilities';
 import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
+import { translations } from '#translations';
 import { SpaceEvents } from '#types';
 import { type CreateObject, type SpacePluginOptions } from '#types';
 
-import { translations } from './translations';
-
 export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   AppPlugin.addMetadataModule({
     metadata: [

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -21,10 +21,10 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* ({ shareableLinkOrigin = window.location.origin }: SpacePluginOptions = {}) {
     const extensions = yield* Effect.all([
       createSpaceExtensions(),
+      createSettingsExtensions(),
       createTypeExtensions(),
       createCollectionExtensions({ shareableLinkOrigin }),
       createCompanionExtensions(),
-      createSettingsExtensions(),
     ]);
 
     return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions.flat());

package/src/capabilities/app-graph-builder/extensions/collections.ts

@@ -6,12 +6,19 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, LayoutOperation, Segments, getObjectPathFromObject, toUrlPath } from '@dxos/app-toolkit';
+import {
+  AppCapabilities,
+  AppNodeMatcher,
+  LayoutOperation,
+  Segments,
+  getObjectPathFromObject,
+  toUrlPath,
+} from '@dxos/app-toolkit';
 import { SpaceState, getSpace, isSpace } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
 import { Collection, Obj, Type } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { CreateAtom, Graph, GraphBuilder, Node } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
@@ -29,7 +36,6 @@ import {
   createObjectNode,
   getCollectionGraphNodePartials,
   getDynamicLabel,
-  whenSpace,
 } from './shared';
 
 //
@@ -51,7 +57,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
     // Collections section virtual node under each space.
     GraphBuilder.createExtension({
       id: 'collections-section',
-      match: whenSpace,
+      match: AppNodeMatcher.whenSpace,
       connector: (space, get) => {
         const spaceState = get(CreateAtom.fromObservable(space.state));
         if (spaceState !== SpaceState.SPACE_READY) {
@@ -76,7 +82,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
             properties: {
               label: ['collections-section.label', { ns: meta.id }],
               icon: 'ph--folder--regular',
-              iconHue: 'neutral',
+              iconHue: 'amber',
               role: 'branch',
               position: 'hoist',
               testId: 'spacePlugin.collectionsSection',
@@ -277,7 +283,7 @@ const constructObjectActions = ({
                   const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
                   const isActive = layout.active.includes(nodeId);
 
-                  Obj.change(parentCollection, (parentCollection) => {
+                  Obj.update(parentCollection, (parentCollection) => {
                     parentCollection.objects.splice(index, 1);
                   });
 

package/src/capabilities/app-graph-builder/extensions/companions.ts

@@ -12,6 +12,7 @@ import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 // eslint-disable-next-line unused-imports/no-unused-imports
 import type { Node } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';
+import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation } from '@dxos/schema';
 
 import { meta } from '#meta';
@@ -64,11 +65,10 @@ export const createCompanionExtensions = Effect.fnUntraced(function* () {
         }
 
         const schema = Obj.getSchema(node.data);
-        const isView = Option.fromNullable(schema).pipe(
-          Option.flatMap((candidate) => ViewAnnotation.get(candidate)),
-          Option.getOrElse(() => false),
-        );
-        if (!isView) {
+        const path = schema ? ViewAnnotation.get(schema).pipe(Option.getOrElse(() => [] as EchoViewRefPath)) : [];
+        const isEchoViewBacked = schema && path.length > 0 ? ViewAnnotation.hasRefAlongPath(node.data, path) : false;
+
+        if (!isEchoViewBacked) {
           return Option.none();
         }
 

package/src/capabilities/app-graph-builder/extensions/settings.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { isPersonalSpace } from '@dxos/app-toolkit';
-import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
+import { AppNodeMatcher, isPersonalSpace } from '@dxos/app-toolkit';
+import { GraphBuilder, Node } from '@dxos/plugin-graph';
 
 import { meta } from '#meta';
 
@@ -13,13 +13,21 @@ import { meta } from '#meta';
 // Extension Factory
 //
 
-/** Creates the settings-sections extension for space settings panel. */
+/**
+ * Settings-style children attached directly under each Space node.
+ *
+ * Both `general` and `members` are pinned to the top via `position: 'hoist'`
+ * so they sit above the un-positioned middle band (collections, mailboxes,
+ * automations, integrations, etc.). Database and Devtools occupy the
+ * `position: 'fallback'` bottom. The previous `schema` panel is gone —
+ * type management is surfaced separately and doesn't need an entry here.
+ */
 export const createSettingsExtensions = Effect.fnUntraced(function* () {
   const extension = yield* GraphBuilder.createExtension({
     id: 'settings-sections',
-    match: NodeMatcher.whenNodeType(`${meta.id}.settings`),
-    connector: (node) => {
-      const personal = node.properties.space && isPersonalSpace(node.properties.space);
+    match: AppNodeMatcher.whenSpace,
+    connector: (space) => {
+      const personal = isPersonalSpace(space);
       return Effect.succeed([
         Node.make({
           id: 'general',
@@ -28,7 +36,9 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
           properties: {
             label: ['space-settings-properties.label', { ns: meta.id }],
             icon: 'ph--sliders--regular',
+            iconHue: 'indigo',
             position: 'hoist',
+            space,
             testId: 'spacePlugin.general',
           },
         }),
@@ -41,22 +51,14 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
                 properties: {
                   label: ['members-panel.label', { ns: meta.id }],
                   icon: 'ph--users--regular',
+                  iconHue: 'lime',
                   position: 'hoist',
+                  space,
                   testId: 'spacePlugin.members',
                 },
               }),
             ]
           : []),
-        Node.make({
-          id: 'schema',
-          type: `${meta.id}.schema`,
-          data: `${meta.id}.schema`,
-          properties: {
-            label: ['space-settings-schema.label', { ns: meta.id }],
-            icon: 'ph--shapes--regular',
-            testId: 'spacePlugin.schema',
-          },
-        }),
       ]);
     },
   });

package/src/capabilities/app-graph-builder/extensions/shared.test.ts

@@ -30,7 +30,7 @@ const TestViewWrapper = Schema.Struct({
     typename: 'test/ViewWrapper',
     version: '0.1.0',
   }),
-  ViewAnnotation.set(true),
+  ViewAnnotation.set(['view']),
 );
 
 describe('buildViewIndex', () => {
@@ -103,7 +103,7 @@ describe('buildViewIndex', () => {
     const userSchemas = db.schemaRegistry
       .query({ location: ['runtime'] })
       .runSync()
-      .filter((schema) => !ViewAnnotation.get(schema).pipe((opt) => opt._tag === 'Some' && opt.value));
+      .filter((schema) => !ViewAnnotation.has(schema));
     const viewIndex = buildViewIndex(registry.get.bind(registry) as any, { db } as any, userSchemas);
 
     expect(viewIndex.typenamesWithViews.size).toBe(0);

package/src/capabilities/app-graph-builder/extensions/shared.ts

@@ -6,17 +6,17 @@ import { type Atom } from '@effect-atom/atom-react';
 import * as Option from 'effect/Option';
 
 import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
+import { type Operation } from '@dxos/compute';
 import { Filter, Obj, type Type } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
 import { Migrations } from '@dxos/migrations';
-import { type Operation } from '@dxos/operation';
 import { type Node } from '@dxos/plugin-graph';
 import { type TreeData } from '@dxos/react-ui-list';
+import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation, getTypenameFromQuery } from '@dxos/schema';
-import { type Label } from '@dxos/ui-types';
+import { type Label } from '@dxos/ui-types/translations';
 
 import { meta } from '#meta';
-import { SPACE_TYPE } from '#types';
 
 export {
   type MetadataResolver,
@@ -57,14 +57,6 @@ export const META_NS: { ns: string } = { ns: meta.id };
 export const BLOCK_REORDER_ABOVE = (_source: TreeData, instruction: any) => instruction.type === 'reorder-above';
 export const CAN_DROP_SPACE = (source: TreeData) => Obj.isObject(source.item.data) || isSpace(source.item.data);
 
-//
-// Matchers
-//
-
-/** Match space nodes and return the Space object. */
-export const whenSpace = (node: Node.Node): Option.Option<Space> =>
-  node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none();
-
 //
 // Caches (space-specific, not moved to app-toolkit)
 //
@@ -134,6 +126,8 @@ export type ViewIndex = {
   typenamesWithViews: Set<string>;
   /** View objects targeting a specific typename. */
   getViewsForTypename: (typename: string) => Obj.Any[];
+  /** True when the schema has `ViewAnnotation` and that path resolves non-null on `object`; false otherwise (no annotation, or null/undefined path — e.g. Kanban with unset `view`). */
+  isView: (object: Obj.Any) => boolean;
 };
 
 /**
@@ -143,18 +137,42 @@ export type ViewIndex = {
  */
 // TODO(wittjosiah): Make reactive to schema registry changes (currently only object/view mutations trigger updates).
 export const buildViewIndex = (get: Atom.Context, space: Space, schemas: Type.AnyEntity[]): ViewIndex => {
-  const viewSchemas = schemas.filter((schema) => ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false)));
+  const viewSchemas = schemas.filter((schema) => ViewAnnotation.has(schema));
 
   const viewsByTypename = new Map<string, Obj.Any[]>();
+  // Object IDs whose `ViewAnnotation` path resolves to a non-null value.
+  // Used by `isView` to distinguish view instances from regular instances of
+  // the same schema (e.g. items-variant Kanban vs view-variant Kanban).
+  const viewObjectIds = new Set<string>();
 
   if (viewSchemas.length > 0) {
     const filter = Filter.or(...viewSchemas.map((schema) => Filter.type(schema)));
     const viewObjects = get(AtomQuery.make(space.db, filter));
 
     for (const viewObject of viewObjects) {
+      const holderSchema = Obj.getSchema(viewObject);
+      const path = holderSchema
+        ? ViewAnnotation.get(holderSchema).pipe(Option.getOrElse(() => [] as EchoViewRefPath))
+        : ([] as EchoViewRefPath);
+
+      if (path.length === 0) {
+        continue;
+      }
+
       const viewSnapshot = get(AtomObj.make(viewObject));
-      const viewRef = viewSnapshot.view;
-      const viewTarget = viewRef ? get(AtomObj.make(viewRef)) : undefined;
+      let holder: unknown = viewSnapshot;
+      for (const segment of path) {
+        holder =
+          holder == null || typeof holder !== 'object' ? undefined : (holder as Record<string, unknown>)[segment];
+      }
+      // Path resolved to a non-null value → this instance is a "view". Path
+      // resolved to null/undefined → it's a regular object that happens to
+      // be of a view-annotated schema.
+      if (holder != null) {
+        viewObjectIds.add(viewObject.id);
+      }
+
+      const viewTarget = holder !== undefined ? get(AtomObj.make(holder as Obj.Any)) : undefined;
       const typename = getTypenameFromQuery(viewTarget?.query?.ast);
       if (typename) {
         const existing = viewsByTypename.get(typename) ?? [];
@@ -167,5 +185,6 @@ export const buildViewIndex = (get: Atom.Context, space: Space, schemas: Type.An
   return {
     typenamesWithViews: new Set(viewsByTypename.keys()),
     getViewsForTypename: (typename) => viewsByTypename.get(typename) ?? [],
+    isView: (object) => viewObjectIds.has(object.id),
   };
 };

package/src/capabilities/app-graph-builder/extensions/spaces.ts

@@ -5,12 +5,12 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, getActiveSpace, getPersonalSpace, isPersonalSpace } from '@dxos/app-toolkit';
+import { AppCapabilities, AppNodeMatcher, getActiveSpace, getPersonalSpace, isPersonalSpace } from '@dxos/app-toolkit';
 import { type Space, SpaceState } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
 import { Filter, Obj } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
 import { Migrations } from '@dxos/migrations';
-import { Operation } from '@dxos/operation';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { CreateAtom, Graph, GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 import { Expando } from '@dxos/schema';
@@ -26,11 +26,9 @@ import {
   CREATE_OBJECT_IN_SPACE_LABEL,
   MIGRATE_SPACE_LABEL,
   RENAME_SPACE_LABEL,
-  SETTINGS_PANEL_LABEL,
   checkPendingMigration,
   spaceActionsCache,
   spaceRearrangeCache,
-  whenSpace,
 } from './shared';
 
 //
@@ -175,7 +173,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
 
     GraphBuilder.createExtension({
       id: 'actions',
-      match: whenSpace,
+      match: AppNodeMatcher.whenSpace,
       actions: (space, get) => {
         const [client] = get(capabilities.atom(ClientCapabilities.Client));
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
@@ -230,7 +228,7 @@ const constructSpaceNode = ({
           nextOrder.map(({ id }) => id),
         );
 
-        Obj.change(spacesOrder, (spacesOrder: any) => {
+        Obj.update(spacesOrder, (spacesOrder: any) => {
           spacesOrder.order = nextOrder.map(({ id }) => id);
         });
       };
@@ -258,19 +256,6 @@ const constructSpaceNode = ({
       onRearrange,
       canDrop: CAN_DROP_SPACE,
     },
-    nodes: [
-      Node.make({
-        id: 'settings',
-        type: `${meta.id}.settings`,
-        data: null,
-        properties: {
-          label: SETTINGS_PANEL_LABEL,
-          icon: 'ph--faders--regular',
-          disposition: 'alternate-tree',
-          space,
-        },
-      }),
-    ],
   });
 };
 

package/src/capabilities/app-graph-builder/extensions/types.ts

@@ -9,12 +9,12 @@ import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppNode, LayoutOperation, Segments } from '@dxos/app-toolkit';
+import { AppCapabilities, AppNode, AppNodeMatcher, LayoutOperation, Segments } from '@dxos/app-toolkit';
 import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
 import { Collection, Filter, Obj, Query, Type } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
 import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
-import { Operation } from '@dxos/operation';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { CreateAtom, GraphBuilder, Node } from '@dxos/plugin-graph';
 import { ViewAnnotation } from '@dxos/schema';
@@ -35,7 +35,6 @@ import {
   createObjectNode,
   downloadBlob,
   getDynamicLabel,
-  whenSpace,
 } from './shared';
 
 //
@@ -53,7 +52,7 @@ export const createTypeExtensions = Effect.fnUntraced(function* () {
     // Types section virtual node under each space.
     GraphBuilder.createExtension({
       id: 'types-section',
-      match: whenSpace,
+      match: AppNodeMatcher.whenSpace,
       connector: (space, get) => {
         const spaceState = get(CreateAtom.fromObservable(space.state));
         if (spaceState !== SpaceState.SPACE_READY) {
@@ -67,6 +66,7 @@ export const createTypeExtensions = Effect.fnUntraced(function* () {
             label: ['types-section.label', { ns: meta.id }],
             icon: 'ph--shapes--regular',
             space,
+            position: 'fallback',
             testId: 'spacePlugin.typesSection',
           }),
         ]);
@@ -92,9 +92,6 @@ export const createTypeExtensions = Effect.fnUntraced(function* () {
           if (SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))) {
             return false;
           }
-          if (ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false))) {
-            return false;
-          }
           if (Type.getTypename(schema) === Collection.Collection.typename) {
             return false;
           }
@@ -109,6 +106,9 @@ export const createTypeExtensions = Effect.fnUntraced(function* () {
           }
           const typename = Type.getTypename(schema);
           const objects = get(AtomQuery.make(space.db, Filter.typename(typename)));
+          if (ViewAnnotation.has(schema)) {
+            return objects.some((obj) => !viewIndex.isView(obj));
+          }
           return objects.length > 0 || viewIndex.typenamesWithViews.has(typename);
         });
 
@@ -182,7 +182,14 @@ export const createTypeExtensions = Effect.fnUntraced(function* () {
         return Option.some({ space: node.data.space as Space, typename: node.data.typename as string });
       },
       connector: ({ space, typename }, get) => {
-        const objects = get(AtomQuery.make(space.db, Filter.typename(typename)));
+        const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
+        const schemas = client
+          ? get(AtomQuery.fromQuery(client.graph.schemaRegistry.query({ location: ['runtime'] })))
+          : [];
+        const viewIndex = buildViewIndex(get, space, schemas);
+        const objects = get(AtomQuery.make(space.db, Filter.typename(typename))).filter(
+          (object: Obj.Unknown) => !viewIndex.isView(object),
+        );
 
         return Effect.succeed(
           objects
@@ -274,7 +281,7 @@ const createSchemaNode = ({
       };
     }),
     Match.orElse(() => ({
-      label: getDynamicLabel('typename.label', typename, { count: 2, default: typename }),
+      label: getDynamicLabel('typename.label', typename, { count: 2, defaultValue: typename }),
       nodeId: typename,
     })),
   );

package/src/capabilities/app-graph-serializer.ts

@@ -12,9 +12,9 @@ import { Collection } from '@dxos/echo';
 
 import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
+import { translations } from '#translations';
 import { SPACE_TYPE } from '#types';
 
-import { translations } from '../translations';
 import { SPACES } from '../util';
 
 const COLLECTION_TYPE = Collection.Collection.typename;

package/src/capabilities/identity-created.ts

@@ -24,7 +24,7 @@ export default Capability.makeModule(
 
     // Create root collection structure.
     yield* Effect.tryPromise(() => personalSpace.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED));
-    Obj.change(personalSpace.properties, (properties) => {
+    Obj.update(personalSpace.properties, (properties) => {
       properties[Collection.Collection.typename] = Ref.make(Collection.make());
       if (Migrations.versionProperty) {
         properties[Migrations.versionProperty] = Migrations.targetVersion;