@dxos/plugin-thread 0.8.4-main.1068cf700f → 0.8.4-main.1c7ec43d41

package/src/containers/ThreadCompanion/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { ThreadCompanion as default } from './ThreadCompanion';

package/src/{components/Chat.stories.tsx → containers/ThreadContainer/ThreadContainer.stories.tsx}

@@ -5,61 +5,58 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Capabilities, Capability, OperationPlugin } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Surface } from '@dxos/app-framework/ui';
-import { faker } from '@dxos/random';
+import { corePlugins } from '@dxos/plugin-testing';
+import { random } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
 import { Thread as ThreadComponent } from '@dxos/react-ui-thread';
-import { render } from '@dxos/storybook-utils';
+import { withLayout, Loading } from '@dxos/react-ui/testing';
 import { Message, Thread } from '@dxos/types';
 
-import { translations } from '../translations';
-import { Channel } from '../types';
+import { translations } from '#translations';
 
-import { ChatContainer } from './ChatContainer';
+import { ThreadContainer } from './ThreadContainer';
 
-faker.seed(1);
+random.seed(1);
 
 const DefaultStory = () => {
   const client = useClient();
   const identity = useIdentity();
   const [space, setSpace] = useState<Space>();
-  const [channel, setChannel] = useState<Channel.Channel | null>();
+  const [thread, setThread] = useState<Thread.Thread | null>();
 
   useAsyncEffect(async () => {
     if (identity) {
       const space = await client.spaces.create();
-      const channel = space.db.add(Channel.make());
+      const thread = space.db.add(Thread.make({ status: 'active' }));
       setSpace(space);
-      setChannel(channel);
+      setThread(thread);
     }
   }, [identity]);
 
-  if (!identity || !channel || !space || !channel.defaultThread.target) {
-    return null;
+  if (!identity || !thread || !space) {
+    return <Loading data={{ identity: !!identity, space: !!space, thread: !!thread }} />;
   }
 
-  return (
-    <main className='is-full max-is-proseMaxWidth mli-auto bs-full overflow-hidden'>
-      <ChatContainer space={space} thread={channel.defaultThread.target} />
-    </main>
-  );
+  return <ThreadContainer space={space} thread={thread} />;
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/Chat',
+  title: 'plugins/plugin-thread/containers/ThreadContainer',
   component: ThreadComponent.Root as any,
-  render: render(DefaultStory),
+  render: DefaultStory,
   decorators: [
-    withTheme(),
+    withLayout({ layout: 'column' }),
+    // TODO(wittjosiah): This shouldn't depend on app framework (use withClientProvider instead).
+    //  Currently this is required due to useOnEditAnalytics.
     withPluginManager({
-      plugins: [OperationPlugin()],
+      plugins: corePlugins(),
       capabilities: [
         Capability.contributes(
           Capabilities.ReactSurface,
@@ -71,7 +68,10 @@ const meta = {
         ),
       ],
     }),
-    withClientProvider({ createSpace: true, types: [Thread.Thread, Channel.Channel, Message.Message] }),
+    withClientProvider({
+      createSpace: true,
+      types: [Thread.Thread, Message.Message],
+    }),
   ],
   parameters: {
     layout: 'fullscreen',

package/src/containers/ThreadContainer/ThreadContainer.tsx

@@ -0,0 +1,75 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { Obj, Ref } from '@dxos/echo';
+import { type Space, useMembers } from '@dxos/react-client/echo';
+import { useIdentity } from '@dxos/react-client/halo';
+import { type ThemedClassName } from '@dxos/react-ui';
+import { type ThreadRootProps } from '@dxos/react-ui-thread';
+import { Message, type Thread } from '@dxos/types';
+import { composable, composableProps } from '@dxos/ui-theme';
+import { isNonNullable } from '@dxos/util';
+
+import { Chat } from '#components';
+import { useStatus } from '#hooks';
+
+export type ThreadContainerProps = ThemedClassName<
+  {
+    space: Space;
+    thread: Thread.Thread;
+    context?: Obj.Unknown;
+    autoFocusTextbox?: boolean;
+  } & Pick<ThreadRootProps, 'current'>
+>;
+
+/**
+ * Renders an AutoMerge {@link Thread} as a chat: appends new messages by pushing
+ * onto `thread.messages`. Used for comment threads and the meeting in-call chat.
+ */
+export const ThreadContainer = composable<HTMLDivElement, ThreadContainerProps>(
+  ({ space, thread, context, autoFocusTextbox, current, ...props }, forwardedRef) => {
+    const id = Obj.getDXN(thread).toString();
+    const identity = useIdentity()!;
+    const members = useMembers(space?.id);
+    const activity = useStatus(space, id);
+
+    const messages = useMemo(
+      () => thread.messages.map((message) => message.target).filter(isNonNullable),
+      [thread.messages],
+    );
+
+    const handleSend = (text: string) => {
+      Obj.update(thread, (thread) => {
+        thread.messages.push(
+          Ref.make(
+            Obj.make(Message.Message, {
+              created: new Date().toISOString(),
+              sender: { identityDid: identity.did },
+              blocks: [{ _tag: 'text', text }],
+              properties: context ? { context: Ref.make(context) } : undefined,
+            }),
+          ),
+        );
+      });
+      return true;
+    };
+
+    return (
+      <Chat
+        {...composableProps(props)}
+        id={id}
+        identity={identity}
+        members={members}
+        messages={messages}
+        activity={activity}
+        onSend={handleSend}
+        autoFocusTextbox={autoFocusTextbox}
+        current={current}
+        ref={forwardedRef}
+      />
+    );
+  },
+);

package/src/containers/ThreadContainer/index.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { ThreadContainer } from './ThreadContainer';
+
+export { ThreadContainer };
+export default ThreadContainer;

package/src/containers/index.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const CallDebugPanel: ComponentType<any> = lazy(() => import('./CallDebugPanel'));
+export const CallSidebar: ComponentType<any> = lazy(() => import('./CallSidebar'));
+export const ChannelChat: ComponentType<any> = lazy(() => import('./ChannelChat'));
+export const ChannelContainer: ComponentType<any> = lazy(() => import('./ChannelContainer'));
+export const ThreadContainer: ComponentType<any> = lazy(() => import('./ThreadContainer'));
+export const ThreadCompanion: ComponentType<any> = lazy(() => import('./ThreadCompanion'));

package/src/{components/command-extension.ts → extensions/command.ts}

@@ -29,7 +29,7 @@ const parser = StreamLanguage.define<{ count: number }>({
 const styles = HighlightStyle.define([
   {
     tag: tags.tagName,
-    class: mx('dx-tag dx-tag--indigo text-baseText font-medium'),
+    class: mx('dx-tag dx-tag--indigo text-base-surface-text font-medium'),
   },
 ]);
 

package/src/extensions/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
+export * from './command';
 export * from './threads';

package/src/extensions/threads.ts

@@ -8,12 +8,13 @@ import { type Atom, type Registry } from '@effect-atom/atom-react';
 
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { createDocAccessor, getTextInRange } from '@dxos/echo-db';
-import { type OperationInvoker } from '@dxos/operation';
+import { OperationInvoker } from '@dxos/operation';
 import { type Markdown } from '@dxos/plugin-markdown/types';
 import { AnchoredTo, Thread } from '@dxos/types';
 import { comments, createExternalCommentSync } from '@dxos/ui-editor';
 
-import { ThreadOperation, type ThreadState } from '../types';
+import { ThreadOperation } from '#operations';
+import { type ThreadState } from '#types';
 
 // TODO(burdon): Factor out.
 const getName = (doc: Markdown.Document, anchor: string): string | undefined => {
@@ -72,8 +73,8 @@ export const threads = (
             const name = getName(doc, anchor.anchor);
             const thread = Relation.getSource(anchor) as Thread.Thread;
             if (name && name !== thread.name) {
-              Obj.change(thread, (t) => {
-                t.name = name;
+              Obj.update(thread, (thread) => {
+                thread.name = name;
               });
             }
           }
@@ -129,8 +130,8 @@ export const threads = (
 
         const thread = query.results.find((object) => Relation.getSource(object).id === id);
         if (thread) {
-          Relation.change(thread, (t) => {
-            t.anchor = undefined;
+          Relation.update(thread, (thread) => {
+            thread.anchor = undefined;
           });
         }
       },
@@ -138,11 +139,11 @@ export const threads = (
         const draft = registry.get(stateAtom).drafts[objectId]?.find((d) => Relation.getDXN(d).toString() === id);
         if (draft) {
           const thread = Relation.getSource(draft) as Thread.Thread;
-          Obj.change(thread, (t) => {
-            t.name = getName(doc, cursor);
+          Obj.update(thread, (thread) => {
+            thread.name = getName(doc, cursor);
           });
-          Relation.change(draft, (d) => {
-            d.anchor = cursor;
+          Relation.update(draft, (draft) => {
+            draft.anchor = cursor;
           });
         }
 
@@ -150,11 +151,11 @@ export const threads = (
         if (relation) {
           const thread = Relation.getSource(relation);
           if (Obj.instanceOf(Thread.Thread, thread)) {
-            Obj.change(thread, (t) => {
-              t.name = getName(doc, cursor);
+            Obj.update(thread, (thread) => {
+              thread.name = getName(doc, cursor);
             });
-            Relation.change(relation, (r) => {
-              r.anchor = cursor;
+            Relation.update(relation, (relation) => {
+              relation.anchor = cursor;
             });
           }
         }

package/src/hooks/analytics.ts

@@ -6,7 +6,7 @@ import { useCallback } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { Obj } from '@dxos/echo';
-import { ObservabilityOperation } from '@dxos/plugin-observability/types';
+import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
 import { useOnTransition } from '@dxos/react-ui';
 import { type ContentBlock } from '@dxos/types';
 
@@ -21,6 +21,7 @@ export const useOnEditAnalytics = (
     if (!message || !textBlock) {
       return;
     }
+
     const db = Obj.getDatabase(message);
     if (!db) {
       return;

package/src/index.ts

@@ -2,9 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const ThreadPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export * from './meta';
+
 export { ThreadCapabilities } from './types';
 export * from './calls';
+// 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';

package/src/meta.ts

@@ -7,7 +7,7 @@ import { trim } from '@dxos/util';
 
 // TODO(wittjosiah): Needs screenshots.
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/thread',
+  id: 'org.dxos.plugin.thread',
   name: 'Chat',
   description: trim`
     Multi-modal communication platform supporting text chat, voice, and video conferencing.
@@ -18,4 +18,4 @@ export const meta: Plugin.Meta = {
   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/operations';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
+
+import { ThreadCapabilities } from '../types';
+import { AddMessage } from './definitions';
+
+const handler: Operation.WithHandler<typeof AddMessage> = 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,36 @@
+//
+// 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/types';
+import { Message } from '@dxos/types';
+
+import { AppendChannelMessage } from './definitions';
+
+const handler: Operation.WithHandler<typeof AppendChannelMessage> = 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 { CreateChannel } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreateChannel> = 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 { CreateProposals } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreateProposals> = 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 { Create, Select } from './definitions';
+
+const handler: Operation.WithHandler<typeof Create> = 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(Select, { current: Obj.getDXN(thread).toString() });
+      yield* Operation.invoke(LayoutOperation.UpdateCompanion, {
+        subject: linkedSegment('comments'),
+      });
+    }),
+  ),
+);
+
+export default handler;