@dxos/plugin-thread 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.4a85c3132b",
+  "version": "0.8.4-main.51f1e5ca51",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,18 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": "./src/blueprints/index.ts",
+    "#capabilities": "./src/capabilities/index.ts",
+    "#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/index.ts",
+    "#translations": "./src/translations.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -25,6 +37,18 @@
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
       "types": "./dist/types/src/blueprints/index.d.ts"
     },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs",
+      "types": "./dist/types/src/operations/index.d.ts"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
@@ -33,16 +57,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -56,81 +70,79 @@
     "@effect/ai": "0.33.2",
     "@effect/experimental": "0.58.0",
     "@peermetrics/webrtc-stats": "5.7.1",
-    "date-fns": "^3.3.1",
+    "date-fns": "^3.6.0",
     "extendable-media-recorder": "^9.2.19",
     "extendable-media-recorder-wav-encoder": "^7.0.123",
     "md5-hex": "5.0.0",
     "react-resize-detector": "^11.0.1",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.4-main.4a85c3132b",
-    "@dxos/app-toolkit": "0.8.4-main.4a85c3132b",
-    "@dxos/assistant": "0.8.4-main.4a85c3132b",
-    "@dxos/blueprints": "0.8.4-main.4a85c3132b",
-    "@dxos/async": "0.8.4-main.4a85c3132b",
-    "@dxos/context": "0.8.4-main.4a85c3132b",
-    "@dxos/debug": "0.8.4-main.4a85c3132b",
-    "@dxos/devtools": "0.8.4-main.4a85c3132b",
-    "@dxos/codec-protobuf": "0.8.4-main.4a85c3132b",
-    "@dxos/echo": "0.8.4-main.4a85c3132b",
-    "@dxos/display-name": "0.8.4-main.4a85c3132b",
-    "@dxos/echo-db": "0.8.4-main.4a85c3132b",
-    "@dxos/echo-react": "0.8.4-main.4a85c3132b",
-    "@dxos/invariant": "0.8.4-main.4a85c3132b",
-    "@dxos/effect": "0.8.4-main.4a85c3132b",
-    "@dxos/keys": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-attention": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-client": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-deck": "0.8.4-main.4a85c3132b",
-    "@dxos/operation": "0.8.4-main.4a85c3132b",
-    "@dxos/log": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-graph": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-markdown": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-observability": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-settings": "0.8.4-main.4a85c3132b",
-    "@dxos/functions": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-space": "0.8.4-main.4a85c3132b",
-    "@dxos/protocols": "0.8.4-main.4a85c3132b",
-    "@dxos/react-client": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-attention": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-dnd": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-editor": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-menu": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-form": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-mosaic": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-sfx": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-thread": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-tabs": "0.8.4-main.4a85c3132b",
-    "@dxos/schema": "0.8.4-main.4a85c3132b",
-    "@dxos/types": "0.8.4-main.4a85c3132b",
-    "@dxos/util": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-stack": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-editor": "0.8.4-main.4a85c3132b"
+    "@dxos/app-toolkit": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-framework": "0.8.4-main.51f1e5ca51",
+    "@dxos/compute": "0.8.4-main.51f1e5ca51",
+    "@dxos/async": "0.8.4-main.51f1e5ca51",
+    "@dxos/assistant": "0.8.4-main.51f1e5ca51",
+    "@dxos/context": "0.8.4-main.51f1e5ca51",
+    "@dxos/debug": "0.8.4-main.51f1e5ca51",
+    "@dxos/devtools": "0.8.4-main.51f1e5ca51",
+    "@dxos/display-name": "0.8.4-main.51f1e5ca51",
+    "@dxos/codec-protobuf": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-db": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-react": "0.8.4-main.51f1e5ca51",
+    "@dxos/invariant": "0.8.4-main.51f1e5ca51",
+    "@dxos/effect": "0.8.4-main.51f1e5ca51",
+    "@dxos/log": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/keys": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-deck": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-markdown": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-settings": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-observability": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-space": "0.8.4-main.51f1e5ca51",
+    "@dxos/protocols": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-dnd": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-editor": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-form": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-sfx": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-mosaic": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-menu": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-stack": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-tabs": "0.8.4-main.51f1e5ca51",
+    "@dxos/schema": "0.8.4-main.51f1e5ca51",
+    "@dxos/types": "0.8.4-main.51f1e5ca51",
+    "@dxos/util": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-thread": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-editor": "0.8.4-main.51f1e5ca51"
   },
   "devDependencies": {
     "@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.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-testing": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-theme": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
-    "@dxos/random": "0.8.4-main.4a85c3132b",
-    "@dxos/storybook-utils": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
+    "vite": "^8.0.10",
+    "@dxos/plugin-testing": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/random": "0.8.4-main.51f1e5ca51",
+    "@dxos/storybook-utils": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -3,16 +3,17 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
 import { Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Ref, Type } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-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';
-import { translations as threadTranslations } from '@dxos/react-ui-thread';
+import { Operation } from '@dxos/compute';
+import { Annotation, Ref, Type } from '@dxos/echo';
+import { ClientEvents } from '@dxos/plugin-client/types';
+import { MarkdownEvents } from '@dxos/plugin-markdown/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { SpaceCapabilities, SpaceEvents, type CreateObject } from '@dxos/plugin-space/types';
+import { translations as threadTranslations } from '@dxos/react-ui-thread/translations';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
 import {
@@ -20,21 +21,23 @@ import {
   BlueprintDefinition,
   CallManager,
   Markdown,
-  OperationResolver,
+  OperationHandler,
+  UndoMappings,
   ReactRoot,
   ReactSurface,
-  Repair,
   ThreadState,
-} from './capabilities';
-import { THREAD_ITEM, meta } from './meta';
-import { translations } from './translations';
-import { Channel, ThreadOperation } from './types';
+} from '#capabilities';
+import { THREAD_ITEM, meta } from '#meta';
+import { ThreadOperation } from '#operations';
+import { translations } from '#translations';
+import { Channel } from '#types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 //  NOTE(burdon): Review/discuss CursorConverter semantics.
 
 // 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(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
@@ -43,9 +46,18 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
       {
         id: Type.getTypename(Channel.Channel),
         metadata: {
-          icon: 'ph--hash--regular',
-          iconHue: 'rose',
-          createObject: ((props) => Effect.sync(() => Channel.make(props))) satisfies CreateObject,
+          icon: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Channel.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
@@ -72,7 +84,8 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
       },
     ],
   }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addOperationHandlerModule({ id: 'undo-mappings', activate: UndoMappings }),
   AppPlugin.addReactRootModule({ activate: ReactRoot }),
   AppPlugin.addSchemaModule({
     schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Thread.Thread],
@@ -108,11 +121,6 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
         ),
       ),
   }),
-  Plugin.addModule({
-    id: 'repair',
-    activatesOn: ClientEvents.SpacesReady,
-    activate: Repair,
-  }),
   Plugin.addModule({
     id: 'markdown',
     activatesOn: MarkdownEvents.SetupExtensions,

package/src/blueprints/thread-blueprint.ts

@@ -2,21 +2,18 @@
 // 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 { ThreadFunctions } from '../functions';
+import { ThreadOperation } from '#operations';
 
-const BLUEPRINT_KEY = 'dxos.org/blueprint/thread';
-
-const functions = Object.values(ThreadFunctions);
+const BLUEPRINT_KEY = 'org.dxos.blueprint.thread';
 
 const make = () =>
   Blueprint.make({
     key: BLUEPRINT_KEY,
     name: 'Thread',
-    tools: Blueprint.toolDefinitions({ functions }),
+    tools: Blueprint.toolDefinitions({ operations: [ThreadOperation.CreateProposals] }),
     instructions: Template.make({
       // TODO(wittjosiah): Move example to function input schema annotation.
       source: trim`
@@ -31,9 +28,8 @@ const make = () =>
     }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
-  functions,
   make,
 };
 

package/src/calls/util/calls-service.ts

@@ -14,7 +14,6 @@ import {
   type TrackObject,
   type TracksResponse,
 } from '../types';
-
 import { HistoryCache } from './history-cache';
 import { BulkRequestDispatcher, FIFOScheduler } from './task-scheduling';
 
@@ -548,7 +547,9 @@ const waitForTransceiverToSendData = async (ctx: Context, transceiver: RTCRtpTra
   ctx.onDispose(() => waitForData.throw(new Error('Transceiver was closed')));
 
   const checkStats = async () => {
-    if (ctx.disposed) return;
+    if (ctx.disposed) {
+      return;
+    }
 
     try {
       const stats = await transceiver.sender.getStats();

package/src/calls/util/stub-media-streams.ts

@@ -74,7 +74,9 @@ export const createInaudibleAudioStreamTrack = async ({ ctx }: { ctx: Context })
 
   let oscillatorStarted = false;
   const ensureOscillatorStarted = () => {
-    if (oscillatorStarted) return;
+    if (oscillatorStarted) {
+      return;
+    }
     oscillator.start();
     oscillatorStarted = true;
   };

package/src/calls-service.stories.tsx

@@ -12,13 +12,14 @@ import { log } from '@dxos/log';
 import { Config, useConfig } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Button } from '@dxos/react-ui';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { withTheme } from '@dxos/react-ui/testing';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
 
 const testVideo = new URL('../testing/video.mp4', import.meta.url).href;
 
+import { useBlackCanvasStreamTrack, useInaudibleAudioStreamTrack, useVideoStreamTrack } from '#hooks';
+
 import { CALLS_URL, CallsServicePeer, type TrackObject } from './calls';
-import { useBlackCanvasStreamTrack, useInaudibleAudioStreamTrack, useVideoStreamTrack } from './hooks';
 
 // TODO(burdon): THIS IS TOO COMPLEX FOR A TEST SETUP.
 const pushAndPullTrack = (mediaStreamTrack?: MediaStreamTrack) => {
@@ -130,9 +131,9 @@ const pushAndPullTrack = (mediaStreamTrack?: MediaStreamTrack) => {
   };
 };
 
-type StoryProps = { source: string };
+type DefaultStoryProps = { source: string };
 
-const DefaultStory = ({ source }: StoryProps) => {
+const DefaultStory = ({ source }: DefaultStoryProps) => {
   const pushVideoElement = useRef<HTMLVideoElement>(null);
   const pullVideoElement = useRef<HTMLVideoElement>(null);
   // Get video stream track.
@@ -166,7 +167,7 @@ const DefaultStory = ({ source }: StoryProps) => {
           Re-pull video
         </Button>
       </div>
-      <Json data={metrics} />
+      <JsonHighlighter data={metrics} />
     </div>
   );
 };
@@ -208,7 +209,7 @@ export const InaudibleAudioStreamTrack = {
 
     return (
       <div className='flex flex-col gap-4 items-center'>
-        <Json data={metrics} />
+        <JsonHighlighter data={metrics} />
         <Button onClick={rePullTrack}>Re-pull audio</Button>
       </div>
     );
@@ -221,7 +222,7 @@ export const BlackVideoStreamTrack = {
     const { rePullTrack, metrics } = pushAndPullTrack(videoStreamTrack);
     return (
       <div className='flex flex-col gap-4 items-center'>
-        <Json data={metrics} />
+        <JsonHighlighter data={metrics} />
         <Button onClick={rePullTrack}>Re-pull audio</Button>
       </div>
     );

package/src/capabilities/{app-graph-builder/app-graph-builder.ts → app-graph-builder.ts}

@@ -7,17 +7,19 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 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 { AttentionCapabilities } from '@dxos/plugin-attention/types';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { linkedSegment } from '@dxos/react-ui-attention';
 import { type SelectionManager, type SelectionMode, defaultSelection } from '@dxos/react-ui-attention';
 
-import { meta } from '../../meta';
-import { Channel, ThreadCapabilities, ThreadOperation, type ThreadState } from '../../types';
-import { getAnchor } from '../../util';
+import { meta } from '#meta';
+import { ThreadOperation } from '#operations';
+import { Channel, ThreadCapabilities, type ThreadState } from '#types';
+
+import { getAnchor } from '../util';
 
 type CommentDisabledParams = {
   stateAtom: Atom.Atom<Atom.Writable<ThreadState>[]>;
@@ -64,7 +66,7 @@ export default Capability.makeModule(
 
     const extensions = yield* Effect.all([
       GraphBuilder.createExtension({
-        id: `${meta.id}/active-call`,
+        id: 'active-call',
         match: NodeMatcher.whenRoot,
         connector: (node, get) => {
           const callManagerAtom = capabilities.atom(ThreadCapabilities.CallManager);
@@ -77,24 +79,20 @@ export default Capability.makeModule(
           return Effect.succeed(
             joined
               ? [
-                  {
-                    id: `${node.id}${ATTENDABLE_PATH_SEPARATOR}active-call`,
-                    type: DECK_COMPANION_TYPE,
+                  AppNode.makeDeckCompanion({
+                    id: 'active-call',
+                    label: ['call-panel.label', { ns: meta.id }],
+                    icon: 'ph--video-conference--regular',
                     data: null,
-                    properties: {
-                      label: ['call panel label', { ns: meta.id }],
-                      icon: 'ph--video-conference--regular',
-                      position: 'hoist',
-                      disposition: 'hidden',
-                    },
-                  },
+                    position: 'hoist',
+                  }),
                 ]
               : [],
           );
         },
       }),
       GraphBuilder.createTypeExtension({
-        id: `${meta.id}/channel-chat-companion`,
+        id: 'channel-chat-companion',
         type: Channel.Channel,
         connector: (channel, get) => {
           const callManager = capabilities.get(ThreadCapabilities.CallManager);
@@ -107,22 +105,18 @@ export default Capability.makeModule(
           }
 
           return Effect.succeed([
-            {
-              id: `${Obj.getDXN(channel).toString()}${ATTENDABLE_PATH_SEPARATOR}chat`,
-              type: PLANK_COMPANION_TYPE,
+            AppNode.makeCompanion({
+              id: 'chat',
+              label: ['channel-companion.label', { ns: meta.id }],
+              icon: 'ph--hash--regular',
               data: 'chat',
-              properties: {
-                label: ['channel companion label', { ns: meta.id }],
-                icon: 'ph--hash--regular',
-                position: 'hoist',
-                disposition: 'hidden',
-              },
-            },
+              position: 'hoist',
+            }),
           ]);
         },
       }),
       GraphBuilder.createExtension({
-        id: `${meta.id}/comments-companion`,
+        id: 'comments-companion',
         match: (node) => {
           if (!Obj.isObject(node.data) || Option.isNone(whenCommentableObject(node))) {
             return Option.none();
@@ -130,41 +124,38 @@ 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),
-              type: PLANK_COMPANION_TYPE,
+            AppNode.makeCompanion({
+              id: linkedSegment('comments'),
+              label: ['comments.label', { ns: meta.id }],
+              icon: 'ph--chat-text--regular',
               data: 'comments',
-              properties: {
-                label: ['comments label', { ns: meta.id }],
-                icon: 'ph--chat-text--regular',
-                disposition: 'hidden',
-                position: 'hoist',
-              },
-            },
+              position: 'hoist',
+            }),
           ]),
       }),
       GraphBuilder.createExtension({
-        id: `${meta.id}/comment-toolbar`,
+        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,
             }),
@@ -172,10 +163,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, {
@@ -185,7 +176,7 @@ export default Capability.makeModule(
                 });
               }),
               properties: {
-                label: ['add comment label', { ns: meta.id }],
+                label: ['add-comment.label', { ns: meta.id }],
                 icon: 'ph--chat-text--regular',
                 disposition: 'toolbar',
                 disabled,

package/src/capabilities/{blueprint-definition/blueprint-definition.ts → blueprint-definition.ts}

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 
-import { ThreadBlueprint } from '../../blueprints';
+import { ThreadBlueprint } from '#blueprints';
 
 const blueprintDefinition = Capability.makeModule<
   [],

package/src/capabilities/{call-manager/call-manager.ts → call-manager.ts}

@@ -5,10 +5,11 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { ClientCapabilities } from '@dxos/plugin-client';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
 
-import { CallManager } from '../../calls';
-import { ThreadCapabilities } from '../../types';
+import { ThreadCapabilities } from '#types';
+
+import { CallManager } from '../calls';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {