@dxos/plugin-preview 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-preview",
-  "version": "0.8.4-main.fcfe5033a5",
+  "version": "0.8.4-staging.60fe92afc8",
   "description": "Preview plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,72 +8,98 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#capabilities": "./src/capabilities/index.ts",
-    "#meta": "./src/meta.ts"
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/PreviewPlugin.workerd.ts",
+        "node": "./src/PreviewPlugin.node.ts",
+        "default": "./src/PreviewPlugin.tsx"
+      },
+      "types": "./dist/types/src/PreviewPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/PreviewPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/PreviewPlugin.node.mjs",
+      "default": "./dist/lib/neutral/PreviewPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./testing": {
+      "source": "./src/testing.ts",
+      "types": "./dist/types/src/testing.d.ts",
+      "default": "./dist/lib/neutral/testing.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom-react": "^0.5.0",
-    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
-    "@dxos/app-graph": "0.8.4-main.fcfe5033a5",
-    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
-    "@dxos/async": "0.8.4-main.fcfe5033a5",
-    "@dxos/echo": "0.8.4-main.fcfe5033a5",
-    "@dxos/client": "0.8.4-main.fcfe5033a5",
-    "@dxos/effect": "0.8.4-main.fcfe5033a5",
-    "@dxos/lit-ui": "0.8.4-main.fcfe5033a5",
-    "@dxos/log": "0.8.4-main.fcfe5033a5",
-    "@dxos/keys": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-attention": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-client": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-client": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-deck": "0.8.4-main.fcfe5033a5",
-    "@dxos/operation": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-editor": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-form": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-menu": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-table": "0.8.4-main.fcfe5033a5",
-    "@dxos/schema": "0.8.4-main.fcfe5033a5",
-    "@dxos/types": "0.8.4-main.fcfe5033a5",
-    "@dxos/ui-editor": "0.8.4-main.fcfe5033a5",
-    "@dxos/util": "0.8.4-main.fcfe5033a5",
-    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
+    "@dxos/app-framework": "0.8.4-staging.60fe92afc8",
+    "@dxos/app-toolkit": "0.8.4-staging.60fe92afc8",
+    "@dxos/async": "0.8.4-staging.60fe92afc8",
+    "@dxos/client": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo-react": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo": "0.8.4-staging.60fe92afc8",
+    "@dxos/effect": "0.8.4-staging.60fe92afc8",
+    "@dxos/keys": "0.8.4-staging.60fe92afc8",
+    "@dxos/log": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-client": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-form": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-mosaic": "0.8.4-staging.60fe92afc8",
+    "@dxos/schema": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-editor": "0.8.4-staging.60fe92afc8",
+    "@dxos/types": "0.8.4-staging.60fe92afc8",
+    "@dxos/util": "0.8.4-staging.60fe92afc8"
   },
   "devDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-testing": "0.8.4-main.fcfe5033a5",
-    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-components": "0.8.4-main.fcfe5033a5",
-    "@dxos/random": "0.8.4-main.fcfe5033a5",
-    "@dxos/echo-db": "0.8.4-main.fcfe5033a5"
+    "vite": "^8.0.16",
+    "@dxos/echo-react": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-testing": "0.8.4-staging.60fe92afc8",
+    "@dxos/random": "0.8.4-staging.60fe92afc8",
+    "@dxos/storybook-utils": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-components": "0.8.4-staging.60fe92afc8"
   },
   "peerDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },

package/src/PreviewPlugin.node.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Organization, Person } from '@dxos/types';
+
+import { meta } from '#meta';
+
+export const PreviewPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
+  Plugin.make,
+);
+
+export default PreviewPlugin;

package/src/PreviewPlugin.test.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { PreviewPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('PreviewPlugin', () => {
+  test('modules activate on the expected events', { timeout: 10_000 }, async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), PreviewPlugin()],
+    });
+
+    // After autoStart: schema auto-cascades from ClientPlugin.
+    expect(harness.manager.getActive()).toContain(moduleId('schema'));
+  });
+});

package/src/PreviewPlugin.tsx

@@ -8,11 +8,10 @@ import { Organization, Person } from '@dxos/types';
 
 import { PreviewPopover, ReactSurface } from '#capabilities';
 import { meta } from '#meta';
-
-import { translations } from './translations';
+import { translations } from '#translations';
 
 export const PreviewPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization], id: 'schema' }),
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
@@ -22,3 +21,5 @@ export const PreviewPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default PreviewPlugin;

package/src/PreviewPlugin.workerd.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Organization, Person } from '@dxos/types';
+
+import { meta } from '#meta';
+
+export const PreviewPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
+  Plugin.make,
+);
+
+export default PreviewPlugin;

package/src/capabilities/preview-popover.ts

@@ -10,9 +10,9 @@ import { addEventListener } from '@dxos/async';
 import { type Client } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
 import { Obj } from '@dxos/echo';
-import { DXN } from '@dxos/keys';
+import { EID } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 import { DX_ANCHOR_ACTIVATE, type DxAnchorActivate } from '@dxos/react-ui';
 import { type PreviewLinkRef, type PreviewLinkTarget } from '@dxos/ui-editor';
 
@@ -24,7 +24,7 @@ const handlePreviewLookup = async (
   { dxn, label }: PreviewLinkRef,
 ): Promise<PreviewLinkTarget | null> => {
   try {
-    const object = await defaultSpace.db.makeRef(DXN.parse(dxn)).load();
+    const object = await defaultSpace.db.makeRef(EID.parse(dxn)).load();
     return { label, object };
   } catch {
     return null;
@@ -37,6 +37,10 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     // TODO(wittjosiah): Factor out lookup handlers to other plugins to make not ECHO-specific.
+    // Monotonic activation token: each invocation captures its own sequence; only the
+    // most recent activation is allowed to commit popover state. Prevents a slow
+    // open (async lookup) from clobbering a later close that fires while it's in flight.
+    let activationSequence = 0;
     const handleAnchorActivate = async ({
       dxn,
       label,
@@ -45,13 +49,32 @@ export default Capability.makeModule(
       title: titleProp,
       side,
       props,
+      state,
     }: DxAnchorActivate) => {
+      const sequence = ++activationSequence;
       const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
+
+      // Explicit close: callers pass `state: false` on pointer-leave to dismiss
+      // the popover. Operation schema requires anchor + kind, so use placeholders;
+      // they're overwritten in ephemeral state but only `state` is read by the UI.
+      if (state === false) {
+        await invokePromise(LayoutOperation.UpdatePopover, {
+          variant: 'virtual',
+          anchor: trigger,
+          kind: 'base',
+          state: false,
+        });
+        return;
+      }
+
       const client = capabilities.get(ClientCapabilities.Client);
       const registry = capabilities.get(Capabilities.AtomRegistry);
+      // Layout is optional: in standalone harnesses (Storybook, tests) no plugin contributes
+      // `AppCapabilities.Layout`, and `getAll` returns an empty array. Reading `registry.get(undefined)`
+      // would crash inside Atom's identity check (`'~atom/Serializable' in undefined`). When layout
+      // isn't available, fall through to the personal-space default.
       const [layoutAtom] = capabilities.getAll(AppCapabilities.Layout);
-      const layout = registry.get(layoutAtom);
-      const spaceId = getSpaceIdFromPath(layout.workspace);
+      const spaceId = layoutAtom && getSpaceIdFromPath(registry.get(layoutAtom).workspace);
       const space = (spaceId && client.spaces.get(spaceId)) ?? getPersonalSpace(client);
       if (!space) {
         return;
@@ -60,8 +83,13 @@ export default Capability.makeModule(
       if (!result) {
         return;
       }
+      // A newer activation (open or close) arrived while the lookup was in flight; bail
+      // out so we don't clobber the latest state.
+      if (sequence !== activationSequence) {
+        return;
+      }
 
-      const title = titleProp ?? Obj.getLabel(result.object);
+      const title = titleProp ?? Obj.getLabel(result.object, { fallback: 'typename' });
 
       await invokePromise(LayoutOperation.UpdatePopover, {
         subjectRef: dxn,

package/src/capabilities/react-surface.tsx

@@ -8,12 +8,12 @@ import React from 'react';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface } from '@dxos/app-framework/ui';
 import { AppSurface } from '@dxos/app-toolkit/ui';
-import { Obj } from '@dxos/echo';
+import { Obj, Type } from '@dxos/echo';
 import { Card } from '@dxos/react-ui';
-import { type ProjectionModel } from '@dxos/schema';
+import { Expando, type ProjectionModel } from '@dxos/schema';
 import { Organization, Person, Pipeline, Task } from '@dxos/types';
 
-import { FormCard, JsonCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
+import { ExpandoCard, FormCard, JsonCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
@@ -24,8 +24,8 @@ export default Capability.makeModule(() =>
       //
 
       Surface.create<{ subject: Person.Person }>({
-        id: 'schema-popover--contact',
-        position: 'hoist',
+        id: 'schemaPopoverContact',
+        position: 'first',
         filter: AppSurface.object(AppSurface.Card, Person.Person),
         component: ({ data, role }) => {
           return (
@@ -37,8 +37,8 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: 'schema-popover--organization',
-        position: 'hoist',
+        id: 'schemaPopoverOrganization',
+        position: 'first',
         filter: AppSurface.object(AppSurface.Card, Organization.Organization),
         component: ({ data, role }) => {
           return (
@@ -50,30 +50,71 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: 'schema-popover--project',
-        position: 'hoist',
+        id: 'schemaPopoverProject',
+        position: 'first',
         filter: AppSurface.object(AppSurface.Card, Pipeline.Pipeline),
         component: ({ data, role }) => {
           return <ProjectCard role={role} subject={data.subject} />;
         },
       }),
       Surface.create({
-        id: 'schema-popover--task',
-        position: 'hoist',
+        id: 'schemaPopoverTask',
+        position: 'first',
         filter: AppSurface.object(AppSurface.Card, Task.Task),
         component: ({ data, role }) => {
           return <TaskCard role={role} subject={data.subject} />;
         },
       }),
+      Surface.create<AppSurface.ObjectCardData<Expando.Expando>>({
+        id: 'schemaPopoverExpando',
+        filter: AppSurface.object(AppSurface.Card, Expando.Expando),
+        component: ({ data, role }) => {
+          return <ExpandoCard role={role} subject={data.subject} ignorePaths={data.ignorePaths} />;
+        },
+      }),
+
+      Surface.create({
+        id: 'schemaPopoverDynamicType',
+        role: 'card--content',
+        filter: (data): data is { subject: Obj.Unknown } => {
+          if (!Obj.isObject(data.subject)) {
+            return false;
+          }
+          const type = Obj.getType(data.subject);
+          if (type) {
+            return Type.getDatabase(type) != null;
+          }
+          // Obj.getType fails for database-registered schemas (DXN mismatch); fall back to typename query.
+          try {
+            const db = Obj.getDatabase(data.subject);
+            const typename = Obj.getTypename(data.subject);
+            return (
+              !!db &&
+              !!typename &&
+              db.graph.registry
+                .list()
+                .filter(Type.isType)
+                .some((t) => Type.getTypename(t) === typename)
+            );
+          } catch {
+            return false;
+          }
+        },
+        component: ({ data, role }) => {
+          // Dynamic/mutable schemas render an editable, full-layout form;
+          // FormCard handles both static and runtime schema resolution internally.
+          return <FormCard role={role} subject={data.subject} readonly={false} layout='full' />;
+        },
+      }),
 
       //
       // Fallback for any object.
       //
 
       Surface.create({
-        id: 'fallback-popover',
+        id: 'fallbackPopover',
         role: 'card--content',
-        position: 'fallback',
+        position: 'last',
         filter: (data): data is { subject: Obj.Unknown; projection?: ProjectionModel } => Obj.isObject(data.subject),
         component: ({ data, role }) => {
           return <FormCard role={role} subject={data.subject} projection={data.projection} />;
@@ -81,9 +122,9 @@ export default Capability.makeModule(() =>
       }),
 
       Surface.create({
-        id: 'fallback-json',
+        id: 'fallbackJson',
         role: 'card--content',
-        position: 'fallback',
+        position: 'last',
         filter: (data): data is Record<string, unknown> => true,
         component: ({ data }) => {
           return <JsonCard data={data} />;
@@ -92,12 +133,12 @@ export default Capability.makeModule(() =>
 
       Surface.create({
         id: 'section',
-        position: 'fallback',
+        position: 'last',
         filter: AppSurface.subject(AppSurface.Section, Obj.isObject),
         component: ({ data }) => {
           return (
-            <div role='none' className='flex w-full justify-center'>
-              <div role='none' className='pt-2 pb-2 dx-card-min-width dx-card-max-width'>
+            <div className='flex w-full justify-center'>
+              <div className='py-2 dx-card-min-width dx-card-max-width'>
                 <Card.Root>
                   <Surface.Surface type={AppSurface.Card} data={data} limit={1} />
                 </Card.Root>

package/src/cards/ExpandoCard.tsx

@@ -0,0 +1,76 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { useCallback, useMemo } from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { SchemaEx } from '@dxos/effect';
+import { Card } from '@dxos/react-ui';
+import { Form } from '@dxos/react-ui-form';
+
+const schemaForValue = (value: unknown): Schema.Schema.AnyNoContext | undefined => {
+  switch (typeof value) {
+    case 'string':
+      return Schema.String;
+    case 'number':
+      return Schema.Number;
+    case 'boolean':
+      return Schema.Boolean;
+    default:
+      return undefined;
+  }
+};
+
+/**
+ * Reserved keys: `id`, plus any `~`-prefixed key (ECHO uses `~`-prefixed
+ * string keys to brand entity instances and schemas — KindId,
+ * SchemaKindId, SnapshotKindId, etc. — and the `~` namespace is reserved
+ * for that purpose). They show up in `Object.keys` but aren't user data.
+ */
+const isInternalKey = (key: string) => key === 'id' || key.startsWith('~');
+
+export const ExpandoCard = ({ subject, ignorePaths }: AppSurface.ObjectCardProps) => {
+  const schema = useMemo(() => {
+    const ignored = new Set(ignorePaths ?? []);
+    const fields: Record<string, Schema.Schema.AnyNoContext> = {};
+    for (const key of Object.keys(subject)) {
+      if (isInternalKey(key) || ignored.has(key)) {
+        continue;
+      }
+      const fieldSchema = schemaForValue((subject as any)[key]);
+      if (fieldSchema) {
+        fields[key] = fieldSchema;
+      }
+    }
+    return Schema.Struct(fields);
+  }, [subject, ignorePaths]);
+
+  const handleSave = useCallback(
+    (values: any, { changed }: { changed: Record<string, boolean> }) => {
+      const paths = Object.keys(changed).filter((path) => changed[path]);
+      Obj.update(subject, () => {
+        for (const path of paths) {
+          const value = values[path];
+          const parts = SchemaEx.splitJsonPath(path as SchemaEx.JsonPath);
+          Obj.setValue(subject, parts, value);
+        }
+      });
+    },
+    [subject],
+  );
+
+  return (
+    <Card.Body>
+      <Form.Root schema={schema} values={subject} autoSave onSave={handleSave}>
+        <Form.Viewport>
+          <Form.Content>
+            <Form.FieldSet />
+          </Form.Content>
+        </Form.Viewport>
+      </Form.Root>
+    </Card.Body>
+  );
+};