@dxos/plugin-thread 0.8.4-main.5acf9ea → 0.8.4-main.66e292d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.5acf9ea",
+  "version": "0.8.4-main.66e292d",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,16 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts"
+      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -35,77 +35,83 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "@effect/ai": "0.29.1",
+    "@effect/experimental": "0.56.0",
     "@peermetrics/webrtc-stats": "5.7.1",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "date-fns": "^3.3.1",
     "extendable-media-recorder": "^9.2.19",
     "extendable-media-recorder-wav-encoder": "^7.0.123",
     "md5-hex": "5.0.0",
-    "react-resize-detector": "^12.0.2",
+    "react-resize-detector": "^11.0.1",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.4-main.5acf9ea",
-    "@dxos/async": "0.8.4-main.5acf9ea",
-    "@dxos/context": "0.8.4-main.5acf9ea",
-    "@dxos/codec-protobuf": "0.8.4-main.5acf9ea",
-    "@dxos/debug": "0.8.4-main.5acf9ea",
-    "@dxos/devtools": "0.8.4-main.5acf9ea",
-    "@dxos/display-name": "0.8.4-main.5acf9ea",
-    "@dxos/echo": "0.8.4-main.5acf9ea",
-    "@dxos/invariant": "0.8.4-main.5acf9ea",
-    "@dxos/echo-schema": "0.8.4-main.5acf9ea",
-    "@dxos/keys": "0.8.4-main.5acf9ea",
-    "@dxos/live-object": "0.8.4-main.5acf9ea",
-    "@dxos/local-storage": "0.8.4-main.5acf9ea",
-    "@dxos/log": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-attention": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-client": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-deck": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-graph": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-markdown": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-space": "0.8.4-main.5acf9ea",
-    "@dxos/protocols": "0.8.4-main.5acf9ea",
-    "@dxos/react-client": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-observability": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-dnd": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-attention": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-editor": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-form": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-menu": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-sfx": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-stack": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-tabs": "0.8.4-main.5acf9ea",
-    "@dxos/schema": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-thread": "0.8.4-main.5acf9ea",
-    "@dxos/util": "0.8.4-main.5acf9ea"
+    "@dxos/app-framework": "0.8.4-main.66e292d",
+    "@dxos/assistant": "0.8.4-main.66e292d",
+    "@dxos/async": "0.8.4-main.66e292d",
+    "@dxos/blueprints": "0.8.4-main.66e292d",
+    "@dxos/codec-protobuf": "0.8.4-main.66e292d",
+    "@dxos/context": "0.8.4-main.66e292d",
+    "@dxos/debug": "0.8.4-main.66e292d",
+    "@dxos/devtools": "0.8.4-main.66e292d",
+    "@dxos/echo": "0.8.4-main.66e292d",
+    "@dxos/echo-db": "0.8.4-main.66e292d",
+    "@dxos/display-name": "0.8.4-main.66e292d",
+    "@dxos/functions": "0.8.4-main.66e292d",
+    "@dxos/invariant": "0.8.4-main.66e292d",
+    "@dxos/keys": "0.8.4-main.66e292d",
+    "@dxos/local-storage": "0.8.4-main.66e292d",
+    "@dxos/live-object": "0.8.4-main.66e292d",
+    "@dxos/log": "0.8.4-main.66e292d",
+    "@dxos/plugin-attention": "0.8.4-main.66e292d",
+    "@dxos/plugin-client": "0.8.4-main.66e292d",
+    "@dxos/plugin-deck": "0.8.4-main.66e292d",
+    "@dxos/plugin-graph": "0.8.4-main.66e292d",
+    "@dxos/plugin-markdown": "0.8.4-main.66e292d",
+    "@dxos/plugin-observability": "0.8.4-main.66e292d",
+    "@dxos/plugin-space": "0.8.4-main.66e292d",
+    "@dxos/protocols": "0.8.4-main.66e292d",
+    "@dxos/react-ui-attention": "0.8.4-main.66e292d",
+    "@dxos/react-ui-dnd": "0.8.4-main.66e292d",
+    "@dxos/react-ui-editor": "0.8.4-main.66e292d",
+    "@dxos/react-ui-form": "0.8.4-main.66e292d",
+    "@dxos/react-ui-menu": "0.8.4-main.66e292d",
+    "@dxos/react-ui-sfx": "0.8.4-main.66e292d",
+    "@dxos/react-ui-stack": "0.8.4-main.66e292d",
+    "@dxos/react-ui-tabs": "0.8.4-main.66e292d",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.66e292d",
+    "@dxos/react-ui-thread": "0.8.4-main.66e292d",
+    "@dxos/schema": "0.8.4-main.66e292d",
+    "@dxos/types": "0.8.4-main.66e292d",
+    "@dxos/util": "0.8.4-main.66e292d",
+    "@dxos/react-client": "0.8.4-main.66e292d"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.5acf9ea",
-    "@dxos/plugin-theme": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-theme": "0.8.4-main.5acf9ea",
-    "@dxos/storybook-utils": "0.8.4-main.5acf9ea"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/plugin-theme": "0.8.4-main.66e292d",
+    "@dxos/random": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/storybook-utils": "0.8.4-main.66e292d"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-theme": "0.8.4-main.5acf9ea"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -2,154 +2,162 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
-import { Ref } from '@dxos/echo';
+import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import { Ref, Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { type CreateObjectIntent } from '@dxos/plugin-space/types';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
-import { AnchoredTo, DataType } from '@dxos/schema';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
 
 import {
   AppGraphBuilder,
+  BlueprintDefinition,
   CallManager,
   IntentResolver,
   Markdown,
   ReactRoot,
   ReactSurface,
+  Repair,
   ThreadState,
 } from './capabilities';
-import { meta, THREAD_ITEM } from './meta';
+import { THREAD_ITEM, meta } from './meta';
 import { translations } from './translations';
-import { ChannelType, ThreadAction, ThreadType } from './types';
+import { Channel, ThreadAction } from './types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 //  NOTE(burdon): Review/discuss CursorConverter semantics.
 
 // TODO(wittjosiah): Rename to ChatPlugin.
 // TODO(wittjosiah): Enabling comments should likely be factored out of this plugin but depend on it's capabilities.
-export const ThreadPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/call-manager`,
-      activatesOn: ClientEvents.ClientReady,
-      activate: CallManager,
-    }),
-    // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
-    // defineModule({
-    //   id: `${meta.id}/module/settings`,
-    //   activatesOn: Events.SetupSettings,
-    //   activate: ThreadSettings,
-    // }),
-    defineModule({
-      id: `${meta.id}/module/state`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: Events.SetupSettings,
-      activate: ThreadState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...threadTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: ChannelType.typename,
-          metadata: {
-            icon: 'ph--hash--regular',
+export const ThreadPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/call-manager`,
+    activatesOn: ClientEvents.ClientReady,
+    activate: CallManager,
+  }),
+  // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
+  // defineModule({
+  //   id: `${meta.id}/module/settings`,
+  //   activatesOn: Events.SetupSettings,
+  //   activate: ThreadSettings,
+  // }),
+  defineModule({
+    id: `${meta.id}/module/state`,
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: Events.SetupSettings,
+    activate: ThreadState,
+  }),
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, [...translations, ...threadTranslations]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/metadata`,
+    activatesOn: Events.SetupMetadata,
+    activate: () => [
+      contributes(Capabilities.Metadata, {
+        id: Type.getTypename(Channel.Channel),
+        metadata: {
+          icon: 'ph--hash--regular',
+          iconHue: 'rose',
+          createObjectIntent: ((_, options) =>
+            createIntent(ThreadAction.CreateChannel, {
+              spaceId: options.space.id,
+            })) satisfies CreateObjectIntent,
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Type.getTypename(Thread.Thread),
+        metadata: {
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: async (thread: Thread.Thread) => await Ref.Array.loadAll(thread.messages ?? []),
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Message.Message.typename,
+        metadata: {
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: () => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: THREAD_ITEM,
+        metadata: {
+          parse: (item: Thread.Thread, type: string) => {
+            switch (type) {
+              case 'node':
+                return { id: item.id, label: item.name, data: item };
+              case 'object':
+                return item;
+              case 'view-object':
+                return { id: `${item.id}-view`, object: item };
+            }
           },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: ThreadType.typename,
-          metadata: {
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (thread: ThreadType) => await Ref.Array.loadAll(thread.messages ?? []),
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: DataType.Message.typename,
-          metadata: {
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (message: DataType.Message) => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: THREAD_ITEM,
-          metadata: {
-            parse: (item: ThreadType, type: string) => {
-              switch (type) {
-                case 'node':
-                  return { id: item.id, label: item.name, data: item };
-                case 'object':
-                  return item;
-                case 'view-object':
-                  return { id: `${item.id}-view`, object: item };
-              }
-            },
-          },
-        }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: ChannelType,
-            getIntent: (_, options) => createIntent(ThreadAction.CreateChannel, { spaceId: options.space.id }),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.Schema, [AnchoredTo, ThreadType, DataType.Message, DataType.MessageV1]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/migration`,
-      activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [DataType.MessageV1ToV2]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/on-space-created`,
-      activatesOn: SpaceEvents.SpaceCreated,
-      activate: () =>
-        contributes(SpaceCapabilities.OnSpaceCreated, ({ space, rootCollection }) =>
-          createIntent(ThreadAction.OnSpaceCreated, { space, rootCollection }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/markdown`,
-      activatesOn: MarkdownEvents.SetupExtensions,
-      activate: Markdown,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-root`,
-      activatesOn: Events.Startup,
-      activate: ReactRoot,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-  ]);
+        },
+      }),
+    ],
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(ClientCapabilities.Schema, [
+        AnchoredTo.AnchoredTo,
+        Channel.Channel,
+        Message.Message,
+        Message.MessageV1,
+        Thread.Thread,
+      ]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/migration`,
+    activatesOn: ClientEvents.SetupMigration,
+    activate: () => contributes(ClientCapabilities.Migration, [Message.MessageV1ToV2]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/on-space-created`,
+    activatesOn: SpaceEvents.SpaceCreated,
+    activate: () =>
+      contributes(SpaceCapabilities.OnCreateSpace, (params) => createIntent(ThreadAction.OnCreateSpace, params)),
+  }),
+  defineModule({
+    id: `${meta.id}/module/repair`,
+    activatesOn: ClientEvents.SpacesReady,
+    activate: Repair,
+  }),
+  defineModule({
+    id: `${meta.id}/module/markdown`,
+    activatesOn: MarkdownEvents.SetupExtensions,
+    activate: Markdown,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-root`,
+    activatesOn: Events.Startup,
+    activate: ReactRoot,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  defineModule({
+    id: `${meta.id}/module/blueprint`,
+    activatesOn: Events.SetupArtifactDefinition,
+    activate: BlueprintDefinition,
+  }),
+]);

package/src/calls/call-manager.ts

@@ -12,7 +12,7 @@ import { live } from '@dxos/live-object';
 import { type Tracks } from '@dxos/protocols/proto/dxos/edge/calls';
 import { isNonNullable } from '@dxos/util';
 
-import { CallSwarmSynchronizer, type CallState } from './call-swarm-synchronizer';
+import { type CallState, CallSwarmSynchronizer } from './call-swarm-synchronizer';
 import { MediaManager, type MediaState } from './media-manager';
 import { type ActivityState, CALLS_URL, type EncodedTrackName, TrackNameCodec, type UserState } from './types';
 
@@ -210,7 +210,7 @@ export class CallManager extends Resource {
 
   private _onCallStateUpdated(state: CallState): void {
     const tracksToPull = state.users
-      ?.filter((user) => user.joined && user.id !== state.self?.id)
+      ?.filter((user) => user.joined && user.id !== state.self!.id)
       ?.flatMap((user) => [user.tracks?.video, user.tracks?.audio, user.tracks?.screenshare])
       .filter(isNonNullable);
     this._mediaManager._schedulePullTracks(tracksToPull as EncodedTrackName[]);

package/src/calls/call-swarm-synchronizer.ts

@@ -17,7 +17,7 @@ import { type Device, type NetworkService } from '@dxos/protocols/proto/dxos/cli
 import { ConnectionState, type SwarmResponse } from '@dxos/protocols/proto/dxos/edge/messenger';
 import { isNonNullable } from '@dxos/util';
 
-import { codec, type ActivityState, type UserState } from './types';
+import { type ActivityState, type UserState, codec } from './types';
 
 export type CallState = {
   /**