@dxos/plugin-thread 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

package/src/containers/ChannelChat/ChannelChat.tsx

@@ -0,0 +1,75 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React from 'react';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { type Space, useMembers, useQuery } from '@dxos/react-client/echo';
+import { useIdentity } from '@dxos/react-client/halo';
+import { type Channel, Message } from '@dxos/types';
+import { composable, composableProps } from '@dxos/ui-theme';
+
+import { Chat } from '#components';
+import { useStatus } from '#hooks';
+import { ThreadOperation } from '#types';
+
+export type ChannelChatProps = {
+  space: Space;
+  channel: Channel.Channel;
+};
+
+/**
+ * Channel chat: composer pinned to the bottom of the panel, messages scrolling
+ * above it (newest at the bottom). Threading via `Message.threadId` is
+ * intentionally not reconstructed in this round.
+ *
+ * Externally-synced channels (any Channel carrying foreign-key `Obj.Meta`,
+ * e.g. Slack/Discord-sourced rooms) render read-only — the composer is
+ * suppressed because there's no local-write path back to the source.
+ */
+export const ChannelChat = composable<HTMLDivElement, ChannelChatProps>(
+  ({ space, channel, ...props }, forwardedRef) => {
+    const identity = useIdentity()!;
+    const members = useMembers(space.id);
+    const id = Obj.getDXN(channel).toString();
+    const activity = useStatus(space, id);
+    const { invokePromise } = useOperationInvoker();
+
+    const feed = channel.feed?.target;
+    const messages = useQuery(
+      space.db,
+      feed ? Query.select(Filter.type(Message.Message)).from(feed) : Query.select(Filter.nothing()),
+    );
+
+    const readOnly = Obj.getMeta(channel).keys.length > 0;
+
+    const handleSend = (text: string) => {
+      if (readOnly) {
+        return false;
+      }
+      void invokePromise(ThreadOperation.AppendChannelMessage, {
+        channel,
+        sender: { identityDid: identity.did },
+        text,
+      });
+      return true;
+    };
+
+    return (
+      <Chat
+        {...composableProps(props)}
+        id={id}
+        identity={identity}
+        members={members}
+        messages={messages}
+        activity={activity}
+        onSend={handleSend}
+        orientation='bottom'
+        readOnly={readOnly}
+        ref={forwardedRef}
+      />
+    );
+  },
+);

package/src/containers/ChannelChat/index.ts

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

package/src/containers/ChannelContainer/ChannelContainer.stories.tsx

@@ -3,27 +3,34 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { Capability } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Query, useDatabase, useQuery } from '@dxos/react-client/echo';
+import { Feed, Query } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { SpacePlugin } from '@dxos/plugin-space/plugin';
+import { corePlugins } from '@dxos/plugin-testing';
+import { Config } from '@dxos/react-client';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
-import { Message, Thread } from '@dxos/types';
+import { Channel, Message, Thread } from '@dxos/types';
 
-import { createThreadPlugins } from '#testing';
-import { Channel } from '#types';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
+import { ThreadPlugin } from '../../ThreadPlugin';
 import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 
 // TODO(wittjosiah): Channel doesn't render full height.
 const DefaultStory = ({ roomId }: ChannelContainerProps) => {
-  const db = useDatabase();
-  const [channel] = useQuery(db, Query.type(Channel.Channel));
+  const [space] = useSpaces();
+  const [channel] = useQuery(space?.db, Query.type(Channel.Channel));
   if (!channel) {
-    return <Loading data={{ db: !!db, channel: !!channel }} />;
+    return <Loading data={{ channel }} />;
   }
 
   return <ChannelContainer subject={channel} attendableId='story' roomId={roomId} role='article' />;
@@ -37,8 +44,45 @@ const meta = {
     withTheme(),
     withLayout({ layout: 'column' }),
     withPluginManager({
-      plugins: [...(await createThreadPlugins())],
-      capabilities: [Capability.contributes(AppCapabilities.Schema, [Channel.Channel, Thread.Thread, Message.Message])],
+      capabilities: [
+        Capability.contributes(AppCapabilities.Schema, [Channel.Channel, Feed.Feed, Thread.Thread, Message.Message]),
+      ],
+      plugins: [
+        ...corePlugins(),
+        ClientPlugin({
+          types: [Channel.Channel, Feed.Feed, Thread.Thread, Message.Message],
+          config: new Config({
+            runtime: {
+              services: {
+                edge: {
+                  url: 'https://edge.dxos.workers.dev/',
+                },
+                iceProviders: [
+                  {
+                    urls: 'https://edge.dxos.workers.dev/ice',
+                  },
+                ],
+              },
+            },
+          }),
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              const { personalSpace } = yield* initializeIdentity(client);
+              const channel = personalSpace.db.add(Channel.make({ name: 'general' }));
+              const feed = yield* Effect.promise(() => channel.feed.load());
+              const seed = [
+                Message.make({ sender: { role: 'user' }, blocks: [{ _tag: 'text', text: 'Hello, channel.' }] }),
+                Message.make({
+                  sender: { role: 'user' },
+                  blocks: [{ _tag: 'text', text: 'Messages are stored in the feed.' }],
+                }),
+              ];
+              yield* Feed.append(feed, seed).pipe(Effect.provide(createFeedServiceLayer(personalSpace.queues)));
+            }),
+        }),
+        SpacePlugin({}),
+        ThreadPlugin(),
+      ],
     }),
   ],
   parameters: {

package/src/containers/ChannelContainer/ChannelContainer.tsx

@@ -17,14 +17,14 @@ import { Button, ElevationProvider, Input, Panel, useTranslation } from '@dxos/r
 import { Settings } from '@dxos/react-ui-form';
 import { Menu, MenuRootProps, createMenuAction, createMenuItemGroup, useMenuActions } from '@dxos/react-ui-menu';
 import { useSoundEffect } from '@dxos/react-ui-sfx';
+import { type Channel } from '@dxos/types';
 import { composable, composableProps } from '@dxos/ui-theme';
 
 import { Call } from '#components';
 import { meta } from '#meta';
 import { ThreadCapabilities } from '#types';
-import { type Channel } from '#types';
 
-import { ChatContainer } from '../ChatContainer';
+import { ChannelChat } from '../ChannelChat';
 
 export type ChannelContainerProps = AppSurface.ObjectArticleProps<
   Channel.Channel | undefined,
@@ -140,14 +140,14 @@ export const ChannelContainer = ({
     );
   }
 
-  if (channel && channel.defaultThread.target && space) {
+  if (channel && space) {
     return (
       <Panel.Root classNames='dx-document'>
         <Panel.Toolbar asChild>
           <ChannelToolbar attendableId={attendableId} role={role} onJoinCall={handleJoin} />
         </Panel.Toolbar>
         <Panel.Content asChild>
-          <ChatContainer space={space} thread={channel.defaultThread.target} />
+          <ChannelChat space={space} channel={channel} />
         </Panel.Content>
       </Panel.Root>
     );

package/src/containers/ThreadCompanion/ThreadCompanion.tsx

@@ -6,11 +6,11 @@ import { useAtomValue } from '@effect-atom/atom-react';
 import React, { useCallback, useMemo } from 'react';
 
 import { Capabilities } from '@dxos/app-framework';
-import { useCapabilities, useCapability, useOperationInvoker, usePluginManager } from '@dxos/app-framework/ui';
+import { useCapabilities, useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
 import { AppCapabilities, CollaborationOperation, LayoutOperation } from '@dxos/app-toolkit';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { Filter, Obj, Query, Relation } from '@dxos/echo';
-import { Ref, useQuery } from '@dxos/react-client/echo';
+import { Filter, Obj, Query, Ref, Relation } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
 import { getParentId, useAttention } from '@dxos/react-ui-attention';
@@ -19,7 +19,7 @@ import { AnchoredTo, Thread } from '@dxos/types';
 
 import { CommentsPanel, type CommentsPanelProps } from '#components';
 import { meta } from '#meta';
-import { ThreadOperation } from '#operations';
+import { ThreadOperation } from '#types';
 import { ThreadCapabilities, type ViewState } from '#types';
 
 const initialViewState: ViewState = { showResolvedThreads: false };
@@ -33,7 +33,6 @@ export type ThreadCompanionProps = AppSurface.ObjectArticleProps<
 
 export const ThreadCompanion = ({ attendableId, subject }: ThreadCompanionProps) => {
   const { t } = useTranslation(meta.id);
-  const manager = usePluginManager();
   const { invokePromise } = useOperationInvoker();
   const identity = useIdentity();
   const subjectId = Obj.getDXN(subject).toString();
@@ -66,6 +65,7 @@ export const ThreadCompanion = ({ attendableId, subject }: ThreadCompanionProps)
     [registry, viewStoreAtom, subjectId],
   );
 
+  const commentConfigs = useCapabilities(AppCapabilities.CommentConfig);
   const anchorSorts = useCapabilities(AppCapabilities.AnchorSort);
   const sort = useMemo(
     () => anchorSorts.find(({ key }) => key === Obj.getTypename(subject))?.sort,
@@ -93,14 +93,12 @@ export const ThreadCompanion = ({ attendableId, subject }: ThreadCompanionProps)
         // Scroll plank into view (deck handler).
         void invokePromise(LayoutOperation.ScrollIntoView, { subject: parentId });
 
-        // Scroll within content to anchor (metadata-driven, per typename).
+        // Scroll within content to anchor (comment config per typename).
         if (anchor.anchor && parentId) {
           const typename = Obj.getTypename(subject);
-          const metadata = manager.capabilities
-            .getAll(AppCapabilities.Metadata)
-            .find(({ id }) => id === typename)?.metadata;
-          if (metadata?.scrollToAnchor) {
-            void invokePromise(metadata.scrollToAnchor, {
+          const commentConfig = commentConfigs.find(({ id }) => id === typename);
+          if (commentConfig?.scrollToAnchor) {
+            void invokePromise(commentConfig.scrollToAnchor, {
               subject: parentId,
               cursor: anchor.anchor,
               ref: threadId,
@@ -109,7 +107,7 @@ export const ThreadCompanion = ({ attendableId, subject }: ThreadCompanionProps)
         }
       }
     },
-    [state.current, invokePromise, registry, stateAtom, parentId, subject, manager],
+    [state.current, invokePromise, registry, stateAtom, parentId, subject, commentConfigs],
   );
 
   const handleComment = useCallback(

package/src/containers/{ChatContainer/ChatContainer.stories.tsx → ThreadContainer/ThreadContainer.stories.tsx}

@@ -19,10 +19,9 @@ import { Thread as ThreadComponent } from '@dxos/react-ui-thread';
 import { withLayout, Loading } from '@dxos/react-ui/testing';
 import { Message, Thread } from '@dxos/types';
 
-import { Channel } from '#types';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
-import { ChatContainer } from './ChatContainer';
+import { ThreadContainer } from './ThreadContainer';
 
 random.seed(1);
 
@@ -30,26 +29,26 @@ 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 <Loading data={{ identity: !!identity, space: !!space, channel: !!channel }} />;
+  if (!identity || !thread || !space) {
+    return <Loading data={{ identity: !!identity, space: !!space, thread: !!thread }} />;
   }
 
-  return <ChatContainer space={space} thread={channel.defaultThread.target} />;
+  return <ThreadContainer space={space} thread={thread} />;
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/containers/ChatContainer',
+  title: 'plugins/plugin-thread/containers/ThreadContainer',
   component: ThreadComponent.Root as any,
   render: DefaultStory,
   decorators: [
@@ -71,7 +70,7 @@ const meta = {
     }),
     withClientProvider({
       createSpace: true,
-      types: [Thread.Thread, Channel.Channel, Message.Message],
+      types: [Thread.Thread, Message.Message],
     }),
   ],
   parameters: {

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

@@ -6,6 +6,7 @@ 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 ChatContainer: ComponentType<any> = lazy(() => import('./ChatContainer'));
+export const ThreadContainer: ComponentType<any> = lazy(() => import('./ThreadContainer'));
 export const ThreadCompanion: ComponentType<any> = lazy(() => import('./ThreadCompanion'));

package/src/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-base-surface-text font-medium'),
+    class: mx('dx-tag dx-tag--indigo text-base-foreground font-medium'),
   },
 ]);
 

package/src/extensions/threads.ts

@@ -8,12 +8,12 @@ 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 { type Markdown } from '@dxos/plugin-markdown/types';
+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 { ThreadOperation } from '#operations';
+import { ThreadOperation } from '#types';
 import { type ThreadState } from '#types';
 
 // TODO(burdon): Factor out.
@@ -73,7 +73,7 @@ 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, (thread) => {
+              Obj.update(thread, (thread) => {
                 thread.name = name;
               });
             }
@@ -130,7 +130,7 @@ export const threads = (
 
         const thread = query.results.find((object) => Relation.getSource(object).id === id);
         if (thread) {
-          Relation.change(thread, (thread) => {
+          Relation.update(thread, (thread) => {
             thread.anchor = undefined;
           });
         }
@@ -139,10 +139,10 @@ 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, (thread) => {
+          Obj.update(thread, (thread) => {
             thread.name = getName(doc, cursor);
           });
-          Relation.change(draft, (draft) => {
+          Relation.update(draft, (draft) => {
             draft.anchor = cursor;
           });
         }
@@ -151,10 +151,10 @@ export const threads = (
         if (relation) {
           const thread = Relation.getSource(relation);
           if (Obj.instanceOf(Thread.Thread, thread)) {
-            Obj.change(thread, (thread) => {
+            Obj.update(thread, (thread) => {
               thread.name = getName(doc, cursor);
             });
-            Relation.change(relation, (relation) => {
+            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/operations';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
 import { useOnTransition } from '@dxos/react-ui';
 import { type ContentBlock } from '@dxos/types';
 

package/src/index.ts

@@ -2,9 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-export { ThreadCapabilities } from './types';
+export * from './blueprints';
 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';
+export * from './types';

package/src/operations/add-message.ts

@@ -5,17 +5,17 @@
 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 { Operation } from '@dxos/operation';
-import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
+import { SpaceOperation } from '@dxos/plugin-space';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
 import { ThreadCapabilities } from '../types';
-import { AddMessage } from './definitions';
+import { ThreadOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof AddMessage> = AddMessage.pipe(
+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);
@@ -30,14 +30,14 @@ const handler: Operation.WithHandler<typeof AddMessage> = AddMessage.pipe(
         sender,
         blocks: [{ _tag: 'text', text }],
       });
-      Obj.change(thread, (thread) => {
+      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.change(thread, (thread) => {
+        Obj.update(thread, (thread) => {
           thread.status = 'active';
         });
         registry.set(stateAtom, {

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

@@ -4,12 +4,12 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
+import { Channel } from '@dxos/types';
 
-import { Channel } from '../types';
-import { CreateChannel } from './definitions';
+import { ThreadOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof CreateChannel> = CreateChannel.pipe(
+const handler: Operation.WithHandler<typeof ThreadOperation.CreateChannel> = ThreadOperation.CreateChannel.pipe(
   Operation.withHandler((input) =>
     Effect.sync(() => ({
       object: Channel.make({ name: input.name }),

package/src/operations/create-proposals.ts

@@ -7,14 +7,14 @@ 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 { Operation } from '@dxos/operation';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
-import { CreateProposals } from './definitions';
+import { ThreadOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof CreateProposals> = CreateProposals.pipe(
+const handler: Operation.WithHandler<typeof ThreadOperation.CreateProposals> = ThreadOperation.CreateProposals.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ doc, diffs }) {
       const object = yield* Database.load(doc);