@dxos/plugin-markdown 0.8.4-main.28f8d3d → 0.8.4-main.406dc2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.4-main.28f8d3d",
+  "version": "0.8.4-main.406dc2a",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,66 +35,69 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/view": "^6.34.1",
+    "@automerge/automerge": "3.1.2",
+    "@codemirror/search": "^6.5.11",
+    "@codemirror/view": "^6.38.4",
+    "@effect/ai": "0.29.1",
+    "@effect/experimental": "0.56.0",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "react-dropzone": "^14.2.3",
-    "@dxos/ai": "0.8.4-main.28f8d3d",
-    "@dxos/assistant": "0.8.4-main.28f8d3d",
-    "@dxos/app-framework": "0.8.4-main.28f8d3d",
-    "@dxos/async": "0.8.4-main.28f8d3d",
-    "@dxos/blueprints": "0.8.4-main.28f8d3d",
-    "@dxos/echo": "0.8.4-main.28f8d3d",
-    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
-    "@dxos/invariant": "0.8.4-main.28f8d3d",
-    "@dxos/keys": "0.8.4-main.28f8d3d",
-    "@dxos/lit-ui": "0.8.4-main.28f8d3d",
-    "@dxos/live-object": "0.8.4-main.28f8d3d",
-    "@dxos/local-storage": "0.8.4-main.28f8d3d",
-    "@dxos/log": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-attention": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-client": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-deck": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-graph": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-preview": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-space": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-theme": "0.8.4-main.28f8d3d",
-    "@dxos/react-client": "0.8.4-main.28f8d3d",
-    "@dxos/react-hooks": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-attention": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-editor": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-form": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-stack": "0.8.4-main.28f8d3d",
-    "@dxos/schema": "0.8.4-main.28f8d3d",
-    "@dxos/util": "0.8.4-main.28f8d3d"
+    "@dxos/ai": "0.8.4-main.406dc2a",
+    "@dxos/app-framework": "0.8.4-main.406dc2a",
+    "@dxos/assistant": "0.8.4-main.406dc2a",
+    "@dxos/echo": "0.8.4-main.406dc2a",
+    "@dxos/echo-db": "0.8.4-main.406dc2a",
+    "@dxos/blueprints": "0.8.4-main.406dc2a",
+    "@dxos/invariant": "0.8.4-main.406dc2a",
+    "@dxos/functions": "0.8.4-main.406dc2a",
+    "@dxos/lit-ui": "0.8.4-main.406dc2a",
+    "@dxos/keys": "0.8.4-main.406dc2a",
+    "@dxos/async": "0.8.4-main.406dc2a",
+    "@dxos/local-storage": "0.8.4-main.406dc2a",
+    "@dxos/live-object": "0.8.4-main.406dc2a",
+    "@dxos/plugin-attention": "0.8.4-main.406dc2a",
+    "@dxos/log": "0.8.4-main.406dc2a",
+    "@dxos/plugin-client": "0.8.4-main.406dc2a",
+    "@dxos/plugin-deck": "0.8.4-main.406dc2a",
+    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
+    "@dxos/plugin-preview": "0.8.4-main.406dc2a",
+    "@dxos/plugin-space": "0.8.4-main.406dc2a",
+    "@dxos/react-hooks": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-attention": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
+    "@dxos/schema": "0.8.4-main.406dc2a",
+    "@dxos/react-client": "0.8.4-main.406dc2a",
+    "@dxos/util": "0.8.4-main.406dc2a",
+    "@dxos/plugin-theme": "0.8.4-main.406dc2a"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/debug": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-storybook-layout": "0.8.4-main.28f8d3d",
-    "@dxos/random": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d",
-    "@dxos/storybook-utils": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-theme": "0.8.4-main.28f8d3d"
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/debug": "0.8.4-main.406dc2a",
+    "@dxos/plugin-storybook-layout": "0.8.4-main.406dc2a",
+    "@dxos/plugin-theme": "0.8.4-main.406dc2a",
+    "@dxos/random": "0.8.4-main.406dc2a",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
+    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -14,10 +14,13 @@ import { DataType } from '@dxos/schema';
 import {
   AnchorSort,
   AppGraphSerializer,
+  BLUEPRINT_KEY,
+  BlueprintDefinition,
   IntentResolver,
   MarkdownSettings,
   MarkdownState,
   ReactSurface,
+  Toolkit,
 } from './capabilities';
 import { MarkdownEvents } from './events';
 import { meta } from './meta';
@@ -25,91 +28,102 @@ import { translations } from './translations';
 import { Markdown, MarkdownAction } from './types';
 import { serializer } from './util';
 
-export const MarkdownPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...editorTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: MarkdownSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/state`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: Events.SetupSettings,
-      activate: MarkdownState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: Markdown.Document.typename,
-          metadata: {
-            label: (object: Markdown.Document) => object.name || object.fallbackName,
-            icon: 'ph--text-aa--regular',
-            graphProps: {
-              managesAutofocus: true,
-            },
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (doc: Markdown.Document) => await Ref.Array.loadAll<Obj.Any>([doc.content]),
-            serializer,
-            // TODO(wittjosiah): Consider how to do generic comments without these.
-            comments: 'anchored',
-            selectionMode: 'multi-range',
-            getAnchorLabel: (doc: Markdown.Document, anchor: string): string | undefined => {
-              if (doc.content) {
-                const [start, end] = anchor.split(':');
-                return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
-              }
-            },
+export const MarkdownPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, [...translations, ...editorTranslations]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/settings`,
+    activatesOn: Events.SetupSettings,
+    activate: MarkdownSettings,
+  }),
+  defineModule({
+    id: `${meta.id}/module/state`,
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: Events.SetupSettings,
+    activate: MarkdownState,
+  }),
+  defineModule({
+    id: `${meta.id}/module/metadata`,
+    activatesOn: Events.SetupMetadata,
+    activate: () =>
+      contributes(Capabilities.Metadata, {
+        id: Markdown.Document.typename,
+        metadata: {
+          label: (object: Markdown.Document) => object.name || object.fallbackName,
+          icon: 'ph--text-aa--regular',
+          blueprints: [BLUEPRINT_KEY],
+          graphProps: {
+            managesAutofocus: true,
           },
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: async (doc: Markdown.Document) => await Ref.Array.loadAll<Obj.Any>([doc.content]),
+          serializer,
+          // TODO(wittjosiah): Consider how to do generic comments without these.
+          comments: 'anchored',
+          selectionMode: 'multi-range',
+          getAnchorLabel: (doc: Markdown.Document, anchor: string): string | undefined => {
+            if (doc.content) {
+              const [start, end] = anchor.split(':');
+              return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
+            }
+          },
+        },
+      }),
+  }),
+  defineModule({
+    id: `${meta.id}/module/object-form`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Markdown.Document,
+          getIntent: () => createIntent(MarkdownAction.Create, {}),
         }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Markdown.Document,
-            getIntent: (_, { space }) => createIntent(MarkdownAction.Create, { spaceId: space.id }),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [DataType.Text]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the editor is loaded when surfaces activation is more granular.
-      activatesBefore: [MarkdownEvents.SetupExtensions],
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-serializer`,
-      activatesOn: Events.AppGraphReady,
-      activate: AppGraphSerializer,
-    }),
-    defineModule({
-      id: `${meta.id}/module/anchor-sort`,
-      // TODO(wittjosiah): More relevant event?
-      activatesOn: Events.AppGraphReady,
-      activate: AnchorSort,
-    }),
-  ]);
+      ),
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () => contributes(ClientCapabilities.Schema, [DataType.Text]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    // TODO(wittjosiah): Should occur before the editor is loaded when surfaces activation is more granular.
+    activatesBefore: [MarkdownEvents.SetupExtensions],
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-serializer`,
+    activatesOn: Events.AppGraphReady,
+    activate: AppGraphSerializer,
+  }),
+  defineModule({
+    id: `${meta.id}/module/anchor-sort`,
+    // TODO(wittjosiah): More relevant event?
+    activatesOn: Events.AppGraphReady,
+    activate: AnchorSort,
+  }),
+  defineModule({
+    id: `${meta.id}/module/blueprint`,
+    activatesOn: Events.SetupArtifactDefinition,
+    activate: BlueprintDefinition,
+  }),
+  defineModule({
+    id: `${meta.id}/module/toolkit`,
+    // TODO(wittjosiah): Use a different event.
+    activatesOn: Events.Startup,
+    activate: Toolkit,
+  }),
+]);

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pipe } from 'effect';
+import * as Function from 'effect/Function';
 
 import { Capabilities, type PluginContext, chain, contributes, createIntent } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
@@ -42,8 +42,8 @@ export default (context: PluginContext) =>
 
         const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(
-          pipe(
-            createIntent(MarkdownAction.Create, { spaceId: space.id, name: data.name, content: data.data }),
+          Function.pipe(
+            createIntent(MarkdownAction.Create, { name: data.name, content: data.data }),
             chain(SpaceAction.AddObject, { target }),
           ),
         );

package/src/capabilities/artifact-definition.ts

@@ -5,36 +5,29 @@
 // ISSUE(burdon): defineArtifact
 // @ts-nocheck
 
-import { Schema, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Schema from 'effect/Schema';
 
 import { ToolResult, createTool } from '@dxos/ai';
-import { Capabilities, type PromiseIntentDispatcher, chain, contributes, createIntent } from '@dxos/app-framework';
+import { Capabilities, chain, contributes, createIntent } from '@dxos/app-framework';
 import { ArtifactId, createArtifactElement } from '@dxos/assistant';
 import { defineArtifact } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
 import { assertArgument, invariant } from '@dxos/invariant';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import { Filter, type Space, fullyQualifiedId } from '@dxos/react-client/echo';
+import { Filter, fullyQualifiedId } from '@dxos/react-client/echo';
 
 import { meta } from '../meta';
 import { Markdown, MarkdownAction } from '../types';
 
-// TODO(burdon): Factor out.
-declare global {
-  interface ToolContextExtensions {
-    space?: Space;
-    dispatch?: PromiseIntentDispatcher;
-  }
-}
-
 export default () => {
   const definition = defineArtifact({
     id: `artifact:${meta.id}`, // TODO(burdon): meta.id/artifact?
     name: meta.name,
     instructions: `
-      - The markdown plugin allows you to work with text documents in the current space.
-      - Use these tools to interact with documents, including listing available documents and retrieving their content.
-      - Documents are stored in Markdown format.
+      The markdown plugin allows you to work with text documents in the current space.
+      Use these tools to interact with documents, including listing available documents and retrieving their content.
+      Documents are stored in Markdown format.
     `,
     schema: Markdown.Document,
     tools: [
@@ -54,7 +47,7 @@ export default () => {
           invariant(extensions?.space, 'No space');
           invariant(extensions?.dispatch, 'No intent dispatcher');
 
-          const intent = pipe(
+          const intent = Function.pipe(
             createIntent(MarkdownAction.Create, {
               spaceId: extensions.space.id,
               name,
@@ -102,7 +95,7 @@ export default () => {
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
           const document = await extensions.space.db.query(Filter.ids(ArtifactId.toDXN(id).toString())).first();
-          assertArgument(Obj.instanceOf(Markdown.Document, document), 'Invalid type');
+          assertArgument(Obj.instanceOf(Markdown.Document, document), 'document', 'Invalid type');
 
           const { content } = await document.content?.load();
           return ToolResult.Success({

package/src/capabilities/blueprint-definition.ts

@@ -0,0 +1,39 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
+import { Blueprint, Template } from '@dxos/blueprints';
+import { type FunctionDefinition } from '@dxos/functions';
+import { trim } from '@dxos/util';
+
+import { diff, open } from '../functions';
+
+const functions: FunctionDefinition[] = [diff, open];
+const tools = ['add-proposals', 'create-document'];
+
+export const BLUEPRINT_KEY = 'dxos.org/blueprint/markdown';
+
+export default (): Capability<any>[] => [
+  contributes(Capabilities.Functions, functions),
+  contributes(
+    Capabilities.BlueprintDefinition,
+    Blueprint.make({
+      key: BLUEPRINT_KEY,
+      name: 'Markdown',
+      tools: Blueprint.toolDefinitions({ functions, tools }),
+      instructions: Template.make({
+        source: trim`
+            You can create and update markdown documents.
+            When asked to edit or update documents return updates as a set of compact diff string pairs.
+            For each diff, respond with the smallest possible matching span.
+            For example:
+            - "There is a tyop in this sentence."
+            + "There is a typo in this sentence."
+            - "This id goof."
+            + "This is good."
+          `,
+      }),
+    }),
+  ),
+];

package/src/capabilities/index.ts

@@ -6,9 +6,12 @@ import { lazy } from '@dxos/app-framework';
 
 export const AnchorSort = lazy(() => import('./anchor-sort'));
 export const AppGraphSerializer = lazy(() => import('./app-graph-serializer'));
+export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
 export const MarkdownSettings = lazy(() => import('./settings'));
 export const MarkdownState = lazy(() => import('./state'));
+export const Toolkit = lazy(() => import('./toolkit'));
 
+export * from './blueprint-definition';
 export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -3,7 +3,8 @@
 //
 
 import { next as A } from '@automerge/automerge';
-import { Option, type Schema, pipe } from 'effect';
+import * as Option from 'effect/Option';
+import type * as Schema from 'effect/Schema';
 
 import {
   Capabilities,
@@ -35,23 +36,22 @@ export default (context: PluginContext) =>
       },
     }),
     createResolver({
-      intent: CollaborationActions.InsertContent,
+      intent: CollaborationActions.AcceptProposal,
       filter: (
         data,
-      ): data is Omit<Schema.Schema.Type<typeof CollaborationActions.InsertContent.fields.input>, 'target'> & {
-        target: Markdown.Document;
-      } => Obj.instanceOf(Markdown.Document, data.target),
-      resolve: async ({ target, object: objectRef, at, label }) => {
-        const text = await target.content.load();
+      ): data is Omit<Schema.Schema.Type<typeof CollaborationActions.AcceptProposal.fields.input>, 'subject'> & {
+        subject: Markdown.Document;
+      } => Obj.instanceOf(Markdown.Document, data.subject),
+      resolve: async ({ subject, anchor, proposal }) => {
+        const text = await subject.content.load();
         const accessor = createDocAccessor(text, ['content']);
-        const { start, end } = pipe(
-          Option.fromNullable(at),
+        const { start, end } = Option.fromNullable(anchor).pipe(
           Option.flatMap((at) => Option.fromNullable(getRangeFromCursor(accessor, at))),
+          // Fallback to the end of the document.
           Option.getOrElse(() => ({ start: text.content.length - 1, end: text.content.length - 1 })),
         );
         accessor.handle.change((doc) => {
-          const ref = `[${label ?? 'Generated content'}]](${objectRef.dxn.toString()})\n`;
-          A.splice(doc, accessor.path.slice(), start, end - start, ref);
+          A.splice(doc, accessor.path.slice(), start, end - start, proposal.text);
         });
       },
     }),

package/src/capabilities/toolkit.ts

@@ -0,0 +1,49 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+
+import { Capabilities, type Capability, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import { invariant } from '@dxos/invariant';
+import { getActiveSpace } from '@dxos/plugin-space';
+import { SpaceAction } from '@dxos/plugin-space/types';
+
+import { MarkdownAction } from '../types';
+
+// TODO(burdon): Reconcile with functions (currently reuses plugin framework intents).
+class MarkdownToolkit extends Toolkit.make(
+  Tool.make('create-document', {
+    description: 'Creates a new markdown document.',
+    parameters: {
+      name: Schema.optional(Schema.String),
+      content: Schema.optional(Schema.String),
+    },
+    // TODO(wittjosiah): Return document.
+    success: Schema.Any,
+    failure: Schema.Never,
+  }),
+) {
+  static layer = (context: PluginContext) =>
+    MarkdownToolkit.toLayer({
+      'create-document': ({ name, content }) => {
+        const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+        const space = getActiveSpace(context);
+        invariant(space, 'No active space');
+
+        return Effect.gen(function* () {
+          const { object } = yield* dispatch(createIntent(MarkdownAction.Create, { name, content }));
+          yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space }));
+          return { id: object.id };
+        }).pipe(Effect.orDie);
+      },
+    });
+}
+
+export default (context: PluginContext): Capability<any>[] => [
+  contributes(Capabilities.Toolkit, MarkdownToolkit),
+  contributes(Capabilities.ToolkitHandler, MarkdownToolkit.layer(context)),
+];

package/src/components/MarkdownCard/MarkdownCard.stories.tsx

@@ -2,8 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
@@ -11,8 +9,8 @@ import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Markdown } from '@dxos/plugin-markdown/types';
 import { faker } from '@dxos/random';
+import { withTheme } from '@dxos/react-ui/testing';
 import { CardContainer } from '@dxos/react-ui-stack/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { translations } from '../../translations';
 
@@ -31,11 +29,10 @@ const meta: Meta<typeof MarkdownCard> = {
     );
   },
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [IntentPlugin()],
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'centered',
@@ -48,7 +45,7 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Popover = {
+export const Popover: Story = {
   args: {
     role: 'card--popover',
     subject: Markdown.makeDocument({
@@ -56,9 +53,9 @@ export const Popover = {
       content: faker.lorem.paragraphs(3),
     }),
   },
-} satisfies Story;
+};
 
-export const Intrinsic = {
+export const Intrinsic: Story = {
   args: {
     role: 'card--intrinsic',
     subject: Markdown.makeDocument({
@@ -66,9 +63,9 @@ export const Intrinsic = {
       content: faker.lorem.paragraphs(3),
     }),
   },
-} satisfies Story;
+};
 
-export const Extrinsic = {
+export const Extrinsic: Story = {
   args: {
     role: 'card--extrinsic',
     subject: Markdown.makeDocument({
@@ -76,4 +73,4 @@ export const Extrinsic = {
       content: faker.lorem.paragraphs(3),
     }),
   },
-} satisfies Story;
+};