@dxos/plugin-thread 0.8.4-main.7ace549 → 0.8.4-main.8baae0fced

package/src/extensions/threads.ts

@@ -4,17 +4,17 @@
 
 import { type Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
-import { computed, effect } from '@preact/signals-core';
+import { type Atom, type Registry } from '@effect-atom/atom-react';
 
-import { type PromiseIntentDispatcher, createIntent } from '@dxos/app-framework';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { createDocAccessor, getTextInRange } from '@dxos/echo-db';
-import { type Markdown } from '@dxos/plugin-markdown/types';
-import { getSpace } from '@dxos/react-client/echo';
-import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
+import { OperationInvoker } from '@dxos/operation';
+import { type Markdown } from '@dxos/plugin-markdown';
 import { AnchoredTo, Thread } from '@dxos/types';
+import { comments, createExternalCommentSync } from '@dxos/ui-editor';
 
-import { ThreadAction, type ThreadState } from '../types';
+import { ThreadOperation } from '#types';
+import { type ThreadState } from '#types';
 
 // TODO(burdon): Factor out.
 const getName = (doc: Markdown.Document, anchor: string): string | undefined => {
@@ -24,46 +24,58 @@ const getName = (doc: Markdown.Document, anchor: string): string | undefined =>
   }
 };
 
+export type ThreadStore = {
+  registry: Registry.Registry;
+  stateAtom: Atom.Writable<ThreadState>;
+};
+
 /**
  * Construct plugins.
  */
-export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?: PromiseIntentDispatcher): Extension => {
-  const space = getSpace(doc);
-  if (!doc || !space || !dispatch) {
+export const threads = (
+  store: ThreadStore,
+  doc?: Markdown.Document,
+  invokePromise?: OperationInvoker.OperationInvoker['invokePromise'],
+): Extension => {
+  const db = doc && Obj.getDatabase(doc);
+  if (!doc || !db || !invokePromise) {
     // Include no-op comments extension here to ensure that the facets are always present when they are expected.
     // TODO(wittjosiah): The Editor should only look for these facets when comments are available.
     return [comments()];
   }
 
-  const query = space.db.query(Query.select(Filter.ids(doc.id)).targetOf(AnchoredTo.AnchoredTo));
-  const unsubscribe = query.subscribe();
+  const { registry, stateAtom } = store;
+  const objectId = Obj.getDXN(doc).toString();
+  const query = db.query(Query.select(Filter.id(doc.id)).targetOf(AnchoredTo.AnchoredTo));
 
-  const anchors = computed(() =>
-    query.objects
+  // Get current anchors by combining query results with store drafts.
+  const getAnchors = () =>
+    query.results
       .filter((anchor) => {
         const thread = Relation.getSource(anchor);
         return Obj.instanceOf(Thread.Thread, thread) && thread.status !== 'resolved';
       })
-      .concat(state.drafts[Obj.getDXN(doc).toString()] ?? []),
-  );
+      .concat(registry.get(stateAtom).drafts[objectId] ?? []);
 
   return [
     EditorView.domEventHandlers({
       destroy: () => {
-        unsubscribe();
+        // Note: cleanup functions for subscriptions are handled by createExternalCommentSync.
       },
     }),
 
     EditorView.updateListener.of((update) => {
       if (update.docChanged) {
-        anchors.value.forEach((anchor) => {
+        getAnchors().forEach((anchor) => {
           if (anchor.anchor) {
             // Only update if the name has changed, otherwise this will cause an infinite loop.
             // Skip if the name is empty; this means comment text was deleted, but thread name should remain.
             const name = getName(doc, anchor.anchor);
             const thread = Relation.getSource(anchor) as Thread.Thread;
             if (name && name !== thread.name) {
-              thread.name = name;
+              Obj.update(thread, (thread) => {
+                thread.name = name;
+              });
             }
           }
         });
@@ -71,10 +83,18 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
     }),
 
     createExternalCommentSync(
-      Obj.getDXN(doc).toString(),
-      (sink) => effect(() => sink()),
+      objectId,
+      (sink) => {
+        // Subscribe to both query changes and store state changes.
+        const unsubQuery = query.subscribe(sink);
+        const unsubStore = registry.subscribe(stateAtom, sink);
+        return () => {
+          unsubQuery();
+          unsubStore();
+        };
+      },
       () =>
-        anchors.value
+        getAnchors()
           .filter((anchor) => anchor.anchor)
           .map((anchor) => ({
             id: Obj.getDXN(Relation.getSource(anchor)).toString(),
@@ -83,52 +103,67 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
     ),
 
     comments({
-      id: Obj.getDXN(doc).toString(),
+      id: objectId,
       onCreate: ({ cursor }) => {
         const name = getName(doc, cursor);
-        void dispatch(
-          createIntent(ThreadAction.Create, {
-            anchor: cursor,
-            name,
-            subject: doc,
-          }),
-        );
+        void invokePromise(ThreadOperation.Create, {
+          anchor: cursor,
+          name,
+          subject: doc,
+        });
       },
       onDelete: ({ id }) => {
-        const draft = state.drafts[Obj.getDXN(doc).toString()];
-        if (draft) {
-          const index = draft.findIndex((thread) => Obj.getDXN(thread).toString() === id);
+        const drafts = registry.get(stateAtom).drafts[objectId];
+        if (drafts) {
+          const index = drafts.findIndex((draft) => Relation.getDXN(draft).toString() === id);
           if (index !== -1) {
-            draft.splice(index, 1);
+            const current = registry.get(stateAtom);
+            registry.set(stateAtom, {
+              ...current,
+              drafts: {
+                ...current.drafts,
+                [objectId]: current.drafts[objectId]?.filter((_, i) => i !== index),
+              },
+            });
           }
         }
 
-        const thread = query.objects.find((object) => Relation.getSource(object).id === id);
+        const thread = query.results.find((object) => Relation.getSource(object).id === id);
         if (thread) {
-          thread.anchor = undefined;
+          Relation.update(thread, (thread) => {
+            thread.anchor = undefined;
+          });
         }
       },
       onUpdate: ({ id, cursor }) => {
-        const draft = state.drafts[Obj.getDXN(doc).toString()]?.find((thread) => Obj.getDXN(thread).toString() === id);
+        const draft = registry.get(stateAtom).drafts[objectId]?.find((d) => Relation.getDXN(d).toString() === id);
         if (draft) {
           const thread = Relation.getSource(draft) as Thread.Thread;
-          thread.name = getName(doc, cursor);
-          draft.anchor = cursor;
+          Obj.update(thread, (thread) => {
+            thread.name = getName(doc, cursor);
+          });
+          Relation.update(draft, (draft) => {
+            draft.anchor = cursor;
+          });
         }
 
-        const relation = query.objects.find((object) => Relation.getSource(object).id === id);
+        const relation = query.results.find((object) => Relation.getSource(object).id === id);
         if (relation) {
           const thread = Relation.getSource(relation);
           if (Obj.instanceOf(Thread.Thread, thread)) {
-            thread.name = getName(doc, cursor);
-            relation.anchor = cursor;
+            Obj.update(thread, (thread) => {
+              thread.name = getName(doc, cursor);
+            });
+            Relation.update(relation, (relation) => {
+              relation.anchor = cursor;
+            });
           }
         }
       },
       onSelect: ({ selection }) => {
         const current = selection.current ?? selection.closest;
         if (current) {
-          void dispatch(createIntent(ThreadAction.Select, { current }));
+          void invokePromise(ThreadOperation.Select, { current });
         }
       },
     }),

package/src/hooks/analytics.ts

@@ -4,34 +4,38 @@
 
 import { useCallback } from 'react';
 
-import { createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
-import { type Live } from '@dxos/live-object';
-import { ObservabilityAction } from '@dxos/plugin-observability/types';
-import { getSpace } from '@dxos/react-client/echo';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { Obj } from '@dxos/echo';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
 import { useOnTransition } from '@dxos/react-ui';
 import { type ContentBlock } from '@dxos/types';
 
-export const useOnEditAnalytics = (message: Live<any>, textBlock: ContentBlock.Text | undefined, editing: boolean) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+export const useOnEditAnalytics = (
+  message: any | undefined,
+  textBlock: ContentBlock.Text | undefined,
+  editing: boolean,
+) => {
+  const { invokePromise } = useOperationInvoker();
 
   const onEdit = useCallback(() => {
-    const space = getSpace(message);
-    if (!space || !textBlock) {
+    if (!message || !textBlock) {
       return;
     }
 
-    void dispatch(
-      createIntent(ObservabilityAction.SendEvent, {
-        name: 'threads.message.update',
-        properties: {
-          spaceId: space.id,
-          messageId: message.id,
-          messageLength: textBlock?.text.length,
-        },
-      }),
-    );
-  }, [dispatch, message, textBlock]);
+    const db = Obj.getDatabase(message);
+    if (!db) {
+      return;
+    }
+
+    void invokePromise(ObservabilityOperation.SendEvent, {
+      name: 'threads.message.update',
+      properties: {
+        spaceId: db.spaceId,
+        messageId: message.id,
+        messageLength: textBlock?.text.length,
+      },
+    });
+  }, [invokePromise, message, textBlock]);
 
   useOnTransition(editing, true, false, onEdit);
 };

package/src/hooks/index.ts

@@ -3,9 +3,4 @@
 //
 
 export * from './analytics';
-
-export * from './useBlackCanvasStreamTrack';
-export * from './useDebugMode';
-export * from './useInaudibleAudioStreamTrack';
 export * from './useStatus';
-export * from './useVideoStreamTrack';

package/src/index.ts

@@ -2,9 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-export { ThreadCapabilities } from './capabilities';
-export * from './calls';
+export * from './blueprints';
+// TODO(wittjosiah): Hooks should not be exported from the plugin package at all.
+//   Either refactor callers to not need them or factor them out to a shared package.
 export * from './hooks';
 export * from './meta';
-
-export * from './ThreadPlugin';
+export * from './types';

package/src/meta.ts

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
-// TODO(wittjosiah): Needs screenshots.
-export const meta: PluginMeta = {
-  id: 'dxos.org/plugin/thread',
-  name: 'Chat',
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.thread',
+  name: 'Threads',
+  author: 'DXOS',
   description: trim`
     Multi-modal communication platform supporting text chat, voice, and video conferencing.
     Create threaded conversations and add contextual comments directly on any workspace object.
@@ -18,4 +18,4 @@ export const meta: PluginMeta = {
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-thread',
 };
 
-export const THREAD_ITEM = `${meta.id}/item`;
+export const THREAD_ITEM = `${meta.id}.item`;

package/src/operations/add-message.ts

@@ -0,0 +1,81 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { Obj, Ref, Relation } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
+
+import { ThreadCapabilities } from '../types';
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.AddMessage> = ThreadOperation.AddMessage.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ anchor, subject, sender, text }) {
+      const registry = yield* Capability.get(Capabilities.AtomRegistry);
+      const stateAtom = yield* Capability.get(ThreadCapabilities.State);
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      const subjectId = Obj.getDXN(subject).toString();
+      const db = Obj.getDatabase(subject);
+      invariant(db, 'Database not found');
+
+      const message = Obj.make(Message.Message, {
+        created: new Date().toISOString(),
+        sender,
+        blocks: [{ _tag: 'text', text }],
+      });
+      Obj.update(thread, (thread) => {
+        thread.messages.push(Ref.make(message));
+      });
+
+      const state = registry.get(stateAtom);
+      const draft = state.drafts[subjectId]?.find((a: { id: string }) => a.id === anchor.id);
+      if (draft) {
+        Obj.update(thread, (thread) => {
+          thread.status = 'active';
+        });
+        registry.set(stateAtom, {
+          ...state,
+          drafts: {
+            ...state.drafts,
+            [subjectId]: state.drafts[subjectId]?.filter((a: { id: string }) => a.id !== anchor.id),
+          },
+        });
+        yield* Operation.invoke(SpaceOperation.AddObject, { object: thread, target: db, hidden: true });
+        yield* Operation.invoke(SpaceOperation.AddRelation, {
+          db,
+          schema: AnchoredTo.AnchoredTo,
+          source: thread,
+          target: subject,
+          fields: { anchor: draft.anchor },
+        });
+        yield* Operation.schedule(ObservabilityOperation.SendEvent, {
+          name: 'threads.create',
+          properties: {
+            spaceId: db.spaceId,
+            threadId: thread.id,
+          },
+        });
+      }
+
+      yield* Operation.schedule(ObservabilityOperation.SendEvent, {
+        name: 'threads.message.add',
+        properties: {
+          spaceId: db.spaceId,
+          threadId: thread.id,
+          threadLength: thread.messages.length,
+          messageId: message.id,
+          messageLength: text.length,
+        },
+      });
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/append-channel-message.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { Database, Feed, Obj } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { invariant } from '@dxos/invariant';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { Message } from '@dxos/types';
+
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.AppendChannelMessage> =
+  ThreadOperation.AppendChannelMessage.pipe(
+    Operation.withHandler(
+      Effect.fnUntraced(function* ({ channel, sender, text }) {
+        const db = Obj.getDatabase(channel);
+        invariant(db, 'Database not found');
+        const client = yield* Capability.get(ClientCapabilities.Client);
+        const space = client.spaces.get(db.spaceId);
+        invariant(space, 'Space not found');
+
+        const feed = yield* Database.load(channel.feed);
+        const message = Message.make({
+          sender,
+          blocks: [{ _tag: 'text', text }],
+        });
+        yield* Feed.append(feed, [message]).pipe(Effect.provide(createFeedServiceLayer(space.queues)));
+      }),
+    ),
+  );
+
+export default handler;

package/src/operations/create-channel.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Operation } from '@dxos/compute';
+import { Channel } from '@dxos/types';
+
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.CreateChannel> = ThreadOperation.CreateChannel.pipe(
+  Operation.withHandler((input) =>
+    Effect.sync(() => ({
+      object: Channel.make({ name: input.name }),
+    })),
+  ),
+);
+
+export default handler;

package/src/operations/create-proposals.ts

@@ -0,0 +1,49 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Array from 'effect/Array';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+
+import { computeDiffsWithCursors } from '@dxos/assistant';
+import { Operation } from '@dxos/compute';
+import { Database, Obj, Ref, Relation } from '@dxos/echo';
+import { createDocAccessor } from '@dxos/echo-db';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
+
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.CreateProposals> = ThreadOperation.CreateProposals.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ doc, diffs }) {
+      const object = yield* Database.load(doc);
+      const content = yield* Effect.promise(() => object.content.load());
+      const accessor = createDocAccessor(content, ['content']);
+
+      yield* Function.pipe(
+        computeDiffsWithCursors(accessor, diffs),
+        Array.map(
+          Effect.fnUntraced(function* ({ cursor, text }) {
+            const proposal = Obj.make(Message.Message, {
+              created: new Date().toISOString(),
+              sender: { role: 'assistant' },
+              blocks: [{ _tag: 'proposal', text }],
+            });
+            const thread = Thread.make({ name: 'Proposal', messages: [Ref.make(proposal)], status: 'active' });
+            const relation = Relation.make(AnchoredTo.AnchoredTo, {
+              [Relation.Source]: thread,
+              [Relation.Target]: object,
+              anchor: cursor,
+            });
+            yield* Database.add(thread);
+            yield* Database.add(relation);
+          }),
+        ),
+        Effect.allWith({ concurrency: 'unbounded' }),
+      );
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/create.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Obj, Relation } from '@dxos/echo';
+import { linkedSegment } from '@dxos/react-ui-attention';
+import { AnchoredTo, Thread } from '@dxos/types';
+
+import { ThreadCapabilities } from '../types';
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.Create> = ThreadOperation.Create.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ name, anchor: _anchor, subject }) {
+      const registry = yield* Capability.get(Capabilities.AtomRegistry);
+      const stateAtom = yield* Capability.get(ThreadCapabilities.State);
+      const subjectId = Obj.getDXN(subject).toString();
+      const thread = Thread.make({ name });
+      const anchor = Relation.make(AnchoredTo.AnchoredTo, {
+        [Relation.Source]: thread,
+        [Relation.Target]: subject,
+        anchor: _anchor,
+      });
+
+      const state = registry.get(stateAtom);
+      const existingDrafts = state.drafts[subjectId];
+      registry.set(stateAtom, {
+        ...state,
+        drafts: {
+          ...state.drafts,
+          [subjectId]: existingDrafts ? [...existingDrafts, anchor] : [anchor],
+        },
+      });
+
+      yield* Operation.invoke(ThreadOperation.Select, { current: Obj.getDXN(thread).toString() });
+      yield* Operation.invoke(LayoutOperation.UpdateCompanion, {
+        subject: linkedSegment('comments'),
+      });
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/delete-message.ts

@@ -0,0 +1,53 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Operation } from '@dxos/compute';
+import { Obj, Relation } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
+import { Thread } from '@dxos/types';
+
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.DeleteMessage> = ThreadOperation.DeleteMessage.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ subject, anchor, messageId }) {
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      const db = Obj.getDatabase(subject);
+      invariant(db, 'Database not found');
+
+      const msgIndex = thread.messages.findIndex((ref) => ref.target?.id === messageId);
+      const msg = thread.messages[msgIndex]?.target;
+      if (!msg) {
+        return { messageIndex: -1 };
+      }
+
+      if (msgIndex === 0 && thread.messages.length === 1) {
+        // TODO(wittjosiah): This doesn't support restoring the thread.
+        yield* Operation.invoke(ThreadOperation.Delete, { subject, anchor });
+        return { messageIndex: -1 };
+      }
+
+      Obj.update(thread, (thread) => {
+        thread.messages.splice(msgIndex, 1);
+      });
+
+      yield* Operation.schedule(ObservabilityOperation.SendEvent, {
+        name: 'threads.message.delete',
+        properties: {
+          spaceId: db.spaceId,
+          threadId: thread.id,
+          threadLength: thread.messages.length,
+          messageId,
+        },
+      });
+
+      return { message: msg, messageIndex: msgIndex };
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/delete.ts

@@ -0,0 +1,63 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { sleep } from '@dxos/async';
+import { Operation } from '@dxos/compute';
+import { Obj, Relation } from '@dxos/echo';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
+import { Thread } from '@dxos/types';
+
+import { ThreadCapabilities } from '../types';
+import { ThreadOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof ThreadOperation.Delete> = ThreadOperation.Delete.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ subject, anchor, thread: _thread }) {
+      const registry = yield* Capability.get(Capabilities.AtomRegistry);
+      const stateAtom = yield* Capability.get(ThreadCapabilities.State);
+      const thread = _thread ?? (Relation.getSource(anchor) as Thread.Thread);
+      const subjectId = Obj.getDXN(subject).toString();
+      const state = registry.get(stateAtom);
+      const draft = state.drafts[subjectId];
+      if (draft) {
+        const index = draft.findIndex((a: { id: string }) => a.id === anchor.id);
+        if (index !== -1) {
+          registry.set(stateAtom, {
+            ...state,
+            drafts: {
+              ...state.drafts,
+              [subjectId]: state.drafts[subjectId]?.filter((_, i) => i !== index),
+            },
+          });
+          return {};
+        }
+      }
+
+      const db = Obj.getDatabase(thread);
+      if (!db) {
+        return {};
+      }
+
+      // TODO(wittjosiah): Without sleep, rendering crashes at `Relation.setSource(anchor)`.
+      db.remove(anchor);
+      yield* Effect.promise(() => sleep(100));
+      db.remove(thread);
+
+      yield* Operation.schedule(ObservabilityOperation.SendEvent, {
+        name: 'threads.delete',
+        properties: {
+          spaceId: db.spaceId,
+          threadId: thread.id,
+        },
+      });
+
+      return { thread, anchor };
+    }),
+  ),
+);
+
+export default handler;