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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.4-main.fcfe5033a5",
+  "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",
@@ -8,159 +8,179 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#blueprints": "./src/blueprints/index.ts",
+    "#blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
     "#capabilities": {
-      "source": "./src/capabilities/index.ts",
-      "types": "./src/capabilities/index.ts",
-      "browser": "./src/capabilities/index.ts",
-      "node": "./src/capabilities/node.ts"
+      "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"
     },
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
-    "#testing": "./src/testing.ts",
-    "#types": "./src/types/index.ts"
+    "#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",
-      "browser": "./dist/lib/browser/blueprints/index.mjs",
-      "node": "./dist/lib/node-esm/blueprints/index.mjs"
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
     },
-    "./cli": {
-      "source": "./src/cli/index.ts",
-      "types": "./dist/types/src/cli/index.d.ts",
-      "browser": "./dist/lib/browser/cli/index.mjs",
-      "node": "./dist/lib/node-esm/cli/index.mjs"
-    },
-    "./operations": {
-      "source": "./src/operations/index.ts",
-      "types": "./dist/types/src/operations/index.d.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "node": "./dist/lib/node-esm/operations/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",
-      "browser": "./dist/lib/browser/testing.mjs",
-      "node": "./dist/lib/node-esm/testing.mjs"
+      "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": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "operations": [
-        "dist/types/src/operations/index.d.ts"
-      ],
-      "toolkit": [
-        "dist/types/src/toolkit.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.2.3",
-    "@codemirror/search": "^6.5.11",
-    "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
-    "@effect-atom/atom": "^0.5.1",
+    "@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.33.2",
-    "@effect/experimental": "0.58.0",
+    "@effect/ai": "0.36.0",
+    "@effect/experimental": "0.60.0",
     "@radix-ui/react-context": "1.1.1",
     "react-dropzone": "^14.2.3",
-    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
-    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
-    "@dxos/assistant": "0.8.4-main.fcfe5033a5",
-    "@dxos/blueprints": "0.8.4-main.fcfe5033a5",
-    "@dxos/client-protocol": "0.8.4-main.fcfe5033a5",
-    "@dxos/ai": "0.8.4-main.fcfe5033a5",
-    "@dxos/async": "0.8.4-main.fcfe5033a5",
-    "@dxos/effect": "0.8.4-main.fcfe5033a5",
-    "@dxos/functions": "0.8.4-main.fcfe5033a5",
-    "@dxos/echo-db": "0.8.4-main.fcfe5033a5",
-    "@dxos/functions-runtime": "0.8.4-main.fcfe5033a5",
-    "@dxos/keys": "0.8.4-main.fcfe5033a5",
-    "@dxos/lit-ui": "0.8.4-main.fcfe5033a5",
-    "@dxos/invariant": "0.8.4-main.fcfe5033a5",
-    "@dxos/operation": "0.8.4-main.fcfe5033a5",
-    "@dxos/log": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-attention": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-client": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-deck": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-space": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-preview": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-theme": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-client": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-graph": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-hooks": "0.8.4-main.fcfe5033a5",
-    "@dxos/echo": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-editor": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-form": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-menu": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-attention": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui-stack": "0.8.4-main.fcfe5033a5",
-    "@dxos/schema": "0.8.4-main.fcfe5033a5",
-    "@dxos/types": "0.8.4-main.fcfe5033a5",
-    "@dxos/ui": "0.8.4-main.fcfe5033a5",
-    "@dxos/util": "0.8.4-main.fcfe5033a5",
-    "@dxos/ui-editor": "0.8.4-main.fcfe5033a5"
+    "@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-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
+    "@effect/platform": "0.96.1",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.20.0",
+    "effect": "3.21.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/debug": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-testing": "0.8.4-main.fcfe5033a5",
-    "@dxos/plugin-theme": "0.8.4-main.fcfe5033a5",
-    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
-    "@dxos/random": "0.8.4-main.fcfe5033a5",
-    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
-    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
+    "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-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
-    "effect": "3.20.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-main.fcfe5033a5",
-    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
+    "@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,76 +2,34 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Annotation, type Obj, Ref } from '@dxos/echo';
-import { createDocAccessor, getTextInRange } from '@dxos/echo-db';
-import { Operation } from '@dxos/operation';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
-import { translations as editorTranslations } from '@dxos/react-ui-editor';
+import { translations as editorTranslations } from '@dxos/react-ui-editor/translations';
 import { Text } from '@dxos/schema';
 
-import { MarkdownBlueprint } from '#blueprints';
 import {
   AnchorSort,
+  AppGraphBuilder,
+  NavigationResolver,
   AppGraphSerializer,
   BlueprintDefinition,
+  CommentConfig,
+  CreateObject,
   MarkdownSettings,
   MarkdownState,
   OperationHandler,
   ReactSurface,
 } from '#capabilities';
 import { meta } from '#meta';
-import { MarkdownOperation } from '#operations';
+import { translations } from '#translations';
 import { Markdown, MarkdownEvents } from '#types';
 
-import { translations } from './translations';
-import { serializer } from './util';
-
 export const MarkdownPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addNavigationResolverModule({ activate: NavigationResolver }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Markdown.Document.typename,
-      metadata: {
-        // TODO(dmaretskyi): Remove label, icon and iconHue and query them of schema.
-        label: (object: Markdown.Document) => object.name || object.fallbackName,
-        icon: Annotation.IconAnnotation.get(Markdown.Document).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(Markdown.Document).pipe(Option.getOrThrow).hue ?? 'white',
-        blueprints: [MarkdownBlueprint.key],
-        graphProps: {
-          managesAutofocus: true,
-        },
-        // TODO(wittjosiah): Move out of metadata.
-        loadReferences: async (doc: Markdown.Document) => await Ref.Array.loadAll<Obj.Unknown>([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);
-          }
-        },
-        createObject: ((props, options) =>
-          Effect.gen(function* () {
-            const object = Markdown.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              hidden: true,
-              targetNodeId: options.targetNodeId,
-            });
-          })) satisfies CreateObject,
-        scrollToAnchor: MarkdownOperation.ScrollToAnchor,
-      },
-    },
-  }),
+  AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({ schema: [Markdown.Document, Text.Text] }),
   AppPlugin.addSurfaceModule({
@@ -102,3 +60,5 @@ export const MarkdownPlugin = Plugin.define(meta).pipe(
   }),
   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/markdown-blueprint.ts

@@ -2,20 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { Blueprint, Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/compute';
 import { trim } from '@dxos/util';
 
-import { Create, Open, Update } from '../operations/definitions';
-
-const BLUEPRINT_KEY = 'org.dxos.blueprint.markdown';
+import { Markdown, MarkdownOperation } from '#types';
 
 const make = () =>
   Blueprint.make({
-    key: BLUEPRINT_KEY,
+    key: Markdown.BLUEPRINT_KEY,
     name: 'Markdown',
     description: 'Work with markdown documents. Preferred over raw database operations.',
-    tools: Blueprint.toolDefinitions({ operations: [Create, Open, Update] }),
+    tools: Blueprint.toolDefinitions({
+      operations: [MarkdownOperation.Create, MarkdownOperation.Open, MarkdownOperation.Update],
+    }),
     instructions: Template.make({
       // TODO(wittjosiah): Move example to function input schema annotation.
       source: trim`
@@ -36,8 +35,8 @@ const make = () =>
     }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
-  key: BLUEPRINT_KEY,
+const blueprint: Blueprint.Definition = {
+  key: Markdown.BLUEPRINT_KEY,
   make,
 };
 

package/src/capabilities/anchor-sort.ts

@@ -6,8 +6,8 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Relation } from '@dxos/echo';
-import { createDocAccessor, getRangeFromCursor } from '@dxos/echo-db';
+import { Relation, Type } from '@dxos/echo';
+import { createDocAccessor, getRangeFromCursor } from '@dxos/echo-client';
 import { type AnchoredTo } from '@dxos/types';
 
 import { Markdown } from '#types';
@@ -15,7 +15,7 @@ import { Markdown } from '#types';
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(AppCapabilities.AnchorSort, {
-      key: Markdown.Document.typename,
+      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;

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

@@ -0,0 +1,63 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation, createTypeSectionExtension } from '@dxos/app-toolkit';
+import { isSpace } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
+import { Type } from '@dxos/echo';
+import { GraphBuilder, Node } from '@dxos/plugin-graph';
+import { SpaceOperation } from '@dxos/plugin-space';
+
+import { Markdown } from '#types';
+
+import { getDocumentsPath } from '../paths';
+
+const documentTypename = Type.getTypename(Markdown.Document);
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* Effect.all([
+      createTypeSectionExtension(Markdown.Document),
+
+      GraphBuilder.createExtension({
+        id: 'documentsSectionActions',
+        match: (node) => {
+          const space = isSpace(node.properties.space) ? node.properties.space : undefined;
+          return node.type === documentTypename && space ? Option.some(space) : Option.none();
+        },
+        actions: (space) =>
+          Effect.succeed([
+            Node.makeAction({
+              id: 'create-document',
+              data: () =>
+                Effect.gen(function* () {
+                  const doc = Markdown.make({});
+                  const { subject } = yield* Operation.invoke(
+                    SpaceOperation.AddObject,
+                    { object: doc, target: space.db, hidden: true, targetNodeId: getDocumentsPath(space.db.spaceId) },
+                    { spaceId: space.db.spaceId },
+                  );
+                  yield* Operation.invoke(
+                    LayoutOperation.Open,
+                    { subject: [...subject] },
+                    { spaceId: space.db.spaceId },
+                  );
+                }),
+              properties: {
+                label: ['add-object.label', { ns: documentTypename }],
+                icon: 'ph--plus--regular',
+                disposition: 'list-item-primary',
+              },
+            }),
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

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

@@ -3,19 +3,18 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
-import { Obj } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { AppCapabilities, RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { Annotation, Collection, Obj, Type } from '@dxos/echo';
+import { SpaceOperation } from '@dxos/plugin-space';
 import { isSpace } from '@dxos/react-client/echo';
 
-import { MarkdownOperation } from '#operations';
+import { translations } from '#translations';
+import { MarkdownOperation } from '#types';
 import { Markdown } from '#types';
 
-import { translations } from '../translations';
-
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     // Get context for lazy capability access in callbacks.
@@ -23,7 +22,7 @@ export default Capability.makeModule(
 
     return Capability.contributes(AppCapabilities.AppGraphSerializer, [
       {
-        inputType: Markdown.Document.typename,
+        inputType: Type.getTypename(Markdown.Document),
         outputType: 'text/markdown',
         // Reconcile with metadata serializers.
         serialize: async (node) => {
@@ -33,7 +32,7 @@ export default Capability.makeModule(
             name:
               doc.name ||
               doc.fallbackName ||
-              translations[0]['en-US'][Markdown.Document.typename]['object-name.placeholder'],
+              translations[0]['en-US'][Type.getTypename(Markdown.Document)]['object-name.placeholder'],
             data: content.content,
             type: 'text/markdown',
           };
@@ -42,7 +41,7 @@ export default Capability.makeModule(
           const space = ancestors.find(isSpace);
           const target =
             ancestors.findLast((ancestor) => Obj.instanceOf(Collection.Collection, ancestor)) ??
-            space?.properties[Collection.Collection.typename]?.target;
+            (space && Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)?.target);
           if (!space || !target) {
             return;
           }

package/src/capabilities/blueprint-definition.ts

@@ -9,9 +9,11 @@ import { AppCapabilities } from '@dxos/app-toolkit';
 
 import { MarkdownBlueprint } from '#blueprints';
 
-const blueprintDefinition = Capability.makeModule<
-  [],
-  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
->(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, MarkdownBlueprint)]));
+// NOTE: Explicit annotation required: d.ts emit cannot portably name the inferred @dxos/compute types (TS2883).
+const blueprintDefinition: () => Effect.Effect<
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[],
+  never,
+  Capability.Service
+> = () => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, MarkdownBlueprint)]);
 
 export default blueprintDefinition;