@dxos/plugin-markdown 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.4-main.dedc0f3",
+  "version": "0.8.4-main.ead640a",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,69 +35,69 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
+    "@automerge/automerge": "3.1.2",
     "@codemirror/search": "^6.5.11",
-    "@codemirror/view": "^6.38.2",
-    "@effect/ai": "0.25.2",
+    "@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.dedc0f3",
-    "@dxos/app-framework": "0.8.4-main.dedc0f3",
-    "@dxos/assistant": "0.8.4-main.dedc0f3",
-    "@dxos/async": "0.8.4-main.dedc0f3",
-    "@dxos/echo": "0.8.4-main.dedc0f3",
-    "@dxos/blueprints": "0.8.4-main.dedc0f3",
-    "@dxos/echo-db": "0.8.4-main.dedc0f3",
-    "@dxos/echo-schema": "0.8.4-main.dedc0f3",
-    "@dxos/functions": "0.8.4-main.dedc0f3",
-    "@dxos/invariant": "0.8.4-main.dedc0f3",
-    "@dxos/lit-ui": "0.8.4-main.dedc0f3",
-    "@dxos/keys": "0.8.4-main.dedc0f3",
-    "@dxos/live-object": "0.8.4-main.dedc0f3",
-    "@dxos/local-storage": "0.8.4-main.dedc0f3",
-    "@dxos/log": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-attention": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-client": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-deck": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-graph": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-preview": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-theme": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-space": "0.8.4-main.dedc0f3",
-    "@dxos/react-client": "0.8.4-main.dedc0f3",
-    "@dxos/react-hooks": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-form": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.dedc0f3",
-    "@dxos/schema": "0.8.4-main.dedc0f3",
-    "@dxos/util": "0.8.4-main.dedc0f3"
+    "@dxos/ai": "0.8.4-main.ead640a",
+    "@dxos/app-framework": "0.8.4-main.ead640a",
+    "@dxos/assistant": "0.8.4-main.ead640a",
+    "@dxos/echo": "0.8.4-main.ead640a",
+    "@dxos/echo-db": "0.8.4-main.ead640a",
+    "@dxos/async": "0.8.4-main.ead640a",
+    "@dxos/functions": "0.8.4-main.ead640a",
+    "@dxos/keys": "0.8.4-main.ead640a",
+    "@dxos/lit-ui": "0.8.4-main.ead640a",
+    "@dxos/blueprints": "0.8.4-main.ead640a",
+    "@dxos/live-object": "0.8.4-main.ead640a",
+    "@dxos/local-storage": "0.8.4-main.ead640a",
+    "@dxos/invariant": "0.8.4-main.ead640a",
+    "@dxos/log": "0.8.4-main.ead640a",
+    "@dxos/plugin-attention": "0.8.4-main.ead640a",
+    "@dxos/plugin-client": "0.8.4-main.ead640a",
+    "@dxos/plugin-deck": "0.8.4-main.ead640a",
+    "@dxos/plugin-graph": "0.8.4-main.ead640a",
+    "@dxos/plugin-preview": "0.8.4-main.ead640a",
+    "@dxos/plugin-space": "0.8.4-main.ead640a",
+    "@dxos/plugin-theme": "0.8.4-main.ead640a",
+    "@dxos/react-client": "0.8.4-main.ead640a",
+    "@dxos/react-hooks": "0.8.4-main.ead640a",
+    "@dxos/react-ui-form": "0.8.4-main.ead640a",
+    "@dxos/react-ui-attention": "0.8.4-main.ead640a",
+    "@dxos/react-ui-stack": "0.8.4-main.ead640a",
+    "@dxos/schema": "0.8.4-main.ead640a",
+    "@dxos/util": "0.8.4-main.ead640a",
+    "@dxos/react-ui-editor": "0.8.4-main.ead640a"
   },
   "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": "7.1.1",
-    "@dxos/plugin-storybook-layout": "0.8.4-main.dedc0f3",
-    "@dxos/debug": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-theme": "0.8.4-main.dedc0f3",
-    "@dxos/random": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
-    "@dxos/storybook-utils": "0.8.4-main.dedc0f3"
+    "@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.ead640a",
+    "@dxos/plugin-storybook-layout": "0.8.4-main.ead640a",
+    "@dxos/plugin-theme": "0.8.4-main.ead640a",
+    "@dxos/random": "0.8.4-main.ead640a",
+    "@dxos/react-ui": "0.8.4-main.ead640a",
+    "@dxos/react-ui-theme": "0.8.4-main.ead640a",
+    "@dxos/storybook-utils": "0.8.4-main.ead640a"
   },
   "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.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.ead640a",
+    "@dxos/react-ui-theme": "0.8.4-main.ead640a"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -28,103 +28,103 @@ 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',
-            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);
-              }
-            },
+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',
+          iconClassName: 'text-indigoSurfaceText',
+          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: () => createIntent(MarkdownAction.Create, {}),
-          }),
-        ),
-    }),
-    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,
-    }),
-  ]);
+      ),
+  }),
+  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,7 +42,7 @@ export default (context: PluginContext) =>
 
         const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(
-          pipe(
+          Function.pipe(
             createIntent(MarkdownAction.Create, { name: data.name, content: data.data }),
             chain(SpaceAction.AddObject, { target }),
           ),

package/src/capabilities/artifact-definition.ts

@@ -5,7 +5,8 @@
 // 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, chain, contributes, createIntent } from '@dxos/app-framework';
@@ -46,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,

package/src/capabilities/intent-resolver.ts

@@ -3,7 +3,8 @@
 //
 
 import { next as A } from '@automerge/automerge';
-import { Option, type Schema } from 'effect';
+import * as Option from 'effect/Option';
+import type * as Schema from 'effect/Schema';
 
 import {
   Capabilities,

package/src/capabilities/toolkit.ts

@@ -2,8 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { AiTool, AiToolkit } from '@effect/ai';
-import { Effect, Schema } from 'effect';
+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';
@@ -13,8 +15,8 @@ import { SpaceAction } from '@dxos/plugin-space/types';
 import { MarkdownAction } from '../types';
 
 // TODO(burdon): Reconcile with functions (currently reuses plugin framework intents).
-class Toolkit extends AiToolkit.make(
-  AiTool.make('create-document', {
+class MarkdownToolkit extends Toolkit.make(
+  Tool.make('create-document', {
     description: 'Creates a new markdown document.',
     parameters: {
       name: Schema.optional(Schema.String),
@@ -26,7 +28,7 @@ class Toolkit extends AiToolkit.make(
   }),
 ) {
   static layer = (context: PluginContext) =>
-    Toolkit.toLayer({
+    MarkdownToolkit.toLayer({
       'create-document': ({ name, content }) => {
         const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const space = getActiveSpace(context);
@@ -42,6 +44,6 @@ class Toolkit extends AiToolkit.make(
 }
 
 export default (context: PluginContext): Capability<any>[] => [
-  contributes(Capabilities.Toolkit, Toolkit),
-  contributes(Capabilities.ToolkitHandler, Toolkit.layer(context)),
+  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,18 +29,17 @@ const meta: Meta<typeof MarkdownCard> = {
     );
   },
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [IntentPlugin()],
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'centered',
     translations,
   },
   tags: ['cards'],
-} satisfies Meta<typeof MarkdownCard>;
+};
 
 export default meta;
 

package/src/components/MarkdownCard/MarkdownCard.tsx

@@ -2,20 +2,20 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pipe } from 'effect';
+import * as Function from 'effect/Function';
 import React, { useCallback } from 'react';
 
 import { LayoutAction, chain, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 import { type PreviewProps } from '@dxos/plugin-preview';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
-import { Button, Icon, useTranslation } from '@dxos/react-ui';
+import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Card } from '@dxos/react-ui-stack';
 import { DataType } from '@dxos/schema';
 
 import { meta } from '../../meta';
 import { Markdown } from '../../types';
-import { getAbstract, getFallbackName } from '../../util';
+import { getContentSnippet, getFallbackName } from '../../util';
 
 // TODO(burdon): Factor out.
 const getTitle = (subject: Markdown.Document | DataType.Text, fallback: string) => {
@@ -29,9 +29,9 @@ const getTitle = (subject: Markdown.Document | DataType.Text, fallback: string)
 // TODO(burdon): Factor out.
 const getSnippet = (subject: Markdown.Document | DataType.Text, fallback: string) => {
   if (Obj.instanceOf(Markdown.Document, subject)) {
-    return getAbstract(subject.content?.target?.content ?? fallback);
+    return Obj.getDescription(subject) || getContentSnippet(subject.content?.target?.content ?? fallback);
   } else if (Obj.instanceOf(DataType.Text, subject)) {
-    return getAbstract(subject.content);
+    return getContentSnippet(subject.content ?? fallback);
   }
 };
 
@@ -46,7 +46,7 @@ export const MarkdownCard = ({ subject, role }: MarkdownCardProps) => {
   const handleNavigate = useCallback(
     () =>
       dispatch(
-        pipe(
+        Function.pipe(
           createIntent(LayoutAction.UpdatePopover, {
             part: 'popover',
             subject: null,
@@ -60,16 +60,17 @@ export const MarkdownCard = ({ subject, role }: MarkdownCardProps) => {
 
   return (
     <Card.SurfaceRoot role={role}>
-      <Card.Heading>{getTitle(subject, t('fallback title'))}</Card.Heading>
-      {snippet && <Card.Text classNames='line-clamp-3 break-words col-span-2'>{snippet}</Card.Text>}
-      {role === 'card--popover' && (
-        <Card.Chrome>
-          <Button onClick={handleNavigate}>
-            <span className='grow'>{t('navigate to document label')}</span>
-            <Icon icon='ph--arrow-right--regular' />
-          </Button>
-        </Card.Chrome>
-      )}
+      <Card.Heading classNames='flex items-center'>
+        {getTitle(subject, t('fallback title'))}
+        <span className='grow' />
+        <IconButton
+          iconOnly
+          icon='ph--arrow-right--regular'
+          label={t('navigate to document label')}
+          onClick={handleNavigate}
+        />
+      </Card.Heading>
+      {snippet && <Card.Text classNames='line-clamp-3 text-sm text-description'>{snippet}</Card.Text>}
     </Card.SurfaceRoot>
   );
 };