@dxos/plugin-markdown 0.8.2-main.fbd8ed0 → 0.8.2-staging.4d6ad0f

package/dist/types/src/types/types.d.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'effect';
+import { Type } from '@dxos/echo';
 import { type Extension, EditorViewMode } from '@dxos/react-ui-editor';
 import { DocumentType } from './schema';
 export declare namespace MarkdownAction {
@@ -6,12 +7,13 @@ export declare namespace MarkdownAction {
         readonly _tag: Schema.tag<"dxos.org/plugin/markdown/action">;
     } & {
         input: Schema.Struct<{
-            spaceId: Schema.Schema<import("@dxos/keys").SpaceId, string, never> & {
+            spaceId: Schema.Schema<Type.SpaceId, string, never> & {
                 byteLength: number;
-                encode: (value: Uint8Array) => import("@dxos/keys").SpaceId;
-                decode: (value: import("@dxos/keys").SpaceId) => Uint8Array;
-                isValid: (value: string) => value is import("@dxos/keys").SpaceId;
-                random: () => import("@dxos/keys").SpaceId;
+                encode: (value: Uint8Array) => Type.SpaceId;
+                decode: (value: Type.SpaceId) => Uint8Array;
+                isValid: (value: string) => value is Type.SpaceId;
+                make: (value: string) => Type.SpaceId;
+                random: () => Type.SpaceId;
             };
             name: Schema.optional<typeof Schema.String>;
             content: Schema.optional<typeof Schema.String>;
@@ -24,110 +26,6 @@ export declare namespace MarkdownAction {
                     readonly id: string;
                     content: string;
                 }>;
-                threads: Schema.mutable<Schema.Array$<import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").TypedObjectFields<{
-                    name: Schema.optional<typeof Schema.String>;
-                    anchor: Schema.optional<typeof Schema.String>;
-                    status: Schema.optional<Schema.Union<[Schema.Literal<["staged"]>, Schema.Literal<["active"]>, Schema.Literal<["resolved"]>]>>;
-                    messages: Schema.mutable<Schema.Array$<import("@dxos/echo-schema").Ref$<{
-                        readonly id: string;
-                        created: string;
-                        sender: {
-                            name?: string | undefined;
-                            contact?: import("@dxos/echo-schema").Ref<{
-                                readonly id: string;
-                                fields?: {
-                                    readonly value: string;
-                                    readonly label: string;
-                                    readonly category?: string | undefined;
-                                }[] | undefined;
-                                organization?: import("@dxos/echo-schema").Ref<{
-                                    readonly id: string;
-                                    description?: string | undefined;
-                                    name?: string | undefined;
-                                    status?: "prospect" | "qualified" | "active" | "commit" | "reject" | undefined;
-                                    image?: string | undefined;
-                                    website?: string | undefined;
-                                }> | undefined;
-                                image?: string | undefined;
-                                fullName?: string | undefined;
-                                preferredName?: string | undefined;
-                                nickname?: string | undefined;
-                                jobTitle?: string | undefined;
-                                department?: string | undefined;
-                                notes?: string | undefined;
-                                emails?: {
-                                    readonly value: string;
-                                    readonly label?: string | undefined;
-                                }[] | undefined;
-                                identities?: {
-                                    readonly value: string;
-                                    readonly label?: string | undefined;
-                                }[] | undefined;
-                                phoneNumbers?: {
-                                    readonly value: string;
-                                    readonly label?: string | undefined;
-                                }[] | undefined;
-                                addresses?: {
-                                    readonly value: {
-                                        readonly street?: string | undefined;
-                                        readonly extended?: string | undefined;
-                                        readonly locality?: string | undefined;
-                                        readonly region?: string | undefined;
-                                        readonly postalCode?: string | undefined;
-                                        readonly postOfficeBoxNumber?: string | undefined;
-                                        readonly country?: string | undefined;
-                                    };
-                                    readonly label?: string | undefined;
-                                }[] | undefined;
-                                urls?: {
-                                    readonly value: string;
-                                    readonly label?: string | undefined;
-                                }[] | undefined;
-                                birthday?: string | undefined;
-                            }> | undefined;
-                            identityDid?: string | undefined;
-                            identityKey?: string | undefined;
-                            email?: string | undefined;
-                            role?: "user" | "assistant" | undefined;
-                        };
-                        blocks: ({
-                            pending?: boolean | undefined;
-                            type: "text";
-                            disposition?: string | undefined;
-                            text: string;
-                        } | {
-                            pending?: boolean | undefined;
-                            type: "json";
-                            disposition?: string | undefined;
-                            data: string;
-                        } | {
-                            pending?: boolean | undefined;
-                            id?: string | undefined;
-                            type: "image";
-                            source?: {
-                                type: "base64";
-                                data: string;
-                                mediaType: string;
-                            } | {
-                                type: "http";
-                                url: string;
-                            } | undefined;
-                        } | {
-                            pending?: boolean | undefined;
-                            type: "reference";
-                            reference: import("@dxos/echo-schema").Ref<import("@dxos/echo-schema").Expando>;
-                        } | {
-                            pending?: boolean | undefined;
-                            type: "transcription";
-                            text: string;
-                            started: string;
-                        })[];
-                        properties?: {
-                            [x: string]: any;
-                        } | undefined;
-                    }>>>;
-                }, import("@dxos/echo-schema").TypedObjectOptions>>>>;
-                assistantChatQueue: Schema.optional<import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").Expando>>;
             }>, {}>;
         }>;
     }>;

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,KAAK,SAAS,EAAmB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAKxC,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAYU,CAAC;mCAAyC,CAAC;;sCAEnE,CAAC;;;qDAO6B,CAAA;;4CAGI,CAAC;;+CAI5C,CAAC;wCACU,CAAC;0CACN,CAAC;yCAE6C,CAAC;2CAE5D,CAAD;;qCAG2B,CAAC;wCAEzB,CAAA;6CACc,CAAC;wCACT,CAAC;wCACL,CAAC;0CACI,CAAC;qCACH,CAAC;sCACH,CAAA;;kDACsC,CAAC;;0CAK9B,CAAC;;kDACL,CAAC;;4CAAmF,CAAC;;kDAAkF,CAAC;;yCAAgF,CAAC;;uDAAiF,CAAC;yDAA+D,CAAC;yDAA+D,CAAC;uDAA6D,CAAC;2DAAiE,CAAC;oEAA0E,CAAC;wDAA8D,CAAC;;kDAA+E,CAAC;;oCAA2E,CAAC;;kDAAkF,CAAC;;wCAA+E,CAAC;;uCAAyE,CAAC;uCAA6C,CAAC;iCAAuC,CAAC;gCAAsC,CAAC;;;mCAAqF,CAAC;;uCAAwE,CAAC;;;mCAAiF,CAAC;;uCAAwE,CAAC;;;mCAAiF,CAAC;8BAAqC,CAAC;;kCAAmE,CAAC;;;;;;;;;mCAA8O,CAAC;;;;mCAA4H,CAAC;;;;;kCAAiJ,CAAC;;;;;;;;;IAnDztE,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAM/B;KAAG;;CACN;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAGrD,MAAM,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,KAAK,SAAS,GAAG,SAAS,CAAC;AAEtG,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAEhC,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAIjD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;GAYlC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,OAAO,EAAE,KAAK,SAAS,EAAmB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAKxC,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;IAC9B,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAM/B;KAAG;;CACN;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAGrD,MAAM,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,KAAK,SAAS,GAAG,SAAS,CAAC;AAEtG,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAEhC,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAIjD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;GAYlC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.2-main.fbd8ed0",
+  "version": "0.8.2-staging.4d6ad0f",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,62 +33,69 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0-beta.0",
+    "@automerge/automerge": "3.0.0-beta.4",
     "@codemirror/search": "^6.5.6",
     "@codemirror/view": "^6.34.1",
-    "@preact/signals-core": "^1.6.0",
-    "effect": "3.14.21",
+    "@preact-signals/safe-react": "^0.9.0",
+    "@preact/signals-core": "^1.9.0",
     "react-dropzone": "^14.2.3",
-    "@dxos/app-framework": "0.8.2-main.fbd8ed0",
-    "@dxos/artifact": "0.8.2-main.fbd8ed0",
-    "@dxos/async": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
-    "@dxos/invariant": "0.8.2-main.fbd8ed0",
-    "@dxos/lit-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/keys": "0.8.2-main.fbd8ed0",
-    "@dxos/echo": "0.8.2-main.fbd8ed0",
-    "@dxos/live-object": "0.8.2-main.fbd8ed0",
-    "@dxos/local-storage": "0.8.2-main.fbd8ed0",
-    "@dxos/log": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-attention": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-deck": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-preview": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-client": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-graph": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-theme": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-space": "0.8.2-main.fbd8ed0",
-    "@dxos/react-client": "0.8.2-main.fbd8ed0",
-    "@dxos/react-hooks": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-attention": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-editor": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-card": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-form": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-stack": "0.8.2-main.fbd8ed0",
-    "@dxos/schema": "0.8.2-main.fbd8ed0",
-    "@dxos/util": "0.8.2-main.fbd8ed0"
+    "@dxos/ai": "0.8.2-staging.4d6ad0f",
+    "@dxos/app-framework": "0.8.2-staging.4d6ad0f",
+    "@dxos/async": "0.8.2-staging.4d6ad0f",
+    "@dxos/artifact": "0.8.2-staging.4d6ad0f",
+    "@dxos/assistant": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-schema": "0.8.2-staging.4d6ad0f",
+    "@dxos/invariant": "0.8.2-staging.4d6ad0f",
+    "@dxos/keys": "0.8.2-staging.4d6ad0f",
+    "@dxos/live-object": "0.8.2-staging.4d6ad0f",
+    "@dxos/lit-ui": "0.8.2-staging.4d6ad0f",
+    "@dxos/local-storage": "0.8.2-staging.4d6ad0f",
+    "@dxos/log": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-deck": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-graph": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-preview": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-attention": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-client": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-space": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-theme": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-hooks": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-client": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-attention": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-card": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-editor": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-stack": "0.8.2-staging.4d6ad0f",
+    "@dxos/schema": "0.8.2-staging.4d6ad0f",
+    "@dxos/util": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-form": "0.8.2-staging.4d6ad0f"
   },
   "devDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "3.14.21",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/debug": "0.8.2-main.fbd8ed0",
-    "@dxos/random": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-storybook-layout": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-theme": "0.8.2-main.fbd8ed0",
-    "@dxos/storybook-utils": "0.8.2-main.fbd8ed0"
+    "@dxos/plugin-theme": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-storybook-layout": "0.8.2-staging.4d6ad0f",
+    "@dxos/random": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui": "0.8.2-staging.4d6ad0f",
+    "@dxos/storybook-utils": "0.8.2-staging.4d6ad0f",
+    "@dxos/debug": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-theme": "0.8.2-staging.4d6ad0f"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0"
+    "@dxos/react-ui": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-theme": "0.8.2-staging.4d6ad0f"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -6,19 +6,20 @@ import { Capabilities, contributes, createIntent, defineModule, definePlugin, Ev
 import { isInstanceOf, type BaseObject } from '@dxos/echo-schema';
 import { RefArray } from '@dxos/live-object';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities, ThreadEvents } from '@dxos/plugin-space';
+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 {
+  AnchorSort,
   AppGraphSerializer,
   ArtifactDefinition,
   IntentResolver,
   MarkdownState,
   MarkdownSettings,
   ReactSurface,
-  Thread,
 } from './capabilities';
 import { MarkdownEvents } from './events';
 import { meta } from './meta';
@@ -60,9 +61,17 @@ export const MarkdownPlugin = () =>
               managesAutofocus: true,
             },
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (doc: DocumentType) =>
-              await RefArray.loadAll<BaseObject>([doc.content, ...doc.threads]),
+            loadReferences: async (doc: DocumentType) => await RefArray.loadAll<BaseObject>([doc.content]),
             serializer,
+            // TODO(wittjosiah): Consider how to do generic comments without these.
+            comments: 'anchored',
+            selectionMode: 'multi-range',
+            getAnchorLabel: (doc: DocumentType, anchor: string): string | undefined => {
+              if (doc.content) {
+                const [start, end] = anchor.split(':');
+                return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
+              }
+            },
           },
         }),
     }),
@@ -101,9 +110,10 @@ export const MarkdownPlugin = () =>
       activate: AppGraphSerializer,
     }),
     defineModule({
-      id: `${meta.id}/module/thread`,
-      activatesOn: ThreadEvents.SetupThread,
-      activate: Thread,
+      id: `${meta.id}/module/anchor-sort`,
+      // TODO(wittjosiah): More relevant event?
+      activatesOn: Events.AppGraphReady,
+      activate: AnchorSort,
     }),
     defineModule({
       id: `${meta.id}/module/artifact-definition`,

package/src/capabilities/anchor-sort.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { getSchemaTypename } from '@dxos/echo-schema';
+import { createDocAccessor, getRangeFromCursor, getTarget } from '@dxos/react-client/echo';
+
+import { DocumentType } from '../types';
+
+export default () =>
+  contributes(Capabilities.AnchorSort, {
+    key: getSchemaTypename(DocumentType)!,
+    sort: (anchorA, anchorB) => {
+      const doc = getTarget(anchorA) as DocumentType;
+      const accessor = doc.content.target ? createDocAccessor(doc.content.target, ['content']) : undefined;
+      if (doc !== getTarget(anchorB) || !accessor) {
+        return 0;
+      }
+
+      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;
+    },
+  });

package/src/capabilities/artifact-definition.ts

@@ -2,16 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { pipe, Schema } from 'effect';
 
-import { Capabilities, contributes, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { ArtifactId, defineArtifact, defineTool, ToolResult } from '@dxos/artifact';
+import { createTool, ToolResult } from '@dxos/ai';
+import { Capabilities, chain, contributes, createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
+import { ArtifactId, defineArtifact } from '@dxos/artifact';
+import { createArtifactElement } from '@dxos/assistant';
 import { isInstanceOf } from '@dxos/echo-schema';
 import { invariant, assertArgument } from '@dxos/invariant';
+import { SpaceAction } from '@dxos/plugin-space/types';
 import { Filter, fullyQualifiedId, type Space } from '@dxos/react-client/echo';
 
 import { meta } from '../meta';
-import { DocumentType } from '../types';
+import { DocumentType, MarkdownAction } from '../types';
 
 // TODO(burdon): Factor out.
 declare global {
@@ -32,7 +35,40 @@ export default () => {
     `,
     schema: DocumentType,
     tools: [
-      defineTool(meta.id, {
+      createTool(meta.id, {
+        name: 'create',
+        description: 'Create a new markdown document',
+        caption: 'Creating document...',
+        schema: Schema.Struct({
+          name: Schema.optional(Schema.String).annotations({
+            description: 'Optional name for the document.',
+          }),
+          content: Schema.String.annotations({
+            description: 'The content of the document.',
+          }),
+        }),
+        execute: async ({ name, content }, { extensions }) => {
+          invariant(extensions?.space, 'No space');
+          invariant(extensions?.dispatch, 'No intent dispatcher');
+
+          const intent = pipe(
+            createIntent(MarkdownAction.Create, {
+              spaceId: extensions.space.id,
+              name,
+              content,
+            }),
+            chain(SpaceAction.AddObject, { target: extensions.space }),
+          );
+
+          const { data, error } = await extensions.dispatch(intent);
+          if (!data || error) {
+            return ToolResult.Error(error?.message ?? 'Failed to create document');
+          }
+
+          return ToolResult.Success(createArtifactElement(data.id));
+        },
+      }),
+      createTool(meta.id, {
         name: 'list',
         description: 'List all markdown documents in the current space.',
         caption: 'Listing markdown documents...',
@@ -53,7 +89,7 @@ export default () => {
           return ToolResult.Success(documentInfo);
         },
       }),
-      defineTool(meta.id, {
+      createTool(meta.id, {
         name: 'inspect',
         description: 'Read the content of a markdown document.',
         caption: 'Inspecting markdown document...',
@@ -62,7 +98,7 @@ export default () => {
         }),
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
-          const document = await extensions.space.db.query({ id: ArtifactId.toDXN(id).toString() }).first();
+          const document = await extensions.space.db.query(Filter.ids(ArtifactId.toDXN(id).toString())).first();
           assertArgument(isInstanceOf(DocumentType, document), 'Invalid type');
 
           const { content } = await document.content?.load();

package/src/capabilities/index.ts

@@ -4,12 +4,12 @@
 
 import { lazy } from '@dxos/app-framework';
 
+export const AnchorSort = lazy(() => import('./anchor-sort'));
 export const AppGraphSerializer = lazy(() => import('./app-graph-serializer'));
 export const ArtifactDefinition = lazy(() => import('./artifact-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 Thread = lazy(() => import('./thread'));
 
 export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -3,6 +3,7 @@
 //
 
 import { next as A } from '@automerge/automerge';
+import { Option, pipe, type Schema } from 'effect';
 
 import {
   Capabilities,
@@ -11,12 +12,9 @@ import {
   createResolver,
   type PluginContext,
 } from '@dxos/app-framework';
-import { createQueueDxn, isInstanceOf } from '@dxos/echo-schema';
-import { makeRef, live, refFromDXN } from '@dxos/live-object';
-import { log } from '@dxos/log';
-import { ClientCapabilities } from '@dxos/plugin-client';
-import { resolveRef } from '@dxos/react-client';
-import { createDocAccessor } from '@dxos/react-client/echo';
+import { isInstanceOf } from '@dxos/echo-schema';
+import { live } from '@dxos/live-object';
+import { createDocAccessor, getRangeFromCursor, Ref } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
 
 import { MarkdownCapabilities } from './capabilities';
@@ -26,12 +24,10 @@ export default (context: PluginContext) =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
       intent: MarkdownAction.Create,
-      resolve: ({ name, spaceId, content }) => {
+      resolve: ({ name, content }) => {
         const doc = live(DocumentType, {
           name,
-          content: makeRef(live(DataType.Text, { content: content ?? '' })),
-          assistantChatQueue: refFromDXN(createQueueDxn(spaceId)),
-          threads: [],
+          content: Ref.make(live(DataType.Text, { content: content ?? '' })),
         });
 
         return { data: { object: doc } };
@@ -44,26 +40,25 @@ export default (context: PluginContext) =>
         state.viewMode[id] = viewMode;
       },
     }),
-    // TODO(burdon): What is the error boundary for intents? Are errors reported back to caller?
     createResolver({
       intent: CollaborationActions.InsertContent,
-      resolve: async ({ spaceId, target: targetRef, object: objectRef, label }) => {
-        const client = context.getCapability(ClientCapabilities.Client);
-        const space = client.spaces.get(spaceId);
-        const target = await resolveRef(client, targetRef.dxn, space);
-        if (target && isInstanceOf(DocumentType, target)) {
-          const accessor = createDocAccessor(target, ['content']);
-          // TODO(burdon): Should be a cursor that references a selected position.
-          const index = 0;
-          accessor.handle.change((doc) => {
-            // TODO(burdon): Throws error:
-            // intent-dispatcher.ts:270 Cannot read properties of undefined (reading 'annotations') (FiberFailure) TypeError: Cannot read properties of undefined (reading 'annotations')
-            const ref = `[${label ?? 'Generated content'}]](${objectRef.dxn.toString()})\n`;
-            A.splice(doc, accessor.path.slice(), index, 0, ref);
-          });
-        } else {
-          log.warn('target is not a document', { targetRef, objectRef });
-        }
+      filter: (
+        data,
+      ): data is Omit<Schema.Schema.Type<typeof CollaborationActions.InsertContent.fields.input>, 'target'> & {
+        target: DocumentType;
+      } => isInstanceOf(DocumentType, data.target),
+      resolve: async ({ target, object: objectRef, at, label }) => {
+        const text = await target.content.load();
+        const accessor = createDocAccessor(text, ['content']);
+        const { start, end } = pipe(
+          Option.fromNullable(at),
+          Option.flatMap((at) => Option.fromNullable(getRangeFromCursor(accessor, at))),
+          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);
+        });
       },
     }),
   ]);

package/src/capabilities/react-surface.tsx

@@ -7,6 +7,7 @@ import React from 'react';
 import { createSurface, contributes, Capabilities, useCapability } from '@dxos/app-framework';
 import { isInstanceOf } from '@dxos/echo-schema';
 import { SettingsStore } from '@dxos/local-storage';
+import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
 
@@ -23,6 +24,7 @@ export default () =>
       filter: (data): data is { subject: DocumentType; variant: undefined } =>
         isInstanceOf(DocumentType, data.subject) && !data.variant,
       component: ({ data, role }) => {
+        const selectionManager = useCapability(AttentionCapabilities.Selection);
         const settingsStore = useCapability(Capabilities.SettingsStore);
         const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
         const { state, editorState, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
@@ -34,6 +36,7 @@ export default () =>
             object={data.subject}
             role={role}
             settings={settings}
+            selectionManager={selectionManager}
             extensionProviders={state.extensionProviders}
             viewMode={viewMode}
             editorStateStore={editorState}
@@ -48,6 +51,7 @@ export default () =>
       filter: (data): data is { id: string; subject: DataType.Text } =>
         typeof data.id === 'string' && isInstanceOf(DataType.Text, data.subject),
       component: ({ data, role }) => {
+        const selectionManager = useCapability(AttentionCapabilities.Selection);
         const settingsStore = useCapability(Capabilities.SettingsStore);
         const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
         const { state, editorState, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
@@ -58,6 +62,7 @@ export default () =>
             object={data.subject}
             role={role}
             settings={settings}
+            selectionManager={selectionManager}
             extensionProviders={state.extensionProviders}
             viewMode={getViewMode(data.id)}
             editorStateStore={editorState}
@@ -71,6 +76,7 @@ export default () =>
       role: ['article', 'section'],
       filter: (data): data is { subject: { id: string; text: string } } => isEditorModel(data.subject),
       component: ({ data, role }) => {
+        const selectionManager = useCapability(AttentionCapabilities.Selection);
         const settingsStore = useCapability(Capabilities.SettingsStore);
         const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
         const { state, editorState, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
@@ -81,6 +87,7 @@ export default () =>
             object={data.subject}
             role={role}
             settings={settings}
+            selectionManager={selectionManager}
             extensionProviders={state.extensionProviders}
             viewMode={getViewMode(data.subject.id)}
             editorStateStore={editorState}