@dxos/plugin-thread 0.8.4-main.70d3990 → 0.8.4-main.74a063c4e0

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

@@ -3,192 +3,191 @@
 //
 
 import { Atom } from '@effect-atom/atom-react';
-import * as Function from 'effect/Function';
+import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
-import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { ROOT_ID, atomFromSignal, createExtension } from '@dxos/plugin-graph';
+import { Operation } from '@dxos/operation';
+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 { ThreadOperation } from '#operations';
+import { Channel, ThreadCapabilities, type ThreadState } from '#types';
 
-import { meta } from '../meta';
-import { Channel, ThreadAction } from '../types';
 import { getAnchor } from '../util';
 
-import { ThreadCapabilities } from './capabilities';
+type CommentDisabledParams = {
+  stateAtom: Atom.Atom<Atom.Writable<ThreadState>[]>;
+  selectionManager: SelectionManager;
+  objectId: string;
+  commentsType: string;
+  selectionMode: SelectionMode | undefined;
+};
+
+/**
+ * Atom family to derive whether the comment button should be disabled.
+ * Uses a composite key to ensure proper caching.
+ */
+const commentDisabledFamily = Atom.family(
+  ({ stateAtom, selectionManager, objectId, commentsType, selectionMode }: CommentDisabledParams) =>
+    Atom.make((get) => {
+      const stateAtoms = get(stateAtom);
+      const state = stateAtoms[0] ? get(stateAtoms[0]) : undefined;
+      const toolbar = state?.toolbar ?? {};
+      const selectionState = get(selectionManager.state);
+      const selection =
+        selectionState.selections[objectId] ?? (selectionMode ? defaultSelection(selectionMode) : undefined);
+      const anchor = getAnchor(selection);
+      const invalidSelection = !anchor;
+      const overlappingComment = toolbar[objectId];
+      return (commentsType === 'anchored' && invalidSelection) || overlappingComment;
+    }),
+);
+
+/** Match ECHO objects that are NOT Channels (i.e. objects that can have comments). */
+const whenCommentableObject = NodeMatcher.whenAll(
+  NodeMatcher.whenEchoObjectMatches,
+  NodeMatcher.whenNot(NodeMatcher.whenEchoTypeMatches(Channel.Channel)),
+);
 
 // TODO(wittjosiah): Highlight active calls in L1.
 //  Track active meetings by subscribing to meetings query and polling the swarms of recent meetings in the space.
-export default (context: PluginContext) => {
-  const resolve = (typename: string) =>
-    context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
 
-  return contributes(Capabilities.AppGraphBuilder, [
-    createExtension({
-      id: `${meta.id}/active-call`,
-      connector: (node) =>
-        Atom.make((get) =>
-          Function.pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
-            Option.map((node) => {
-              const [call] = get(context.capabilities(ThreadCapabilities.CallManager));
-              return get(
-                atomFromSignal(() =>
-                  call?.joined
-                    ? [
-                        {
-                          id: `${node.id}${ATTENDABLE_PATH_SEPARATOR}active-call`,
-                          type: DECK_COMPANION_TYPE,
-                          data: null,
-                          properties: {
-                            label: ['call panel label', { ns: meta.id }],
-                            icon: 'ph--video-conference--regular',
-                            position: 'hoist',
-                            disposition: 'hidden',
-                          },
-                        },
-                      ]
-                    : [],
-                ),
-              );
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-    // TODO(wittjosiah): The channel shouldn't become the companion during a call.
-    //   Alternative: the call/meeting/thread should be a child node of the channel and that should be opened.
-    createExtension({
-      id: `${meta.id}/channel-chat-companion`,
-      connector: (node) => {
-        return Atom.make((get) => {
-          return Function.pipe(
-            get(node),
-            Option.flatMap((node) =>
-              Obj.instanceOf(Channel.Channel, node.data) ? Option.some(node.data) : Option.none(),
-            ),
-            Option.map((channel) => {
-              const callManager = context.getCapability(ThreadCapabilities.CallManager);
-              const joined = get(
-                atomFromSignal(() => callManager.joined && callManager.roomId === Obj.getDXN(channel).toString()),
-              );
-              if (!joined) {
-                return [];
-              }
+    const resolve = (typename: string) =>
+      capabilities.getAll(AppCapabilities.Metadata).find(({ id }: { id: string }) => id === typename)?.metadata ?? {};
 
-              return [
-                {
-                  id: `${Obj.getDXN(channel).toString()}${ATTENDABLE_PATH_SEPARATOR}chat`,
-                  type: PLANK_COMPANION_TYPE,
-                  data: 'chat',
-                  properties: {
-                    label: ['channel companion label', { ns: meta.id }],
-                    icon: 'ph--hash--regular',
+    const extensions = yield* Effect.all([
+      GraphBuilder.createExtension({
+        id: 'active-call',
+        match: NodeMatcher.whenRoot,
+        connector: (node, get) => {
+          const callManagerAtom = capabilities.atom(ThreadCapabilities.CallManager);
+          const [call] = get(callManagerAtom);
+          if (!call) {
+            return Effect.succeed([]);
+          }
+          // Use derived joinedAtom for efficient subscription.
+          const joined = get(call.joinedAtom);
+          return Effect.succeed(
+            joined
+              ? [
+                  AppNode.makeDeckCompanion({
+                    id: 'active-call',
+                    label: ['call-panel.label', { ns: meta.id }],
+                    icon: 'ph--video-conference--regular',
+                    data: null,
                     position: 'hoist',
-                    disposition: 'hidden',
-                  },
-                },
-              ];
-            }),
-            Option.getOrElse(() => []),
+                  }),
+                ]
+              : [],
           );
-        });
-      },
-    }),
-    createExtension({
-      id: `${meta.id}/comments-companion`,
-      connector: (node) =>
-        Atom.make((get) =>
-          Function.pipe(
-            get(node),
-            Option.flatMap((node) => {
-              if (!Obj.isObject(node.data) || Obj.instanceOf(Channel.Channel, node.data)) {
-                return Option.none();
-              }
-              const metadata = resolve(Obj.getTypename(node.data)!);
-              return typeof metadata.comments === 'string' ? Option.some(node) : Option.none();
+        },
+      }),
+      GraphBuilder.createTypeExtension({
+        id: 'channel-chat-companion',
+        type: Channel.Channel,
+        connector: (channel, get) => {
+          const callManager = capabilities.get(ThreadCapabilities.CallManager);
+          // Use derived atoms for efficient subscription.
+          const joined = get(callManager.joinedAtom);
+          const roomId = get(callManager.roomIdAtom);
+          const isActive = joined && roomId === Obj.getDXN(channel).toString();
+          if (!isActive) {
+            return Effect.succeed([]);
+          }
+
+          return Effect.succeed([
+            AppNode.makeCompanion({
+              id: 'chat',
+              label: ['channel-companion.label', { ns: meta.id }],
+              icon: 'ph--hash--regular',
+              data: 'chat',
+              position: 'hoist',
             }),
-            Option.map((node) => [
-              {
-                id: [node.id, 'comments'].join(ATTENDABLE_PATH_SEPARATOR),
-                type: PLANK_COMPANION_TYPE,
-                data: 'comments',
-                properties: {
-                  label: ['comments label', { ns: meta.id }],
-                  icon: 'ph--chat-text--regular',
-                  disposition: 'hidden',
-                  position: 'hoist',
-                },
-              },
-            ]),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-    createExtension({
-      id: `${meta.id}/comment-toolbar`,
-      actions: (node) =>
-        Atom.make((get) =>
-          Function.pipe(
-            get(node),
-            Option.flatMap((node) => {
-              if (!Obj.isObject(node.data) || Obj.instanceOf(Channel.Channel, node.data)) {
-                return Option.none();
-              }
-              const metadata = resolve(Obj.getTypename(node.data)!);
-              return typeof metadata.comments === 'string' ? Option.some(node.data) : Option.none();
+          ]);
+        },
+      }),
+      GraphBuilder.createExtension({
+        id: 'comments-companion',
+        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) : Option.none();
+        },
+        connector: () =>
+          Effect.succeed([
+            AppNode.makeCompanion({
+              id: linkedSegment('comments'),
+              label: ['comments.label', { ns: meta.id }],
+              icon: 'ph--chat-text--regular',
+              data: 'comments',
+              position: 'hoist',
             }),
-            Option.map((object) => {
-              const selectionManager = context.getCapability(AttentionCapabilities.Selection);
-              const toolbar = get(context.capabilities(ThreadCapabilities.State))[0]?.state.toolbar ?? {};
-              const disabled = get(
-                atomFromSignal(() => {
-                  const metadata = resolve(Obj.getTypename(object)!);
-                  const selection = selectionManager.getSelection(
-                    Obj.getDXN(object).toString(),
-                    metadata.selectionMode,
-                  );
-                  const anchor = getAnchor(selection);
-                  const invalidSelection = !anchor;
-                  const overlappingComment = toolbar[Obj.getDXN(object).toString()];
-                  return (metadata.comments === 'anchored' && invalidSelection) || overlappingComment;
-                }),
-              );
+          ]),
+      }),
+      GraphBuilder.createExtension({
+        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) : Option.none();
+        },
+        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 metadata = resolve(Obj.getTypename(object)!);
 
-              return [
-                {
-                  id: `${Obj.getDXN(object).toString()}/comment`,
-                  data: () => {
-                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                    const metadata = resolve(Obj.getTypename(object)!);
-                    const selection = selectionManager.getSelection(Obj.getDXN(object).toString());
-                    // TODO(wittjosiah): Use presence of selection to determine if the comment should be anchored.
-                    // Requires all components which support selection (e.g. table/kanban) to support anchored comments.
-                    const anchor = metadata.comments === 'anchored' ? getAnchor(selection) : Date.now().toString();
-                    const name = metadata.getAnchorLabel?.(object, anchor);
-                    void dispatch(
-                      createIntent(ThreadAction.Create, {
-                        anchor,
-                        name,
-                        subject: object,
-                      }),
-                    );
-                  },
-                  properties: {
-                    label: ['add comment label', { ns: meta.id }],
-                    icon: 'ph--chat-text--regular',
-                    disposition: 'toolbar',
-                    disabled,
-                    testId: 'thread.comment.add',
-                  },
-                },
-              ];
+          const disabled = get(
+            commentDisabledFamily({
+              stateAtom,
+              selectionManager,
+              objectId: objectDxn,
+              commentsType: metadata.comments as string,
+              selectionMode: metadata.selectionMode,
             }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-  ]);
-};
+          );
+
+          return Effect.succeed([
+            {
+              id: 'comment',
+              data: Effect.fnUntraced(function* () {
+                const metadata = resolve(Obj.getTypename(object)!);
+                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, {
+                  anchor,
+                  name,
+                  subject: object,
+                });
+              }),
+              properties: {
+                label: ['add-comment.label', { ns: meta.id }],
+                icon: 'ph--chat-text--regular',
+                disposition: 'toolbar',
+                disabled,
+                testId: 'thread.comment.add',
+              },
+            },
+          ]);
+        },
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/blueprint-definition.ts

@@ -2,37 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
-import { Blueprint, Template } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
-import { trim } from '@dxos/util';
+import * as Effect from 'effect/Effect';
 
-import { createProposals } from '../functions';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
-const functions: FunctionDefinition[] = [createProposals];
+import { ThreadBlueprint } from '#blueprints';
 
-export const ASSISTANT_BLUEPRINT_KEY = 'dxos.org/blueprint/thread';
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, ThreadBlueprint)]));
 
-export default (): Capability<any>[] => [
-  contributes(Capabilities.Functions, functions),
-  contributes(
-    Capabilities.BlueprintDefinition,
-    Blueprint.make({
-      key: ASSISTANT_BLUEPRINT_KEY,
-      name: 'Thread',
-      tools: Blueprint.toolDefinitions({ functions }),
-      instructions: Template.make({
-        // TODO(wittjosiah): Move example to function input schema annotation.
-        source: trim`
-            You can update markdown documents via proposals.
-            For each diff, respond with the smallest possible matching span.
-            For example:
-              - "There is a tyop in this sentence."
-              + "There is a typo in this sentence."
-              - "This id goof."
-              + "This is good."
-          `,
-      }),
-    }),
-  ),
-];
+export default blueprintDefinition;

package/src/capabilities/call-manager.ts

@@ -2,19 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type PluginContext, contributes } from '@dxos/app-framework';
-import { ClientCapabilities } from '@dxos/plugin-client';
+import * as Effect from 'effect/Effect';
 
-import { CallManager } from '../calls';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+
+import { ThreadCapabilities } from '#types';
 
-import { ThreadCapabilities } from './capabilities';
+import { CallManager } from '../calls';
 
-export default async (context: PluginContext) => {
-  const client = context.getCapability(ClientCapabilities.Client);
-  const callManager = new CallManager(client);
-  await callManager.open();
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const client = yield* Capability.get(ClientCapabilities.Client);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const callManager = new CallManager(client, registry);
+    yield* Effect.tryPromise(() => callManager.open());
 
-  return contributes(ThreadCapabilities.CallManager, callManager, () => {
-    void callManager.close();
-  });
-};
+    return Capability.contributes(ThreadCapabilities.CallManager, callManager, () =>
+      Effect.sync(() => {
+        void callManager.close();
+      }),
+    );
+  }),
+);

package/src/capabilities/index.ts

@@ -2,17 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
 
-export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
-export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
-export const CallManager = lazy(() => import('./call-manager'));
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const Markdown = lazy(() => import('./markdown'));
-export const ReactRoot = lazy(() => import('./react-root'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-export const Repair = lazy(() => import('./repair'));
-export const ThreadSettings = lazy(() => import('./settings'));
-export const ThreadState = lazy(() => import('./state'));
-
-export * from './capabilities';
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+export const CallManager = Capability.lazy('CallManager', () => import('./call-manager'));
+export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactRoot = Capability.lazy('ReactRoot', () => import('./react-root'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const ThreadSettings = Capability.lazy('ThreadSettings', () => import('./settings'));
+export const ThreadState = Capability.lazy('ThreadState', () => import('./state'));
+export const UndoMappings = Capability.lazy('UndoMappings', () => import('./undo-mappings'));

package/src/capabilities/markdown.ts

@@ -3,55 +3,66 @@
 //
 
 import { EditorView } from '@codemirror/view';
+import * as Effect from 'effect/Effect';
 
-import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
-import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { DeckOperation } from '@dxos/plugin-deck/operations';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
-import { type EditorState, commentClickedEffect, commentsState, overlap } from '@dxos/react-ui-editor';
+import { linkedSegment } from '@dxos/react-ui-attention';
+import { type EditorState, commentClickedEffect, commentsState, documentId, overlap } from '@dxos/ui-editor';
+
+import { ThreadCapabilities } from '#types';
 
 import { threads } from '../extensions';
 
-import { ThreadCapabilities } from './capabilities';
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    const capabilities = yield* Capability.Service;
 
-export default (context: PluginContext) =>
-  contributes(MarkdownCapabilities.Extensions, [
-    ({ document: doc }) => {
-      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-      const { state } = context.getCapability(ThreadCapabilities.MutableState);
-      return threads(state, doc, dispatch);
-    },
-    ({ document: doc }) => {
-      if (!doc) return [];
-      const { state } = context.getCapability(ThreadCapabilities.MutableState);
+    return Capability.contributes(MarkdownCapabilities.Extensions, [
+      ({ document: doc }) => {
+        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(Capabilities.AtomRegistry);
+        const stateAtom = capabilities.get(ThreadCapabilities.State);
 
-      return EditorView.updateListener.of((update) => {
-        if (update.docChanged || update.selectionSet) {
-          state.toolbar[Obj.getDXN(doc).toString()] = selectionOverlapsComment(update.state);
-        }
-      });
-    },
-    ({ document: doc }) => {
-      if (!doc) return [];
-      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-      const id = Obj.getDXN(doc).toString();
+        return EditorView.updateListener.of((update) => {
+          if (update.docChanged || update.selectionSet) {
+            const id = update.state.facet(documentId);
+            const overlaps = selectionOverlapsComment(update.state);
+            const current = registry.get(stateAtom);
+            registry.set(stateAtom, {
+              ...current,
+              toolbar: { ...current.toolbar, [id]: overlaps },
+            });
+          }
+        });
+      },
+      ({ document: doc }) => {
+        if (!doc) return [];
+        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 dispatch(
-                createIntent(DeckAction.ChangeCompanion, {
-                  primary: id,
-                  companion: `${id}${ATTENDABLE_PATH_SEPARATOR}comments`,
-                }),
-              );
-            }
+        return EditorView.updateListener.of((update) => {
+          update.transactions.forEach((transaction) => {
+            transaction.effects.forEach(async (effect) => {
+              if (effect.is(commentClickedEffect)) {
+                void invokePromise(DeckOperation.ChangeCompanion, {
+                  companion: linkedSegment('comments'),
+                });
+              }
+            });
           });
         });
-      });
-    },
-  ]);
+      },
+    ]);
+  }),
+);
 
 const selectionOverlapsComment = (state: EditorState): boolean => {
   // May not be defined if thread plugin not installed.

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { ThreadOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, ThreadOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-root.tsx

@@ -2,16 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capabilities, contributes } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 
-import { Call } from '../components';
-import { meta } from '../meta';
+import { Call } from '#components';
+import { meta } from '#meta';
 
-export default () => {
-  return contributes(Capabilities.ReactRoot, {
-    id: meta.id,
-    root: () => <Call.Audio />,
-  });
-};
+export default Capability.makeModule(() =>
+  Effect.sync(() => {
+    return Capability.contributes(Capabilities.ReactRoot, {
+      id: meta.id,
+      root: () => <Call.Audio />,
+    });
+  }),
+);