@dxos/plugin-thread 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

package/src/components/ThreadSettings.tsx

@@ -5,12 +5,18 @@
 import React from 'react';
 
 import { useTranslation } from '@dxos/react-ui';
-import { ControlPage } from '@dxos/react-ui-form';
+import { Settings } from '@dxos/react-ui-form';
 
 import { meta } from '../meta';
 import type { ThreadSettingsProps } from '../types';
 
-export const ThreadSettings = ({ settings: _settings }: { settings: ThreadSettingsProps }) => {
+export type ThreadSettingsComponentProps = {
+  settings: ThreadSettingsProps;
+  onSettingsChange: (fn: (current: ThreadSettingsProps) => ThreadSettingsProps) => void;
+};
+
+// TODO(burdon): Settings.
+export const ThreadSettings = ({ settings: _settings }: ThreadSettingsComponentProps) => {
   const { t: _t } = useTranslation(meta.id);
-  return <ControlPage></ControlPage>;
+  return <Settings.Root></Settings.Root>;
 };

package/src/components/command-extension.ts

@@ -5,8 +5,8 @@
 import { HighlightStyle, StreamLanguage, syntaxHighlighting } from '@codemirror/language';
 import { type Extension } from '@codemirror/state';
 
-import { tags } from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
+import { tags } from '@dxos/ui-editor';
+import { mx } from '@dxos/ui-theme';
 
 /**
  * https://github.com/codemirror/stream-parser/blob/main/test/test-stream-parser.ts

package/src/components/index.ts

@@ -2,9 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { lazy } from 'react';
-
-// TODO(wittjosiah): Suspense boundary for sidebar?
 export * from './Call';
 export * from './CallDebugPanel';
 export * from './CallSidebar';
@@ -14,5 +11,5 @@ export * from './MessageContainer';
 export * from './ThreadCompanion';
 export * from './ThreadSettings';
 
-export const ChannelContainer = lazy(() => import('./ChannelContainer'));
-export const ChatContainer = lazy(() => import('./ChatContainer'));
+export { ChannelContainer } from './ChannelContainer';
+export { ChatContainer } from './ChatContainer';

package/src/extensions/threads.ts

@@ -4,17 +4,16 @@
 
 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 OperationInvoker } from '@dxos/operation';
 import { type Markdown } from '@dxos/plugin-markdown/types';
-import { getSpace } from '@dxos/react-client/echo';
-import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
 import { AnchoredTo, Thread } from '@dxos/types';
+import { comments, createExternalCommentSync } from '@dxos/ui-editor';
 
-import { ThreadAction, type ThreadState } from '../types';
+import { ThreadOperation, type ThreadState } from '../types';
 
 // TODO(burdon): Factor out.
 const getName = (doc: Markdown.Document, anchor: string): string | undefined => {
@@ -24,46 +23,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.id(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(() =>
+  // 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.change(thread, (t) => {
+                t.name = name;
+              });
             }
           }
         });
@@ -71,10 +82,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 +102,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.results.find((object) => Relation.getSource(object).id === id);
         if (thread) {
-          thread.anchor = undefined;
+          Relation.change(thread, (t) => {
+            t.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.change(thread, (t) => {
+            t.name = getName(doc, cursor);
+          });
+          Relation.change(draft, (d) => {
+            d.anchor = cursor;
+          });
         }
 
         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.change(thread, (t) => {
+              t.name = getName(doc, cursor);
+            });
+            Relation.change(relation, (r) => {
+              r.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/functions/create-proposals.ts

@@ -7,12 +7,10 @@ import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId, computeDiffsWithCursors } from '@dxos/assistant';
-import { Obj, Ref, Relation } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { computeDiffsWithCursors } from '@dxos/assistant';
+import { Database, Obj, Ref, Relation, Type } from '@dxos/echo';
 import { createDocAccessor } from '@dxos/echo-db';
 import { defineFunction } from '@dxos/functions';
-import { DXN } from '@dxos/keys';
 import { Markdown } from '@dxos/plugin-markdown/types';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
@@ -21,14 +19,16 @@ export default defineFunction({
   name: 'Create Proposals',
   description: 'Proposes a set of changes to a document.',
   inputSchema: Schema.Struct({
-    id: ArtifactId,
+    doc: Type.Ref(Markdown.Document).annotations({
+      description: 'The ID of the document.',
+    }),
     diffs: Schema.Array(Schema.String).annotations({
       description: 'The diffs to propose for the document.',
     }),
   }),
   outputSchema: Schema.Void,
-  handler: Effect.fn(function* ({ data: { id, diffs: _diffs } }) {
-    const object = yield* Database.Service.resolve(DXN.parse(id), Markdown.Document);
+  handler: Effect.fn(function* ({ data: { doc, diffs: _diffs } }) {
+    const object = yield* Database.load(doc);
     const content = yield* Effect.promise(() => object.content.load());
     const accessor = createDocAccessor(content, ['content']);
 
@@ -47,8 +47,8 @@ export default defineFunction({
             [Relation.Target]: object,
             anchor: cursor,
           });
-          yield* Database.Service.add(thread);
-          yield* Database.Service.add(relation);
+          yield* Database.add(thread);
+          yield* Database.add(relation);
         }),
       ),
       Effect.allWith({ concurrency: 'unbounded' }),

package/src/hooks/analytics.ts

@@ -4,34 +4,37 @@
 
 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/types';
 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;
+    }
+    const db = Obj.getDatabase(message);
+    if (!db) {
       return;
     }
 
-    void dispatch(
-      createIntent(ObservabilityAction.SendEvent, {
-        name: 'threads.message.update',
-        properties: {
-          spaceId: space.id,
-          messageId: message.id,
-          messageLength: textBlock?.text.length,
-        },
-      }),
-    );
-  }, [dispatch, message, textBlock]);
+    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/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export { ThreadCapabilities } from './capabilities';
+export { ThreadCapabilities } from './types';
 export * from './calls';
 export * from './hooks';
 export * from './meta';

package/src/meta.ts

@@ -2,11 +2,11 @@
 // 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 = {
+export const meta: Plugin.Meta = {
   id: 'dxos.org/plugin/thread',
   name: 'Chat',
   description: trim`

package/src/testing/stories.ts

@@ -2,27 +2,32 @@
 // Copyright 2023 DXOS.org
 //
 
-import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { OperationPlugin, type Plugin } from '@dxos/app-framework';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { GraphPlugin } from '@dxos/plugin-graph';
+import { SettingsPlugin } from '@dxos/plugin-settings';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { ThemePlugin } from '@dxos/plugin-theme';
 import { Config } from '@dxos/react-client';
-import { defaultTx } from '@dxos/react-ui-theme';
+import { defaultTx } from '@dxos/ui-theme';
 
 import { ThreadPlugin } from '../ThreadPlugin';
 import { Channel } from '../types';
 
-export const createThreadPlugins = async () => [
+export const createThreadPlugins = async (): Promise<Array<Plugin.Plugin>> => [
   ThemePlugin({ tx: defaultTx }),
   ClientPlugin({
-    onClientInitialized: async ({ client }) => {
-      await client.halo.createIdentity({ displayName: 'Test User' });
-    },
-    onSpacesReady: async ({ client }) => {
-      await client.spaces.default.waitUntilReady();
-      client.spaces.default.db.add(Channel.make());
-    },
+    onClientInitialized: ({ client }) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => client.halo.createIdentity({ displayName: 'Test User' }));
+      }),
+    onSpacesReady: ({ client }) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => client.spaces.default.waitUntilReady());
+        client.spaces.default.db.add(Channel.make());
+      }),
     config: new Config({
       runtime: {
         client: {
@@ -44,7 +49,7 @@ export const createThreadPlugins = async () => [
     }),
   }),
   SpacePlugin({}),
-  IntentPlugin(),
+  OperationPlugin(),
   SettingsPlugin(),
   GraphPlugin(),
   ThreadPlugin(),

package/src/types/Channel.ts

@@ -8,15 +8,19 @@ import { Obj, Ref, Type } from '@dxos/echo';
 import { FormInputAnnotation } from '@dxos/echo/internal';
 import { Thread } from '@dxos/types';
 
-const _Channel = Schema.Struct({
+export const Channel = Schema.Struct({
   name: Schema.optional(Schema.String),
   defaultThread: Type.Ref(Thread.Thread).pipe(FormInputAnnotation.set(false)),
   // TODO(wittjosiah): Should be an "ordered collection".
-  threads: Type.Ref(Thread.Thread).pipe(Schema.Array, Schema.mutable, FormInputAnnotation.set(false)),
-}).pipe(Type.Obj({ typename: 'dxos.org/type/Channel', version: '0.1.0' }));
-export interface Channel extends Schema.Schema.Type<typeof _Channel> {}
-export interface ChannelEncoded extends Schema.Schema.Encoded<typeof _Channel> {}
-export const Channel: Schema.Schema<Channel, ChannelEncoded> = _Channel;
+  threads: Type.Ref(Thread.Thread).pipe(Schema.Array, FormInputAnnotation.set(false)),
+}).pipe(
+  Type.object({
+    typename: 'dxos.org/type/Channel',
+    version: '0.1.0',
+  }),
+);
+
+export interface Channel extends Schema.Schema.Type<typeof Channel> {}
 
 export const make = (props: Pick<Obj.MakeProps<typeof Channel>, 'name'> = {}) =>
   Obj.make(Channel, {

package/src/types/capabilities.ts

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Atom } from '@effect-atom/atom-react';
+
+import { Capability } from '@dxos/app-framework';
+
+import { type CallManager, type CallState, type MediaState } from '../calls';
+import { meta } from '../meta';
+import { type Channel, type ThreadSettingsProps, type ThreadState, type ViewStore } from '../types';
+
+export namespace ThreadCapabilities {
+  export const Settings = Capability.make<Atom.Writable<ThreadSettingsProps>>(`${meta.id}/capability/settings`);
+  export const CallManager = Capability.make<CallManager>(`${meta.id}/capability/call-manager`);
+
+  // TODO(burdon): Better way to define specific extensions for meeting companions.
+  // TODO(burdon): This brings in deps from ../calls; how should we manage/minimize explicit type exposure to other plugins?
+  // TODO(wittjosiah): These callbacks could be intents once we support broadcast.
+  export type CallProperties = {
+    onJoin: (state: { channel?: Channel.Channel; roomId?: string }) => Promise<void>;
+    onLeave: (roomId?: string) => Promise<void>;
+    onCallStateUpdated: (callState: CallState) => Promise<void>;
+    onMediaStateUpdated: ([mediaState, isSpeaking]: [MediaState, boolean]) => Promise<void>;
+  };
+
+  export const CallExtension = Capability.make<CallProperties>(`${meta.id}/capability/call-extension`);
+
+  /** Thread state (drafts, toolbar state, current selection). */
+  export const State = Capability.make<Atom.Writable<ThreadState>>(`${meta.id}/capability/state`);
+
+  /** Per-subject view state (e.g., showResolvedThreads). */
+  export const ViewState = Capability.make<Atom.Writable<ViewStore>>(`${meta.id}/capability/view-state`);
+}

package/src/types/index.ts

@@ -2,5 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
+export * from './capabilities';
 export * as Channel from './Channel';
 export * from './types';