@dxos/plugin-thread 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.c351d160a8",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,21 +14,21 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts"
     },
     "./blueprints": {
+      "source": "./src/blueprints/index.ts",
       "browser": "./dist/lib/browser/blueprints/index.mjs",
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts"
     }
   },
@@ -51,10 +51,10 @@
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/ai": "0.32.1",
-    "@effect/experimental": "0.57.11",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/experimental": "0.58.0",
     "@peermetrics/webrtc-stats": "5.7.1",
     "date-fns": "^3.3.1",
     "extendable-media-recorder": "^9.2.19",
@@ -62,73 +62,75 @@
     "md5-hex": "5.0.0",
     "react-resize-detector": "^11.0.1",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/assistant": "0.8.4-main.bc674ce",
-    "@dxos/codec-protobuf": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/blueprints": "0.8.4-main.bc674ce",
-    "@dxos/debug": "0.8.4-main.bc674ce",
-    "@dxos/context": "0.8.4-main.bc674ce",
-    "@dxos/devtools": "0.8.4-main.bc674ce",
-    "@dxos/display-name": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/echo-react": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/effect": "0.8.4-main.bc674ce",
-    "@dxos/keys": "0.8.4-main.bc674ce",
-    "@dxos/functions": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/plugin-attention": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-client": "0.8.4-main.bc674ce",
-    "@dxos/plugin-deck": "0.8.4-main.bc674ce",
-    "@dxos/plugin-markdown": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/plugin-space": "0.8.4-main.bc674ce",
-    "@dxos/protocols": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/plugin-observability": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-attention": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-dnd": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-editor": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-form": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-menu": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-sfx": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-mosaic": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-tabs": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-thread": "0.8.4-main.bc674ce",
-    "@dxos/schema": "0.8.4-main.bc674ce",
-    "@dxos/ui-editor": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce",
-    "@dxos/types": "0.8.4-main.bc674ce"
+    "@dxos/app-toolkit": "0.8.4-main.c351d160a8",
+    "@dxos/assistant": "0.8.4-main.c351d160a8",
+    "@dxos/async": "0.8.4-main.c351d160a8",
+    "@dxos/blueprints": "0.8.4-main.c351d160a8",
+    "@dxos/codec-protobuf": "0.8.4-main.c351d160a8",
+    "@dxos/context": "0.8.4-main.c351d160a8",
+    "@dxos/debug": "0.8.4-main.c351d160a8",
+    "@dxos/devtools": "0.8.4-main.c351d160a8",
+    "@dxos/display-name": "0.8.4-main.c351d160a8",
+    "@dxos/echo": "0.8.4-main.c351d160a8",
+    "@dxos/echo-db": "0.8.4-main.c351d160a8",
+    "@dxos/effect": "0.8.4-main.c351d160a8",
+    "@dxos/functions": "0.8.4-main.c351d160a8",
+    "@dxos/keys": "0.8.4-main.c351d160a8",
+    "@dxos/invariant": "0.8.4-main.c351d160a8",
+    "@dxos/log": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-attention": "0.8.4-main.c351d160a8",
+    "@dxos/operation": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-client": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-graph": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-deck": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-markdown": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-observability": "0.8.4-main.c351d160a8",
+    "@dxos/echo-react": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-settings": "0.8.4-main.c351d160a8",
+    "@dxos/protocols": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-space": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-dnd": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-attention": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-form": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-editor": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-menu": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-mosaic": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-sfx": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-stack": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-tabs": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-thread": "0.8.4-main.c351d160a8",
+    "@dxos/schema": "0.8.4-main.c351d160a8",
+    "@dxos/types": "0.8.4-main.c351d160a8",
+    "@dxos/react-client": "0.8.4-main.c351d160a8",
+    "@dxos/ui-editor": "0.8.4-main.c351d160a8",
+    "@dxos/app-framework": "0.8.4-main.c351d160a8",
+    "@dxos/util": "0.8.4-main.c351d160a8"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/plugin-theme": "0.8.4-main.bc674ce",
-    "@dxos/random": "0.8.4-main.bc674ce",
-    "@dxos/plugin-testing": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/plugin-testing": "0.8.4-main.c351d160a8",
+    "@dxos/random": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-theme": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8",
+    "@dxos/storybook-utils": "0.8.4-main.c351d160a8"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -3,11 +3,13 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
-import { Ref, Type } from '@dxos/echo';
+import { Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Annotation, Ref, Type } from '@dxos/echo';
 import { Operation } from '@dxos/operation';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
+import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
 import { type CreateObject } from '@dxos/plugin-space/types';
@@ -22,7 +24,6 @@ import {
   OperationResolver,
   ReactRoot,
   ReactSurface,
-  Repair,
   ThreadState,
 } from './capabilities';
 import { THREAD_ITEM, meta } from './meta';
@@ -35,33 +36,15 @@ import { Channel, ThreadOperation } from './types';
 // TODO(wittjosiah): Rename to ChatPlugin.
 // TODO(wittjosiah): Enabling comments should likely be factored out of this plugin but depend on it's capabilities.
 export const ThreadPlugin = Plugin.define(meta).pipe(
-  Plugin.addModule({
-    id: 'call-manager',
-    activatesOn: ClientEvents.ClientReady,
-    activate: CallManager,
-  }),
-  // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
-  // Plugin.addModule({
-  //   id: 'settings',
-  //   activatesOn: Events.SetupSettings,
-  //   activate: ThreadSettings,
-  // }),
-  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: Common.ActivationEvent.SetupSettings,
-    activate: ThreadState,
-  }),
-  Common.Plugin.addTranslationsModule({ translations: [...translations, ...threadTranslations] }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
     metadata: [
       {
         id: Type.getTypename(Channel.Channel),
         metadata: {
-          icon: 'ph--hash--regular',
-          iconHue: 'rose',
+          icon: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).hue ?? 'white',
           createObject: ((props) => Effect.sync(() => Channel.make(props))) satisfies CreateObject,
         },
       },
@@ -72,13 +55,6 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
           loadReferences: async (thread: Thread.Thread) => await Ref.Array.loadAll(thread.messages ?? []),
         },
       },
-      {
-        id: Message.Message.typename,
-        metadata: {
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: () => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
-        },
-      },
       {
         id: THREAD_ITEM,
         metadata: {
@@ -96,13 +72,31 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
       },
     ],
   }),
-  Common.Plugin.addSchemaModule({
-    schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Message.MessageV1, Thread.Thread],
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addReactRootModule({ activate: ReactRoot }),
+  AppPlugin.addSchemaModule({
+    schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Thread.Thread],
+  }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations: [...translations, ...threadTranslations] }),
+  Plugin.addModule({
+    id: 'call-manager',
+    activatesOn: ClientEvents.ClientReady,
+    activate: CallManager,
   }),
+  // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
+  // Plugin.addModule({
+  //   id: 'settings',
+  //   activatesOn: Events.SetupSettings,
+  //   activate: ThreadSettings,
+  // }),
   Plugin.addModule({
-    id: 'migration',
-    activatesOn: ClientEvents.SetupMigration,
-    activate: () => Effect.succeed(Capability.contributes(ClientCapabilities.Migration, [Message.MessageV1ToV2])),
+    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: ThreadState,
   }),
   Plugin.addModule({
     id: 'on-space-created',
@@ -114,20 +108,10 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
         ),
       ),
   }),
-  Plugin.addModule({
-    id: 'repair',
-    activatesOn: ClientEvents.SpacesReady,
-    activate: Repair,
-  }),
   Plugin.addModule({
     id: 'markdown',
     activatesOn: MarkdownEvents.SetupExtensions,
     activate: Markdown,
   }),
-  Common.Plugin.addReactRootModule({ activate: ReactRoot }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
   Plugin.make,
 );

package/src/blueprints/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as ThreadBlueprint from './thread-blueprint';
+export { default as ThreadBlueprint } from './thread-blueprint';

package/src/blueprints/thread-blueprint.ts

@@ -2,19 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type AppCapabilities } from '@dxos/app-toolkit';
 import { Blueprint, Template } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
 import { trim } from '@dxos/util';
 
-import { createProposals } from '../functions';
+import { ThreadFunctions } from '../functions';
 
-export const functions: FunctionDefinition[] = [createProposals];
+const BLUEPRINT_KEY = 'org.dxos.blueprint.thread';
 
-export const Key = 'dxos.org/blueprint/thread';
+const functions = Object.values(ThreadFunctions);
 
-export const make = () =>
+const make = () =>
   Blueprint.make({
-    key: Key,
+    key: BLUEPRINT_KEY,
     name: 'Thread',
     tools: Blueprint.toolDefinitions({ functions }),
     instructions: Template.make({
@@ -30,3 +30,11 @@ export const make = () =>
       `,
     }),
   });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
+
+export default blueprint;

package/src/calls-service.stories.tsx

@@ -172,10 +172,10 @@ const DefaultStory = ({ source }: StoryProps) => {
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/calls-service',
+  title: 'plugins/plugin-thread/experimental/Calls',
   render: DefaultStory,
   decorators: [
-    withTheme,
+    withTheme(),
     withClientProvider({
       config: new Config({
         runtime: {

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

@@ -6,11 +6,12 @@ import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, COMPANION_PREFIX } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
 import { Operation } from '@dxos/operation';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { DECK_COMPANION_TYPE, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { type SelectionManager, type SelectionMode, defaultSelection } from '@dxos/react-ui-attention';
 
@@ -59,11 +60,11 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     const resolve = (typename: string) =>
-      capabilities.getAll(Common.Capability.Metadata).find(({ id }: { id: string }) => id === typename)?.metadata ?? {};
+      capabilities.getAll(AppCapabilities.Metadata).find(({ id }: { id: string }) => id === typename)?.metadata ?? {};
 
     const extensions = yield* Effect.all([
       GraphBuilder.createExtension({
-        id: `${meta.id}/active-call`,
+        id: `${meta.id}.active-call`,
         match: NodeMatcher.whenRoot,
         connector: (node, get) => {
           const callManagerAtom = capabilities.atom(ThreadCapabilities.CallManager);
@@ -77,7 +78,7 @@ export default Capability.makeModule(
             joined
               ? [
                   {
-                    id: `${node.id}${ATTENDABLE_PATH_SEPARATOR}active-call`,
+                    id: 'active-call',
                     type: DECK_COMPANION_TYPE,
                     data: null,
                     properties: {
@@ -93,7 +94,7 @@ export default Capability.makeModule(
         },
       }),
       GraphBuilder.createTypeExtension({
-        id: `${meta.id}/channel-chat-companion`,
+        id: `${meta.id}.channel-chat-companion`,
         type: Channel.Channel,
         connector: (channel, get) => {
           const callManager = capabilities.get(ThreadCapabilities.CallManager);
@@ -107,7 +108,7 @@ export default Capability.makeModule(
 
           return Effect.succeed([
             {
-              id: `${Obj.getDXN(channel).toString()}${ATTENDABLE_PATH_SEPARATOR}chat`,
+              id: 'chat',
               type: PLANK_COMPANION_TYPE,
               data: 'chat',
               properties: {
@@ -121,7 +122,7 @@ export default Capability.makeModule(
         },
       }),
       GraphBuilder.createExtension({
-        id: `${meta.id}/comments-companion`,
+        id: `${meta.id}.comments-companion`,
         match: (node) => {
           if (!Obj.isObject(node.data) || Option.isNone(whenCommentableObject(node))) {
             return Option.none();
@@ -129,10 +130,10 @@ export default Capability.makeModule(
           const metadata = resolve(Obj.getTypename(node.data)!);
           return typeof metadata.comments === 'string' ? Option.some(node) : Option.none();
         },
-        connector: (node) =>
+        connector: () =>
           Effect.succeed([
             {
-              id: [node.id, 'comments'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: `${COMPANION_PREFIX}comments`,
               type: PLANK_COMPANION_TYPE,
               data: 'comments',
               properties: {
@@ -145,25 +146,26 @@ export default Capability.makeModule(
           ]),
       }),
       GraphBuilder.createExtension({
-        id: `${meta.id}/comment-toolbar`,
+        id: `${meta.id}.comment-toolbar`,
         match: (node) => {
           if (!Obj.isObject(node.data) || Option.isNone(whenCommentableObject(node))) {
             return Option.none();
           }
           const metadata = resolve(Obj.getTypename(node.data)!);
-          return typeof metadata.comments === 'string' ? Option.some(node.data) : Option.none();
+          return typeof metadata.comments === 'string' ? Option.some(node) : Option.none();
         },
-        actions: (object, get) => {
+        actions: (matched, get) => {
+          const object = matched.data;
+          const objectDxn = Obj.getDXN(object).toString();
           const stateAtom = capabilities.atom(ThreadCapabilities.State);
           const selectionManager = capabilities.get(AttentionCapabilities.Selection);
-          const objectId = Obj.getDXN(object).toString();
           const metadata = resolve(Obj.getTypename(object)!);
 
           const disabled = get(
             commentDisabledFamily({
               stateAtom,
               selectionManager,
-              objectId,
+              objectId: objectDxn,
               commentsType: metadata.comments as string,
               selectionMode: metadata.selectionMode,
             }),
@@ -171,10 +173,10 @@ export default Capability.makeModule(
 
           return Effect.succeed([
             {
-              id: `${Obj.getDXN(object).toString()}/comment`,
+              id: 'comment',
               data: Effect.fnUntraced(function* () {
                 const metadata = resolve(Obj.getTypename(object)!);
-                const selection = selectionManager.getSelection(Obj.getDXN(object).toString());
+                const selection = selectionManager.getSelection(objectDxn);
                 const anchor = metadata.comments === 'anchored' ? getAnchor(selection) : Date.now().toString();
                 const name = metadata.getAnchorLabel?.(object, anchor);
                 yield* Operation.invoke(ThreadOperation.Create, {
@@ -196,6 +198,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/blueprint-definition/blueprint-definition.ts

@@ -4,20 +4,14 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
 import { ThreadBlueprint } from '../../blueprints';
 
-export type BlueprintCapabilities = [
-  Capability.Capability<typeof Common.Capability.Functions>,
-  Capability.Capability<typeof Common.Capability.BlueprintDefinition>,
-];
-
-const blueprintDefinition = Capability.makeModule<[], BlueprintCapabilities>(() =>
-  Effect.succeed([
-    Capability.contributes(Common.Capability.Functions, ThreadBlueprint.functions),
-    Capability.contributes(Common.Capability.BlueprintDefinition, ThreadBlueprint.make()),
-  ]),
-);
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, ThreadBlueprint)]));
 
 export default blueprintDefinition;

package/src/capabilities/call-manager/call-manager.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { CallManager } from '../../calls';
@@ -13,7 +13,7 @@ import { ThreadCapabilities } from '../../types';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const client = yield* Capability.get(ClientCapabilities.Client);
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
     const callManager = new CallManager(client, registry);
     yield* Effect.tryPromise(() => callManager.open());
 

package/src/capabilities/index.ts

@@ -9,6 +9,5 @@ export * from './markdown';
 export * from './operation-resolver';
 export * from './react-root';
 export * from './react-surface';
-export * from './repair';
 export * from './settings';
 export * from './state';

package/src/capabilities/markdown/markdown.ts

@@ -5,11 +5,11 @@
 import { EditorView } from '@codemirror/view';
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
-import { ATTENDABLE_PATH_SEPARATOR, DeckOperation } from '@dxos/plugin-deck/types';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { COMPANION_PREFIX } from '@dxos/app-toolkit';
+import { DeckOperation } from '@dxos/plugin-deck/types';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
-import { type EditorState, commentClickedEffect, commentsState, overlap } from '@dxos/ui-editor';
+import { type EditorState, commentClickedEffect, commentsState, documentId, overlap } from '@dxos/ui-editor';
 
 import { threads } from '../../extensions';
 import { ThreadCapabilities } from '../../types';
@@ -21,40 +21,38 @@ export default Capability.makeModule(
 
     return Capability.contributes(MarkdownCapabilities.Extensions, [
       ({ document: doc }) => {
-        const { invokePromise } = capabilities.get(Common.Capability.OperationInvoker);
-        const registry = capabilities.get(Common.Capability.AtomRegistry);
+        const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
+        const registry = capabilities.get(Capabilities.AtomRegistry);
         const stateAtom = capabilities.get(ThreadCapabilities.State);
         return threads({ registry, stateAtom }, doc, invokePromise);
       },
       ({ document: doc }) => {
         if (!doc) return [];
-        const registry = capabilities.get(Common.Capability.AtomRegistry);
+        const registry = capabilities.get(Capabilities.AtomRegistry);
         const stateAtom = capabilities.get(ThreadCapabilities.State);
 
         return EditorView.updateListener.of((update) => {
           if (update.docChanged || update.selectionSet) {
-            const objectId = Obj.getDXN(doc).toString();
+            const id = update.state.facet(documentId);
             const overlaps = selectionOverlapsComment(update.state);
             const current = registry.get(stateAtom);
             registry.set(stateAtom, {
               ...current,
-              toolbar: { ...current.toolbar, [objectId]: overlaps },
+              toolbar: { ...current.toolbar, [id]: overlaps },
             });
           }
         });
       },
       ({ document: doc }) => {
         if (!doc) return [];
-        const { invokePromise } = capabilities.get(Common.Capability.OperationInvoker);
-        const id = Obj.getDXN(doc).toString();
+        const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
 
         return EditorView.updateListener.of((update) => {
           update.transactions.forEach((transaction) => {
             transaction.effects.forEach(async (effect) => {
               if (effect.is(commentClickedEffect)) {
                 void invokePromise(DeckOperation.ChangeCompanion, {
-                  primary: id,
-                  companion: `${id}${ATTENDABLE_PATH_SEPARATOR}comments`,
+                  companion: `${COMPANION_PREFIX}comments`,
                 });
               }
             });