@dxos/plugin-markdown 0.8.4-main.fd6878d → 0.8.4-staging.60fe92afc8

package/package.json

@@ -1,100 +1,186 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.4-main.fd6878d",
+  "version": "0.8.4-staging.60fe92afc8",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
+    "#capabilities": {
+      "source": {
+        "node": "./src/capabilities/node.ts",
+        "default": "./src/capabilities/index.ts"
+      },
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "node": "./dist/lib/neutral/capabilities/node.mjs",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/MarkdownPlugin.workerd.ts",
+        "node": "./src/MarkdownPlugin.node.ts",
+        "default": "./src/MarkdownPlugin.tsx"
+      },
+      "types": "./dist/types/src/MarkdownPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/MarkdownPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/MarkdownPlugin.node.mjs",
+      "default": "./dist/lib/neutral/MarkdownPlugin.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": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/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": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/view": "^6.34.1",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@automerge/automerge": "3.3.0-fragments.1",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/view": "^6.43.0",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.36.0",
+    "@effect/experimental": "0.60.0",
+    "@radix-ui/react-context": "1.1.1",
     "react-dropzone": "^14.2.3",
-    "@dxos/ai": "0.8.4-main.fd6878d",
-    "@dxos/app-framework": "0.8.4-main.fd6878d",
-    "@dxos/assistant": "0.8.4-main.fd6878d",
-    "@dxos/async": "0.8.4-main.fd6878d",
-    "@dxos/echo": "0.8.4-main.fd6878d",
-    "@dxos/echo-schema": "0.8.4-main.fd6878d",
-    "@dxos/blueprints": "0.8.4-main.fd6878d",
-    "@dxos/invariant": "0.8.4-main.fd6878d",
-    "@dxos/keys": "0.8.4-main.fd6878d",
-    "@dxos/live-object": "0.8.4-main.fd6878d",
-    "@dxos/log": "0.8.4-main.fd6878d",
-    "@dxos/lit-ui": "0.8.4-main.fd6878d",
-    "@dxos/local-storage": "0.8.4-main.fd6878d",
-    "@dxos/plugin-client": "0.8.4-main.fd6878d",
-    "@dxos/plugin-attention": "0.8.4-main.fd6878d",
-    "@dxos/plugin-graph": "0.8.4-main.fd6878d",
-    "@dxos/plugin-space": "0.8.4-main.fd6878d",
-    "@dxos/plugin-theme": "0.8.4-main.fd6878d",
-    "@dxos/plugin-preview": "0.8.4-main.fd6878d",
-    "@dxos/react-client": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-attention": "0.8.4-main.fd6878d",
-    "@dxos/react-hooks": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-editor": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-form": "0.8.4-main.fd6878d",
-    "@dxos/plugin-deck": "0.8.4-main.fd6878d",
-    "@dxos/schema": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-stack": "0.8.4-main.fd6878d",
-    "@dxos/util": "0.8.4-main.fd6878d"
+    "@dxos/ai": "0.8.4-staging.60fe92afc8",
+    "@dxos/app-framework": "0.8.4-staging.60fe92afc8",
+    "@dxos/app-toolkit": "0.8.4-staging.60fe92afc8",
+    "@dxos/assistant": "0.8.4-staging.60fe92afc8",
+    "@dxos/async": "0.8.4-staging.60fe92afc8",
+    "@dxos/client-protocol": "0.8.4-staging.60fe92afc8",
+    "@dxos/client": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo": "0.8.4-staging.60fe92afc8",
+    "@dxos/compute": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo-client": "0.8.4-staging.60fe92afc8",
+    "@dxos/functions-runtime": "0.8.4-staging.60fe92afc8",
+    "@dxos/effect": "0.8.4-staging.60fe92afc8",
+    "@dxos/invariant": "0.8.4-staging.60fe92afc8",
+    "@dxos/keys": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-attention": "0.8.4-staging.60fe92afc8",
+    "@dxos/log": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-graph": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-space": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-client": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-preview": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-attention": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-client": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-editor": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-mosaic": "0.8.4-staging.60fe92afc8",
+    "@dxos/types": "0.8.4-staging.60fe92afc8",
+    "@dxos/schema": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-editor": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/util": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui-form": "0.8.4-staging.60fe92afc8"
   },
   "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/plugin-storybook-layout": "0.8.4-main.fd6878d",
-    "@dxos/debug": "0.8.4-main.fd6878d",
-    "@dxos/random": "0.8.4-main.fd6878d",
-    "@dxos/react-ui-theme": "0.8.4-main.fd6878d",
-    "@dxos/react-ui": "0.8.4-main.fd6878d",
-    "@dxos/plugin-theme": "0.8.4-main.fd6878d",
-    "@dxos/storybook-utils": "0.8.4-main.fd6878d"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.96.1",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.21.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.16",
+    "@dxos/plugin-testing": "0.8.4-staging.60fe92afc8",
+    "@dxos/debug": "0.8.4-staging.60fe92afc8",
+    "@dxos/plugin-theme": "0.8.4-staging.60fe92afc8",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/storybook-utils": "0.8.4-staging.60fe92afc8",
+    "@dxos/random": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8"
   },
   "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.fd6878d",
-    "@dxos/react-ui-theme": "0.8.4-main.fd6878d"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.96.1",
+    "effect": "3.21.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
+    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.node.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Text } from '@dxos/schema';
+
+import { CreateObject, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { Markdown } from '#types';
+
+export const MarkdownPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Markdown.Document, Text.Text] }),
+  Plugin.make,
+);
+
+export default MarkdownPlugin;

package/src/MarkdownPlugin.test.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { MarkdownPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('MarkdownPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), MarkdownPlugin()],
+    });
+
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('CreateObject'), moduleId('schema'), moduleId('OperationHandler')]),
+    );
+  });
+});

package/src/MarkdownPlugin.tsx

@@ -2,114 +2,63 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { type Obj, Ref } from '@dxos/echo';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
-import { createDocAccessor, getTextInRange } from '@dxos/react-client/echo';
-import { translations as editorTranslations } from '@dxos/react-ui-editor';
-import { DataType } from '@dxos/schema';
+import { Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { translations as editorTranslations } from '@dxos/react-ui-editor/translations';
+import { Text } from '@dxos/schema';
 
 import {
   AnchorSort,
+  AppGraphBuilder,
+  NavigationResolver,
   AppGraphSerializer,
-  IntentResolver,
+  BlueprintDefinition,
+  CommentConfig,
+  CreateObject,
   MarkdownSettings,
   MarkdownState,
+  OperationHandler,
   ReactSurface,
-} from './capabilities';
-import { MarkdownEvents } from './events';
-import { meta } from './meta';
-import { translations } from './translations';
-import { Markdown, MarkdownAction } from './types';
-import { serializer } from './util';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { Markdown, MarkdownEvents } from '#types';
 
-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);
-              }
-            },
-          },
-        }),
-    }),
-    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,
-    }),
-  ]);
+export const MarkdownPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addNavigationResolverModule({ activate: NavigationResolver }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Markdown.Document, Text.Text] }),
+  AppPlugin.addSurfaceModule({
+    activate: ReactSurface,
+    firesBeforeActivation: [MarkdownEvents.SetupExtensions],
+  }),
+  AppPlugin.addTranslationsModule({ translations: [...translations, ...editorTranslations] }),
+  Plugin.addModule({
+    activatesOn: AppActivationEvents.SetupSettings,
+    activate: MarkdownSettings,
+  }),
+  Plugin.addModule({
+    id: '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: AppActivationEvents.SetupSettings,
+    activate: MarkdownState,
+  }),
+  Plugin.addModule({
+    activatesOn: AppActivationEvents.AppGraphReady,
+    activate: AppGraphSerializer,
+  }),
+  Plugin.addModule({
+    // TODO(wittjosiah): More relevant event?
+    activatesOn: AppActivationEvents.AppGraphReady,
+    activate: AnchorSort,
+  }),
+  Plugin.make,
+);
+
+export default MarkdownPlugin;

package/src/MarkdownPlugin.workerd.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Text } from '@dxos/schema';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { Markdown } from '#types';
+
+export const MarkdownPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Markdown.Document, Text.Text] }),
+  Plugin.make,
+);
+
+export default MarkdownPlugin;

package/src/blueprints/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as MarkdownBlueprint } from './markdown-blueprint';

package/src/blueprints/markdown-blueprint.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Blueprint, Template } from '@dxos/compute';
+import { trim } from '@dxos/util';
+
+import { Markdown, MarkdownOperation } from '#types';
+
+const make = () =>
+  Blueprint.make({
+    key: Markdown.BLUEPRINT_KEY,
+    name: 'Markdown',
+    description: 'Work with markdown documents. Preferred over raw database operations.',
+    tools: Blueprint.toolDefinitions({
+      operations: [MarkdownOperation.Create, MarkdownOperation.Open, MarkdownOperation.Update],
+    }),
+    instructions: Template.make({
+      // TODO(wittjosiah): Move example to function input schema annotation.
+      source: trim`
+        {{! Markdown }}
+
+        You can create, read 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.
+
+        Example:
+        ${'```'}diff
+        - "There is a tyop in this sentence."
+        + "There is a typo in this sentence."
+        - "This id good."
+        + "This sentence is really good."
+        ${'```'}
+      `,
+    }),
+  });
+
+const blueprint: Blueprint.Definition = {
+  key: Markdown.BLUEPRINT_KEY,
+  make,
+};
+
+export default blueprint;

package/src/capabilities/anchor-sort.ts

@@ -2,29 +2,36 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes } from '@dxos/app-framework';
-import { Type } from '@dxos/echo';
-import { createDocAccessor, getRangeFromCursor, getTarget } from '@dxos/react-client/echo';
+import * as Effect from 'effect/Effect';
 
-import { Markdown } from '../types';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Relation, Type } from '@dxos/echo';
+import { createDocAccessor, getRangeFromCursor } from '@dxos/echo-client';
+import { type AnchoredTo } from '@dxos/types';
 
-export default () =>
-  contributes(Capabilities.AnchorSort, {
-    key: Type.getTypename(Markdown.Document)!,
-    sort: (anchorA, anchorB) => {
-      const doc = getTarget(anchorA) as Markdown.Document;
-      const accessor = doc.content.target ? createDocAccessor(doc.content.target, ['content']) : undefined;
-      if (doc !== getTarget(anchorB) || !accessor) {
-        return 0;
-      }
+import { Markdown } from '#types';
 
-      const getStartPosition = (cursor: string | undefined) => {
-        const range = cursor ? getRangeFromCursor(accessor, cursor) : undefined;
-        return range?.start ?? Number.MAX_SAFE_INTEGER;
-      };
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(AppCapabilities.AnchorSort, {
+      key: Type.getTypename(Markdown.Document),
+      sort: (anchorA: AnchoredTo.AnchoredTo, anchorB: AnchoredTo.AnchoredTo) => {
+        const doc = Relation.getTarget(anchorA) as Markdown.Document;
+        const accessor = doc.content.target ? createDocAccessor(doc.content.target, ['content']) : undefined;
+        if (doc !== Relation.getTarget(anchorB) || !accessor) {
+          return 0;
+        }
 
-      const posA = getStartPosition(anchorA.anchor);
-      const posB = getStartPosition(anchorB.anchor);
-      return posA - posB;
-    },
-  });
+        const getStartPosition = (cursor: string | undefined) => {
+          const range = cursor ? getRangeFromCursor(accessor, cursor) : undefined;
+          return range?.start ?? Number.MAX_SAFE_INTEGER;
+        };
+
+        const posA = getStartPosition(anchorA.anchor);
+        const posB = getStartPosition(anchorB.anchor);
+        return posA - posB;
+      },
+    }),
+  ),
+);